sequel 4.46.0 → 4.49.0

data/spec/integration/model_test.rb

@@ -49,7 +49,7 @@ describe "Sequel::Model basic support" do
     Item.all.must_equal [Item.load(:id=>1, :name=>'J')]
   end
 
-  it "should not raise an error if the implied database table doesn't exist " do
+  deprecated "should not raise an error if the implied database table doesn't exist" do
     class ::Item::Thing < Sequel::Model(@db)
       set_dataset :items
     end
@@ -57,6 +57,26 @@ describe "Sequel::Model basic support" do
     Item::Thing.first.must_equal Item::Thing.load(:id=>1, :name=>'J')
   end
 
+  it "should raise an error if the implied database table doesn't exist if require_valid_table is true" do
+    proc do
+      c = Sequel::Model(@db)
+      c.require_valid_table = true
+      class ::Item::Thing < c
+        set_dataset :items
+      end
+    end.must_raise Sequel::Error
+  end
+
+  it "should not raise an error if the implied database table doesn't exist if require_valid_table is false" do
+    c = Sequel::Model(@db)
+    c.require_valid_table = false
+    class ::Item::Thing < c
+      set_dataset :items
+    end
+    Item.create(:name=>'J')
+    Item::Thing.first.must_equal Item::Thing.load(:id=>1, :name=>'J')
+  end
+
   it "should create accessors for all table columns even if all dataset columns aren't selected" do
     c = Class.new(Sequel::Model(@db[:items].select(:id)))
     o = c.new
@@ -219,14 +239,43 @@ describe "Sequel::Model basic support" do
 end
 
 describe "Sequel::Model with no existing table" do 
-  it "should not raise an error when setting the dataset" do
+  deprecated "should not raise an error when setting the dataset" do
     db = DB
     db.drop_table?(:items)
-    class ::Item < Sequel::Model(db); end; Object.send(:remove_const, :Item)
-    c = Class.new(Sequel::Model); c.set_dataset(db[:items])
+    c = Class.new(Sequel::Model)
+    c.set_dataset(db[:items])
     db.transaction do
       c = Class.new(Sequel::Model(db[:items]))
       db.get(Sequel.cast(1, Integer)).must_equal 1
     end
   end
+
+  it "should not raise an error when setting the dataset when require_valid_table is true" do
+    db = DB
+    db.drop_table?(:items)
+    c1 = Sequel::Model(db);
+    c = Class.new(Sequel::Model)
+    c.require_valid_table = true
+    proc{c.set_dataset(db[:items])}.must_raise Sequel::Error
+    db.transaction do
+      c = Class.new(Sequel::Model)
+      c.require_valid_table = true
+      proc{c.dataset = db[:items]}.must_raise Sequel::Error
+      db.get(Sequel.cast(1, Integer)).must_equal 1
+    end
+  end
+
+  it "should not raise an error when setting the dataset when require_valid_table is false" do
+    db = DB
+    db.drop_table?(:items)
+    c = Class.new(Sequel::Model)
+    c.require_valid_table = false
+    c.set_dataset(db[:items])
+    db.transaction do
+      c = Class.new(Sequel::Model)
+      c.require_valid_table = false
+      c.dataset = db[:items]
+      db.get(Sequel.cast(1, Integer)).must_equal 1
+    end
+  end
 end

data/spec/integration/plugin_test.rb

@@ -38,7 +38,8 @@ describe "Class Table Inheritance Plugin" do
     class ::Staff < Employee
       many_to_one :manager
     end 
-    
+    class ::Intern < Employee
+    end 
     
     @i1 = @db[:employees].insert(:name=>'E', :kind=>'Employee')
     @i2 = @db[:employees].insert(:name=>'S', :kind=>'Staff')
@@ -51,9 +52,10 @@ describe "Class Table Inheritance Plugin" do
     @db[:managers].insert(:id=>@i5, :num_staff=>2)
     @db[:executives].insert(:id=>@i5, :num_managers=>1)
     @db[:staff].insert(:id=>@i2, :manager_id=>@i4)
+    @i6 = @db[:employees].insert(:name=>'I', :kind=>'Intern')
   end
   after do
-    [:Ceo, :Executive, :Manager, :Staff, :Employee].each{|s| Object.send(:remove_const, s)}
+    [:Intern, :Ceo, :Executive, :Manager, :Staff, :Employee].each{|s| Object.send(:remove_const, s)}
   end
   after(:all) do
     @db.drop_table? :staff, :executives, :managers, :employees
@@ -65,7 +67,8 @@ describe "Class Table Inheritance Plugin" do
       Staff.load(:id=>@i2, :name=>'S', :kind=>'Staff'),
       Manager.load(:id=>@i3, :name=>'M', :kind=>'Manager'),
       Executive.load(:id=>@i4, :name=>'Ex', :kind=>'Executive'),
-      Ceo.load(:id=>@i5, :name=>'C', :kind=>'Ceo')
+      Ceo.load(:id=>@i5, :name=>'C', :kind=>'Ceo'),
+      Intern.load(:id=>@i6, :name=>'I', :kind=>'Intern'),
     ]
   end
   
@@ -102,6 +105,7 @@ describe "Class Table Inheritance Plugin" do
     Manager.db_schema.keys.sort_by{|x| x.to_s}.must_equal [:id, :kind, :name, :num_staff]
     Executive.db_schema.keys.sort_by{|x| x.to_s}.must_equal [:id, :kind, :name, :num_managers, :num_staff]
     Ceo.db_schema.keys.sort_by{|x| x.to_s}.must_equal [:id, :kind, :name, :num_managers, :num_staff]
+    Intern.db_schema.keys.sort_by{|x| x.to_s}.must_equal [:id, :kind, :name]
   end
   
   it "should include columns for tables for ancestor classes" do
@@ -110,6 +114,7 @@ describe "Class Table Inheritance Plugin" do
     Manager.columns.must_equal [:id, :name, :kind, :num_staff]
     Executive.columns.must_equal [:id, :name, :kind, :num_staff, :num_managers]
     Ceo.columns.must_equal [:id, :name, :kind, :num_staff, :num_managers]
+    Intern.columns.must_equal [:id, :name, :kind]
   end
   
   it "should delete rows from all tables" do
@@ -1195,6 +1200,7 @@ describe "AssociationPks plugin" do
     class ::Album < Sequel::Model
       plugin :association_pks
       many_to_many :tags, :order=>:id, :delay_pks=>false
+      many_to_many :uat_tags, :order=>Sequel[:tags][:id], :delay_pks=>false, :class=>:Tag, :right_key=>:tag_id, :association_pks_use_associated_table=>true
     end 
     class ::Tag < Sequel::Model
     end 
@@ -1260,6 +1266,10 @@ describe "AssociationPks plugin" do
     Album.order(:id).all.map{|a| a.tag_pks.sort}.must_equal [[@t1, @t2, @t3], [@t2], []]
   end
 
+  it "should return correct associated pks for many_to_many associations using :association_pks_use_associated_table" do
+    Album.order(:id).all.map{|a| a.uat_tag_pks.sort}.must_equal [[@t1, @t2, @t3], [@t2], []]
+  end
+
   it "should return correct associated right-side cpks for one_to_many associations" do
     Album.one_to_many :vocalists, :order=>:first
     Album.order(:id).all.map{|a| a.vocalist_pks.sort}.must_equal [[@v1, @v2, @v3], [], []]
@@ -1270,6 +1280,11 @@ describe "AssociationPks plugin" do
     Album.order(:id).all.map{|a| a.vocalist_pks.sort}.must_equal [[@v1, @v2, @v3], [@v2], []]
   end
 
+  it "should return correct associated right-side cpks for many_to_many associations when using :association_pks_use_associated_table" do
+    Album.many_to_many :vocalists, :join_table=>:albums_vocalists, :right_key=>[:first, :last], :order=>Sequel[:vocalists][:first], :association_pks_use_associated_table=>true
+    Album.order(:id).all.map{|a| a.vocalist_pks.sort}.must_equal [[@v1, @v2, @v3], [@v2], []]
+  end
+
   it "should return correct associated pks for left-side cpks for one_to_many associations" do
     Vocalist.one_to_many :instruments, :key=>[:first, :last], :order=>:id
     Vocalist.order(:first, :last).all.map{|a| a.instrument_pks.sort}.must_equal [[@i1, @i2, @i3], [], []]
@@ -1280,6 +1295,11 @@ describe "AssociationPks plugin" do
     Vocalist.order(:first, :last).all.map{|a| a.instrument_pks.sort}.must_equal [[@i1, @i2, @i3], [@i2], []]
   end
 
+  it "should return correct associated pks for left-side cpks for many_to_many associations when using :association_pks_use_associated_table" do
+    Vocalist.many_to_many :instruments, :join_table=>:vocalists_instruments, :left_key=>[:first, :last], :order=>:id, :association_pks_use_associated_table=>true
+    Vocalist.order(:first, :last).all.map{|a| a.instrument_pks.sort}.must_equal [[@i1, @i2, @i3], [@i2], []]
+  end
+
   it "should return correct associated right-side cpks for left-side cpks for one_to_many associations" do
     Vocalist.one_to_many :hits, :key=>[:first, :last], :order=>:week
     Vocalist.order(:first, :last).all.map{|a| a.hit_pks.sort}.must_equal [[@h1, @h2, @h3], [], []]
@@ -1290,6 +1310,11 @@ describe "AssociationPks plugin" do
     Vocalist.order(:first, :last).all.map{|a| a.hit_pks.sort}.must_equal [[@h1, @h2, @h3], [@h2], []]
   end
 
+  it "should return correct associated right-side cpks for left-side cpks for many_to_many associations when using :association_pks_use_associated_table" do
+    Vocalist.many_to_many :hits, :join_table=>:vocalists_hits, :left_key=>[:first, :last], :right_key=>[:year, :week], :order=>Sequel[:vocalists_hits][:week], :association_pks_use_associated_table=>true
+    Vocalist.order(:first, :last).all.map{|a| a.hit_pks.sort}.must_equal [[@h1, @h2, @h3], [@h2], []]
+  end
+
   deprecated "should handle :delay_pks=>true association option for new instances" do
     album_class = Class.new(Album)
     album_class.many_to_many :tags, :clone=>:tags, :delay_pks=>true, :join_table=>:albums_tags, :left_key=>:album_id
@@ -1937,7 +1962,6 @@ describe "Caching plugins" do
   end
   before do
     @Album = Class.new(Sequel::Model(@db[:albums]))
-    @Album.plugin :many_to_one_pk_lookup
   end
   after(:all) do
     @db.drop_table?(:albums, :artists)

data/spec/integration/prepared_statement_test.rb

@@ -22,6 +22,7 @@ describe "Prepared Statements and Bound Arguments" do
     @ds.filter(:numb=>:$n).call(:all, :n=>10).must_equal [{:id=>1, :numb=>10}]
     @ds.filter(:numb=>:$n).call(:first, :n=>10).must_equal(:id=>1, :numb=>10)
     @ds.filter(:numb=>:$n).call([:map, :numb], :n=>10).must_equal [10]
+    @ds.filter(:numb=>:$n).call([:as_hash, :id, :numb], :n=>10).must_equal(1=>10)
     @ds.filter(:numb=>:$n).call([:to_hash, :id, :numb], :n=>10).must_equal(1=>10)
     @ds.filter(:numb=>:$n).call([:to_hash_groups, :id, :numb], :n=>10).must_equal(1=>[10])
   end
@@ -161,6 +162,8 @@ describe "Prepared Statements and Bound Arguments" do
     @db.call(:select_n, :n=>10).must_equal(:id=>1, :numb=>10)
     @ds.filter(:numb=>:$n).prepare([:map, :numb], :select_n)
     @db.call(:select_n, :n=>10).must_equal [10]
+    @ds.filter(:numb=>:$n).prepare([:as_hash, :id, :numb], :select_n)
+    @db.call(:select_n, :n=>10).must_equal(1=>10)
     @ds.filter(:numb=>:$n).prepare([:to_hash, :id, :numb], :select_n)
     @db.call(:select_n, :n=>10).must_equal(1=>10)
   end

data/spec/integration/schema_test.rb

@@ -215,7 +215,7 @@ describe "Database index parsing" do
     DB.indexes(:items).must_equal({})
   end
 
-  cspecify "should not include partial indexes", :sqlite do
+  it "should not include partial indexes" do
     DB.create_table!(:items){Integer :n; Integer :a; index :n, :where=>proc{n > 10}}
     DB.indexes(:items).must_equal({})
   end if DB.supports_partial_indexes?
@@ -387,6 +387,26 @@ describe "Database schema modifiers" do
     @db.table_exists?(:items).must_equal false
   end if DB.supports_transactional_ddl?
   
+  it "should handle errors creating indexes when ignoring index errors" do
+    @db.drop_table?(:items)
+    @db.transaction do
+      @db.create_table(:items, :ignore_index_errors=>true) do
+        Integer :n1
+        Integer :n2
+        index :n1, :name=>'items_n1'
+        index :foo, :name=>'items_f'
+        index :n2, :name=>'items_n2'
+        index :bar, :name=>'items_g'
+      end
+    end
+    @db.table_exists?(:items).must_equal true
+    indexes = @db.indexes(:items).keys
+    indexes.must_include :items_n1
+    indexes.must_include :items_n2
+    indexes.wont_include :items_f
+    indexes.wont_include :items_g
+  end if DB.supports_transactional_ddl? && DB.database_type != :mssql
+  
   describe "join tables" do
     after do
       @db.drop_join_table(:cat_id=>:cats, :dog_id=>:dogs) if @db.table_exists?(:cats_dogs)

data/spec/integration/transaction_test.rb

@@ -14,7 +14,7 @@ describe "Database transactions" do
   end
 
   it "should support transactions" do
-    @db.transaction{@d << {:name => 'abc', :value => 1}}
+    @db.transaction{@d.insert(:name => 'abc', :value => 1)}
     @d.count.must_equal 1
   end
 
@@ -32,25 +32,25 @@ describe "Database transactions" do
   it "should correctly rollback transactions" do
     proc do
       @db.transaction do
-        @d << {:name => 'abc', :value => 1}
+        @d.insert(:name => 'abc', :value => 1)
         raise Interrupt, 'asdf'
       end
     end.must_raise(Interrupt)
 
     @db.transaction do
-      @d << {:name => 'abc', :value => 1}
+      @d.insert(:name => 'abc', :value => 1)
       raise Sequel::Rollback
     end.must_be_nil
 
     proc do
       @db.transaction(:rollback=>:reraise) do
-        @d << {:name => 'abc', :value => 1}
+        @d.insert(:name => 'abc', :value => 1)
         raise Sequel::Rollback
       end
     end.must_raise(Sequel::Rollback)
 
     @db.transaction(:rollback=>:always) do
-      @d << {:name => 'abc', :value => 1}
+      @d.insert(:name => 'abc', :value => 1)
       2
     end.must_equal 2
 
@@ -60,14 +60,14 @@ describe "Database transactions" do
   it "should support nested transactions" do
     @db.transaction do
       @db.transaction do
-        @d << {:name => 'abc', :value => 1}
+        @d.insert(:name => 'abc', :value => 1)
       end 
     end 
     @d.count.must_equal 1
 
     @d.delete
     @db.transaction do
-      @d << {:name => 'abc', :value => 1}
+      @d.insert(:name => 'abc', :value => 1)
       @db.transaction do
         raise Sequel::Rollback
       end 
@@ -75,7 +75,7 @@ describe "Database transactions" do
     @d.count.must_equal 0
 
     proc {@db.transaction do
-      @d << {:name => 'abc', :value => 1}
+      @d.insert(:name => 'abc', :value => 1)
       @db.transaction do
         raise Interrupt, 'asdf'
       end 
@@ -86,9 +86,9 @@ describe "Database transactions" do
   if DB.supports_savepoints?
     it "should handle table_exists? failures inside transactions" do
       @db.transaction do
-        @d << {:name => '1'}
+        @d.insert(:name => '1')
         @db.table_exists?(:asadf098asd9asd98sa).must_equal false
-        @d << {:name => '2'}
+        @d.insert(:name => '2')
       end
       @d.select_order_map(:name).must_equal %w'1 2'
     end
@@ -96,7 +96,7 @@ describe "Database transactions" do
     it "should handle :rollback=>:always inside transactions" do
       @db.transaction do
         @db.transaction(:rollback=>:always) do
-          @d << {:name => 'abc', :value => 1}
+          @d.insert(:name => 'abc', :value => 1)
           2
         end.must_equal 2
       end
@@ -105,36 +105,36 @@ describe "Database transactions" do
 
     it "should handle table_exists? failures inside savepoints" do
       @db.transaction do
-        @d << {:name => '1'}
+        @d.insert(:name => '1')
         @db.transaction(:savepoint=>true) do
-          @d << {:name => '2'}
+          @d.insert(:name => '2')
           @db.table_exists?(:asadf098asd9asd98sa).must_equal false
-          @d << {:name => '3'}
+          @d.insert(:name => '3')
         end
-        @d << {:name => '4'}
+        @d.insert(:name => '4')
       end
       @d.select_order_map(:name).must_equal %w'1 2 3 4'
     end
 
     it "should support nested transactions through savepoints using the savepoint option" do
       @db.transaction do
-        @d << {:name => '1'}
+        @d.insert(:name => '1')
         @db.transaction(:savepoint=>true) do
-          @d << {:name => '2'}
+          @d.insert(:name => '2')
           @db.transaction do
-            @d << {:name => '3'}
+            @d.insert(:name => '3')
             raise Sequel::Rollback
           end
         end
-        @d << {:name => '4'}
+        @d.insert(:name => '4')
         @db.transaction do
-          @d << {:name => '6'}
+          @d.insert(:name => '6')
           @db.transaction(:savepoint=>true) do
-            @d << {:name => '7'}
+            @d.insert(:name => '7')
             raise Sequel::Rollback
           end
         end
-        @d << {:name => '5'}
+        @d.insert(:name => '5')
       end
 
       @d.order(:name).map(:name).must_equal %w{1 4 5 6}
@@ -142,23 +142,23 @@ describe "Database transactions" do
 
     it "should support nested transactions through savepoints using the auto_savepoint option" do
       @db.transaction(:auto_savepoint=>true) do
-        @d << {:name => '1'}
+        @d.insert(:name => '1')
         @db.transaction do
-          @d << {:name => '2'}
+          @d.insert(:name => '2')
           @db.transaction do
-            @d << {:name => '3'}
+            @d.insert(:name => '3')
             raise Sequel::Rollback
           end
         end
-        @d << {:name => '4'}
+        @d.insert(:name => '4')
         @db.transaction(:auto_savepoint=>true) do
-          @d << {:name => '6'}
+          @d.insert(:name => '6')
           @db.transaction do
-            @d << {:name => '7'}
+            @d.insert(:name => '7')
             raise Sequel::Rollback
           end
         end
-        @d << {:name => '5'}
+        @d.insert(:name => '5')
       end
 
       @d.order(:name).map(:name).must_equal %w{1 4 5 6}
@@ -168,7 +168,7 @@ describe "Database transactions" do
   it "should handle returning inside of the block by committing" do
     def ret_commit
       @db.transaction do
-        @db[:items] << {:name => 'abc'}
+        @db[:items].insert(:name => 'abc')
         return
       end
     end
@@ -199,20 +199,20 @@ describe "Database transactions" do
     end
 
     it "should commit prepared transactions using commit_prepared_transaction" do
-      @db.transaction(:prepare=>'XYZ'){@d << {:name => '1'}}
+      @db.transaction(:prepare=>'XYZ'){@d.insert(:name => '1')}
       @db.commit_prepared_transaction('XYZ')
       @d.select_order_map(:name).must_equal ['1']
     end
 
     it "should rollback prepared transactions using rollback_prepared_transaction" do
-      @db.transaction(:prepare=>'XYZ'){@d << {:name => '1'}}
+      @db.transaction(:prepare=>'XYZ'){@d.insert(:name => '1')}
       @db.rollback_prepared_transaction('XYZ')
       @d.select_order_map(:name).must_equal []
     end
 
     if DB.supports_savepoints_in_prepared_transactions?
       it "should support savepoints when using prepared transactions" do
-        @db.transaction(:prepare=>'XYZ'){@db.transaction(:savepoint=>true){@d << {:name => '1'}}}
+        @db.transaction(:prepare=>'XYZ'){@db.transaction(:savepoint=>true){@d.insert(:name => '1')}}
         @db.commit_prepared_transaction('XYZ')
         @d.select_order_map(:name).must_equal ['1']
       end
@@ -221,7 +221,7 @@ describe "Database transactions" do
 
   it "should support all transaction isolation levels" do
     [:uncommitted, :committed, :repeatable, :serializable].each_with_index do |l, i|
-      @db.transaction(:isolation=>l){@d << {:name => 'abc', :value => 1}}
+      @db.transaction(:isolation=>l){@d.insert(:name => 'abc', :value => 1)}
       @d.count.must_equal i + 1
     end
   end
@@ -331,10 +331,10 @@ if (! defined?(RUBY_ENGINE) or RUBY_ENGINE == 'ruby') and RUBY_VERSION < '1.9'
       q1 = Queue.new
       t = Thread.new do
         @db.transaction do
-          @d << {:name => 'abc', :value => 1}
+          @d.insert(:name => 'abc', :value => 1)
           q1.push nil
           q.pop
-          @d << {:name => 'def', :value => 2}
+          @d.insert(:name => 'def', :value => 2)
         end
       end
       q1.pop
@@ -348,14 +348,14 @@ if (! defined?(RUBY_ENGINE) or RUBY_ENGINE == 'ruby') and RUBY_VERSION < '1.9'
         q1 = Queue.new
         t = Thread.new do
           @db.transaction do
-            @d << {:name => 'abc', :value => 1}
+            @d.insert(:name => 'abc', :value => 1)
             @db.transaction(:savepoint=>true) do
-              @d << {:name => 'def', :value => 2}
+              @d.insert(:name => 'def', :value => 2)
               q1.push nil
               q.pop
-              @d << {:name => 'ghi', :value => 3}
+              @d.insert(:name => 'ghi', :value => 3)
             end
-            @d << {:name => 'jkl', :value => 4}
+            @d.insert(:name => 'jkl', :value => 4)
           end
         end
         q1.pop

data/spec/model/association_reflection_spec.rb

@@ -286,7 +286,7 @@ describe Sequel::Model::Associations::AssociationReflection do
     def @c.name() "C" end
   end
 
-  it "#eager_loading_predicate_key should be an alias of predicate_key for backwards compatibility" do
+  deprecated "#eager_loading_predicate_key should be an alias of predicate_key for backwards compatibility" do
     @c.one_to_many :cs, :class=>@c
     @c.dataset.literal(@c.association_reflection(:cs).eager_loading_predicate_key).must_equal 'foo.c_id'
   end
@@ -586,6 +586,48 @@ describe Sequel::Model::Associations::AssociationReflection, "with default assoc
     r[:foo].must_equal 3
     r[:bar].must_equal 2
   end
+
+  it "should have default_association_type_options take precedence over default_association_options" do
+    @c.default_association_options = {:foo=>2, :bar=>3}
+    @c.default_association_type_options[:many_to_one] = {:foo=>1, :bar=>2}
+    @c.many_to_one :c, :class=>@c, :foo=>3
+    r = @c.association_reflection(:c)
+    r[:foo].must_equal 3
+    r[:bar].must_equal 2
+  end
+
+  it "should use default_association_type_options as defaults" do
+    @c.default_association_type_options[:many_to_one] = {:foo=>1, :bar=>2}
+    @c.many_to_one :c, :class=>@c, :foo=>3
+    r = @c.association_reflection(:c)
+    r[:foo].must_equal 3
+    r[:bar].must_equal 2
+
+    @c.one_to_many :cs, :class=>@c, :foo=>3
+    r = @c.association_reflection(:cs)
+    r[:foo].must_equal 3
+    r[:bar].must_be_nil
+  end
+
+  it "should inherit default_association_type_options" do
+    @c.default_association_type_options[:many_to_one] = {:foo=>1, :bar=>2}
+    c = Class.new(@c)
+    c.many_to_one :c, :class=>c, :foo=>3
+    r = c.association_reflection(:c)
+    r[:foo].must_equal 3
+    r[:bar].must_equal 2
+
+    @c.default_association_type_options[:many_to_one][:bar] = 4
+    c.many_to_one :d, :class=>c, :foo=>3
+    r = c.association_reflection(:d)
+    r[:foo].must_equal 3
+    r[:bar].must_equal 2
+
+    c.one_to_many :ds, :class=>c, :foo=>3
+    r = c.association_reflection(:ds)
+    r[:foo].must_equal 3
+    r[:bar].must_be_nil
+  end
 end
 
 describe "Sequel::Model.freeze" do

data/spec/model/associations_spec.rb

@@ -679,7 +679,7 @@ describe Sequel::Model, "many_to_one" do
     p.associations[:parent].must_equal :foo
   end
 
-  it "should raise error and not call internal add or remove method if before callback returns false, even if raise_on_save_failure is false" do
+  deprecated "should raise error and not call internal add or remove method if before callback returns false, even if raise_on_save_failure is false" do
     p = @c2.new
     c = @c2.load(:id=>123)
     p.raise_on_save_failure = false
@@ -1126,7 +1126,7 @@ describe Sequel::Model, "one_to_one" do
     parent.pk.must_equal 20
   end
 
-  it "should raise error and not call internal add or remove method if before callback returns false, even if raise_on_save_failure is false" do
+  deprecated "should raise error and not call internal add or remove method if before callback returns false, even if raise_on_save_failure is false" do
     p = @c2.load(:id=>321)
     c = @c2.load(:id=>123)
     p.raise_on_save_failure = false
@@ -1141,6 +1141,21 @@ describe Sequel::Model, "one_to_one" do
     proc{p.parent = nil}.must_raise(Sequel::HookFailed)
   end
 
+  it "should raise error and not call internal add or remove method if before callback calls cancel_action, even if raise_on_save_failure is false" do
+    p = @c2.load(:id=>321)
+    c = @c2.load(:id=>123)
+    p.raise_on_save_failure = false
+    @c2.one_to_one :parent, :class => @c2, :before_set=>:bs
+    def p.bs(x) cancel_action end
+    def p._parent=; raise; end
+    proc{p.parent = c}.must_raise(Sequel::HookFailed)
+    
+    p.associations[:parent].must_be_nil
+    p.associations[:parent] = c
+    p.parent.must_equal c
+    proc{p.parent = nil}.must_raise(Sequel::HookFailed)
+  end
+
   it "should not validate the associated object in setter if the :validate=>false option is used" do
     @c2.one_to_one :parent, :class => @c2, :validate=>false
     n = @c2.new(:id => 1234)
@@ -1878,7 +1893,7 @@ describe Sequel::Model, "one_to_many" do
     attributes.collect{|a| a.pk}.must_equal [20, 30]
   end
 
-  it "should raise error and not call internal add or remove method if before callback returns false if raise_on_save_failure is true" do
+  deprecated "should raise error and not call internal add or remove method if before callback returns false if raise_on_save_failure is true" do
     p = @c2.load(:id=>10)
     c = @c1.load(:id=>123)
     @c2.one_to_many :attributes, :class => @c1, :before_add=>:ba, :before_remove=>:br
@@ -1894,7 +1909,7 @@ describe Sequel::Model, "one_to_many" do
     p.attributes.must_equal [c]
   end
 
-  it "should return nil and not call internal add or remove method if before callback returns false if raise_on_save_failure is false" do
+  deprecated "should return nil and not call internal add or remove method if before callback returns false if raise_on_save_failure is false" do
     p = @c2.load(:id=>10)
     c = @c1.load(:id=>123)
     p.raise_on_save_failure = false
@@ -2051,11 +2066,16 @@ describe Sequel::Model, "many_to_many" do
     @c2.new(:id => 1234).attributes_dataset.sql.must_equal 'SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.attribute_id = attributes.id) WHERE (attributes_nodes.node_id = 1234)'
   end
   
-  it "should respect :eager_loader_predicate_key when lazily loading" do
+  deprecated "should respect :eager_loading_predicate_key when lazily loading" do
     @c2.many_to_many :attributes, :class => @c1, :eager_loading_predicate_key=>Sequel.subscript(Sequel[:attributes_nodes][:node_id], 0)
     @c2.new(:id => 1234).attributes_dataset.sql.must_equal 'SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.attribute_id = attributes.id) WHERE (attributes_nodes.node_id[0] = 1234)'
   end
   
+  it "should respect :predicate_key when lazily loading" do
+    @c2.many_to_many :attributes, :class => @c1, :predicate_key=>Sequel.subscript(Sequel[:attributes_nodes][:node_id], 0)
+    @c2.new(:id => 1234).attributes_dataset.sql.must_equal 'SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.attribute_id = attributes.id) WHERE (attributes_nodes.node_id[0] = 1234)'
+  end
+  
   it "should use explicit key values and join table if given" do
     @c2.many_to_many :attributes, :class => @c1, :left_key => :nodeid, :right_key => :attributeid, :join_table => :attribute2node
     @c2.new(:id => 1234).attributes_dataset.sql.must_equal 'SELECT attributes.* FROM attributes INNER JOIN attribute2node ON (attribute2node.attributeid = attributes.id) WHERE (attribute2node.nodeid = 1234)'
@@ -2746,7 +2766,7 @@ describe Sequel::Model, "many_to_many" do
     attributes.collect{|a| a.pk}.must_equal [20, 30]
   end
 
-  it "should raise error and not call internal add or remove method if before callback returns false if raise_on_save_failure is true" do
+  deprecated "should raise error and not call internal add or remove method if before callback returns false if raise_on_save_failure is true" do
     p = @c2.load(:id=>10)
     c = @c1.load(:id=>123)
     @c2.many_to_many :attributes, :class => @c1, :before_add=>:ba, :before_remove=>:br
@@ -2763,7 +2783,7 @@ describe Sequel::Model, "many_to_many" do
     p.attributes.must_equal [c]
   end
 
-  it "should return nil and not call internal add or remove method if before callback returns false if raise_on_save_failure is false" do
+  deprecated "should return nil and not call internal add or remove method if before callback returns false if raise_on_save_failure is false" do
     p = @c2.load(:id=>10)
     c = @c1.load(:id=>123)
     p.raise_on_save_failure = false
@@ -2882,8 +2902,8 @@ describe Sequel::Model, "one_through_one" do
     @c2.new(:id => 1234).attribute_dataset.sql.must_equal 'SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.attribute_id = attributes.id) WHERE (attributes_nodes.node_id = 1234) LIMIT 1'
   end
   
-  it "should respect :eager_loader_predicate_key when lazily loading" do
-    @c2.one_through_one :attribute, :class => @c1, :eager_loading_predicate_key=>Sequel.subscript(Sequel[:attributes_nodes][:node_id], 0)
+  it "should respect :predicate_key when lazily loading" do
+    @c2.one_through_one :attribute, :class => @c1, :predicate_key=>Sequel.subscript(Sequel[:attributes_nodes][:node_id], 0)
     @c2.new(:id => 1234).attribute_dataset.sql.must_equal 'SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.attribute_id = attributes.id) WHERE (attributes_nodes.node_id[0] = 1234) LIMIT 1'
   end