Fixed the archive searcher to use repository.adapter.query instead of self.find_by_sql as the behaviour has changed. Also fixed the specific_date_function to no longer load up the config/database.yml

AJ Christensen · El Draper · commit 4904834fe0ae · 2008-07-18T20:54:13.000+01:00
diff --git a/app/models/article.rb b/app/models/article.rb
@@ -131,7 +131,7 @@ def find_by_permalink(permalink)
     end
 
     def get_archive_hash
-      counts = self.find_by_sql("SELECT COUNT(*) as count, #{specific_date_function} FROM articles WHERE published_at IS NOT NULL AND published = 1 GROUP BY year, month ORDER BY year DESC, month DESC")
+      counts = repository.adapter.query("SELECT COUNT(*) as count, #{specific_date_function} FROM articles WHERE published_at IS NOT NULL AND published = 1 GROUP BY year, month ORDER BY year DESC, month DESC")
       archives = counts.map do |entry|
         {
           :name => "#{Date::MONTHNAMES[entry.month.to_i]} #{entry.year}",
@@ -145,8 +145,7 @@ def get_archive_hash
 
     private 
       def specific_date_function
-        # This is pretty nasty loading up the db.yml to get at this, but I wasn't able to find the method in merb just yet. Change it!
-        if YAML::load(File.read("config/database.yml"))[Merb.environment.to_sym][:adapter] == 'sqlite3'
+        if Merb::Orms::DataMapper.full_config[Merb.environment.to_s]["adapter"] == "sqlite3"
           "strftime('%Y', published_at) as year, strftime('%m', published_at) as month"
         else
           "extract(year from published_at) as year, extract(month from published_at) as month"
