sequel 3.26.0 → 3.27.0

data/spec/model/record_spec.rb

@@ -630,6 +630,40 @@ describe "Model#pk" do
   end
 end
 
+describe "Model#pk_or_nil" do
+  before(:each) do
+    @m = Class.new(Sequel::Model)
+    @m.columns :id, :x, :y
+  end
+  
+  it "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
+    @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
+    @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
+    @m.set_primary_key nil
+    m = @m.new(:id => 111, :x => 2, :y => 3)
+    m.pk_or_nil.should be_nil
+
+    @m.no_primary_key
+    m = @m.new(:id => 111, :x => 2, :y => 3)
+    m.pk_or_nil.should be_nil
+  end
+end
+
 describe "Model#pk_hash" do
   before(:each) do
     @m = Class.new(Sequel::Model)
@@ -769,6 +803,32 @@ describe Sequel::Model, "#set" do
     @o1.set(:x => 2, :z => 3)
     @o1.values.should == {:x => 2, :z=>3}
   end
+
+  it "#set should correctly handle cases where a module with a setter method is included in the class" do
+    @o1.set(:x => 1)
+    @o1.values.should == {:x => 1}
+
+    @c.send(:include, Module.new do
+      def z=(v)
+        self[:z] = v
+      end
+    end)
+    @o1.set(:x => 2, :z => 3)
+    @o1.values.should == {:x => 2, :z=>3}
+  end
+
+  it "#set should correctly handle cases where the object extends a module with a setter method " do
+    @o1.set(:x => 1)
+    @o1.values.should == {:x => 1}
+
+    @o1.extend(Module.new do
+      def z=(v)
+        self[:z] = v
+      end
+    end)
+    @o1.set(:x => 2, :z => 3)
+    @o1.values.should == {:x => 2, :z=>3}
+  end
 end
 
 describe Sequel::Model, "#update" do
@@ -1027,6 +1087,11 @@ describe Sequel::Model, "#exists?" do
     @model.load(:id=>2).exists?.should be_false
     MODEL_DB.sqls.should == ['SELECT 1 FROM items WHERE (id = 2) LIMIT 1']
   end
+
+  it "should return false without issuing a query if the model object is new" do
+    @model.new.exists?.should be_false
+    MODEL_DB.sqls.should == []
+  end
 end
 
 describe Sequel::Model, "#each" do
@@ -1124,13 +1189,10 @@ describe Sequel::Model, "#hash" do
     y = Class.new(Sequel::Model)
     y.columns :id, :x
     a = z.load(:id => 1, :x => 3)
-    b = z.load(:id => 1, :x => 4)
-    c = z.load(:id => 2, :x => 3)
-    d = y.load(:id => 1, :x => 3)
     
-    a.hash.should == b.hash
-    a.hash.should_not == c.hash
-    a.hash.should_not == d.hash
+    a.hash.should == z.load(:id => 1, :x => 4).hash
+    a.hash.should_not == z.load(:id => 2, :x => 3).hash
+    a.hash.should_not == y.load(:id => 1, :x => 3).hash
   end
 
   specify "should be the same only for objects with the same class and values if the pk is nil" do
@@ -1139,14 +1201,71 @@ describe Sequel::Model, "#hash" do
     y = Class.new(Sequel::Model)
     y.columns :id, :x
     a = z.new(:x => 3)
-    b = z.new(:x => 4)
-    c = z.new(:x => 3)
-    d = y.new(:x => 3)
     
-    a.hash.should_not == b.hash
-    a.hash.should == c.hash
-    a.hash.should_not == d.hash
+    a.hash.should_not == z.new(:x => 4).hash
+    a.hash.should == z.new(:x => 3).hash
+    a.hash.should_not == y.new(:x => 3).hash
+  end
+
+  specify "should be the same only for objects with the same class and pk if pk is composite and all values are non-NULL" do
+    z = Class.new(Sequel::Model)
+    z.columns :id, :id2, :x
+    z.set_primary_key(:id, :id2)
+    y = Class.new(Sequel::Model)
+    y.columns :id, :id2, :x
+    y.set_primary_key(:id, :id2)
+    a = z.load(:id => 1, :id2=>2, :x => 3)
+    
+    a.hash.should == z.load(:id => 1, :id2=>2, :x => 4).hash
+    a.hash.should_not == z.load(:id => 2, :id2=>1, :x => 3).hash
+    a.hash.should_not == y.load(:id => 1, :id2=>1, :x => 3).hash
+  end
+
+  specify "should be the same only for objects with the same class and value if pk is composite and one values is NULL" do
+    z = Class.new(Sequel::Model)
+    z.columns :id, :id2, :x
+    z.set_primary_key(:id, :id2)
+    y = Class.new(Sequel::Model)
+    y.columns :id, :id2, :x
+    y.set_primary_key(:id, :id2)
+
+    a = z.load(:id => 1, :id2 => nil, :x => 3)
+    a.hash.should == z.load(:id => 1, :id2=>nil, :x => 3).hash
+    a.hash.should_not == z.load(:id => 1, :id2=>nil, :x => 4).hash
+    a.hash.should_not == y.load(:id => 1, :id2=>nil, :x => 3).hash
+
+    a = z.load(:id =>nil, :id2 => nil, :x => 3)
+    a.hash.should == z.load(:id => nil, :id2=>nil, :x => 3).hash
+    a.hash.should_not == z.load(:id => nil, :id2=>nil, :x => 4).hash
+    a.hash.should_not == y.load(:id => nil, :id2=>nil, :x => 3).hash
+
+    a = z.load(:id => 1, :x => 3)
+    a.hash.should == z.load(:id => 1, :x => 3).hash
+    a.hash.should_not == z.load(:id => 1, :id2=>nil, :x => 3).hash
+    a.hash.should_not == z.load(:id => 1, :x => 4).hash
+    a.hash.should_not == y.load(:id => 1, :x => 3).hash
+
+    a = z.load(:x => 3)
+    a.hash.should == z.load(:x => 3).hash
+    a.hash.should_not == z.load(:id => nil, :id2=>nil, :x => 3).hash
+    a.hash.should_not == z.load(:x => 4).hash
+    a.hash.should_not == y.load(:x => 3).hash
+  end
+
+  specify "should be the same only for objects with the same class and values if the no primary key" do
+    z = Class.new(Sequel::Model)
+    z.columns :id, :x
+    z.no_primary_key
+    y = Class.new(Sequel::Model)
+    y.columns :id, :x
+    y.no_primary_key
+    a = z.new(:x => 3)
+    
+    a.hash.should_not == z.new(:x => 4).hash
+    a.hash.should == z.new(:x => 3).hash
+    a.hash.should_not == y.new(:x => 3).hash
   end
+
 end
 
 describe Sequel::Model, "#initialize" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  hash: 111
+  hash: 107
   prerelease: false
   segments: 
   - 3
-  - 26
+  - 27
   - 0
-  version: 3.26.0
+  version: 3.27.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-01 00:00:00 -07:00
+date: 2011-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -45,6 +45,9 @@ extra_rdoc_files:
 - doc/sql.rdoc
 - doc/validations.rdoc
 - doc/virtual_rows.rdoc
+- doc/mass_assignment.rdoc
+- doc/testing.rdoc
+- doc/schema_modification.rdoc
 - doc/release_notes/1.0.txt
 - doc/release_notes/1.1.txt
 - doc/release_notes/1.3.txt
@@ -90,6 +93,7 @@ extra_rdoc_files:
 - doc/release_notes/3.8.0.txt
 - doc/release_notes/3.9.0.txt
 - doc/release_notes/3.26.0.txt
+- doc/release_notes/3.27.0.txt
 files: 
 - MIT-LICENSE
 - CHANGELOG
@@ -153,10 +157,14 @@ files:
 - doc/release_notes/3.8.0.txt
 - doc/release_notes/3.9.0.txt
 - doc/release_notes/3.26.0.txt
+- doc/release_notes/3.27.0.txt
 - doc/sharding.rdoc
 - doc/sql.rdoc
 - doc/validations.rdoc
 - doc/virtual_rows.rdoc
+- doc/mass_assignment.rdoc
+- doc/testing.rdoc
+- doc/schema_modification.rdoc
 - spec/adapters/firebird_spec.rb
 - spec/adapters/informix_spec.rb
 - spec/adapters/mssql_spec.rb
@@ -327,6 +335,7 @@ files:
 - lib/sequel/adapters/mysql.rb
 - lib/sequel/adapters/odbc.rb
 - lib/sequel/adapters/odbc/mssql.rb
+- lib/sequel/adapters/odbc/db2.rb
 - lib/sequel/adapters/openbase.rb
 - lib/sequel/adapters/oracle.rb
 - lib/sequel/adapters/postgres.rb
@@ -338,6 +347,7 @@ files:
 - lib/sequel/adapters/shared/sqlite.rb
 - lib/sequel/adapters/shared/access.rb
 - lib/sequel/adapters/shared/informix.rb
+- lib/sequel/adapters/shared/mysql_prepared_statements.rb
 - lib/sequel/adapters/sqlite.rb
 - lib/sequel/adapters/utils/stored_procedures.rb
 - lib/sequel/adapters/mysql2.rb