sequel 3.23.0 → 3.24.0

data/spec/model/base_spec.rb

@@ -485,3 +485,62 @@ describe Sequel::Model, ".[] optimization" do
     @c[1]
   end
 end
+
+describe "Model datasets #with_pk" do
+  before do
+    @c = Class.new(Sequel::Model(:a))
+    @ds = @c.dataset
+    def @ds.fetch_rows(sql)
+      db << sql
+      yield(:id=>1)
+    end
+    @sqls = MODEL_DB.sqls
+    @sqls.clear
+  end
+
+  it "should return the first record where the primary key matches" do
+    @ds.with_pk(1).should == @c.load(:id=>1)
+    @sqls.should == ["SELECT * FROM a WHERE (id = 1) LIMIT 1"]
+  end
+
+  it "should handle existing filters" do
+    @ds.filter(:a=>2).with_pk(1)
+    @sqls.should == ["SELECT * FROM a WHERE ((a = 2) AND (id = 1)) LIMIT 1"]
+  end
+
+  it "should work with string values" do
+    @ds.with_pk("foo")
+    @sqls.should == ["SELECT * FROM a WHERE (id = 'foo') LIMIT 1"]
+  end
+
+  it "should handle an array for composite primary keys" do
+    @c.set_primary_key :id1, :id2
+    @ds.with_pk([1, 2])
+    @sqls.should == ["SELECT * FROM a WHERE ((id1 = 1) AND (id2 = 2)) LIMIT 1"]
+  end
+
+  it "should raise an error if a single primary key is given when a composite primary key should be used" do
+    @c.set_primary_key :id1, :id2
+    proc{@ds.with_pk(1)}.should raise_error(Sequel::Error)
+  end
+
+  it "should raise an error if a composite primary key is given when a single primary key should be used" do
+    proc{@ds.with_pk([1, 2])}.should raise_error(Sequel::Error)
+  end
+
+  it "should raise an error if the wrong number of composite keys is given" do
+    @c.set_primary_key :id1, :id2
+    proc{@ds.with_pk([1, 2, 3])}.should raise_error(Sequel::Error)
+  end
+
+  it "should have #[] consider an integer as a primary key lookup" do
+    @ds[1].should == @c.load(:id=>1)
+    @sqls.should == ["SELECT * FROM a WHERE (id = 1) LIMIT 1"]
+  end
+
+  it "should not have #[] consider a string as a primary key lookup" do
+    @ds['foo'].should == @c.load(:id=>1)
+    @sqls.should == ["SELECT * FROM a WHERE (foo) LIMIT 1"]
+  end
+
+end

data/spec/model/hooks_spec.rb

@@ -268,4 +268,165 @@ describe "Model#before_validation && Model#after_validation" do
     @c.load(:id => 2233).save.should == nil
     MODEL_DB.sqls.should == []
   end
+  
+  specify "#valid? should return false if before_validation returns false" do
+    @c.send(:define_method, :before_validation){false}
+    @c.load(:id => 2233).valid?.should == false
+  end
+end
+
+describe "Model around filters" do
+  before do
+    MODEL_DB.reset
+
+    @c = Class.new(Sequel::Model(:items))
+    @c.class_eval do
+      columns :id, :x
+      def _save_refresh(*a) end
+    end
+  end
+  
+  specify "around_create should be called around new record creation" do
+    @c.class_eval do
+      def around_create
+        MODEL_DB << 'ac_before'
+        super
+        MODEL_DB << 'ac_after'
+      end
+    end
+    @c.create(:x => 2)
+    MODEL_DB.sqls.should == [ 'ac_before', 'INSERT INTO items (x) VALUES (2)', 'ac_after' ]
+  end
+
+  specify "around_delete should be called around record destruction" do
+    @c.class_eval do
+      def around_destroy
+        MODEL_DB << 'ad_before'
+        super
+        MODEL_DB << 'ad_after'
+      end
+    end
+    @c.load(:id=>1, :x => 2).destroy
+    MODEL_DB.sqls.should == [ 'ad_before', 'DELETE FROM items WHERE (id = 1)', 'ad_after' ]
+  end
+  
+  specify "around_update should be called around updating existing records" do
+    @c.class_eval do
+      def around_update
+        MODEL_DB << 'au_before'
+        super
+        MODEL_DB << 'au_after'
+      end
+    end
+    @c.load(:id=>1, :x => 2).save
+    MODEL_DB.sqls.should == [ 'au_before', 'UPDATE items SET x = 2 WHERE (id = 1)', 'au_after' ]
+  end
+
+  specify "around_update should be called around saving both new and existing records, around either after_create and after_update" do
+    @c.class_eval do
+      def around_update
+        MODEL_DB << 'au_before'
+        super
+        MODEL_DB << 'au_after'
+      end
+      def around_create
+        MODEL_DB << 'ac_before'
+        super
+        MODEL_DB << 'ac_after'
+      end
+      def around_save
+        MODEL_DB << 'as_before'
+        super
+        MODEL_DB << 'as_after'
+      end
+    end
+    @c.create(:x => 2)
+    MODEL_DB.sqls.should == [ 'as_before', 'ac_before', 'INSERT INTO items (x) VALUES (2)', 'ac_after', 'as_after' ]
+    MODEL_DB.sqls.clear
+    @c.load(:id=>1, :x => 2).save
+    MODEL_DB.sqls.should == [ 'as_before', 'au_before', 'UPDATE items SET x = 2 WHERE (id = 1)', 'au_after', 'as_after' ]
+  end
+
+  specify "around_validation should be called around validating records" do
+    @c.class_eval do
+      def around_validation
+        MODEL_DB << 'av_before'
+        super
+        MODEL_DB << 'av_after'
+      end
+      def validate
+        MODEL_DB << 'validate'
+      end
+    end
+    @c.new(:x => 2).valid?.should == true
+    MODEL_DB.sqls.should == [ 'av_before', 'validate', 'av_after' ]
+  end
+
+  specify "around_validation should be able to catch validation errors and modify them" do
+    @c.class_eval do
+      def validate
+        errors.add(:x, 'foo')
+      end
+    end
+    @c.new(:x => 2).valid?.should == false
+    @c.class_eval do
+      def around_validation
+        super
+        errors.clear
+      end
+    end
+    @c.new(:x => 2).valid?.should == true
+  end
+
+  specify "around_create that doesn't call super should raise a HookFailed" do
+    @c.send(:define_method, :around_create){}
+    proc{@c.create(:x => 2)}.should raise_error(Sequel::HookFailed)
+  end
+  
+  specify "around_update that doesn't call super should raise a HookFailed" do
+    @c.send(:define_method, :around_update){}
+    proc{@c.load(:x => 2).save}.should raise_error(Sequel::HookFailed)
+  end
+  
+  specify "around_save that doesn't call super should raise a HookFailed" do
+    @c.send(:define_method, :around_save){}
+    proc{@c.create(:x => 2)}.should raise_error(Sequel::HookFailed)
+    proc{@c.load(:x => 2).save}.should raise_error(Sequel::HookFailed)
+  end
+  
+  specify "around_destroy that doesn't call super should raise a HookFailed" do
+    @c.send(:define_method, :around_destroy){}
+    proc{@c.load(:x => 2).destroy}.should raise_error(Sequel::HookFailed)
+  end
+  
+  specify "around_validation that doesn't call super should raise a HookFailed" do
+    @c.send(:define_method, :around_validation){}
+    proc{@c.new.save}.should raise_error(Sequel::HookFailed)
+  end
+
+  specify "around_validation that doesn't call super should have valid? return false" do
+    @c.send(:define_method, :around_validation){}
+    @c.new.valid?.should == false
+  end
+
+  specify "around_* that doesn't call super should return nil if raise_on_save_failure is false" do
+    @c.raise_on_save_failure = false
+
+    o = @c.load(:id => 1)
+    o.meta_def(:around_save){}
+    o.save.should == nil
+
+    o = @c.load(:id => 1)
+    o.meta_def(:around_update){}
+    o.save.should == nil
+
+    o = @c.new
+    o.meta_def(:around_create){}
+    o.save.should == nil
+
+    o = @c.new
+    o.meta_def(:around_validation){}
+    o.save.should == nil
+  end
+
 end

data/spec/model/record_spec.rb

@@ -52,6 +52,7 @@ describe "Model#save" do
 
   it "should use dataset's insert_select method if present" do
     ds = @c.dataset = @c.dataset.clone
+    def ds.supports_insert_select?() true end
     def ds.insert_select(hash)
       execute("INSERT INTO items (y) VALUES (2)")
       {:y=>2}
@@ -1167,6 +1168,29 @@ describe Sequel::Model, "#initialize" do
     m.values.should == {:x => 2}
   end
 end
+  
+describe Sequel::Model, "#initialize_set" do
+  before do
+    @c = Class.new(Sequel::Model){columns :id, :x, :y}
+  end
+
+  specify "should be called by initialize to set the column values" do
+    @c.send(:define_method, :initialize_set){|h| set(:y => 3)}
+    @c.new(:x => 2).values.should == {:y => 3}
+  end
+
+  specify "should be called with the hash given to initialize " do
+    x = nil
+    @c.send(:define_method, :initialize_set){|y| x = y}
+    @c.new(:x => 2)
+    x.should == {:x => 2}
+  end
+
+  specify "should not cause columns modified by the method to be considered as changed" do
+    @c.send(:define_method, :initialize_set){|h| set(:y => 3)}
+    @c.new(:x => 2).changed_columns.should == []
+  end
+end
 
 describe Sequel::Model, ".create" do
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  hash: 91
+  hash: 103
   prerelease: false
   segments: 
   - 3
-  - 23
+  - 24
   - 0
-  version: 3.23.0
+  version: 3.24.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 -07:00
+date: 2011-06-01 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -87,6 +87,7 @@ extra_rdoc_files:
 - doc/release_notes/3.21.0.txt
 - doc/release_notes/3.22.0.txt
 - doc/release_notes/3.23.0.txt
+- doc/release_notes/3.24.0.txt
 files: 
 - MIT-LICENSE
 - CHANGELOG
@@ -141,6 +142,7 @@ files:
 - doc/release_notes/3.21.0.txt
 - doc/release_notes/3.22.0.txt
 - doc/release_notes/3.23.0.txt
+- doc/release_notes/3.24.0.txt
 - doc/sharding.rdoc
 - doc/sql.rdoc
 - doc/virtual_rows.rdoc
@@ -221,6 +223,11 @@ files:
 - spec/extensions/to_dot_spec.rb
 - spec/extensions/association_autoreloading_spec.rb
 - spec/extensions/serialization_modification_detection_spec.rb
+- spec/extensions/defaults_setter_spec.rb
+- spec/extensions/prepared_statements_spec.rb
+- spec/extensions/prepared_statements_safe_spec.rb
+- spec/extensions/prepared_statements_with_pk_spec.rb
+- spec/extensions/prepared_statements_associations_spec.rb
 - spec/extensions/columns_introspection_spec.rb
 - spec/integration/associations_test.rb
 - spec/integration/database_test.rb
@@ -310,6 +317,9 @@ files:
 - lib/sequel/adapters/jdbc/postgresql.rb
 - lib/sequel/adapters/jdbc/sqlite.rb
 - lib/sequel/adapters/jdbc/as400.rb
+- lib/sequel/adapters/jdbc/informix.rb
+- lib/sequel/adapters/jdbc/jtds.rb
+- lib/sequel/adapters/jdbc/sqlserver.rb
 - lib/sequel/adapters/mysql.rb
 - lib/sequel/adapters/odbc.rb
 - lib/sequel/adapters/odbc/mssql.rb
@@ -323,6 +333,7 @@ files:
 - lib/sequel/adapters/shared/progress.rb
 - lib/sequel/adapters/shared/sqlite.rb
 - lib/sequel/adapters/shared/access.rb
+- lib/sequel/adapters/shared/informix.rb
 - lib/sequel/adapters/sqlite.rb
 - lib/sequel/adapters/utils/stored_procedures.rb
 - lib/sequel/adapters/mysql2.rb
@@ -418,9 +429,15 @@ files:
 - lib/sequel/plugins/xml_serializer.rb
 - lib/sequel/plugins/association_autoreloading.rb
 - lib/sequel/plugins/serialization_modification_detection.rb
+- lib/sequel/plugins/defaults_setter.rb
+- lib/sequel/plugins/prepared_statements.rb
+- lib/sequel/plugins/prepared_statements_safe.rb
+- lib/sequel/plugins/prepared_statements_with_pk.rb
+- lib/sequel/plugins/prepared_statements_associations.rb
 - lib/sequel/sql.rb
 - lib/sequel/timezones.rb
 - lib/sequel/version.rb
+- lib/sequel/ast_transformer.rb
 - lib/sequel_core.rb
 - lib/sequel_model.rb
 has_rdoc: true