@@ -131,7 +131,7 @@ class Article 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 @@ class Article 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" app/models/article.rb 3ecb1bc008c4d7156f2e4dc6e3fe95b8e8726c0d AJ Christensen aj@junglist.gen.nz http://github.com/mleung/feather/commit/4904834fe0ae86fefa5ddbec97036aec104938e9 4904834fe0ae86fefa5ddbec97036aec104938e9 2008-07-18T12:54:13-07:00 2008-07-08T15:25:11-07:00 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 7937a38eb0efb934acbe87196d08a9331501d1c9 El Draper el@eldiablo.co.uk