@@ -5,16 +5,12 @@ require 'active_record' module YamlDb def self.dump(filename) - verify_utf8 - disable_logger YamlDb::Dump.dump(File.new(filename, "w")) reenable_logger end def self.load(filename) - verify_utf8 - disable_logger YamlDb::Load.load(File.new(filename, "r")) reenable_logger @@ -28,22 +24,6 @@ module YamlDb def self.reenable_logger ActiveRecord::Base.logger = @@old_logger end - - class EncodingException < RuntimeError; end - - def self.verify_utf8 - raise "RAILS_ENV is not defined" unless defined?(RAILS_ENV) - - unless ActiveRecord::Base.configurations[RAILS_ENV].has_key?('encoding') - raise EncodingException, "Your database.yml configuration needs to specify encoding" - end - - unless ['unicode', 'utf8'].include?(ActiveRecord::Base.configurations[RAILS_ENV]['encoding']) - raise EncodingException, "Your database encoding must be utf8 (mysql) or unicode (postgres)" - end - - true - end end lib/yaml_db.rb @@ -11,7 +11,6 @@ describe YamlDb::Dump do ActiveRecord::Base.connection.stub!(:select_one).and_return({"count"=>"2"}) ActiveRecord::Base.connection.stub!(:select_all).and_return([ { 'a' => 1, 'b' => 2 }, { 'a' => 3, 'b' => 4 } ]) YamlDb::Utils.stub!(:quote_table).with('mytable').and_return('mytable') - YamlDb.stub!(:verify_utf8) end before(:each) do spec/yaml_dump_spec.rb @@ -3,7 +3,6 @@ require File.dirname(__FILE__) + '/base' describe YamlDb::Load do before do YamlDb::Utils.stub!(:quote_table).with('mytable').and_return('mytable') - YamlDb.stub!(:verify_utf8) ActiveRecord::Base = mock('ActiveRecord::Base', :null_object => true) ActiveRecord::Base.connection = mock('connection') spec/yaml_load_spec.rb spec/yaml_spec.rb 87faf6beefb49609f3091a51acefede142bc2fd8 Adam Wiggins adam@heroku.com http://github.com/adamwiggins/yaml_db/commit/5e94f245c98e71838bc402462c8d817e8b67492d 5e94f245c98e71838bc402462c8d817e8b67492d 2008-10-23T14:54:54-07:00 2008-10-23T14:54:40-07:00 Revert "verify the database encoding is utf8 or unicode" This reverts commit 1917392c269d43962c22ca0f3ec36042522c0909. 43a6d1aa5836f3967c62da23d2f813aebe4aa60b Adam Wiggins adam@heroku.com