sequel 3.26.0 → 3.27.0

data/lib/sequel/version.rb

@@ -3,7 +3,7 @@ module Sequel
   MAJOR = 3
   # The minor version of Sequel.  Bumped for every non-patch level
   # release, generally around once a month.
-  MINOR = 26
+  MINOR = 27
   # The tiny version of Sequel.  Usually 0, only bumped for bugfix
   # releases that fix regressions from previous versions.
   TINY  = 0

data/spec/adapters/mysql_spec.rb

@@ -956,7 +956,7 @@ describe "MySQL::Dataset#calc_found_rows" do
   end
 end
 
-if MYSQL_DB.adapter_scheme == :mysql or MYSQL_DB.adapter_scheme == :jdbc
+if MYSQL_DB.adapter_scheme == :mysql or MYSQL_DB.adapter_scheme == :jdbc or MYSQL_DB.adapter_scheme == :mysql2
   describe "MySQL Stored Procedures" do
     before do
       MYSQL_DB.create_table(:items){Integer :id; Integer :value}
@@ -977,26 +977,30 @@ if MYSQL_DB.adapter_scheme == :mysql or MYSQL_DB.adapter_scheme == :jdbc
       MYSQL_DB[:items].count.should == 0
     end
     
-    specify "should be callable on the dataset object" do
-      MYSQL_DB.execute_ddl('CREATE PROCEDURE test_sproc(a INTEGER) BEGIN SELECT *, a AS b FROM items; END')
-      MYSQL_DB[:items].delete
-      @d = MYSQL_DB[:items]
-      @d.call_sproc(:select, :test_sproc, 3).should == []
-      @d.insert(:value=>1)
-      @d.call_sproc(:select, :test_sproc, 4).should == [{:id=>nil, :value=>1, :b=>4}]
-      @d.row_proc = proc{|r| r.keys.each{|k| r[k] *= 2 if r[k].is_a?(Integer)}; r}
-      @d.call_sproc(:select, :test_sproc, 3).should == [{:id=>nil, :value=>2, :b=>6}]
-    end
-    
-    specify "should be callable on the dataset object with multiple arguments" do
-      MYSQL_DB.execute_ddl('CREATE PROCEDURE test_sproc(a INTEGER, c INTEGER) BEGIN SELECT *, a AS b, c AS d FROM items; END')
-      MYSQL_DB[:items].delete
-      @d = MYSQL_DB[:items]
-      @d.call_sproc(:select, :test_sproc, 3, 4).should == []
-      @d.insert(:value=>1)
-      @d.call_sproc(:select, :test_sproc, 4, 5).should == [{:id=>nil, :value=>1, :b=>4, :d=>5}]
-      @d.row_proc = proc{|r| r.keys.each{|k| r[k] *= 2 if r[k].is_a?(Integer)}; r}
-      @d.call_sproc(:select, :test_sproc, 3, 4).should == [{:id=>nil, :value=>2, :b=>6, :d => 8}]
+    # Mysql2 doesn't support stored procedures that return result sets, probably because
+    # CLIENT_MULTI_RESULTS is not set.
+    unless MYSQL_DB.adapter_scheme == :mysql2
+      specify "should be callable on the dataset object" do
+        MYSQL_DB.execute_ddl('CREATE PROCEDURE test_sproc(a INTEGER) BEGIN SELECT *, a AS b FROM items; END')
+        MYSQL_DB[:items].delete
+        @d = MYSQL_DB[:items]
+        @d.call_sproc(:select, :test_sproc, 3).should == []
+        @d.insert(:value=>1)
+        @d.call_sproc(:select, :test_sproc, 4).should == [{:id=>nil, :value=>1, :b=>4}]
+        @d.row_proc = proc{|r| r.keys.each{|k| r[k] *= 2 if r[k].is_a?(Integer)}; r}
+        @d.call_sproc(:select, :test_sproc, 3).should == [{:id=>nil, :value=>2, :b=>6}]
+      end
+      
+      specify "should be callable on the dataset object with multiple arguments" do
+        MYSQL_DB.execute_ddl('CREATE PROCEDURE test_sproc(a INTEGER, c INTEGER) BEGIN SELECT *, a AS b, c AS d FROM items; END')
+        MYSQL_DB[:items].delete
+        @d = MYSQL_DB[:items]
+        @d.call_sproc(:select, :test_sproc, 3, 4).should == []
+        @d.insert(:value=>1)
+        @d.call_sproc(:select, :test_sproc, 4, 5).should == [{:id=>nil, :value=>1, :b=>4, :d=>5}]
+        @d.row_proc = proc{|r| r.keys.each{|k| r[k] *= 2 if r[k].is_a?(Integer)}; r}
+        @d.call_sproc(:select, :test_sproc, 3, 4).should == [{:id=>nil, :value=>2, :b=>6, :d => 8}]
+      end
     end
 
     specify "should deal with nil values" do

data/spec/core/database_spec.rb

@@ -1344,6 +1344,206 @@ describe "Database#typecast_value" do
     @db.typecast_value(:integer, "0x80").should == 128
   end
 
+  specify "should typecast blobs as as Sequel::SQL::Blob" do
+    v = @db.typecast_value(:blob, "0x013")
+    v.should be_a_kind_of(Sequel::SQL::Blob)
+    v.should == Sequel::SQL::Blob.new("0x013")
+    @db.typecast_value(:blob, v).object_id.should == v.object_id
+  end
+
+  specify "should typecast boolean values to true, false, or nil" do
+    @db.typecast_value(:boolean, false).should be_false
+    @db.typecast_value(:boolean, 0).should be_false
+    @db.typecast_value(:boolean, "0").should be_false
+    @db.typecast_value(:boolean, 'f').should be_false
+    @db.typecast_value(:boolean, 'false').should be_false
+    @db.typecast_value(:boolean, true).should be_true
+    @db.typecast_value(:boolean, 1).should be_true
+    @db.typecast_value(:boolean, '1').should be_true
+    @db.typecast_value(:boolean, 't').should be_true
+    @db.typecast_value(:boolean, 'true').should be_true
+    @db.typecast_value(:boolean, '').should be_nil
+  end
+
+  specify "should typecast date values to Date" do
+    @db.typecast_value(:date, Date.today).should == Date.today
+    @db.typecast_value(:date, DateTime.now).should == Date.today
+    @db.typecast_value(:date, Time.now).should == Date.today
+    @db.typecast_value(:date, Date.today.to_s).should == Date.today
+    @db.typecast_value(:date, :year=>Date.today.year, :month=>Date.today.month, :day=>Date.today.day).should == Date.today
+  end
+
+  specify "should typecast datetime values to Sequel.datetime_class with correct timezone handling" do
+    t = Time.utc(2011, 1, 2, 3, 4, 5) # UTC Time
+    t2 = Time.mktime(2011, 1, 2, 3, 4, 5) # Local Time
+    t3 = Time.utc(2011, 1, 2, 3, 4, 5) - (t - t2) # Local Time in UTC Time
+    t4 = Time.mktime(2011, 1, 2, 3, 4, 5) + (t - t2) # UTC Time in Local Time
+    dt = DateTime.civil(2011, 1, 2, 3, 4, 5)
+    r1 = defined?(Rational) ? Rational(t2.utc_offset, 86400) : t2.utc_offset/86400.0
+    r2 = defined?(Rational) ? Rational((t - t2).to_i, 86400) : (t - t2).to_i/86400.0
+    dt2 = DateTime.civil(2011, 1, 2, 3, 4, 5, r1)
+    dt3 = DateTime.civil(2011, 1, 2, 3, 4, 5) - r2
+    dt4 = DateTime.civil(2011, 1, 2, 3, 4, 5, r1) + r2
+
+    t.should == t4
+    t2.should == t3
+    dt.should == dt4
+    dt2.should == dt3
+
+    check = proc do |i, o| 
+      v = @db.typecast_value(:datetime, i)
+      v.should == o
+      if o.is_a?(Time)
+        v.utc_offset.should == o.utc_offset
+      else
+        v.offset.should == o.offset
+      end
+    end
+    begin
+      @db.typecast_value(:datetime, dt).should == t
+      @db.typecast_value(:datetime, dt2).should == t2
+      @db.typecast_value(:datetime, t).should == t
+      @db.typecast_value(:datetime, t2).should == t2
+      @db.typecast_value(:datetime, dt.to_s).should == t
+      @db.typecast_value(:datetime, dt.strftime('%F %T')).should == t2
+      @db.typecast_value(:datetime, Date.civil(2011, 1, 2)).should == Time.mktime(2011, 1, 2, 0, 0, 0)
+      @db.typecast_value(:datetime, :year=>dt.year, :month=>dt.month, :day=>dt.day, :hour=>dt.hour, :minute=>dt.min, :second=>dt.sec).should == t2
+
+      Sequel.datetime_class = DateTime
+      @db.typecast_value(:datetime, dt).should == dt
+      @db.typecast_value(:datetime, dt2).should == dt2
+      @db.typecast_value(:datetime, t).should == dt
+      @db.typecast_value(:datetime, t2).should == dt2
+      @db.typecast_value(:datetime, dt.to_s).should == dt
+      @db.typecast_value(:datetime, dt.strftime('%F %T')).should == dt
+      @db.typecast_value(:datetime, Date.civil(2011, 1, 2)).should == DateTime.civil(2011, 1, 2, 0, 0, 0)
+      @db.typecast_value(:datetime, :year=>dt.year, :month=>dt.month, :day=>dt.day, :hour=>dt.hour, :minute=>dt.min, :second=>dt.sec).should == dt
+
+      Sequel.application_timezone = :utc
+      Sequel.typecast_timezone = :local
+      Sequel.datetime_class = Time
+      check[dt, t]
+      check[dt2, t3]
+      check[t, t]
+      check[t2, t3]
+      check[dt.to_s, t]
+      check[dt.strftime('%F %T'), t3]
+      check[Date.civil(2011, 1, 2), Time.utc(2011, 1, 2, 0, 0, 0)]
+      check[{:year=>dt.year, :month=>dt.month, :day=>dt.day, :hour=>dt.hour, :minute=>dt.min, :second=>dt.sec}, t3]
+
+      Sequel.datetime_class = DateTime
+      check[dt, dt]
+      check[dt2, dt3]
+      check[t, dt]
+      check[t2, dt3]
+      check[dt.to_s, dt]
+      check[dt.strftime('%F %T'), dt3]
+      check[Date.civil(2011, 1, 2), DateTime.civil(2011, 1, 2, 0, 0, 0)]
+      check[{:year=>dt.year, :month=>dt.month, :day=>dt.day, :hour=>dt.hour, :minute=>dt.min, :second=>dt.sec}, dt3]
+
+      Sequel.typecast_timezone = :utc
+      Sequel.datetime_class = Time
+      check[dt, t]
+      check[dt2, t3]
+      check[t, t]
+      check[t2, t3]
+      check[dt.to_s, t]
+      check[dt.strftime('%F %T'), t]
+      check[Date.civil(2011, 1, 2), Time.utc(2011, 1, 2, 0, 0, 0)]
+      check[{:year=>dt.year, :month=>dt.month, :day=>dt.day, :hour=>dt.hour, :minute=>dt.min, :second=>dt.sec}, t]
+
+      Sequel.datetime_class = DateTime
+      check[dt, dt]
+      check[dt2, dt3]
+      check[t, dt]
+      check[t2, dt3]
+      check[dt.to_s, dt]
+      check[dt.strftime('%F %T'), dt]
+      check[Date.civil(2011, 1, 2), DateTime.civil(2011, 1, 2, 0, 0, 0)]
+      check[{:year=>dt.year, :month=>dt.month, :day=>dt.day, :hour=>dt.hour, :minute=>dt.min, :second=>dt.sec}, dt]
+
+      Sequel.application_timezone = :local
+      Sequel.datetime_class = Time
+      check[dt, t4]
+      check[dt2, t2]
+      check[t, t4]
+      check[t2, t2]
+      check[dt.to_s, t4]
+      check[dt.strftime('%F %T'), t4]
+      check[Date.civil(2011, 1, 2), Time.local(2011, 1, 2, 0, 0, 0)]
+      check[{:year=>dt.year, :month=>dt.month, :day=>dt.day, :hour=>dt.hour, :minute=>dt.min, :second=>dt.sec}, t4]
+
+      Sequel.datetime_class = DateTime
+      check[dt, dt4]
+      check[dt2, dt2]
+      check[t, dt4]
+      check[t2, dt2]
+      check[dt.to_s, dt4]
+      check[dt.strftime('%F %T'), dt4]
+      check[Date.civil(2011, 1, 2), DateTime.civil(2011, 1, 2, 0, 0, 0, r1)]
+      check[{:year=>dt.year, :month=>dt.month, :day=>dt.day, :hour=>dt.hour, :minute=>dt.min, :second=>dt.sec}, dt4]
+
+      Sequel.typecast_timezone = :local
+      Sequel.datetime_class = Time
+      check[dt, t4]
+      check[dt2, t2]
+      check[t, t4]
+      check[t2, t2]
+      check[dt.to_s, t4]
+      check[dt.strftime('%F %T'), t2]
+      check[Date.civil(2011, 1, 2), Time.local(2011, 1, 2, 0, 0, 0)]
+      check[{:year=>dt.year, :month=>dt.month, :day=>dt.day, :hour=>dt.hour, :minute=>dt.min, :second=>dt.sec}, t2]
+
+      Sequel.datetime_class = DateTime
+      check[dt, dt4]
+      check[dt2, dt2]
+      check[t, dt4]
+      check[t2, dt2]
+      check[dt.to_s, dt4]
+      check[dt.strftime('%F %T'), dt2]
+      check[Date.civil(2011, 1, 2), DateTime.civil(2011, 1, 2, 0, 0, 0, r1)]
+      check[{:year=>dt.year, :month=>dt.month, :day=>dt.day, :hour=>dt.hour, :minute=>dt.min, :second=>dt.sec}, dt2]
+
+    ensure
+      Sequel.default_timezone = nil
+      Sequel.datetime_class = Time
+    end
+  end
+
+  specify "should typecast decimal values to BigDecimal" do
+    [1.0, 1, '1.0', BigDecimal('1.0')].each do |i|
+      v = @db.typecast_value(:decimal, i)
+      v.should be_a_kind_of(BigDecimal)
+      v.should == BigDecimal.new('1.0')
+    end
+  end
+
+  specify "should typecast float values to Float" do
+    [1.0, 1, '1.0', BigDecimal('1.0')].each do |i|
+      v = @db.typecast_value(:float, i)
+      v.should be_a_kind_of(Float)
+      v.should == 1.0
+    end
+  end
+
+  specify "should typecast string values to String" do
+    [1.0, '1.0', '1.0'.to_sequel_blob].each do |i|
+      v = @db.typecast_value(:string, i)
+      v.should be_an_instance_of(String)
+      v.should == "1.0"
+    end
+  end
+
+  specify "should typecast time values to SQLTime" do
+    t = Time.now
+    st = Sequel::SQLTime.local(t.year, t.month, t.day, 1, 2, 3)
+    [st, Time.utc(t.year, t.month, t.day, 1, 2, 3), Time.local(t.year, t.month, t.day, 1, 2, 3), '01:02:03', {:hour=>1, :minute=>2, :second=>3}].each do |i|
+      v = @db.typecast_value(:time, i)
+      v.should be_an_instance_of(Sequel::SQLTime)
+      v.should == st
+    end
+  end
+
   specify "should have an underlying exception class available at wrapped_exception" do
     begin
       @db.typecast_value(:date, 'a')

data/spec/core/dataset_spec.rb

@@ -1020,6 +1020,12 @@ describe "Dataset#literal" do
     d.literal(d).should == "(#{d.sql})"
   end
   
+  specify "should literalize Sequel::SQLTime properly" do
+    t = Sequel::SQLTime.now
+    s = t.strftime("'%H:%M:%S")
+    @dataset.literal(t).should == "#{s}.#{sprintf('%06i', t.usec)}'"
+  end
+  
   specify "should literalize Time properly" do
     t = Time.now
     s = t.strftime("'%Y-%m-%d %H:%M:%S")

data/spec/extensions/prepared_statements_safe_spec.rb

@@ -66,4 +66,14 @@ describe "prepared_statements_safe plugin" do
     @p.update(:i=>3)
     @sqls[1].should =~ /UPDATE people SET (name = 'foo'|i = 3), (name = 'foo'|i = 3) WHERE \(id = 1\)/
   end
+
+  specify "should work with abstract classes" do
+    c = Class.new(Sequel::Model)
+    c.plugin :prepared_statements_safe
+    c1 = Class.new(c)
+    c1.meta_def(:get_db_schema){@db_schema = {:i=>{:default=>'f(x)'}, :name=>{:ruby_default=>'foo'}, :id=>{:primary_key=>true}}}
+    c1.set_dataset(:people)
+    c1.prepared_statements_column_defaults.should == {:name=>'foo'}
+    Class.new(c1).prepared_statements_column_defaults.should == {:name=>'foo'}
+  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/integration/schema_test.rb

@@ -246,6 +246,15 @@ describe "Database schema modifiers" do
     @db.schema(:items, :reload=>true).map{|x| x.first}.should == [:number, :id]
     @ds.columns!.should == [:number, :id]
     @ds.map(:number).should == [10]
+    proc{@ds.insert(:id=>@ds.map(:id).first)}.should raise_error
+  end
+
+  cspecify "should drop primary key constraints from tables correctly", :sqlite do
+    @db.create_table!(:items){Integer :number; primary_key [:number], :name=>:items_pk}
+    @ds.insert(:number=>10)
+    @db.alter_table(:items){drop_constraint :items_pk, :type=>:primary_key}
+    @ds.map(:number).should == [10]
+    proc{@ds.insert(10)}.should_not raise_error
   end
 
   specify "should add foreign key columns to tables correctly" do
@@ -320,13 +329,33 @@ describe "Database schema modifiers" do
   end
 
   cspecify "should add unique constraints and foreign key table constraints correctly", :sqlite do
-    @db.create_table!(:items){Integer :id; Integer :item_id}
+    @db.create_table!(:items, :engine=>:InnoDB){Integer :id; Integer :item_id}
     @db.alter_table(:items) do
       add_unique_constraint [:item_id, :id]
       add_foreign_key [:id, :item_id], :items, :key=>[:item_id, :id]
     end
     @db.schema(:items, :reload=>true).map{|x| x.first}.should == [:id, :item_id]
     @ds.columns!.should == [:id, :item_id]
+    proc{@ds.insert(1, 1)}.should_not raise_error
+    proc{@ds.insert(1, 1)}.should raise_error
+    proc{@ds.insert(1, 2)}.should raise_error
+  end
+
+  cspecify "should drop unique constraints and foreign key table constraints correctly", :sqlite do
+    @db.create_table!(:items) do
+      Integer :id
+      Integer :item_id
+      unique [:item_id, :id], :name=>:items_uk
+      foreign_key [:id, :item_id], :items, :key=>[:item_id, :id], :name=>:items_fk
+    end
+    @db.alter_table(:items) do
+      drop_constraint(:items_fk, :type=>:foreign_key)
+      drop_constraint(:items_uk, :type=>:unique)
+    end
+    @db.schema(:items, :reload=>true).map{|x| x.first}.should == [:id, :item_id]
+    @ds.columns!.should == [:id, :item_id]
+    proc{@ds.insert(1, 2)}.should_not raise_error
+    proc{@ds.insert(1, 2)}.should_not raise_error
   end
 
   cspecify "should remove columns from tables correctly", :h2, :mssql do

data/spec/integration/type_test.rb

@@ -68,11 +68,18 @@ describe "Supported types" do
     ds.first[:dat].to_s.should == d.to_s
   end
   
-  cspecify "should support generic time type", [:do], [:swift], [:odbc], [:jdbc, :mssql], [:tinytds] do
+  cspecify "should support generic time type", [:do], [:swift], [:odbc], [:jdbc, :mssql], [:jdbc, :postgres], [:mysql2], [:tinytds] do
     ds = create_items_table_with_column(:tim, Time, :only_time=>true)
-    t = Time.now
+    t = Sequel::SQLTime.now
     ds.insert(:tim => t)
-    ds.first[:tim].strftime('%H%M%S').should == t.strftime('%H%M%S')
+    v = ds.first[:tim]
+    ds.literal(v).should == ds.literal(t)
+    v.should be_a_kind_of(Sequel::SQLTime)
+    ds.delete
+    ds.insert(:tim => v)
+    v2 = ds.first[:tim]
+    ds.literal(v2).should == ds.literal(t)
+    v2.should be_a_kind_of(Sequel::SQLTime)
   end
   
   cspecify "should support generic datetime type", [:do, :sqlite], [:jdbc, :sqlite] do

data/spec/model/base_spec.rb

@@ -131,6 +131,50 @@ describe Sequel::Model, ".def_dataset_method" do
   end
 end
 
+describe Sequel::Model, ".dataset_module" do
+  before do
+    @c = Class.new(Sequel::Model(:items))
+  end
+  
+  it "should extend the dataset with the module if the model has a dataset" do
+    @c.instance_eval{dataset_module{def return_3() 3 end}}
+    @c.dataset.return_3.should == 3
+  end
+
+  it "should add methods defined in the module to the class" do
+    @c.instance_eval{dataset_module{def return_3() 3 end}}
+    @c.return_3.should == 3
+  end
+
+  it "should cache calls and readd methods if set_dataset is used" do
+    @c.instance_eval{dataset_module{def return_3() 3 end}}
+    @c.set_dataset :items
+    @c.return_3.should == 3
+    @c.dataset.return_3.should == 3
+  end
+
+  it "should readd methods to subclasses, if set_dataset is used in a subclass" do
+    @c.instance_eval{dataset_module{def return_3() 3 end}}
+    c = Class.new(@c)
+    c.set_dataset :items
+    c.return_3.should == 3
+    c.dataset.return_3.should == 3
+  end
+
+  it "should only have a single dataset_module per class" do
+    @c.instance_eval{dataset_module{def return_3() 3 end}}
+    @c.instance_eval{dataset_module{def return_3() 3 + (begin; super; rescue NoMethodError; 1; end) end}}
+    @c.return_3.should == 4
+  end
+
+  it "should not have subclasses share the dataset_module" do
+    @c.instance_eval{dataset_module{def return_3() 3 end}}
+    c = Class.new(@c)
+    c.instance_eval{dataset_module{def return_3() 3 + (begin; super; rescue NoMethodError; 1; end) end}}
+    c.return_3.should == 6
+  end
+end
+
 describe "A model class with implicit table name" do
   before do
     class Donkey < Sequel::Model

data/spec/model/model_spec.rb

@@ -40,6 +40,13 @@ describe "Sequel::Model()" do
     c.table_name.should == :boo
   end
 
+  it "should return a model subclass with the given dataset if given a dataset using an SQL::Identifier" do
+    ds = @db[:blah.identifier]
+    c = Sequel::Model(ds)
+    c.superclass.should == Sequel::Model
+    c.dataset.should == ds
+  end
+
   it "should return a model subclass associated to the given database if given a database" do
     db = Sequel::Database.new
     c = Sequel::Model(db)
@@ -98,6 +105,13 @@ describe "Sequel::Model()" do
         class ::Album < Sequel::Model(@db[:table]); end
       end.should_not raise_error
     end
+
+    it "should work without raising an exception with a dataset with an SQL::Identifier" do
+      proc do
+        class ::Album < Sequel::Model(@db[:table.identifier]); end
+        class ::Album < Sequel::Model(@db[:table.identifier]); end
+      end.should_not raise_error
+    end
   end
 end