sequel 3.45.0 → 3.46.0

data/spec/extensions/migration_spec.rb

@@ -128,6 +128,8 @@ describe "Reversible Migrations with Sequel.migration{change{}}" do
         add_column :d, String
         add_constraint :blah, 'd IS NOT NULL'
         add_foreign_key :e, :b
+        add_foreign_key [:e], :b, :name=>'e_fk'
+        add_foreign_key [:e, :a], :b
         add_primary_key :f, :b
         add_index :e, :name=>'e_n'
         add_full_text_index :e, :name=>'e_ft'
@@ -151,6 +153,8 @@ describe "Reversible Migrations with Sequel.migration{change{}}" do
         [:add_column, :d, String],
         [:add_constraint, :blah, "d IS NOT NULL"],
         [:add_foreign_key, :e, :b],
+        [:add_foreign_key, [:e], :b, {:name=>"e_fk"}],
+        [:add_foreign_key, [:e, :a], :b],
         [:add_primary_key, :f, :b],
         [:add_index, :e, {:name=>"e_n"}],
         [:add_full_text_index, :e, {:name=>"e_ft"}],
@@ -173,7 +177,9 @@ describe "Reversible Migrations with Sequel.migration{change{}}" do
         [:drop_index, :e, {:name=>"e_ft"}],
         [:drop_index, :e, {:name=>"e_n"}],
         [:drop_column, :f],
-        [:drop_column, :e],
+        [:drop_foreign_key, [:e, :a]],
+        [:drop_foreign_key, [:e], {:name=>"e_fk"}],
+        [:drop_foreign_key, :e],
         [:drop_constraint, :blah],
         [:drop_column, :d]]
       ],

data/spec/extensions/serialization_spec.rb

@@ -218,6 +218,17 @@ describe "Serialization plugin" do
       "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
   end
 
+  it "should clear the deserialized columns when using set_values" do
+    @c.set_primary_key :id
+    @c.plugin :serialization, :yaml, :abc, :def
+    o = @c.load(:id => 1, :abc => "--- 1\n", :def => "--- hello\n")
+    o.abc = 23
+    o.deserialized_values.length.should == 1
+    o.abc.should == 23
+    o.set_values(:id=>1)
+    o.deserialized_values.length.should == 0
+  end
+  
   it "should clear the deserialized columns when refreshing" do
     @c.set_primary_key :id
     @c.plugin :serialization, :yaml, :abc, :def
@@ -238,6 +249,17 @@ describe "Serialization plugin" do
     o.deserialized_values.length.should == 0
   end
   
+  it "should clear the deserialized columns when refreshing after saving a new object with insert_select" do
+    @c.set_primary_key :id
+    @c.plugin :serialization, :yaml, :abc, :def
+    def (@c.instance_dataset).supports_insert_select?() true end
+    def (@c.instance_dataset).insert_select(*) {:id=>1} end
+    o = @c.new(:abc => "--- 1\n", :def => "--- hello\n")
+    o.deserialized_values.length.should == 2
+    o.save
+    o.deserialized_values.length.should == 0
+  end
+  
   it "should raise an error if calling internal serialization methods with bad columns" do
     @c.set_primary_key :id
     @c.plugin :serialization

data/spec/extensions/single_table_inheritance_spec.rb

@@ -193,7 +193,7 @@ describe Sequel::Model, "#sti_key" do
       StiTest2.dataset.row_proc.call(:kind=>1).should be_a_instance_of(StiTest3)
       StiTest2.dataset.row_proc.call(:kind=>2).should be_a_instance_of(StiTest4)
 
-      StiTest3.create.kind.should == 1
+      [0,1].should include(StiTest3.create.kind)
       StiTest4.create.kind.should == 2
     end
 
@@ -214,7 +214,8 @@ describe Sequel::Model, "#sti_key" do
       class ::StiTest4 < ::StiTest2; end
     
       StiTest2.dataset.sql.should == "SELECT * FROM sti_test2s"
-      StiTest3.dataset.sql.should == "SELECT * FROM sti_test2s WHERE (sti_test2s.kind IN (0, 1))"
+      ["SELECT * FROM sti_test2s WHERE (sti_test2s.kind IN (0, 1))",
+       "SELECT * FROM sti_test2s WHERE (sti_test2s.kind IN (1, 0))"].should include(StiTest3.dataset.sql)
     end
 
     it "should honor a :key_chooser" do

data/spec/extensions/validation_helpers_spec.rb

@@ -294,6 +294,12 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @m.value = 123.05
     @m.should_not be_valid
     @m.errors.full_messages.should == ['value is not a Integer']
+    
+    @c.set_validations{validates_type(Integer, :value)}
+    @m.value = nil
+    @m.should be_valid
+    @m.value = false
+    @m.should_not be_valid
   end
 
   specify "should support validates_presence" do

data/spec/integration/dataset_test.rb

@@ -361,6 +361,11 @@ describe Sequel::Database do
     INTEGRATION_DB.get(Sequel.cast(Sequel.blob("\1\2\3"), File).as(:a)).should == "\1\2\3"
   end
 
+  cspecify "should properly escape identifiers", :db2, :oracle do
+    INTEGRATION_DB.create_table(:"\\'\"[]"){Integer :id}
+    INTEGRATION_DB.drop_table(:"\\'\"[]")
+  end
+
   specify "should have a working table_exists?" do
     t = :basdfdsafsaddsaf
     INTEGRATION_DB.drop_table?(t)

data/spec/integration/schema_test.rb

@@ -237,6 +237,15 @@ describe "Database foreign key parsing" do
     @db.alter_table(:a){add_index [:d, :c], :unique=>true}
     @db.alter_table(:b){add_foreign_key [:f, :e], :a, :key=>[:d, :c]}
     @pr[:b, [[:e], :a, [:pk, :c]], [[:f], :a, [:c]], [[:f], :a, [:d]], [[:f, :e], :a, [:d, :c]]]
+
+    @db.alter_table(:b){drop_foreign_key [:f, :e]}
+    @pr[:b, [[:e], :a, [:pk, :c]], [[:f], :a, [:c]], [[:f], :a, [:d]]]
+
+    @db.alter_table(:b){drop_foreign_key :e}
+    @pr[:b, [[:f], :a, [:c]], [[:f], :a, [:d]]]
+
+    proc{@db.alter_table(:b){drop_foreign_key :f}}.should raise_error(Sequel::Error)
+    @pr[:b, [[:f], :a, [:c]], [[:f], :a, [:d]]]
   end
 
   specify "should handle composite foreign and primary keys" do
@@ -367,6 +376,13 @@ describe "Database schema modifiers" do
     @ds.insert([10])
   end
 
+  specify "should be able to specify constraint names for column constraints" do
+    @db.create_table!(:items2){primary_key :id, :primary_key_constraint_name=>:foo_pk}
+    @db.create_table!(:items){foreign_key :id, :items2, :unique=>true, :foreign_key_constraint_name => :foo_fk, :unique_constraint_name => :foo_uk, :null=>false}
+    @db.alter_table(:items){drop_constraint :foo_fk, :type=>:foreign_key; drop_constraint :foo_uk, :type=>:unique}
+    @db.alter_table(:items2){drop_constraint :foo_pk, :type=>:primary_key}
+  end
+
   specify "should handle foreign keys correctly when creating tables" do
     @db.create_table!(:items) do 
       primary_key :id

data/spec/model/associations_spec.rb

@@ -137,6 +137,46 @@ describe Sequel::Model, "associate" do
     proc{c.one_to_many :cs, :clone=>:c}.should_not raise_error(Sequel::Error)
     proc{c.one_to_one :c2, :clone=>:cs}.should_not raise_error(Sequel::Error)
   end
+
+  it "should clear associations cache when using set_values" do
+    c = Class.new(Sequel::Model(:c))
+    c.many_to_one :c
+    o = c.new
+    o.associations[:c] = 1
+    o.set_values(:id=>1)
+    o.associations.should == {}
+  end
+
+  it "should clear associations cache when refreshing object manually" do
+    c = Class.new(Sequel::Model(:c))
+    c.many_to_one :c
+    o = c.new
+    o.associations[:c] = 1
+    o.refresh
+    o.associations.should == {}
+  end
+
+  it "should clear associations cache when refreshing object after save" do
+    c = Class.new(Sequel::Model(:c))
+    c.many_to_one :c
+    o = c.new
+    o.associations[:c] = 1
+    o.save
+    o.associations.should == {}
+  end
+
+  it "should clear associations cache when saving with insert_select" do
+    ds = Sequel::Model.db[:c]
+    def ds.supports_insert_select?() true end
+    def ds.insert_select(*) {:id=>1} end
+    c = Class.new(Sequel::Model(ds))
+    c.many_to_one :c
+    o = c.new
+    o.associations[:c] = 1
+    o.save
+    o.associations.should == {}
+  end
+
 end
 
 describe Sequel::Model, "many_to_one" do

data/spec/model/base_spec.rb

@@ -693,7 +693,7 @@ describe Sequel::Model, ".[] optimization" do
   end
 end
 
-describe "Model datasets #with_pk" do
+describe "Model datasets #with_pk with #with_pk!" do
   before do
     @c = Class.new(Sequel::Model(:a))
     @ds = @c.dataset
@@ -704,16 +704,22 @@ describe "Model datasets #with_pk" do
   it "should return the first record where the primary key matches" do
     @ds.with_pk(1).should == @c.load(:id=>1)
     MODEL_DB.sqls.should == ["SELECT * FROM a WHERE (a.id = 1) LIMIT 1"]
+    @ds.with_pk!(1).should == @c.load(:id=>1)
+    MODEL_DB.sqls.should == ["SELECT * FROM a WHERE (a.id = 1) LIMIT 1"]
   end
 
   it "should handle existing filters" do
     @ds.filter(:a=>2).with_pk(1)
     MODEL_DB.sqls.should == ["SELECT * FROM a WHERE ((a = 2) AND (a.id = 1)) LIMIT 1"]
+    @ds.filter(:a=>2).with_pk!(1)
+    MODEL_DB.sqls.should == ["SELECT * FROM a WHERE ((a = 2) AND (a.id = 1)) LIMIT 1"]
   end
 
   it "should work with string values" do
     @ds.with_pk("foo")
     MODEL_DB.sqls.should == ["SELECT * FROM a WHERE (a.id = 'foo') LIMIT 1"]
+    @ds.with_pk!("foo")
+    MODEL_DB.sqls.should == ["SELECT * FROM a WHERE (a.id = 'foo') LIMIT 1"]
   end
 
   it "should handle an array for composite primary keys" do
@@ -723,6 +729,20 @@ describe "Model datasets #with_pk" do
     ["SELECT * FROM a WHERE ((a.id1 = 1) AND (a.id2 = 2)) LIMIT 1",
     "SELECT * FROM a WHERE ((a.id2 = 2) AND (a.id1 = 1)) LIMIT 1"].should include(sqls.pop)
     sqls.should == []
+
+    @ds.with_pk!([1, 2])
+    sqls = MODEL_DB.sqls
+    ["SELECT * FROM a WHERE ((a.id1 = 1) AND (a.id2 = 2)) LIMIT 1",
+    "SELECT * FROM a WHERE ((a.id2 = 2) AND (a.id1 = 1)) LIMIT 1"].should include(sqls.pop)
+    sqls.should == []
+  end
+
+  it "should have with_pk return nil and with_pk! raise if no rows match" do
+    @ds._fetch = []
+    @ds.with_pk(1).should == nil
+    MODEL_DB.sqls.should == ["SELECT * FROM a WHERE (a.id = 1) LIMIT 1"]
+    proc{@ds.with_pk!(1)}.should raise_error(Sequel::NoMatchingRow)
+    MODEL_DB.sqls.should == ["SELECT * FROM a WHERE (a.id = 1) LIMIT 1"]
   end
 
   it "should have #[] consider an integer as a primary key lookup" do

data/spec/model/record_spec.rb

@@ -1642,11 +1642,14 @@ describe Sequel::Model, "typecasting" do
     m.x.should == bd
     m.x = bd
     m.x.should == bd
+    m.x = '0'
+    m.x.should == 0
   end
 
   specify "should raise an error if invalid data is used in an decimal field" do
     @c.db_schema = {:x=>{:type=>:decimal}}
     proc{@c.new.x = Date.today}.should raise_error(Sequel::InvalidValue)
+    proc{@c.new.x = 'foo'}.should raise_error(Sequel::InvalidValue)
   end
 
   specify "should assign value if raise_on_typecast_failure is off and assigning invalid decimal" do

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 3.45.0
-  prerelease: 
+  version: 3.46.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies: []
 description: The Database Toolkit for Ruby
 email: code@jeremyevans.net
@@ -44,6 +43,7 @@ extra_rdoc_files:
 - doc/object_model.rdoc
 - doc/core_extensions.rdoc
 - doc/bin_sequel.rdoc
+- doc/security.rdoc
 - doc/release_notes/1.0.txt
 - doc/release_notes/1.1.txt
 - doc/release_notes/1.3.txt
@@ -108,6 +108,7 @@ extra_rdoc_files:
 - doc/release_notes/3.43.0.txt
 - doc/release_notes/3.44.0.txt
 - doc/release_notes/3.45.0.txt
+- doc/release_notes/3.46.0.txt
 files:
 - MIT-LICENSE
 - CHANGELOG
@@ -190,6 +191,7 @@ files:
 - doc/release_notes/3.43.0.txt
 - doc/release_notes/3.44.0.txt
 - doc/release_notes/3.45.0.txt
+- doc/release_notes/3.46.0.txt
 - doc/sharding.rdoc
 - doc/sql.rdoc
 - doc/validations.rdoc
@@ -202,6 +204,7 @@ files:
 - doc/object_model.rdoc
 - doc/core_extensions.rdoc
 - doc/bin_sequel.rdoc
+- doc/security.rdoc
 - spec/adapters/firebird_spec.rb
 - spec/adapters/informix_spec.rb
 - spec/adapters/mssql_spec.rb
@@ -467,6 +470,8 @@ files:
 - lib/sequel/database/logging.rb
 - lib/sequel/database/misc.rb
 - lib/sequel/database/query.rb
+- lib/sequel/database/features.rb
+- lib/sequel/database/transactions.rb
 - lib/sequel/dataset.rb
 - lib/sequel/dataset/actions.rb
 - lib/sequel/dataset/features.rb
@@ -588,33 +593,32 @@ files:
 - lib/sequel_model.rb
 homepage: http://sequel.rubyforge.org
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --quiet
 - --line-numbers
 - --inline-source
 - --title
-- ! 'Sequel: The Database Toolkit for Ruby'
+- 'Sequel: The Database Toolkit for Ruby'
 - --main
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sequel
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The Database Toolkit for Ruby
 test_files: []