sequel 3.38.0 → 3.39.0

data/spec/integration/schema_test.rb

@@ -108,6 +108,16 @@ describe "Database schema parser" do
     INTEGRATION_DB.schema(:items).first.last[:ruby_default].should == 'blah'
   end
 
+  specify "should parse current timestamp defaults from the schema properly" do
+    INTEGRATION_DB.create_table!(:items){Time :a, :default=>Sequel::CURRENT_TIMESTAMP}
+    INTEGRATION_DB.schema(:items).first.last[:ruby_default].should == Sequel::CURRENT_TIMESTAMP
+  end
+
+  cspecify "should parse current date defaults from the schema properly", :mysql, :oracle do
+    INTEGRATION_DB.create_table!(:items){Date :a, :default=>Sequel::CURRENT_DATE}
+    INTEGRATION_DB.schema(:items).first.last[:ruby_default].should == Sequel::CURRENT_DATE
+  end
+
   cspecify "should parse types from the schema properly", [:jdbc, :db2], :oracle do
     INTEGRATION_DB.create_table!(:items){Integer :number}
     INTEGRATION_DB.schema(:items).first.last[:type].should == :integer
@@ -575,6 +585,30 @@ describe "Database schema modifiers" do
     end
     @db.schema(:items, :reload=>true).map{|x| x.first}.should == [:id]
   end
+
+  cspecify "should work correctly with many operations in a single alter_table call", [:jdbc, :db2], [:db2] do
+    @db.create_table!(:items) do
+      primary_key :id
+      String :name2
+      String :number2
+      constraint :bar, Sequel.~(:id=>nil)
+    end
+    @ds.insert(:name2=>'A12')
+    @db.alter_table(:items) do
+      add_column :number, Integer
+      drop_column :number2
+      rename_column :name2, :name
+      drop_constraint :bar
+      set_column_not_null :name
+      set_column_default :name, 'A13'
+      add_constraint :foo, Sequel.like(:name, 'A%')
+    end
+    @db[:items].first.should == {:id=>1, :name=>'A12', :number=>nil}
+    @db[:items].delete
+    proc{@db[:items].insert(:name=>nil)}.should raise_error(Sequel::DatabaseError)
+    @db[:items].insert(:number=>1)
+    @db[:items].get(:name).should == 'A13'
+  end
 end
 
 test_tables = begin

data/spec/model/dataset_methods_spec.rb

@@ -69,3 +69,41 @@ describe Sequel::Model::DatasetMethods, "#to_hash"  do
     proc{@d.to_hash}.should raise_error(Sequel::Error)
   end
 end
+
+describe Sequel::Model::DatasetMethods, "#join_table"  do
+  before do
+    @c = Class.new(Sequel::Model(:items))
+  end
+
+  specify "should allow use to use a model class when joining" do
+    @c.join(Class.new(Sequel::Model(:categories)), :item_id => :id).sql.should == 'SELECT * FROM items INNER JOIN categories ON (categories.item_id = items.id)'
+  end
+
+  specify "should handle model classes that aren't simple selects using a subselect" do
+    @c.join(Class.new(Sequel::Model(MODEL_DB[:categories].where(:foo=>1))), :item_id => :id).sql.should == 'SELECT * FROM items INNER JOIN (SELECT * FROM categories WHERE (foo = 1)) AS t1 ON (t1.item_id = items.id)'
+  end
+end 
+
+describe Sequel::Model::DatasetMethods, "#graph"  do
+  before do
+    @c = Class.new(Sequel::Model(:items))
+    @c.columns :id
+  end
+
+  specify "should allow use to use a model class when joining" do
+    c = Class.new(Sequel::Model(:categories))
+    c.columns :id
+    @c.graph(c, :item_id => :id).sql.should == 'SELECT items.id, categories.id AS categories_id FROM items LEFT OUTER JOIN categories ON (categories.item_id = items.id)'
+  end
+end 
+
+describe Sequel::Model::DatasetMethods, "#insert_sql"  do
+  before do
+    @c = Class.new(Sequel::Model(:items))
+    @c.columns :id
+  end
+
+  specify "should handle a single model instance as an argument" do
+    @c.insert_sql(@c.load(:id=>1)).should == 'INSERT INTO items (id) VALUES (1)'
+  end
+end 

data/spec/model/hooks_spec.rb

@@ -140,6 +140,12 @@ describe "Model#before_save && Model#after_save" do
     @c.load(:id => 2233).save.should == nil
     MODEL_DB.sqls.should == []
   end
+
+  specify "#save should have a raised exception reference the model instance" do
+    @c.send(:define_method, :before_save){false}
+    proc{@c.create(:x => 2233)}.should raise_error(Sequel::HookFailed){|e| e.model.should == @c.load(:x=>2233)}
+    MODEL_DB.sqls.should == []
+  end
 end
 
 describe "Model#before_destroy && Model#after_destroy" do

data/spec/model/validations_spec.rb

@@ -128,6 +128,28 @@ describe Sequel::Model do
     @o.errors[:blah].should be_empty
   end
   
+  specify "should allow raising of ValidationFailed with a Model instance with errors" do
+    @o.errors.add(:score, 'is too low')
+    begin
+      raise Sequel::ValidationFailed, @o
+    rescue Sequel::ValidationFailed => e
+    end
+    e.model.should equal(@o)
+    e.errors.should equal(@o.errors)
+    e.message.should == 'score is too low'
+  end
+  
+  specify "should allow raising of ValidationFailed with an Errors instance" do
+    @o.errors.add(:score, 'is too low')
+    begin
+      raise Sequel::ValidationFailed, @o.errors
+    rescue Sequel::ValidationFailed => e
+    end
+    e.model.should be_nil
+    e.errors.should equal(@o.errors)
+    e.message.should == 'score is too low'
+  end
+
   specify "should allow raising of ValidationFailed with a string" do
     proc{raise Sequel::ValidationFailed, "no reason"}.should raise_error(Sequel::ValidationFailed, "no reason")
   end
@@ -165,8 +187,11 @@ describe "Model#save" do
     MODEL_DB.sqls.should == ['UPDATE people SET x = 6 WHERE (id = 4)']
   end
 
-  specify "should raise error if validations fail and raise_on_save_faiure is true" do
-    proc{@m.save}.should raise_error(Sequel::ValidationFailed){|e| e.errors.should == @m.errors }
+  specify "should raise error if validations fail and raise_on_save_failure is true" do
+    proc{@m.save}.should(raise_error(Sequel::ValidationFailed) do |e|
+      e.model.should equal(@m)
+      e.errors.should equal(@m.errors)
+    end)
   end
 
   specify "should raise error if validations fail and :raise_on_failure option is true" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 3.38.0
+  version: 3.39.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-09-01 00:00:00.000000000 Z
 dependencies: []
 description: The Database Toolkit for Ruby
 email: code@jeremyevans.net
@@ -100,6 +100,7 @@ extra_rdoc_files:
 - doc/release_notes/3.36.0.txt
 - doc/release_notes/3.37.0.txt
 - doc/release_notes/3.38.0.txt
+- doc/release_notes/3.39.0.txt
 files:
 - MIT-LICENSE
 - CHANGELOG
@@ -175,6 +176,7 @@ files:
 - doc/release_notes/3.36.0.txt
 - doc/release_notes/3.37.0.txt
 - doc/release_notes/3.38.0.txt
+- doc/release_notes/3.39.0.txt
 - doc/sharding.rdoc
 - doc/sql.rdoc
 - doc/validations.rdoc
@@ -291,6 +293,8 @@ files:
 - spec/extensions/pg_row_plugin_spec.rb
 - spec/extensions/pg_row_spec.rb
 - spec/extensions/pg_typecast_on_load_spec.rb
+- spec/extensions/constraint_validations_plugin_spec.rb
+- spec/extensions/constraint_validations_spec.rb
 - spec/integration/associations_test.rb
 - spec/integration/database_test.rb
 - spec/integration/dataset_test.rb
@@ -485,6 +489,7 @@ files:
 - lib/sequel/extensions/pg_interval.rb
 - lib/sequel/extensions/pg_row.rb
 - lib/sequel/extensions/pg_row_ops.rb
+- lib/sequel/extensions/constraint_validations.rb
 - lib/sequel/metaprogramming.rb
 - lib/sequel/model.rb
 - lib/sequel/model/associations.rb
@@ -544,6 +549,7 @@ files:
 - lib/sequel/plugins/eager_each.rb
 - lib/sequel/plugins/pg_row.rb
 - lib/sequel/plugins/pg_typecast_on_load.rb
+- lib/sequel/plugins/constraint_validations.rb
 - lib/sequel/timezones.rb
 - lib/sequel/version.rb
 - lib/sequel/ast_transformer.rb