sequel 3.40.0 → 3.41.0

data/spec/integration/plugin_test.rb

@@ -530,60 +530,89 @@ end
 describe "Touch plugin" do
   before(:all) do
     @db = INTEGRATION_DB
-    @db.instance_variable_set(:@schemas, {})
-    @db.create_table!(:artists) do
+    @db.drop_table? :albums_artists, :albums, :artists
+    @db.create_table(:artists) do
       primary_key :id
       String :name
       DateTime :updated_at
     end
-    @db.create_table!(:albums) do
+    @db.create_table(:albums) do
       primary_key :id
       String :name
       foreign_key :artist_id, :artists
       DateTime :updated_at
     end
+    @db.create_join_table({:album_id=>:albums, :artist_id=>:artists}, :no_index=>true)
   end
   before do
     @db[:albums].delete
     @db[:artists].delete
     class ::Album < Sequel::Model(@db)
-      many_to_one :artist
-      plugin :touch, :associations=>:artist
     end
     class ::Artist < Sequel::Model(@db)
     end 
     
     @artist = Artist.create(:name=>'1')
-    @album = Album.create(:name=>'A', :artist=>@artist)
+    @album = Album.create(:name=>'A', :artist_id=>@artist.id)
   end
   after do
     [:Album, :Artist].each{|s| Object.send(:remove_const, s)}
   end
   after(:all) do
-    @db.drop_table? :albums, :artists
+    @db.drop_table? :albums_artists, :albums, :artists
   end
 
   specify "should update the timestamp column when touching the record" do
+    Album.plugin :touch
     @album.updated_at.should == nil
     @album.touch
     @album.updated_at.to_i.should be_within(2).of(Time.now.to_i)
   end
   
-  cspecify "should update the timestamp column for associated records when the record is updated or destroyed", [:do, :sqlite], [:jdbc, :sqlite], [:swift] do
+  cspecify "should update the timestamp column for many_to_one associated records when the record is updated or destroyed", [:do, :sqlite], [:jdbc, :sqlite], [:swift] do
+    Album.many_to_one :artist
+    Album.plugin :touch, :associations=>:artist
     @artist.updated_at.should == nil
     @album.update(:name=>'B')
     ua = @artist.reload.updated_at
     if ua.is_a?(Time)
-      ua.to_i.should be_within(2).of(Time.now.to_i)
+      ua.to_i.should be_within(60).of(Time.now.to_i)
     else
-      (DateTime.now - ua).should be_within(2.0/86400).of(0)
+      (DateTime.now - ua).should be_within(60.0/86400).of(0)
     end
     @artist.update(:updated_at=>nil)
     @album.destroy
     if ua.is_a?(Time)
-      ua.to_i.should be_within(2).of(Time.now.to_i)
+      ua.to_i.should be_within(60).of(Time.now.to_i)
+    else
+      (DateTime.now - ua).should be_within(60.0/86400).of(0)
+    end
+  end
+
+  cspecify "should update the timestamp column for one_to_many associated records when the record is updated", [:do, :sqlite], [:jdbc, :sqlite], [:swift] do
+    Artist.one_to_many :albums
+    Artist.plugin :touch, :associations=>:albums
+    @album.updated_at.should == nil
+    @artist.update(:name=>'B')
+    ua = @album.reload.updated_at
+    if ua.is_a?(Time)
+      ua.to_i.should be_within(60).of(Time.now.to_i)
+    else
+      (DateTime.now - ua).should be_within(60.0/86400).of(0)
+    end
+  end
+
+  cspecify "should update the timestamp column for many_to_many associated records when the record is updated", [:do, :sqlite], [:jdbc, :sqlite], [:swift] do
+    Artist.many_to_many :albums
+    Artist.plugin :touch, :associations=>:albums
+    @artist.add_album(@album)
+    @album.updated_at.should == nil
+    @artist.update(:name=>'B')
+    ua = @album.reload.updated_at
+    if ua.is_a?(Time)
+      ua.to_i.should be_within(60).of(Time.now.to_i)
     else
-      (DateTime.now - ua).should be_within(2.0/86400).of(0)
+      (DateTime.now - ua).should be_within(60.0/86400).of(0)
     end
   end
 end

data/spec/integration/schema_test.rb

@@ -389,6 +389,11 @@ describe "Database schema modifiers" do
     @ds.all.should == [{:id=>i, :item_id=>nil}]
   end
 
+  specify "should not allow NULLs in a primary key" do
+    @db.create_table!(:items){String :id, :primary_key=>true}
+    proc{@ds.insert(:id=>nil)}.should raise_error(Sequel::DatabaseError)
+  end
+
   specify "should rename columns correctly" do
     @db.create_table!(:items){Integer :id}
     @ds.insert(:id=>10)
@@ -430,6 +435,15 @@ describe "Database schema modifiers" do
     @db[:items2].select_order_map([:id, :b]).should == [[1, 10], [2, 20]]
   end
 
+  cspecify "should rename primary_key columns correctly", :db2 do
+    @db.create_table!(:items){Integer :id, :primary_key=>true}
+    @ds.insert(:id=>10)
+    @db.alter_table(:items){rename_column :id, :id2}
+    @db.schema(:items, :reload=>true).map{|x| x.first}.should == [:id2]
+    @ds.columns!.should == [:id2]
+    @ds.all.should == [{:id2=>10}]
+  end
+
   cspecify "should set column NULL/NOT NULL correctly", [:jdbc, :db2], [:db2] do
     @db.create_table!(:items, :engine=>:InnoDB){Integer :id}
     @ds.insert(:id=>10)

data/spec/integration/spec_helper.rb

@@ -94,3 +94,10 @@ if INTEGRATION_DB.adapter_scheme == :ibmdb || (INTEGRATION_DB.adapter_scheme ==
     super
   end
 end
+
+if ENV['SEQUEL_CONNECTION_VALIDATOR']
+  ENV['SEQUEL_NO_CHECK_SQLS'] = '1'
+  INTEGRATION_DB.extension(:connection_validator)
+  INTEGRATION_DB.pool.connection_validation_timeout = -1
+end
+

data/spec/integration/type_test.rb

@@ -64,6 +64,9 @@ describe "Supported types" do
     ds = create_items_table_with_column(:name, String, :text=>true)
     ds.insert(:name => 'Test User'*100)
     ds.all.should == [{:name=>'Test User'*100}]
+
+    ds.update(:name=>ds.get(:name))
+    ds.all.should == [{:name=>'Test User'*100}]
   end
   
   cspecify "should support generic date type", [:do, :sqlite], [:jdbc, :sqlite], :mssql, :oracle do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 3.40.0
+  version: 3.41.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies: []
 description: The Database Toolkit for Ruby
 email: code@jeremyevans.net
@@ -43,6 +43,7 @@ extra_rdoc_files:
 - doc/thread_safety.rdoc
 - doc/object_model.rdoc
 - doc/core_extensions.rdoc
+- doc/bin_sequel.rdoc
 - doc/release_notes/1.0.txt
 - doc/release_notes/1.1.txt
 - doc/release_notes/1.3.txt
@@ -102,6 +103,7 @@ extra_rdoc_files:
 - doc/release_notes/3.38.0.txt
 - doc/release_notes/3.39.0.txt
 - doc/release_notes/3.40.0.txt
+- doc/release_notes/3.41.0.txt
 files:
 - MIT-LICENSE
 - CHANGELOG
@@ -179,6 +181,7 @@ files:
 - doc/release_notes/3.38.0.txt
 - doc/release_notes/3.39.0.txt
 - doc/release_notes/3.40.0.txt
+- doc/release_notes/3.41.0.txt
 - doc/sharding.rdoc
 - doc/sql.rdoc
 - doc/validations.rdoc
@@ -190,6 +193,7 @@ files:
 - doc/thread_safety.rdoc
 - doc/object_model.rdoc
 - doc/core_extensions.rdoc
+- doc/bin_sequel.rdoc
 - spec/adapters/firebird_spec.rb
 - spec/adapters/informix_spec.rb
 - spec/adapters/mssql_spec.rb
@@ -243,7 +247,6 @@ files:
 - spec/extensions/thread_local_timezones_spec.rb
 - spec/extensions/timestamps_spec.rb
 - spec/extensions/typecast_on_load_spec.rb
-- spec/extensions/validation_class_methods_spec.rb
 - spec/extensions/validation_helpers_spec.rb
 - spec/extensions/composition_spec.rb
 - spec/extensions/rcte_tree_spec.rb
@@ -297,6 +300,8 @@ files:
 - spec/extensions/pg_typecast_on_load_spec.rb
 - spec/extensions/constraint_validations_plugin_spec.rb
 - spec/extensions/constraint_validations_spec.rb
+- spec/extensions/connection_validator_spec.rb
+- spec/extensions/validation_class_methods_spec.rb
 - spec/integration/associations_test.rb
 - spec/integration/database_test.rb
 - spec/integration/dataset_test.rb
@@ -497,6 +502,7 @@ files:
 - lib/sequel/extensions/pg_row.rb
 - lib/sequel/extensions/pg_row_ops.rb
 - lib/sequel/extensions/constraint_validations.rb
+- lib/sequel/extensions/connection_validator.rb
 - lib/sequel/metaprogramming.rb
 - lib/sequel/model.rb
 - lib/sequel/model/associations.rb