sequel 3.21.0 → 3.29.0

data/spec/extensions/prepared_statements_spec.rb

@@ -0,0 +1,72 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+describe "prepared_statements plugin" do
+  before do
+    @c = Class.new(Sequel::Model(:people))
+    @c.columns :id, :name, :i
+    @ds = ds = @c.dataset
+    def ds.fetch_rows(sql)
+      db << {:server=>@opts[:server] || :read_only}.merge(opts)[:server]
+      super{|h|}
+      yield(:id=>1, :name=>'foo', :i=>2)
+    end
+    def ds.update(*)
+      db << default_server_opts(opts)[:server]
+      super
+    end
+    def ds.insert(*)
+      db << default_server_opts(opts)[:server]
+      super
+      1
+    end
+    def ds.delete(*)
+      db << default_server_opts(opts)[:server]
+      super
+    end
+    @c.plugin :prepared_statements
+    @p = @c.load(:id=>1, :name=>'foo', :i=>2)
+    @c.db.execute 'foo'
+    @sqls = @c.db.sqls
+    @sqls.clear
+  end
+
+  specify "should correctly lookup by primary key" do
+    @c[1].should == @p
+    @sqls.should == [:read_only, "SELECT * FROM people WHERE (id = 1) LIMIT 1"]
+  end 
+
+  specify "should correctly delete instance" do
+    @p.destroy.should == @p
+    @sqls.should == [:default, "DELETE FROM people WHERE (id = 1)"]
+  end
+
+  specify "should correctly update instance" do
+    @p.update(:name=>'bar').should == @c.load(:id=>1, :name=>'bar', :i => 2)
+    @sqls.should == [:default, "UPDATE people SET name = 'bar' WHERE (id = 1)"]
+  end
+
+  specify "should correctly create instance" do
+    @c.create(:name=>'foo').should == @c.load(:id=>1, :name=>'foo', :i => 2)
+    @sqls.should == [:default, "INSERT INTO people (name) VALUES ('foo')", :default, "SELECT * FROM people WHERE (id = 1) LIMIT 1"]
+  end
+
+  specify "should correctly create instance if dataset supports insert_select" do
+    def @ds.supports_insert_select?
+      true
+    end
+    def @ds.insert_select(h)
+      return {:id=>1, :name=>'foo', :i => 2}
+    end
+    def @ds.insert_sql(*)
+      "#{super}#{' RETURNING *' if opts.has_key?(:returning)}"
+    end
+    @c.create(:name=>'foo').should == @c.load(:id=>1, :name=>'foo', :i => 2)
+    @sqls.should == [:default, "INSERT INTO people (name) VALUES ('foo') RETURNING *"]
+  end
+
+  specify "should work correctly when subclassing" do
+    c = Class.new(@c)
+    c[1].should == c.load(:id=>1, :name=>'foo', :i=>2)
+    @sqls.should == [:read_only, "SELECT * FROM people WHERE (id = 1) LIMIT 1"]
+  end 
+end

data/spec/extensions/prepared_statements_with_pk_spec.rb

@@ -0,0 +1,38 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+describe "prepared_statements_with_pk plugin" do
+  before do
+    @c = Class.new(Sequel::Model(:people))
+    @c.columns :id, :name, :i
+    @ds = ds = @c.dataset
+    def ds.fetch_rows(sql)
+      db << {:server=>@opts[:server] || :read_only}.merge(opts)[:server]
+      super{|h|}
+      yield(:id=>1, :name=>'foo', :i=>2)
+    end
+    @c.plugin :prepared_statements_with_pk
+    @p = @c.load(:id=>1, :name=>'foo', :i=>2)
+    @c.db.execute 'foo'
+    @sqls = @c.db.sqls
+    @sqls.clear
+  end
+
+  specify "should load the prepared_statements plugin" do
+    @c.plugins.should include(Sequel::Plugins::PreparedStatements)
+  end
+
+  specify "should correctly lookup by primary key from dataset" do
+    @c.dataset.filter(:name=>'foo')[1].should == @p
+    @sqls.should == [:read_only, "SELECT * FROM people WHERE ((name = 'foo') AND (people.id = 1)) LIMIT 1"]
+  end
+
+  specify "should still work correctly if there are multiple conflicting variables" do
+    @c.dataset.filter(:name=>'foo').or(:name=>'bar')[1].should == @p
+    @sqls.should == [:read_only, "SELECT * FROM people WHERE (((name = 'foo') OR (name = 'bar')) AND (people.id = 1)) LIMIT 1"]
+  end
+
+  specify "should still work correctly if the primary key is used elsewhere in the query" do
+    @c.dataset.filter{id > 2}[1].should == @p
+    @sqls.should == [:read_only, "SELECT * FROM people WHERE ((id > 2) AND (people.id = 1)) LIMIT 1"]
+  end
+end

data/spec/extensions/schema_dumper_spec.rb

@@ -263,8 +263,8 @@ END_MIG
       s.each{|_, c| c[:ruby_default] = column_schema_to_ruby_default(c[:default], c[:type])}
       s
     end
-    @d.dump_table_schema(:t4).gsub(/[+-]\d\d:\d\d"\)/, '")').should == "create_table(:t4) do\n  TrueClass :c1, :default=>false\n  String :c2, :default=>\"blah\"\n  Integer :c3, :default=>-1\n  Float :c4, :default=>1.0\n  BigDecimal :c5, :default=>BigDecimal.new(\"0.1005E3\")\n  File :c6, :default=>Sequel::SQL::Blob.new(\"blah\")\n  Date :c7, :default=>Date.parse(\"2008-10-29\")\n  DateTime :c8, :default=>DateTime.parse(\"2008-10-29T10:20:30\")\n  Time :c9, :default=>Time.parse(\"10:20:30\"), :only_time=>true\n  String :c10\nend"
-    @d.dump_table_schema(:t4, :same_db=>true).gsub(/[+-]\d\d:\d\d"\)/, '")').should == "create_table(:t4) do\n  column :c1, \"boolean\", :default=>false\n  column :c2, \"varchar\", :default=>\"blah\"\n  column :c3, \"integer\", :default=>-1\n  column :c4, \"float\", :default=>1.0\n  column :c5, \"decimal\", :default=>BigDecimal.new(\"0.1005E3\")\n  column :c6, \"blob\", :default=>Sequel::SQL::Blob.new(\"blah\")\n  column :c7, \"date\", :default=>Date.parse(\"2008-10-29\")\n  column :c8, \"datetime\", :default=>DateTime.parse(\"2008-10-29T10:20:30\")\n  column :c9, \"time\", :default=>Time.parse(\"10:20:30\")\n  column :c10, \"interval\", :default=>\"'6 weeks'\".lit\nend"
+    @d.dump_table_schema(:t4).gsub(/[+-]\d\d:\d\d"\)/, '")').should == "create_table(:t4) do\n  TrueClass :c1, :default=>false\n  String :c2, :default=>\"blah\"\n  Integer :c3, :default=>-1\n  Float :c4, :default=>1.0\n  BigDecimal :c5, :default=>BigDecimal.new(\"0.1005E3\")\n  File :c6, :default=>Sequel::SQL::Blob.new(\"blah\")\n  Date :c7, :default=>Date.parse(\"2008-10-29\")\n  DateTime :c8, :default=>DateTime.parse(\"2008-10-29T10:20:30\")\n  Time :c9, :default=>Sequel::SQLTime.parse(\"10:20:30\"), :only_time=>true\n  String :c10\nend"
+    @d.dump_table_schema(:t4, :same_db=>true).gsub(/[+-]\d\d:\d\d"\)/, '")').should == "create_table(:t4) do\n  column :c1, \"boolean\", :default=>false\n  column :c2, \"varchar\", :default=>\"blah\"\n  column :c3, \"integer\", :default=>-1\n  column :c4, \"float\", :default=>1.0\n  column :c5, \"decimal\", :default=>BigDecimal.new(\"0.1005E3\")\n  column :c6, \"blob\", :default=>Sequel::SQL::Blob.new(\"blah\")\n  column :c7, \"date\", :default=>Date.parse(\"2008-10-29\")\n  column :c8, \"datetime\", :default=>DateTime.parse(\"2008-10-29T10:20:30\")\n  column :c9, \"time\", :default=>Sequel::SQLTime.parse(\"10:20:30\")\n  column :c10, \"interval\", :default=>\"'6 weeks'\".lit\nend"
   end
   
   it "should not use a '...'.lit as a fallback if using MySQL with the :same_db option" do

data/spec/extensions/schema_spec.rb

@@ -23,22 +23,19 @@ describe Sequel::Model, "dataset & schema" do
 end
 
 describe Sequel::Model, "table_exists?" do
-
-  before(:each) do
+  before do
     MODEL_DB.reset
     @model = Class.new(Sequel::Model(:items))
   end
 
   it "should get the table name and question the model's db if table_exists?" do
-    @model.should_receive(:table_name).and_return(:items)
-    @model.db.should_receive(:table_exists?)
-    @model.table_exists?
+    @model.db.should_receive(:table_exists?).and_return(false)
+    @model.table_exists?.should == false
   end
 end
 
 describe Sequel::Model, "create_table and schema" do
-
-  before(:each) do
+  before do
     MODEL_DB.reset
     @model = Class.new(Sequel::Model) do
       set_schema(:items) do
@@ -60,7 +57,7 @@ describe Sequel::Model, "create_table and schema" do
 
   it "should reload the schema from the database" do
     schem = {:name=>{:type=>:string}, :price=>{:type=>:float}}
-    @model.db.should_receive(:schema).with(:items, :reload=>true).and_return(schem.to_a.sort_by{|x| x[0].to_s})
+    @model.db.should_receive(:schema).with(@model.dataset, :reload=>true).and_return(schem.to_a.sort_by{|x| x[0].to_s})
     @model.create_table
     @model.db_schema.should == schem
     @model.instance_variable_get(:@columns).should == [:name, :price]
@@ -84,19 +81,15 @@ describe Sequel::Model, "create_table and schema" do
 end
 
 describe Sequel::Model, "drop_table" do
-
-  before(:each) do
-    MODEL_DB.reset
+  before do
     @model = Class.new(Sequel::Model(:items))
+    MODEL_DB.reset
   end
 
   it "should get the drop table SQL for the associated table and then execute the SQL." do
-    @model.should_receive(:table_name).and_return(:items)
-    @model.db.should_receive(:drop_table_sql).with(:items)
-    @model.db.should_receive(:execute).and_return(:true)
     @model.drop_table
+    MODEL_DB.sqls.should == ['DROP TABLE items']
   end
-
 end
 
 describe Sequel::Model, "create_table!" do
@@ -106,9 +99,8 @@ describe Sequel::Model, "create_table!" do
   end
   
   it "should drop table if it exists and then create the table" do
-    @model.should_receive(:drop_table).and_return(true)
-    @model.should_receive(:create_table).and_return(true)
     @model.create_table!
+    MODEL_DB.sqls.should == ['DROP TABLE items', 'CREATE TABLE items ()']
   end
 end
 
@@ -120,13 +112,13 @@ describe Sequel::Model, "create_table?" do
   
   it "should not create the table if it already exists" do
     @model.should_receive(:table_exists?).and_return(true)
-    @model.should_not_receive(:create_table)
-    @model.create_table?.should == nil
+    @model.create_table?
+    MODEL_DB.sqls.should == []
   end
 
   it "should create the table if it doesn't exist" do
     @model.should_receive(:table_exists?).and_return(false)
-    @model.should_receive(:create_table).and_return(3)
-    @model.create_table?.should == 3
+    @model.create_table?
+    MODEL_DB.sqls.should == ['CREATE TABLE items ()']
   end
 end

data/spec/extensions/serialization_modification_detection_spec.rb

@@ -0,0 +1,37 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require 'yaml'
+
+describe "serialization_modification_detection plugin" do
+  before do
+    @c = Class.new(Sequel::Model(:items))
+    @c.class_eval do
+      columns :id, :h
+      plugin :serialization, :yaml, :h
+      plugin :serialization_modification_detection
+    end
+    @o1 = @c.new
+    @o2 = @c.load(:id=>1, :h=>"--- {}\n\n")
+    MODEL_DB.reset
+  end
+  
+  it "should not detect columns that haven't been changed" do
+    @o2.changed_columns.should == []
+    @o2.h.should == {}
+    @o2.h[1] = 2
+    @o2.h.clear
+    @o2.changed_columns.should == []
+  end
+  
+  it "should detect columns that have been changed" do
+    @o2.changed_columns.should == []
+    @o2.h.should == {}
+    @o2.h[1] = 2
+    @o2.changed_columns.should == [:h]
+  end
+  
+  it "should report correct changed_columns after saving" do
+    @o2.h[1] = 2
+    @o2.save_changes
+    @o2.changed_columns.should == []
+  end
+end

data/spec/extensions/serialization_spec.rb

@@ -22,11 +22,11 @@ describe "Serialization plugin" do
   it "should allow setting additional serializable attributes via plugin :serialization call" do
     @c.plugin :serialization, :yaml, :abc
     @c.create(:abc => 1, :def=> 2)
-    MODEL_DB.sqls.last.should =~ /INSERT INTO items \((abc, def|def, abc)\) VALUES \(('--- 1\n', 2|2, '--- 1\n')\)/
+    MODEL_DB.sqls.last.should =~ /INSERT INTO items \((abc, def|def, abc)\) VALUES \(('--- 1\n(\.\.\.\n)?', 2|2, '--- 1\n(\.\.\.\n)?')\)/
 
     @c.plugin :serialization, :marshal, :def
     @c.create(:abc => 1, :def=> 1)
-    MODEL_DB.sqls.last.should =~ /INSERT INTO items \((abc, def|def, abc)\) VALUES \(('--- 1\n', 'BAhpBg==\n'|'BAhpBg==\n', '--- 1\n')\)/
+    MODEL_DB.sqls.last.should =~ /INSERT INTO items \((abc, def|def, abc)\) VALUES \(('--- 1\n(\.\.\.\n)?', 'BAhpBg==\n'|'BAhpBg==\n', '--- 1\n(\.\.\.\n)?')\)/
     
     @c.plugin :serialization, :json, :ghi
     @c.create(:ghi => [123])
@@ -38,10 +38,7 @@ describe "Serialization plugin" do
     @c.create(:abc => 1)
     @c.create(:abc => "hello")
 
-    MODEL_DB.sqls.should == [ \
-      "INSERT INTO items (abc) VALUES ('--- 1\n')", \
-      "INSERT INTO items (abc) VALUES ('--- hello\n')", \
-    ]
+    MODEL_DB.sqls.map{|s| s.sub("...\n", '')}.should == ["INSERT INTO items (abc) VALUES ('--- 1\n')", "INSERT INTO items (abc) VALUES ('--- hello\n')"]
   end
 
   it "serialization_format should be the serialization format used" do
@@ -97,7 +94,7 @@ describe "Serialization plugin" do
 
     o.update(:abc => 23)
     @c.create(:abc => [1, 2, 3])
-    MODEL_DB.sqls.should == ["UPDATE items SET abc = '--- 23\n' WHERE (id = 1)",
+    MODEL_DB.sqls.should == ["UPDATE items SET abc = '#{23.to_yaml}' WHERE (id = 1)",
       "INSERT INTO items (abc) VALUES ('#{[1, 2, 3].to_yaml}')"]
   end
 
@@ -164,7 +161,7 @@ describe "Serialization plugin" do
 
     o.update(:abc => 23)
     Class.new(@c).create(:abc => [1, 2, 3])
-    MODEL_DB.sqls.should == ["UPDATE items SET abc = '--- 23\n' WHERE (id = 1)",
+    MODEL_DB.sqls.should == ["UPDATE items SET abc = '#{23.to_yaml}' WHERE (id = 1)",
       "INSERT INTO items (abc) VALUES ('#{[1, 2, 3].to_yaml}')"]
   end
 

data/spec/extensions/single_table_inheritance_spec.rb

@@ -54,6 +54,17 @@ describe Sequel::Model, "#sti_key" do
     StiTest.all.collect{|x| x.class}.should == [StiTest, StiTestSub1, StiTestSub2]
   end 
 
+  it "should return rows with the correct class for subclasses based on the polymorphic_key value" do
+    class ::StiTestSub1Sub < StiTestSub1
+    end 
+    ds = StiTestSub1.dataset
+    def ds.fetch_rows(sql)
+      yield({:kind=>'StiTestSub1'})
+      yield({:kind=>'StiTestSub1Sub'})
+    end 
+    StiTestSub1.all.collect{|x| x.class}.should == [StiTestSub1, StiTestSub1Sub]
+  end 
+
   it "should fallback to the main class if the given class does not exist" do
     def @ds.fetch_rows(sql)
       yield({:kind=>'StiTestSub3'})

data/spec/extensions/spec_helper.rb

@@ -8,9 +8,11 @@ unless Sequel.const_defined?('Model')
   require 'sequel/model'
 end
 
-Sequel.extension(*%w'string_date_time inflector pagination query pretty_table blank migration schema_dumper looser_typecasting sql_expr thread_local_timezones to_dot')
+Sequel.extension(*%w'string_date_time inflector pagination query pretty_table blank migration schema_dumper looser_typecasting sql_expr thread_local_timezones to_dot columns_introspection')
 {:hook_class_methods=>[], :schema=>[], :validation_class_methods=>[]}.each{|p, opts| Sequel::Model.plugin(p, *opts)}
 
+Sequel::Dataset.introspect_all_columns if ENV['SEQUEL_COLUMNS_INTROSPECTION']
+
 def skip_warn(s)
   warn "Skipping test of #{s}" if ENV["SKIPPED_TEST_WARN"]
 end
@@ -46,6 +48,10 @@ class MockDatabase < Sequel::Database
   self.identifier_input_method = nil
   self.identifier_output_method = nil
   attr_reader :sqls
+
+  def connect(opts)
+    Object.new
+  end
   
   def execute(sql, opts={})
     @sqls ||= []

data/spec/extensions/thread_local_timezones_spec.rb

@@ -39,7 +39,27 @@ describe "Sequel thread_local_timezones extension" do
   end
     
   it "should be thread safe" do
-    [Thread.new{Sequel.thread_application_timezone = :utc; sleep 0.03; Sequel.application_timezone.should == :utc},
-     Thread.new{sleep 0.01; Sequel.thread_application_timezone = :local; sleep 0.01; Sequel.application_timezone.should == :local}].each{|x| x.join}
+    q, q1, q2 = Queue.new, Queue.new, Queue.new
+    tz1, tz2 = nil, nil
+    t1 = Thread.new do
+      Sequel.thread_application_timezone = :utc
+      q2.push nil
+      q.pop
+      tz1 = Sequel.application_timezone
+    end
+    t2 = Thread.new do
+      Sequel.thread_application_timezone = :local
+      q2.push nil
+      q1.pop
+      tz2 = Sequel.application_timezone
+    end
+    q2.pop
+    q2.pop
+    q.push nil
+    q1.push nil
+    t1.join
+    t2.join
+    tz1.should == :utc
+    tz2.should == :local
   end
 end

data/spec/extensions/to_dot_spec.rb

@@ -2,9 +2,7 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe Sequel::Model, "to_dot extension" do
   def dot(ds)
-    a = []
-    ds.send(:_to_dot, a, "", 0, ds, 0)
-    a[2..-1]
+    Sequel::ToDot.new(ds).instance_variable_get(:@dot)[4...-1]
   end
 
   before do
@@ -123,7 +121,7 @@ END
   end
 
   it "should handle SQL::Subscript" do
-    dot(@ds.select(:a.sql_subscript(1))).should == ["1 -> 2 [label=\"select\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\"Subscript: a\"];", "3 -> 4 [label=\"f\"];", "4 [label=\":a\"];", "3 -> 5 [label=\"sub\"];", "5 [label=\"Array\"];", "5 -> 6 [label=\"0\"];", "6 [label=\"1\"];"]
+    dot(@ds.select(:a.sql_subscript(1))).should == ["1 -> 2 [label=\"select\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\"Subscript\"];", "3 -> 4 [label=\"f\"];", "4 [label=\":a\"];", "3 -> 5 [label=\"sub\"];", "5 [label=\"Array\"];", "5 -> 6 [label=\"0\"];", "6 [label=\"1\"];"]
   end
 
   it "should handle SQL::WindowFunction" do
@@ -135,7 +133,7 @@ END
   end
 
   it "should handle JOIN ON" do
-    dot(@ds.from(:a).join(:d, :b=>:c)).should == ["1 -> 2 [label=\"from\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\":a\"];", "1 -> 4 [label=\"join\"];", "4 [label=\"Array\"];", "4 -> 5 [label=\"0\"];", "5 [label=\"INNER JOIN ON\"];", "5 -> 6 [label=\"table\"];", "6 [label=\":d\"];", "5 -> 7 [label=\"on\"];", "7 [label=\"Array\"];", "7 -> 8 [label=\"0\"];", "8 [label=\"Array\"];", "8 -> 9 [label=\"0\"];", "9 [label=\"QualifiedIdentifier\"];", "9 -> 10 [label=\"table\"];", "10 [label=\"\\\"d\\\"\"];", "9 -> 11 [label=\"column\"];", "11 [label=\"\\\"b\\\"\"];", "8 -> 12 [label=\"1\"];", "12 [label=\"QualifiedIdentifier\"];", "12 -> 13 [label=\"table\"];", "13 [label=\"\\\"a\\\"\"];", "12 -> 14 [label=\"column\"];", "14 [label=\"\\\"c\\\"\"];"]
+    dot(@ds.from(:a).join(:d, :b=>:c)).should == ["1 -> 2 [label=\"from\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\":a\"];", "1 -> 4 [label=\"join\"];", "4 [label=\"Array\"];", "4 -> 5 [label=\"0\"];", "5 [label=\"INNER JOIN ON\"];", "5 -> 6 [label=\"table\"];", "6 [label=\":d\"];", "5 -> 7 [label=\"on\"];", "7 [label=\"ComplexExpression: =\"];", "7 -> 8 [label=\"0\"];", "8 [label=\"QualifiedIdentifier\"];", "8 -> 9 [label=\"table\"];", "9 [label=\"\\\"d\\\"\"];", "8 -> 10 [label=\"column\"];", "10 [label=\"\\\"b\\\"\"];", "7 -> 11 [label=\"1\"];", "11 [label=\"QualifiedIdentifier\"];", "11 -> 12 [label=\"table\"];", "12 [label=\"\\\"a\\\"\"];", "11 -> 13 [label=\"column\"];", "13 [label=\"\\\"c\\\"\"];"]
   end
 
   it "should handle JOIN USING" do

data/spec/extensions/typecast_on_load_spec.rb

@@ -2,22 +2,17 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe Sequel::Model, "TypecastOnLoad plugin" do
   before do
-    @db = Sequel::Database.new({})
+    @db = Sequel.mock(:fetch=>{:id=>1, :b=>"1", :y=>"0"}, :columns=>[:id, :b, :y])
     def @db.schema(*args)
       [[:id, {}], [:y, {:type=>:boolean, :db_type=>'tinyint(1)'}], [:b, {:type=>:integer, :db_type=>'integer'}]]
     end
     @c = Class.new(Sequel::Model(@db[:items])) do
-      include(Module.new{def _refresh(ds); values[:b] = b.to_s; self; end})
       attr_accessor :bset
       def b=(x)
         self.bset = true
         super
       end
     end
-    @c.instance_eval do
-      @columns = [:id, :b, :y]
-      def columns; @columns; end
-    end
   end 
 
   specify "should call setter method with value when loading the object, for all given columns" do

data/spec/extensions/xml_serializer_spec.rb

@@ -36,6 +36,18 @@ describe "Sequel::Plugins::XmlSerializer" do
     Album.from_xml(@album.to_xml).should == @album
   end
 
+  it "should round trip successfully for namespaced models" do
+    module XmlSerializerTest
+      class Artist < Sequel::Model
+      plugin :xml_serializer
+      columns :id, :name
+      @db_schema = {:id=>{:type=>:integer}, :name=>{:type=>:string}}
+      end 
+    end
+    artist = XmlSerializerTest::Artist.load(:id=>2, :name=>'YJM')
+    XmlSerializerTest::Artist.from_xml(artist.to_xml).should == artist
+  end
+
   it "should round trip successfully with empty strings" do
     artist = Artist.load(:id=>2, :name=>'')
     Artist.from_xml(artist.to_xml).should == artist
@@ -106,13 +118,13 @@ describe "Sequel::Plugins::XmlSerializer" do
   end
 
   it "should support an :encoding option when serializing" do
-    ["<?xml version=\"1.0\" encoding=\"utf-8\"?><artist><id>2</id><name>YJM</name></artist>",
-     "<?xml version=\"1.0\" encoding=\"utf-8\"?><artist><name>YJM</name><id>2</id></artist>"].should include(@artist.to_xml(:encoding=>'utf-8').gsub(/\n */m, ''))
+    ["<?xml version=\"1.0\" encoding=\"UTF-8\"?><artist><id>2</id><name>YJM</name></artist>",
+     "<?xml version=\"1.0\" encoding=\"UTF-8\"?><artist><name>YJM</name><id>2</id></artist>"].should include(@artist.to_xml(:encoding=>'UTF-8').gsub(/\n */m, ''))
   end
 
   it "should support a :builder_opts option when serializing" do
-    ["<?xml version=\"1.0\" encoding=\"utf-8\"?><artist><id>2</id><name>YJM</name></artist>",
-     "<?xml version=\"1.0\" encoding=\"utf-8\"?><artist><name>YJM</name><id>2</id></artist>"].should include(@artist.to_xml(:builder_opts=>{:encoding=>'utf-8'}).gsub(/\n */m, ''))
+    ["<?xml version=\"1.0\" encoding=\"UTF-8\"?><artist><id>2</id><name>YJM</name></artist>",
+     "<?xml version=\"1.0\" encoding=\"UTF-8\"?><artist><name>YJM</name><id>2</id></artist>"].should include(@artist.to_xml(:builder_opts=>{:encoding=>'UTF-8'}).gsub(/\n */m, ''))
   end
 
   it "should support an :types option when serializing" do