sequel 3.14.0 → 3.15.0

data/spec/model/base_spec.rb

@@ -408,18 +408,18 @@ describe Sequel::Model, ".require_modification" do
   end
 
   it "should depend on whether the dataset provides an accurate number of rows matched by default" do
-    Class.new(Sequel::Model(@ds1)).require_modification.should == false
-    Class.new(Sequel::Model(@ds2)).require_modification.should == true
+    Class.new(Sequel::Model).set_dataset(@ds1).require_modification.should == false
+    Class.new(Sequel::Model).set_dataset(@ds2).require_modification.should == true
   end
 
   it "should obey global setting regardless of dataset support if set" do
     Sequel::Model.require_modification = true
-    Class.new(Sequel::Model(@ds1)).require_modification.should == true
-    Class.new(Sequel::Model(@ds2)).require_modification.should == true
+    Class.new(Sequel::Model).set_dataset(@ds1).require_modification.should == true
+    Class.new(Sequel::Model).set_dataset(@ds2).require_modification.should == true
     
     Sequel::Model.require_modification = false
-    Class.new(Sequel::Model(@ds1)).require_modification.should == false
-    Class.new(Sequel::Model(@ds2)).require_modification.should == false
+    Class.new(Sequel::Model).set_dataset(@ds1).require_modification.should == false
+    Class.new(Sequel::Model).set_dataset(@ds1).require_modification.should == false
   end
 end
 

data/spec/model/model_spec.rb

@@ -30,6 +30,33 @@ describe "Sequel::Model()" do
     SmBlahTest.db.should == db
     SmBlahTest.table_name.should == :sm_blah_tests
   end
+
+  describe "reloading" do
+    after do
+      Object.send(:remove_const, :Album) if defined?(::Album)
+    end
+
+    it "should work without raising an exception with a symbol" do
+      proc do
+        class ::Album < Sequel::Model(:table); end
+        class ::Album < Sequel::Model(:table); end
+      end.should_not raise_error
+    end
+
+    it "should work without raising an exception with a database" do
+      proc do
+        class ::Album < Sequel::Model(@db); end
+        class ::Album < Sequel::Model(@db); end
+      end.should_not raise_error
+    end
+
+    it "should work without raising an exception with a dataset" do
+      proc do
+        class ::Album < Sequel::Model(@db[:table]); end
+        class ::Album < Sequel::Model(@db[:table]); end
+      end.should_not raise_error
+    end
+  end
 end
 
 describe Sequel::Model do
@@ -381,7 +408,7 @@ describe Sequel::Model, "attribute accessors" do
     @c = Class.new(Sequel::Model) do
       def self.db_schema
          set_columns(Array(@columns))
-        @db_schema = {:x=>{}, :y=>{}}
+        @db_schema = {:x=>{:type=>:integer}, :y=>{:type=>:integer}}
       end
       def self.set_dataset(ds, opts={}) 
         @columns = ds.columns
@@ -417,6 +444,14 @@ describe Sequel::Model, "attribute accessors" do
     proc{o.send(:x=)}.should raise_error
     proc{o.send(:x=, 3, 4)}.should raise_error
   end
+
+  it "should have a working typecasting setter even if the column is not selected" do
+    @c.set_dataset(@dataset.select(:y))
+    o = @c.new
+
+    o.x = '34'
+    o.x.should == 34
+  end
 end
 
 describe Sequel::Model, ".[]" do
@@ -498,7 +533,7 @@ context "Model.db_schema" do
     @c.dataset.instance_variable_get(:@columns).should == [:x, :y]
   end
 
-  specify "should restrict the schema and columns for datasets with a :select option" do
+  specify "should not restrict the schema for datasets with a :select option" do
     ds = @dataset.select(:x, :y___z)
     d = ds.db
     def d.schema(table, opts = {})
@@ -506,7 +541,7 @@ context "Model.db_schema" do
     end
     def @c.columns; [:x, :z]; end
     @c.dataset = ds
-    @c.db_schema.should == {:x=>{:type=>:integer}, :z=>{}}
+    @c.db_schema.should == {:x=>{:type=>:integer}, :z=>{}, :y=>{:type=>:string}}
   end
 
   specify "should not use schema if the dataset uses multiple tables or custom sql" do

data/spec/model/record_spec.rb

@@ -715,6 +715,30 @@ describe Sequel::Model, "#set" do
     returned_value.should == @o1
     MODEL_DB.sqls.should == []
   end
+
+  it "#set should correctly handle cases where an instance method is added to the class" do
+    @o1.set(:x => 1)
+    @o1.values.should == {:x => 1}
+
+    @c.class_eval 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 a singleton method is added to the object" do
+    @o1.set(:x => 1)
+    @o1.values.should == {:x => 1}
+
+    def @o1.z=(v)
+      self[:z] = v
+    end
+    @o1.set(:x => 2, :z => 3)
+    @o1.values.should == {:x => 2, :z=>3}
+  end
 end
 
 describe Sequel::Model, "#update" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 59
   prerelease: false
   segments: 
   - 3
-  - 14
+  - 15
   - 0
-  version: 3.14.0
+  version: 3.15.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-02 00:00:00 -07:00
+date: 2010-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -78,6 +78,7 @@ extra_rdoc_files:
 - doc/release_notes/3.12.0.txt
 - doc/release_notes/3.13.0.txt
 - doc/release_notes/3.14.0.txt
+- doc/release_notes/3.15.0.txt
 files: 
 - COPYING
 - CHANGELOG
@@ -123,6 +124,7 @@ files:
 - doc/release_notes/3.12.0.txt
 - doc/release_notes/3.13.0.txt
 - doc/release_notes/3.14.0.txt
+- doc/release_notes/3.15.0.txt
 - doc/sharding.rdoc
 - doc/sql.rdoc
 - doc/virtual_rows.rdoc
@@ -297,6 +299,7 @@ files:
 - lib/sequel/adapters/shared/sqlite.rb
 - lib/sequel/adapters/sqlite.rb
 - lib/sequel/adapters/utils/stored_procedures.rb
+- lib/sequel/adapters/mysql2.rb
 - lib/sequel/connection_pool.rb
 - lib/sequel/connection_pool/sharded_single.rb
 - lib/sequel/connection_pool/sharded_threaded.rb