sequel 4.44.0 → 4.45.0

data/spec/extensions/instance_hooks_spec.rb

@@ -1,8 +1,9 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "InstanceHooks plugin" do
-  def r(x)
+  def r(x=nil)
     @r << x
+    yield if block_given?
     x
   end
   
@@ -24,7 +25,7 @@ describe "InstanceHooks plugin" do
     @r.must_equal [4, 2, 1, 3]
   end
 
-  it "should cancel the save if before_create_hook block returns false" do
+  deprecated "should cancel the save if before_create_hook block returns false" do
     @o.after_create_hook{r 1}
     @o.before_create_hook{r false}
     @o.before_create_hook{r 4}
@@ -35,6 +36,17 @@ describe "InstanceHooks plugin" do
     @r.must_equal [4, false]
   end
 
+  it "should cancel the save if before_create_hook block calls cancel_action" do
+    @o.after_create_hook{r 1}
+    @o.before_create_hook{r{@o.cancel_action}}
+    @o.before_create_hook{r 4}
+    @o.save.must_be_nil
+    @r.must_equal [4, nil]
+    @r.clear
+    @o.save.must_be_nil
+    @r.must_equal [4, nil]
+  end
+
   it "should support before_update_hook and after_update_hook" do
     @x.after_update_hook{r 1}
     @x.before_update_hook{r 2}
@@ -46,7 +58,7 @@ describe "InstanceHooks plugin" do
     @r.must_equal [4, 2, 1, 3]
   end
 
-  it "should cancel the save if before_update_hook block returns false" do
+  deprecated "should cancel the save if before_update_hook block returns false" do
     @x.after_update_hook{r 1}
     @x.before_update_hook{r false}
     @x.before_update_hook{r 4}
@@ -57,6 +69,17 @@ describe "InstanceHooks plugin" do
     @r.must_equal [4, false]
   end
 
+  it "should cancel the save if before_update_hook block calls cancel_action" do
+    @x.after_update_hook{r 1}
+    @x.before_update_hook{r{@x.cancel_action}}
+    @x.before_update_hook{r 4}
+    @x.save.must_be_nil
+    @r.must_equal [4, nil]
+    @r.clear
+    @x.save.must_be_nil
+    @r.must_equal [4, nil]
+  end
+
   it "should support before_save_hook and after_save_hook" do
     @o.after_save_hook{r 1}
     @o.before_save_hook{r 2}
@@ -76,7 +99,7 @@ describe "InstanceHooks plugin" do
     @r.must_equal [4, 2, 1, 3]
   end
 
-  it "should cancel the save if before_save_hook block returns false" do
+  deprecated "should cancel the save if before_save_hook block returns false" do
     @x.after_save_hook{r 1}
     @x.before_save_hook{r false}
     @x.before_save_hook{r 4}
@@ -94,6 +117,24 @@ describe "InstanceHooks plugin" do
     @r.must_equal [4, false]
   end
 
+  it "should cancel the save if before_save_hook block calls cancel_action" do
+    @x.after_save_hook{r 1}
+    @x.before_save_hook{r{@x.cancel_action}}
+    @x.before_save_hook{r 4}
+    @x.save.must_be_nil
+    @r.must_equal [4, nil]
+    @r.clear
+    
+    @x.after_save_hook{r 1}
+    @x.before_save_hook{r{@x.cancel_action}}
+    @x.before_save_hook{r 4}
+    @x.save.must_be_nil
+    @r.must_equal [4, nil]
+    @r.clear
+    @x.save.must_be_nil
+    @r.must_equal [4, nil]
+  end
+
   it "should support before_destroy_hook and after_destroy_hook" do
     @x.after_destroy_hook{r 1}
     @x.before_destroy_hook{r 2}
@@ -103,7 +144,7 @@ describe "InstanceHooks plugin" do
     @r.must_equal [4, 2, 1, 3]
   end
 
-  it "should cancel the destroy if before_destroy_hook block returns false" do
+  deprecated "should cancel the destroy if before_destroy_hook block returns false" do
     @x.after_destroy_hook{r 1}
     @x.before_destroy_hook{r false}
     @x.before_destroy_hook{r 4}
@@ -111,6 +152,14 @@ describe "InstanceHooks plugin" do
     @r.must_equal [4, false]
   end
 
+  it "should cancel the destroy if before_destroy_hook block calls cancel_action" do
+    @x.after_destroy_hook{r 1}
+    @x.before_destroy_hook{r{@x.cancel_action}}
+    @x.before_destroy_hook{r 4}
+    @x.destroy.must_be_nil
+    @r.must_equal [4, nil]
+  end
+
   it "should support before_validation_hook and after_validation_hook" do
     @o.after_validation_hook{r 1}
     @o.before_validation_hook{r 2}
@@ -120,7 +169,7 @@ describe "InstanceHooks plugin" do
     @r.must_equal [4, 2, 1, 3]
   end
 
-  it "should cancel the save if before_validation_hook block returns false" do
+  deprecated "should cancel the save if before_validation_hook block returns false" do
     @o.after_validation_hook{r 1}
     @o.before_validation_hook{r false}
     @o.before_validation_hook{r 4}
@@ -131,6 +180,17 @@ describe "InstanceHooks plugin" do
     @r.must_equal [4, false]
   end
 
+  it "should cancel the save if before_validation_hook block calls cancel_action" do
+    @o.after_validation_hook{r 1}
+    @o.before_validation_hook{r{@o.cancel_action}}
+    @o.before_validation_hook{r 4}
+    @o.valid?.must_equal false
+    @r.must_equal [4, nil]
+    @r.clear
+    @o.valid?.must_equal false
+    @r.must_equal [4, nil]
+  end
+
   it "should clear only related hooks on successful create" do
     @o.after_destroy_hook{r 1}
     @o.before_destroy_hook{r 2}
@@ -210,10 +270,12 @@ describe "InstanceHooks plugin with transactions" do
     @c = Class.new(Sequel::Model(@db[:items])) do
       attr_accessor :rb
       def after_save
+        super
         db.execute('as')
         raise Sequel::Rollback if rb
       end
       def after_destroy
+        super
         db.execute('ad')
         raise Sequel::Rollback if rb
       end
@@ -227,28 +289,28 @@ describe "InstanceHooks plugin with transactions" do
     @db.sqls
   end
   
-  it "should support after_commit_hook" do
+  deprecated "should support after_commit_hook" do
     @o.after_commit_hook{@db.execute('ac1')}
     @o.after_commit_hook{@db.execute('ac2')}
     @o.save.wont_equal nil
     @db.sqls.must_equal ['BEGIN', 'as', 'COMMIT', 'ac1', 'ac2']
   end
   
-  it "should support after_rollback_hook" do
+  deprecated "should support after_rollback_hook" do
     @or.after_rollback_hook{@db.execute('ar1')}
     @or.after_rollback_hook{@db.execute('ar2')}
     @or.save.must_be_nil
     @db.sqls.must_equal ['BEGIN', 'as', 'ROLLBACK', 'ar1', 'ar2']
   end
   
-  it "should support after_commit_hook" do
+  deprecated "should support after_destroy_commit_hook" do
     @o.after_destroy_commit_hook{@db.execute('adc1')}
     @o.after_destroy_commit_hook{@db.execute('adc2')}
     @o.destroy.wont_equal nil
     @db.sqls.must_equal ['BEGIN', "DELETE FROM items WHERE (id = 1)", 'ad', 'COMMIT', 'adc1', 'adc2']
   end
   
-  it "should support after_rollback_hook" do
+  deprecated "should support after_destroy_rollback_hook" do
     @or.after_destroy_rollback_hook{@db.execute('adr1')}
     @or.after_destroy_rollback_hook{@db.execute('adr2')}
     @or.destroy.must_be_nil
@@ -267,10 +329,12 @@ describe "InstanceHooks plugin with transactions" do
     @o.after_save_hook{r 1}.must_be_same_as(@o)
     @o.after_update_hook{r 1}.must_be_same_as(@o)
     @o.after_create_hook{r 1}.must_be_same_as(@o)
-    @o.after_commit_hook{r 1}.must_be_same_as(@o)
-    @o.after_rollback_hook{r 1}.must_be_same_as(@o)
-    @o.after_destroy_commit_hook{r 1}.must_be_same_as(@o)
-    @o.after_destroy_rollback_hook{r 1}.must_be_same_as(@o)
+    deprecated do
+      @o.after_commit_hook{r 1}.must_be_same_as(@o)
+      @o.after_rollback_hook{r 1}.must_be_same_as(@o)
+      @o.after_destroy_commit_hook{r 1}.must_be_same_as(@o)
+      @o.after_destroy_rollback_hook{r 1}.must_be_same_as(@o)
+    end
   end
 
 end

data/spec/extensions/lazy_attributes_spec.rb

@@ -42,6 +42,12 @@ describe "Sequel::Plugins::LazyAttributes" do
     Object.send(:remove_const, :LazyAttributesModel)
   end
   
+  deprecated "should allow access to lazy_attributes_module" do
+    @c.lazy_attributes_module.must_be_kind_of Module
+    @c.lazy_attributes_module = v = Module.new
+    @c.lazy_attributes_module.must_equal v
+  end
+
   it "should allowing adding additional lazy attributes via plugin :lazy_attributes" do
     @c.set_dataset(@ds.select(:id, :blah))
     @c.dataset.sql.must_equal 'SELECT id, blah FROM la'
@@ -168,9 +174,9 @@ describe "Sequel::Plugins::LazyAttributes" do
     @db.sqls.must_equal ["SELECT la.id FROM la LIMIT 1", "SELECT la.name FROM la WHERE (id = 1) LIMIT 1"]
   end
 
-  it "should freeze lazy_attributes_module when freezing model class" do
+  it "should not allow additional lazy attributes after freezing" do
     @c.plugin :lazy_attributes, :blah
     @c.freeze
-    @c.lazy_attributes_module.frozen?.must_equal true
+    proc{@c.lazy_attributes :name}.must_raise RuntimeError, TypeError
   end
 end

data/spec/extensions/many_through_many_spec.rb

@@ -440,7 +440,7 @@ describe Sequel::Model, "many_through_many" do
     n = @c1.load(:id => 1234)
     n.associations[:tags] = []
     DB.sqls.must_equal []
-    n.tags(true).must_equal [@c2.load(:id=>1)]
+    n.tags(:reload=>true).must_equal [@c2.load(:id=>1)]
     DB.sqls.must_equal ['SELECT tags.* FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) INNER JOIN albums ON (albums.id = albums_tags.album_id) INNER JOIN albums_artists ON (albums_artists.album_id = albums.id) WHERE (albums_artists.artist_id = 1234)']
     n.associations[:tags].must_equal n.tags
     DB.sqls.length.must_equal 0
@@ -1558,7 +1558,7 @@ describe Sequel::Model, "one_through_many" do
     n = @c1.load(:id => 1234)
     n.associations[:tag] = nil
     DB.sqls.must_equal []
-    n.tag(true).must_equal @c2.load(:id=>1)
+    n.tag(:reload=>true).must_equal @c2.load(:id=>1)
     DB.sqls.must_equal ['SELECT tags.* FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) INNER JOIN albums ON (albums.id = albums_tags.album_id) INNER JOIN albums_artists ON (albums_artists.album_id = albums.id) WHERE (albums_artists.artist_id = 1234) LIMIT 1']
     n.associations[:tag].must_equal n.tag
     DB.sqls.length.must_equal 0

data/spec/extensions/mssql_optimistic_locking_spec.rb

@@ -35,7 +35,7 @@ describe "MSSSQL optimistic locking plugin" do
     @db.numrows = 0
     @o.timestamp = '2345'
     proc{@o.destroy}.must_raise(Sequel::NoExistingObject)
-    @db.sqls.must_equal ["DELETE FROM items WHERE ((id = 1) AND (timestamp = 0x32333435))"]
+    @db.sqls.must_equal ["DELETE TOP (1) FROM items WHERE ((id = 1) AND (timestamp = 0x32333435))"]
   end
 
   it "should allow refresh after failed save" do

data/spec/extensions/nested_attributes_spec.rb

@@ -49,6 +49,12 @@ describe "NestedAttributes plugin" do
     @db.sqls
   end
   
+  deprecated "should allow access to nested_attributes_module" do
+    @Artist.nested_attributes_module.must_be_kind_of Module
+    @Artist.nested_attributes_module = v = Module.new
+    @Artist.nested_attributes_module.must_equal v
+  end
+
   it "should support creating new many_to_one objects" do
     a = @Album.new({:name=>'Al', :artist_attributes=>{:name=>'Ar'}})
     @db.sqls.must_equal []
@@ -695,8 +701,8 @@ describe "NestedAttributes plugin" do
     proc{@Album.load(:id=>10, :name=>'Al').set_nested_attributes(:tags, [{:id=>30, :name=>'T2', :number=>3}], :fields=>[:name])}.must_raise(Sequel::Error)
   end
 
-  it "should freeze nested_attributes_module when freezing model class" do
+  it "should not allow modifying ensted attributes after freezing" do
     @Artist.freeze
-    @Artist.nested_attributes_module.frozen?.must_equal true
+    proc{@Artist.nested_attributes :albums}.must_raise RuntimeError, TypeError
   end
 end

data/spec/extensions/pg_array_spec.rb

@@ -4,11 +4,9 @@ describe "pg_array extension" do
   before(:all) do
     Sequel.extension :pg_array
     @pg_types = Sequel::Postgres::PG_TYPES.dup
-    @pg_named_types = Sequel::Postgres::PG_NAMED_TYPES.dup
   end
   after(:all) do
     Sequel::Postgres::PG_TYPES.replace(@pg_types)
-    Sequel::Postgres::PG_NAMED_TYPES.replace(@pg_named_types)
   end
 
   before do
@@ -375,10 +373,10 @@ describe "pg_array extension" do
     @db.typecast_value(:banana_array, %w'1 2').must_equal [1,2]
   end
 
-  it "should set appropriate timestamp conversion procs when resetting conversion procs" do
-    Sequel::Postgres::PG_NAMED_TYPES[:foo] = proc{|v| v*2}
+  it "should set appropriate timestamp conversion procs when adding conversion procs" do
     @db.fetch = [[{:oid=>2222, :typname=>'foo'}], [{:oid=>2222, :typarray=>2223, :typname=>'foo'}]]
     @db.reset_conversion_procs
+    @db.add_named_conversion_proc(:foo){|v| v*2}
     procs = @db.conversion_procs
     procs[1185].call('{"2011-10-20 11:12:13"}').must_equal [Time.local(2011, 10, 20, 11, 12, 13)]
     procs[1115].call('{"2011-10-20 11:12:13"}').must_equal [Time.local(2011, 10, 20, 11, 12, 13)]
@@ -386,6 +384,22 @@ describe "pg_array extension" do
     procs[2223].call('{"2"}').must_equal ['22']
   end
 
+  deprecated "should set appropriate timestamp conversion procs when resetting conversion procs when modifying PG_NAMED_TYPES" do
+    @pg_named_types = Sequel::Postgres::PG_NAMED_TYPES.dup
+    begin
+      Sequel::Postgres::PG_NAMED_TYPES[:foo] = proc{|v| v*2}
+      @db.fetch = [[{:oid=>2222, :typname=>'foo'}], [{:oid=>2222, :typarray=>2223, :typname=>'foo'}]]
+      @db.reset_conversion_procs
+      procs = @db.conversion_procs
+      procs[1185].call('{"2011-10-20 11:12:13"}').must_equal [Time.local(2011, 10, 20, 11, 12, 13)]
+      procs[1115].call('{"2011-10-20 11:12:13"}').must_equal [Time.local(2011, 10, 20, 11, 12, 13)]
+      procs[2222].call('1').must_equal '11'
+      procs[2223].call('{"2"}').must_equal ['22']
+    ensure
+      Sequel::Postgres::PG_NAMED_TYPES.replace(@pg_named_types)
+    end
+  end
+
   it "should return correct results for Database#schema_type_class" do
     @db.register_array_type('banana', :oid=>7866, :scalar_typecast=>:integer){|s| s.to_i}
     @db.schema_type_class(:banana_array).must_equal Sequel::Postgres::PGArray

data/spec/extensions/prepared_statements_associations_spec.rb

@@ -2,34 +2,36 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Sequel::Plugins::PreparedStatementsAssociations" do
   before do
-    @db = Sequel.mock(:servers=>{:foo=>{}})
-    @db.extend_datasets do
-      def select_sql
-        sql = super
-        sql << ' -- prepared' if is_a?(Sequel::Dataset::PreparedStatementMethods)
-        sql
+    deprecated do
+      @db = Sequel.mock(:servers=>{:foo=>{}})
+      @db.extend_datasets do
+        def select_sql
+          sql = super
+          sql << ' -- prepared' if is_a?(Sequel::Dataset::PreparedStatementMethods)
+          sql
+        end
       end
+      @Artist = Class.new(Sequel::Model(@db[:artists]))
+      @Artist.columns :id, :id2
+      @Album= Class.new(Sequel::Model(@db[:albums]))
+      @Album.columns :id, :artist_id, :id2, :artist_id2
+      @Tag = Class.new(Sequel::Model(@db[:tags]))
+      @Tag.columns :id, :id2
+      @Artist.plugin :prepared_statements_associations
+      @Album.plugin :prepared_statements_associations
+      @Artist.one_to_many :albums, :class=>@Album, :key=>:artist_id
+      @Artist.one_to_one :album, :class=>@Album, :key=>:artist_id
+      @Album.many_to_one :artist, :class=>@Artist
+      @Album.many_to_many :tags, :class=>@Tag, :join_table=>:albums_tags, :left_key=>:album_id
+      @Album.one_through_one :tag, :clone=>:tags
+      @Artist.plugin :many_through_many
+      @Artist.many_through_many :tags, [[:albums, :artist_id, :id], [:albums_tags, :album_id, :tag_id]], :class=>@Tag
+      @Artist.one_through_many :tag, :clone=>:tags
+      @db.sqls
     end
-    @Artist = Class.new(Sequel::Model(@db[:artists]))
-    @Artist.columns :id, :id2
-    @Album= Class.new(Sequel::Model(@db[:albums]))
-    @Album.columns :id, :artist_id, :id2, :artist_id2
-    @Tag = Class.new(Sequel::Model(@db[:tags]))
-    @Tag.columns :id, :id2
-    @Artist.plugin :prepared_statements_associations
-    @Album.plugin :prepared_statements_associations
-    @Artist.one_to_many :albums, :class=>@Album, :key=>:artist_id
-    @Artist.one_to_one :album, :class=>@Album, :key=>:artist_id
-    @Album.many_to_one :artist, :class=>@Artist
-    @Album.many_to_many :tags, :class=>@Tag, :join_table=>:albums_tags, :left_key=>:album_id
-    @Album.one_through_one :tag, :clone=>:tags
-    @Artist.plugin :many_through_many
-    @Artist.many_through_many :tags, [[:albums, :artist_id, :id], [:albums_tags, :album_id, :tag_id]], :class=>@Tag
-    @Artist.one_through_many :tag, :clone=>:tags
-    @db.sqls
   end
 
-  it "should run correct SQL for associations" do
+  deprecated "should run correct SQL for associations" do
     @Artist.load(:id=>1).albums
     @db.sqls.must_equal ["SELECT id, artist_id, id2, artist_id2 FROM albums WHERE (albums.artist_id = 1) -- prepared"]
 
@@ -52,7 +54,7 @@ describe "Sequel::Plugins::PreparedStatementsAssociations" do
     @db.sqls.must_equal ["SELECT tags.id, tags.id2 FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) INNER JOIN albums ON (albums.id = albums_tags.album_id) WHERE (albums.artist_id = 1) LIMIT 1 -- prepared"]
   end
 
-  it "should run correct shard for associations when also using sharding plugin" do
+  deprecated "should run correct shard for associations when also using sharding plugin" do
     @Artist.plugin :sharding
     @Album.plugin :sharding
 
@@ -84,12 +86,12 @@ describe "Sequel::Plugins::PreparedStatementsAssociations" do
     @db.sqls.must_equal ["SELECT albums.id, albums.artist_id, albums.id2, albums.artist_id2 FROM albums INNER JOIN albums_tags ON (albums_tags.album_id = albums.id) WHERE (albums_tags.tag_id = 1) -- prepared -- foo"]
   end
 
-  it "should not override the shard for associations if not using the sharding plugin" do
+  deprecated "should not override the shard for associations if not using the sharding plugin" do
     @Artist.load(:id=>1).set_server(:foo).albums
     @db.sqls.must_equal ["SELECT id, artist_id, id2, artist_id2 FROM albums WHERE (albums.artist_id = 1) -- prepared"]
   end
 
-  it "should run correct SQL for composite key associations" do
+  deprecated "should run correct SQL for composite key associations" do
     @Artist.one_to_many :albums, :class=>@Album, :key=>[:artist_id, :artist_id2], :primary_key=>[:id, :id2]
     @Artist.one_to_one :album, :class=>@Album, :key=>[:artist_id, :artist_id2], :primary_key=>[:id, :id2]
     @Album.many_to_one :artist, :class=>@Artist, :key=>[:artist_id, :artist_id2], :primary_key=>[:id, :id2]
@@ -121,13 +123,13 @@ describe "Sequel::Plugins::PreparedStatementsAssociations" do
     @db.sqls.must_equal ["SELECT tags.id, tags.id2 FROM tags INNER JOIN albums_tags ON ((albums_tags.tag_id = tags.id) AND (albums_tags.tag_id2 = tags.id2)) INNER JOIN albums ON ((albums.id = albums_tags.album_id) AND (albums.id2 = albums_tags.album_id2)) WHERE ((albums.artist_id = 1) AND (albums.artist_id2 = 2)) LIMIT 1 -- prepared"]
   end
 
-  it "should not run query if no objects can be associated" do
+  deprecated "should not run query if no objects can be associated" do
     @Artist.new.albums.must_equal []
     @Album.new.artist.must_be_nil
     @db.sqls.must_equal []
   end
 
-  it "should run a regular query if not caching association metadata" do
+  deprecated "should run a regular query if not caching association metadata" do
     @Artist.cache_associations = false
     @Artist.load(:id=>1).albums
     @db.sqls.must_equal ["SELECT * FROM albums WHERE (albums.artist_id = 1)"]
@@ -135,66 +137,73 @@ describe "Sequel::Plugins::PreparedStatementsAssociations" do
     @db.sqls.must_equal ["SELECT * FROM albums WHERE (albums.artist_id = 1) LIMIT 1"]
   end
 
-  it "should run a regular query if there is a callback" do
+  deprecated "should run a regular query if there is a callback" do
     @Artist.load(:id=>1).albums(proc{|ds| ds})
     @db.sqls.must_equal ["SELECT * FROM albums WHERE (albums.artist_id = 1)"]
     @Artist.load(:id=>1).album(proc{|ds| ds})
     @db.sqls.must_equal ["SELECT * FROM albums WHERE (albums.artist_id = 1) LIMIT 1"]
   end
 
-  it "should run a regular query if :prepared_statement=>false option is used for the association" do
+  deprecated "should run a regular query if there is a block" do
+    @Artist.load(:id=>1).albums{|ds| ds}
+    @db.sqls.must_equal ["SELECT * FROM albums WHERE (albums.artist_id = 1)"]
+    @Artist.load(:id=>1).album{|ds| ds}
+    @db.sqls.must_equal ["SELECT * FROM albums WHERE (albums.artist_id = 1) LIMIT 1"]
+  end
+
+  deprecated "should run a regular query if :prepared_statement=>false option is used for the association" do
     @Artist.one_to_many :albums, :class=>@Album, :key=>:artist_id, :prepared_statement=>false
     @Artist.load(:id=>1).albums
     @db.sqls.must_equal ["SELECT * FROM albums WHERE (albums.artist_id = 1)"]
   end
 
-  it "should run a regular query if unrecognized association is used" do
+  deprecated "should run a regular query if unrecognized association is used" do
     a = @Artist.one_to_many :albums, :class=>@Album, :key=>:artist_id
     a[:type] = :foo
     @Artist.load(:id=>1).albums
     @db.sqls.must_equal ["SELECT * FROM albums WHERE (albums.artist_id = 1)"]
   end
 
-  it "should run a regular query if a block is used when defining the association" do
+  deprecated "should run a regular query if a block is used when defining the association" do
     @Artist.one_to_many :albums, :class=>@Album, :key=>:artist_id do |ds| ds end
     @Artist.load(:id=>1).albums
     @db.sqls.must_equal ["SELECT * FROM albums WHERE (albums.artist_id = 1)"]
   end
 
-  it "should use a prepared statement if the associated dataset has conditions" do
+  deprecated "should use a prepared statement if the associated dataset has conditions" do
     @Album.dataset = @Album.dataset.where(:a=>2)
     @Artist.one_to_many :albums, :class=>@Album, :key=>:artist_id
     @Artist.load(:id=>1).albums
     @db.sqls.must_equal ["SELECT id, artist_id, id2, artist_id2 FROM albums WHERE ((a = 2) AND (albums.artist_id = 1)) -- prepared"]
   end
 
-  it "should use a prepared statement if the :conditions association option" do
+  deprecated "should use a prepared statement if the :conditions association option" do
     @Artist.one_to_many :albums, :class=>@Album, :key=>:artist_id, :conditions=>{:a=>2} 
     @Artist.load(:id=>1).albums
     @db.sqls.must_equal ["SELECT id, artist_id, id2, artist_id2 FROM albums WHERE ((a = 2) AND (albums.artist_id = 1)) -- prepared"]
   end
 
-  it "should not use a prepared statement if :conditions association option uses an identifier" do
+  deprecated "should not use a prepared statement if :conditions association option uses an identifier" do
     @Artist.one_to_many :albums, :class=>@Album, :key=>:artist_id, :conditions=>{Sequel.identifier('a')=>2}
     @Artist.load(:id=>1).albums
     @db.sqls.must_equal ["SELECT id, artist_id, id2, artist_id2 FROM albums WHERE ((a = 2) AND (albums.artist_id = 1)) -- prepared"]
   end
 
-  it "should run a regular query if :dataset option is used when defining the association" do
+  deprecated "should run a regular query if :dataset option is used when defining the association" do
     album = @Album
     @Artist.one_to_many :albums, :class=>@Album, :dataset=>proc{album.filter(:artist_id=>id)} 
     @Artist.load(:id=>1).albums
     @db.sqls.must_equal ["SELECT * FROM albums WHERE (artist_id = 1)"]
   end
 
-  it "should run a regular query if :cloning an association that doesn't used prepared statements" do
+  deprecated "should run a regular query if :cloning an association that doesn't used prepared statements" do
     @Artist.one_to_many :albums, :class=>@Album, :key=>:artist_id do |ds| ds end
     @Artist.one_to_many :oalbums, :clone=>:albums
     @Artist.load(:id=>1).oalbums
     @db.sqls.must_equal ["SELECT * FROM albums WHERE (albums.artist_id = 1)"]
   end
 
-  it "should work correctly when using an instance specific association" do
+  deprecated "should work correctly when using an instance specific association" do
     tag = @Tag 
     @Artist.many_to_one :tag, :key=>nil, :read_only=>true, :dataset=>proc{tag.where(:id=>id).limit(1)}, :reciprocal=>nil, :reciprocal_type=>nil
     @Artist.load(:id=>1).tag.must_be_nil