sequel 3.47.0 → 3.48.0

data/spec/integration/dataset_test.rb

@@ -50,7 +50,7 @@ describe "Simple Dataset operations" do
   end
 
   specify "should have insert_multiple return primary key values" do
-    @ds.insert_multiple([{:number=>20}, {:number=>30}]).should == [2, 3]
+    @ds.extension(:sequel_3_dataset_methods).insert_multiple([{:number=>20}, {:number=>30}]).should == [2, 3]
     @ds.filter(:id=>2).get(:number).should == 20
     @ds.filter(:id=>3).get(:number).should == 30
   end
@@ -65,11 +65,11 @@ describe "Simple Dataset operations" do
   end
 
   specify "should graph correctly" do
-    @ds.graph(:items, {:id=>:id}, :table_alias=>:b).all.should == [{:items=>{:id=>1, :number=>10}, :b=>{:id=>1, :number=>10}}]
+    @ds.graph(:items, {:id=>:id}, :table_alias=>:b).extension(:graph_each).all.should == [{:items=>{:id=>1, :number=>10}, :b=>{:id=>1, :number=>10}}]
   end
 
   specify "should graph correctly with a subselect" do
-    @ds.from_self(:alias=>:items).graph(@ds.from_self, {:id=>:id}, :table_alias=>:b).all.should == [{:items=>{:id=>1, :number=>10}, :b=>{:id=>1, :number=>10}}]
+    @ds.from_self(:alias=>:items).graph(@ds.from_self, {:id=>:id}, :table_alias=>:b).extension(:graph_each).all.should == [{:items=>{:id=>1, :number=>10}, :b=>{:id=>1, :number=>10}}]
   end
 
   cspecify "should have insert work correctly when inserting a row with all NULL values", :hsqldb do
@@ -893,7 +893,7 @@ describe "Sequel::Dataset convenience methods" do
   
   it "#[]= should update matching rows" do
     @ds.insert(20, 10)
-    @ds[:a=>20] = {:b=>30}
+    @ds.extension(:sequel_3_dataset_methods)[:a=>20] = {:b=>30}
     @ds.all.should == [{:a=>20, :b=>30}]
   end
   
@@ -1335,25 +1335,21 @@ describe "Sequel::Dataset DSL support" do
     end
   end
   
-  specify "should work empty arrays with nulls and Sequel.empty_array_null_handling = true" do
-    begin
-      Sequel.empty_array_handle_nulls = false
-      @ds.insert(nil, nil)
-      @ds.filter(:a=>[]).all.should == []
-      @ds.exclude(:a=>[]).all.should == [{:a=>nil, :b=>nil}]
-      @ds.filter([:a, :b]=>[]).all.should == []
-      @ds.exclude([:a, :b]=>[]).all.should == [{:a=>nil, :b=>nil}]
-
-      unless Sequel.guarded?(:mssql, :oracle, :db2)
-        # Some databases don't like boolean results in the select list
-        pr = proc{|r| r.is_a?(Integer) ? (r != 0) : r}
-        pr[@ds.get(Sequel.expr(:a=>[]))].should == false
-        pr[@ds.get(~Sequel.expr(:a=>[]))].should == true
-        pr[@ds.get(Sequel.expr([:a, :b]=>[]))].should == false
-        pr[@ds.get(~Sequel.expr([:a, :b]=>[]))].should == true
-      end
-    ensure
-      Sequel.empty_array_handle_nulls = true
+  specify "should work empty arrays with nulls and the empty_array_ignore_nulls extension" do
+    ds = @ds.extension(:empty_array_ignore_nulls)
+    ds.insert(nil, nil)
+    ds.filter(:a=>[]).all.should == []
+    ds.exclude(:a=>[]).all.should == [{:a=>nil, :b=>nil}]
+    ds.filter([:a, :b]=>[]).all.should == []
+    ds.exclude([:a, :b]=>[]).all.should == [{:a=>nil, :b=>nil}]
+
+    unless Sequel.guarded?(:mssql, :oracle, :db2)
+      # Some databases don't like boolean results in the select list
+      pr = proc{|r| r.is_a?(Integer) ? (r != 0) : r}
+      pr[ds.get(Sequel.expr(:a=>[]))].should == false
+      pr[ds.get(~Sequel.expr(:a=>[]))].should == true
+      pr[ds.get(Sequel.expr([:a, :b]=>[]))].should == false
+      pr[ds.get(~Sequel.expr([:a, :b]=>[]))].should == true
     end
   end
 
@@ -1583,7 +1579,7 @@ describe "Dataset defaults and overrides" do
   before(:all) do
     @db = INTEGRATION_DB
     @db.create_table!(:a){Integer :a}
-    @ds = @db[:a].order(:a)
+    @ds = @db[:a].order(:a).extension(:set_overrides)
   end
   before do
     @ds.delete

data/spec/integration/eager_loader_test.rb

@@ -496,8 +496,8 @@ describe "many_to_one/one_to_many not referencing primary key" do
     end
   end
   before do
-    Client.delete
-    Invoice.delete
+    Client.dataset.delete
+    Invoice.dataset.delete
     @client1 = Client.create(:name=>'X')
     @client2 = Client.create(:name=>'Y')
     @invoice1 = Invoice.create(:client_name=>'X')
@@ -639,8 +639,8 @@ describe "one to one associations" do
       primary_key :id
     end
     class ::Book < Sequel::Model
-      one_to_one :first_page, :class=>:Page, :conditions=>{:page_number=>1}
-      one_to_one :second_page, :class=>:Page, :conditions=>{:page_number=>2}
+      one_to_one :first_page, :class=>:Page, :conditions=>{:page_number=>1}, :reciprocal=>nil
+      one_to_one :second_page, :class=>:Page, :conditions=>{:page_number=>2}, :reciprocal=>nil
     end
 
     INTEGRATION_DB.create_table!(:pages) do
@@ -649,7 +649,7 @@ describe "one to one associations" do
       Integer :page_number
     end
     class ::Page < Sequel::Model
-      many_to_one :book
+      many_to_one :book, :reciprocal=>nil
     end
 
     @book1 = Book.create

data/spec/integration/model_test.rb

@@ -125,7 +125,7 @@ describe "Sequel::Model basic support" do
   specify "#exists? should return whether the item is still in the database" do
     i = Item.create(:name=>'J')
     i.exists?.should == true
-    Item.delete
+    Item.dataset.delete
     i.exists?.should == false
   end
 
@@ -139,10 +139,10 @@ describe "Sequel::Model basic support" do
     i = Item.create(:name=>'J', :num=>1)
     Item.all.should == [Item.load(:id=>1, :name=>'J', :num=>1)]
     i.set(:name=>'K', :num=>2)
-    i.save(:name)
+    i.save(:columns=>:name)
     Item.all.should == [Item.load(:id=>1, :name=>'K', :num=>1)]
     i.set(:name=>'L')
-    i.save(:num)
+    i.save(:columns=>:num)
     Item.all.should == [Item.load(:id=>1, :name=>'K', :num=>2)]
   end
   

data/spec/integration/plugin_test.rb

@@ -493,38 +493,6 @@ describe "Tactical Eager Loading Plugin" do
   end
 end
 
-describe "Identity Map plugin" do 
-  before do
-    @db = INTEGRATION_DB
-    @db.create_table!(:items) do
-      primary_key :id
-      String :name
-      Integer :num
-    end
-    class ::Item < Sequel::Model(@db)
-      plugin :identity_map
-    end
-    Item.create(:name=>'J', :num=>3)
-  end
-  after do
-    @db.drop_table?(:items)
-    Object.send(:remove_const, :Item)
-  end
-
-  specify "should return the same instance if retrieved more than once" do
-    Item.with_identity_map{Item.first.object_id.should == Item.first.object_id}
-  end
-  
-  specify "should merge attributes that don't exist in the model" do
-    Item.with_identity_map do 
-      i = Item.select(:id, :name).first
-      i.values.should == {:id=>1, :name=>'J'}
-      Item.first
-      i.values.should == {:id=>1, :name=>'J', :num=>3}
-    end
-  end
-end
-
 describe "Touch plugin" do
   before(:all) do
     @db = INTEGRATION_DB
@@ -1060,7 +1028,7 @@ describe "UpdatePrimaryKey plugin" do
     @db[:t].all.should == [{:a=>1, :b=>4}]
     @c.first.set(:b=>5).save
     @db[:t].all.should == [{:a=>1, :b=>5}]
-    @c.first.set(:b=>6).save(:b)
+    @c.first.set(:b=>6).save(:columns=>:b)
     @db[:t].all.should == [{:a=>1, :b=>6}]
   end
 
@@ -1072,7 +1040,7 @@ describe "UpdatePrimaryKey plugin" do
   specify "should handle updating just the primary key field when saving changes" do
     @c.first.update(:a=>2)
     @db[:t].all.should == [{:a=>2, :b=>3}]
-    @c.first.set(:a=>3).save(:a)
+    @c.first.set(:a=>3).save(:columns=>:a)
     @db[:t].all.should == [{:a=>3, :b=>3}]
   end
 
@@ -1430,7 +1398,7 @@ describe "List plugin without a scope" do
     @c.plugin :list
   end
   before do
-    @c.delete
+    @c.dataset.delete
     @c.create :name => "abc"
     @c.create :name => "def"
     @c.create :name => "hig"
@@ -1505,7 +1473,7 @@ describe "List plugin with a scope" do
     @c.plugin :list, :field => :pos, :scope => :parent_id
   end
   before do
-    @c.delete
+    @c.dataset.delete
     p1 = @c.create :name => "Hm", :parent_id => 0
     p2 = @c.create :name => "Ps", :parent_id => p1.id
     @c.create :name => "P1", :parent_id => p2.id
@@ -1746,7 +1714,7 @@ describe "Sequel::Plugins::PreparedStatements" do
     @c.plugin :prepared_statements_with_pk
   end
   before do
-    @c.delete
+    @c.dataset.delete
     @foo = @c.create(:name=>'foo', :i=>10)
     @bar = @c.create(:name=>'bar', :i=>20)
   end
@@ -1942,13 +1910,13 @@ describe "Sequel::Plugins::ConstraintValidations" do
     it "should set up automatic validations inside the model" do 
       c = Class.new(Sequel::Model(@ds))
       c.plugin :constraint_validations
-      c.delete
+      c.dataset.delete
       proc{c.create(@valid_row)}.should_not raise_error
 
       # Test for unique validation 
       c.new(@valid_row).should_not be_valid
 
-      c.delete
+      c.dataset.delete
       @violations.each do |col, vals|
         try = @valid_row.dup
         vals.each do |val|

data/spec/integration/schema_test.rb

@@ -4,13 +4,11 @@ describe "Database schema parser" do
   before do
     @iom = INTEGRATION_DB.identifier_output_method
     @iim = INTEGRATION_DB.identifier_input_method
-    @defsch = INTEGRATION_DB.default_schema
     @qi = INTEGRATION_DB.quote_identifiers?
   end
   after do
     INTEGRATION_DB.identifier_output_method = @iom
     INTEGRATION_DB.identifier_input_method = @iim
-    INTEGRATION_DB.default_schema = @defsch
     INTEGRATION_DB.quote_identifiers = @qi
     INTEGRATION_DB.drop_table?(:items)
   end
@@ -19,7 +17,6 @@ describe "Database schema parser" do
     INTEGRATION_DB.identifier_output_method = :reverse
     INTEGRATION_DB.identifier_input_method = :reverse
     INTEGRATION_DB.quote_identifiers = true
-    INTEGRATION_DB.default_schema = nil if INTEGRATION_DB.default_schema
     INTEGRATION_DB.create_table!(:items){Integer :number}
     begin
       INTEGRATION_DB.schema(:items, :reload=>true).should be_a_kind_of(Array)
@@ -33,7 +30,6 @@ describe "Database schema parser" do
     INTEGRATION_DB.identifier_output_method = :reverse
     INTEGRATION_DB.identifier_input_method = :reverse
     INTEGRATION_DB.quote_identifiers = true
-    INTEGRATION_DB.default_schema = nil if INTEGRATION_DB.default_schema
     INTEGRATION_DB.create_table!(:items){Integer :number}
     INTEGRATION_DB.identifier_output_method = @iom
     INTEGRATION_DB.identifier_input_method = @iim
@@ -148,15 +144,6 @@ describe "Database schema parser" do
   end
 end if INTEGRATION_DB.supports_schema_parsing?
 
-test_indexes = begin
-  INTEGRATION_DB.drop_table?(:blah)
-  INTEGRATION_DB.indexes(:blah)
-  true
-rescue Sequel::NotImplemented
-  false
-rescue
-  true
-end
 describe "Database index parsing" do
   after do
     INTEGRATION_DB.drop_table?(:items)
@@ -188,17 +175,8 @@ describe "Database index parsing" do
     INTEGRATION_DB.create_table!(:items){Integer :n; Integer :a; primary_key [:n, :a]}
     INTEGRATION_DB.indexes(:items).should == {}
   end
-end if test_indexes
+end if INTEGRATION_DB.supports_index_parsing?
 
-test_foreign_key_list = begin
-  INTEGRATION_DB.drop_table?(:blah)
-  INTEGRATION_DB.foreign_key_list(:blah)
-  true
-rescue Sequel::NotImplemented
-  false
-rescue
-  true
-end
 describe "Database foreign key parsing" do
   before do
     @db = INTEGRATION_DB
@@ -253,7 +231,7 @@ describe "Database foreign key parsing" do
     @db.create_table!(:b, :engine=>:InnoDB){Integer :e; Integer :f; foreign_key [:e, :f], :a; foreign_key [:f, :e], :a, :key=>[:c, :b]}
     @pr[:b, [[:e, :f], :a, [:pk, :b, :c]], [[:f, :e], :a, [:c, :b]]]
   end
-end if test_foreign_key_list
+end if INTEGRATION_DB.supports_foreign_key_parsing?
 
 describe "Database schema modifiers" do
   before do
@@ -686,12 +664,6 @@ describe "Database schema modifiers" do
   end if INTEGRATION_DB.supports_deferrable_constraints?
 end
 
-test_tables = begin
-  INTEGRATION_DB.tables
-  true
-rescue Sequel::NotImplemented
-  false
-end
 describe "Database#tables" do
   before do
     class ::String
@@ -726,14 +698,8 @@ describe "Database#tables" do
     @db.identifier_input_method = :xxxxx
     @db.tables.each{|t| t.to_s.should =~ /\Ax{5}\d+\z/}
   end
-end if test_tables
+end if INTEGRATION_DB.supports_table_listing?
 
-test_views = begin
-  INTEGRATION_DB.views
-  true
-rescue Sequel::NotImplemented
-  false
-end
 describe "Database#views" do
   before do
     class ::String
@@ -768,4 +734,4 @@ describe "Database#views" do
     @db.identifier_input_method = :xxxxx
     @db.views.each{|t| t.to_s.should =~ /\Ax{5}\d+\z/}
   end
-end if test_views
+end if INTEGRATION_DB.supports_view_listing?

data/spec/integration/spec_helper.rb

@@ -14,6 +14,7 @@ begin
   require File.join(File.dirname(File.dirname(__FILE__)), 'spec_config.rb') unless defined?(INTEGRATION_DB)
 rescue LoadError
 end
+Sequel::Deprecation.backtrace_filter = lambda{|line, lineno| lineno < 4 || line =~ /_(spec|test)\.rb/}
 
 if ENV['SEQUEL_COLUMNS_INTROSPECTION']
   Sequel.extension :columns_introspection
@@ -21,7 +22,7 @@ if ENV['SEQUEL_COLUMNS_INTROSPECTION']
 end
 
 Sequel::Model.use_transactions = false
-Sequel::Model.cache_anonymous_models = false
+Sequel.cache_anonymous_models = false
 
 unless defined?(RSpec)
   module Spec::Matchers

data/spec/model/association_reflection_spec.rb

@@ -115,6 +115,75 @@ describe Sequel::Model::Associations::AssociationReflection, "#reciprocal" do
     ParParentThree.association_reflection(:par_parents).keys.should_not include(:reciprocal)
     ParParentThree.association_reflection(:par_parents).reciprocal.should == :par_parent_threes
   end
+
+  qspecify "should handle ambiguous reciprocals" do
+    ParParent.many_to_one :par_parent_two, :class=>ParParentTwo, :key=>:par_parent_two_id
+    ParParent.many_to_one :par_parent_two2, :clone=>:par_parent_two
+    ParParentTwo.one_to_many :par_parents, :class=>ParParent, :key=>:par_parent_two_id
+    ParParentTwo.one_to_many :par_parents2, :clone=>:par_parents
+    ParParent.many_to_many :par_parent_threes, :class=>ParParentThree, :right_key=>:par_parent_three_id
+    ParParent.many_to_many :par_parent_threes2, :clone=>:par_parent_threes
+    ParParentThree.many_to_many :par_parents
+
+    [:par_parent_two, :par_parent_two2].should include(ParParentTwo.association_reflection(:par_parents).reciprocal)
+    [:par_parents, :par_parents2].should include(ParParent.association_reflection(:par_parent_two).reciprocal)
+    [:par_parent_threes, :par_parent_threes2].should include(ParParentThree.association_reflection(:par_parents).reciprocal)
+  end
+
+  it "should handle ambiguous reciprocals where only one doesn't have conditions/blocks" do
+    ParParent.many_to_one :par_parent_two, :class=>ParParentTwo, :key=>:par_parent_two_id
+    ParParent.many_to_one :par_parent_two2, :clone=>:par_parent_two, :conditions=>{:id=>:id}
+    ParParentTwo.one_to_many :par_parents
+    ParParent.many_to_many :par_parent_threes, :class=>ParParentThree, :right_key=>:par_parent_three_id
+    ParParent.many_to_many :par_parent_threes2, :clone=>:par_parent_threes do |ds|
+      ds
+    end
+    ParParentThree.many_to_many :par_parents
+
+    ParParentTwo.association_reflection(:par_parents).reciprocal.should == :par_parent_two
+    ParParentThree.association_reflection(:par_parents).reciprocal.should == :par_parent_threes
+  end
+
+  it "should handle ambiguous reciprocals where only one has matching primary keys" do
+    ParParent.many_to_one :par_parent_two, :class=>ParParentTwo, :key=>:par_parent_two_id
+    ParParent.many_to_one :par_parent_two2, :clone=>:par_parent_two, :primary_key=>:foo
+    ParParentTwo.one_to_many :par_parents, :class=>ParParent, :key=>:par_parent_two_id
+    ParParentTwo.one_to_many :par_parents2, :clone=>:par_parents, :primary_key=>:foo
+    ParParent.many_to_many :par_parent_threes, :class=>ParParentThree, :right_key=>:par_parent_three_id
+    ParParent.many_to_many :par_parent_threes2, :clone=>:par_parent_threes, :right_primary_key=>:foo
+    ParParent.many_to_many :par_parent_threes3, :clone=>:par_parent_threes, :left_primary_key=>:foo
+    ParParentThree.many_to_many :par_parents
+
+    ParParent.association_reflection(:par_parent_two).reciprocal.should == :par_parents
+    ParParent.association_reflection(:par_parent_two2).reciprocal.should == :par_parents2
+    ParParentTwo.association_reflection(:par_parents).reciprocal.should == :par_parent_two
+    ParParentTwo.association_reflection(:par_parents2).reciprocal.should == :par_parent_two2
+    ParParentThree.association_reflection(:par_parents).reciprocal.should == :par_parent_threes
+  end
+
+  specify "should handle reciprocals where current association has conditions/block" do
+    ParParent.many_to_one :par_parent_two, :conditions=>{:id=>:id}
+    ParParentTwo.one_to_many :par_parents
+    ParParent.many_to_many :par_parent_threes do |ds|
+      ds
+    end
+    ParParentThree.many_to_many :par_parents
+
+    ParParent.association_reflection(:par_parent_two).reciprocal.should == :par_parents
+    ParParent.association_reflection(:par_parent_threes).reciprocal.should == :par_parents
+  end
+
+  qspecify "should handle reciprocals where reciprocal association has conditions/block" do
+    ParParent.many_to_one :par_parent_two, :conditions=>{:id=>:id}
+    ParParentTwo.one_to_many :par_parents
+    ParParent.many_to_many :par_parent_threes do |ds|
+      ds
+    end
+    ParParentThree.many_to_many :par_parents
+
+    ParParentTwo.association_reflection(:par_parents).reciprocal.should == :par_parent_two
+    ParParentThree.association_reflection(:par_parents).reciprocal.should == :par_parent_threes
+  end
 end
 
 describe Sequel::Model::Associations::AssociationReflection, "#select" do
@@ -317,14 +386,10 @@ describe Sequel::Model::Associations::AssociationReflection, "#eager_limit_strat
     def (c.dataset).supports_window_functions?() true end
     c.many_to_many :cs, :class=>c, :limit=>1
     c.association_reflection(:cs).eager_limit_strategy.should == :window_function
-
-    c.default_eager_limit_strategy = :correlated_subquery
-    c.many_to_many :cs, :class=>c, :limit=>1
-    c.association_reflection(:cs).eager_limit_strategy.should == :correlated_subquery
   end
 
   it "should ignore Model.default_eager_limit_strategy for one_to_one associations" do
-    @c.default_eager_limit_strategy = :correlated_subquery
+    @c.default_eager_limit_strategy = :window_function
     @c.one_to_one :c, :class=>@c
     @c.association_reflection(:c).eager_limit_strategy.should be_nil
   end

data/spec/model/associations_spec.rb

@@ -1301,7 +1301,7 @@ describe Sequel::Model, "one_to_many" do
   end
 
   it "should have add_ method accept a composite key" do
-    @c1.set_primary_key :id, :z
+    @c1.set_primary_key [:id, :z]
     @c2.one_to_many :attributes, :class => @c1, :key =>[:node_id, :y], :primary_key=>[:id, :x]
     @c1.dataset._fetch = {:id => 2345, :z => 8, :node_id => 1234, :y=>5}
     
@@ -1326,7 +1326,7 @@ describe Sequel::Model, "one_to_many" do
   end
   
   it "should accept a array of composite primary key values for the remove_ method and remove an existing record" do
-    @c1.set_primary_key :id, :y
+    @c1.set_primary_key [:id, :y]
     @c2.one_to_many :attributes, :class => @c1, :key=>:node_id, :primary_key=>:id
     n = @c2.new(:id => 123)
     @c1.dataset._fetch = {:id=>234, :node_id=>123, :y=>5}
@@ -1682,7 +1682,7 @@ describe Sequel::Model, "one_to_many" do
   end
 
   it "should allow additional arguments given to the remove_ method and pass them onwards to the _remove_ method" do
-    @c2.one_to_many :attributes, :class => @c1
+    @c2.one_to_many :attributes, :class => @c1, :reciprocal=>nil
     p = @c2.load(:id=>10)
     c = @c1.load(:id=>123)
     def p._remove_attribute(x,*y)
@@ -1801,7 +1801,7 @@ describe Sequel::Model, "one_to_many" do
     p.attributes.should == [c]
   end
   
-  it "should raise an error if trying to use the :one_to_one option" do
+  qspecify "should raise an error if trying to use the :one_to_one option" do
     proc{@c2.one_to_many :attribute, :class => @c1, :one_to_one=>true}.should raise_error(Sequel::Error)
     proc{@c2.associate :one_to_many, :attribute, :class => @c1, :one_to_one=>true}.should raise_error(Sequel::Error)
   end
@@ -2371,13 +2371,13 @@ describe Sequel::Model, "many_to_many" do
   end
 
   it "add, remove, and remove_all methods should respect :join_table_block option" do
-    @c2.many_to_many :attributes, :class => @c1, :join_table_block=>proc{|ds| ds.filter(:x=>123).set_overrides(:x=>123)}
+    @c2.many_to_many :attributes, :class => @c1, :join_table_block=>proc{|ds| ds.filter(:x=>123)}
     o = @c2.load(:id => 1234)
     o.add_attribute(@c1.load(:id=>44))
     o.remove_attribute(@c1.load(:id=>45))
     o.remove_all_attributes
     sqls = MODEL_DB.sqls
-    sqls.shift =~ /INSERT INTO attributes_nodes \((node_id|attribute_id|x), (node_id|attribute_id|x), (node_id|attribute_id|x)\) VALUES \((1234|123|44), (1234|123|44), (1234|123|44)\)/
+    sqls.shift =~ /INSERT INTO attributes_nodes \((node_id|attribute_id), (node_id|attribute_id)\) VALUES \((1234|44), (1234|44)\)/
     sqls.should == ["DELETE FROM attributes_nodes WHERE ((x = 123) AND (node_id = 1234) AND (attribute_id = 45))",
       "DELETE FROM attributes_nodes WHERE ((x = 123) AND (node_id = 1234))"]
   end
@@ -3148,7 +3148,7 @@ describe "Sequel::Model Associations with non-column expression keys" do
     @Foo.one_to_one :bar, :primary_key=>:obj_id, :primary_key_column=>Sequel.subscript(:object_ids, 0), :key=>Sequel.subscript(:object_ids, 0), :key_method=>:obj_id, :class=>@Bar
     @Bar.many_to_one :foo, :key=>:obj_id, :key_column=>Sequel.subscript(:object_ids, 0), :primary_key=>Sequel.subscript(:object_ids, 0), :primary_key_method=>:obj_id, :class=>@Foo
     @Foo.many_to_many :mtmbars, :join_table=>:bars_foos, :left_primary_key=>:obj_id, :left_primary_key_column=>Sequel.subscript(:object_ids, 0), :right_primary_key=>Sequel.subscript(:object_ids, 0), :right_primary_key_method=>:obj_id, :left_key=>Sequel.subscript(:foo_ids, 0), :right_key=>Sequel.subscript(:bar_ids, 0), :class=>@Bar
-    @Bar.many_to_many :mtmfoos, :join_table=>:bars_foos, :left_primary_key=>:obj_id, :left_primary_key_column=>Sequel.subscript(:object_ids, 0), :right_primary_key=>Sequel.subscript(:object_ids, 0), :right_primary_key_method=>:obj_id, :left_key=>Sequel.subscript(:bar_ids, 0), :right_key=>Sequel.subscript(:foo_ids, 0), :class=>@Foo
+    @Bar.many_to_many :mtmfoos, :join_table=>:bars_foos, :left_primary_key=>:obj_id, :left_primary_key_column=>Sequel.subscript(:object_ids, 0), :right_primary_key=>Sequel.subscript(:object_ids, 0), :right_primary_key_method=>:obj_id, :left_key=>Sequel.subscript(:bar_ids, 0), :right_key=>Sequel.subscript(:foo_ids, 0), :class=>@Foo, :reciprocal=>nil
     @foo = @Foo.load(:id=>1, :object_ids=>[2])
     @bar = @Bar.load(:id=>1, :object_ids=>[2])
     @db.sqls
@@ -3233,24 +3233,24 @@ describe "Model#pk_or_nil" do
     @m.columns :id, :x, :y
   end
   
-  it "should be default return the value of the :id column" do
+  qspecify "should be default return the value of the :id column" do
     m = @m.load(:id => 111, :x => 2, :y => 3)
     m.pk_or_nil.should == 111
   end
 
-  it "should be return the primary key value for custom primary key" do
+  qspecify "should be return the primary key value for custom primary key" do
     @m.set_primary_key :x
     m = @m.load(:id => 111, :x => 2, :y => 3)
     m.pk_or_nil.should == 2
   end
 
-  it "should be return the primary key value for composite primary key" do
+  qspecify "should be return the primary key value for composite primary key" do
     @m.set_primary_key [:y, :x]
     m = @m.load(:id => 111, :x => 2, :y => 3)
     m.pk_or_nil.should == [3, 2]
   end
 
-  it "should raise if no primary key" do
+  qspecify "should not raise if no primary key" do
     @m.set_primary_key nil
     m = @m.new(:id => 111, :x => 2, :y => 3)
     m.pk_or_nil.should be_nil