sequel 3.32.0 → 3.33.0

data/spec/extensions/server_block_spec.rb

@@ -0,0 +1,90 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+shared_examples_for "Database#with_server" do  
+  specify "should set the default server to use in the block" do
+    @db.with_server(:a){@db[:t].all}
+    @db.sqls.should == ["SELECT * FROM t -- a"]
+    @db.with_server(:b){@db[:t].all}
+    @db.sqls.should == ["SELECT * FROM t -- b"]
+  end
+
+  specify "should have no affect after the block" do
+    @db.with_server(:a){@db[:t].all}
+    @db.sqls.should == ["SELECT * FROM t -- a"]
+    @db[:t].all
+    @db.sqls.should == ["SELECT * FROM t"]
+  end
+
+  specify "should not override specific server inside the block" do
+    @db.with_server(:a){@db[:t].server(:b).all}
+    @db.sqls.should == ["SELECT * FROM t -- b"]
+  end
+
+  specify "should work correctly when blocks are nested" do
+    @db[:t].all
+    @db.with_server(:a) do
+      @db[:t].all
+      @db.with_server(:b){@db[:t].all}
+      @db[:t].all
+    end
+    @db[:t].all
+    @db.sqls.should == ["SELECT * FROM t", "SELECT * FROM t -- a", "SELECT * FROM t -- b", "SELECT * FROM t -- a", "SELECT * FROM t"]
+  end
+
+  specify "should work correctly for inserts/updates/deletes" do
+    @db.with_server(:a) do
+      @db[:t].insert
+      @db[:t].update(:a=>1)
+      @db[:t].delete
+    end
+    @db.sqls.should == ["INSERT INTO t DEFAULT VALUES -- a", "UPDATE t SET a = 1 -- a", "DELETE FROM t -- a"]
+  end
+end
+
+describe "Database#with_server single threaded" do
+  before do
+    @db = Sequel.mock(:single_threaded=>true, :servers=>{:a=>{}, :b=>{}})
+    @db.extend Sequel::ServerBlock
+  end
+
+  it_should_behave_like "Database#with_server"
+end
+
+describe "Database#with_server multi threaded" do
+  before do
+    @db = Sequel.mock(:servers=>{:a=>{}, :b=>{}, :c=>{}, :d=>{}})
+    @db.extend Sequel::ServerBlock
+  end
+
+  it_should_behave_like "Database#with_server"
+
+  specify "should respect multithreaded access" do
+    q, q1 = Queue.new, Queue.new
+    
+    t = nil
+    @db[:t].all
+    @db.with_server(:a) do
+      @db[:t].all
+      t = Thread.new do
+        @db[:t].all
+        @db.with_server(:c) do
+          @db[:t].all
+          @db.with_server(:d){@db[:t].all}
+          q.push nil
+          q1.pop
+          @db[:t].all
+        end
+        @db[:t].all
+      end
+      q.pop
+      @db.with_server(:b){@db[:t].all}
+      @db[:t].all
+    end
+    @db[:t].all
+    q1.push nil
+    t.join
+    @db.sqls.should == ["SELECT * FROM t", "SELECT * FROM t -- a", "SELECT * FROM t", "SELECT * FROM t -- c", "SELECT * FROM t -- d",
+      "SELECT * FROM t -- b", "SELECT * FROM t -- a", "SELECT * FROM t", "SELECT * FROM t -- c", "SELECT * FROM t"]
+  end
+end
+

data/spec/extensions/spec_helper.rb

@@ -8,7 +8,7 @@ unless Sequel.const_defined?('Model')
   require 'sequel/model'
 end
 
-Sequel.extension(*%w'string_date_time inflector pagination query pretty_table blank migration schema_dumper looser_typecasting sql_expr thread_local_timezones to_dot columns_introspection')
+Sequel.extension(*%w'string_date_time inflector pagination query pretty_table blank migration schema_dumper looser_typecasting sql_expr thread_local_timezones to_dot columns_introspection server_block arbitrary_servers')
 {:hook_class_methods=>[], :schema=>[], :validation_class_methods=>[]}.each{|p, opts| Sequel::Model.plugin(p, *opts)}
 
 Sequel::Dataset.introspect_all_columns if ENV['SEQUEL_COLUMNS_INTROSPECTION']

data/spec/files/transaction_migrations/001_create_alt_basic.rb

@@ -0,0 +1,3 @@
+Sequel.migration do
+  change{create_table(:sm11111){Integer :smc1}}
+end

data/spec/files/transaction_migrations/002_create_basic.rb

@@ -0,0 +1,3 @@
+Sequel.migration do
+  change{create_table(:sm){Integer :smc1}}
+end

data/spec/files/transactionless_migrations/001_create_alt_basic.rb

@@ -0,0 +1,4 @@
+Sequel.migration do
+  no_transaction
+  change{create_table(:sm11111){Integer :smc1}}
+end

data/spec/files/transactionless_migrations/002_create_basic.rb

@@ -0,0 +1,4 @@
+Sequel.migration do
+  no_transaction
+  change{create_table(:sm){Integer :smc1}}
+end

data/spec/integration/dataset_test.rb

@@ -81,7 +81,7 @@ describe "Simple Dataset operations" do
     @ds.all.should == [{:id=>1, :number=>11}]
   end
   
-  cspecify "should have update return the number of matched rows", [:mysql, :mysql], [:do, :mysql], [:mysql2], [:ado] do
+  cspecify "should have update return the number of matched rows", [:do, :mysql], [:ado] do
     @ds.update(:number=>:number).should == 1
     @ds.filter(:id=>1).update(:number=>:number).should == 1
     @ds.filter(:id=>2).update(:number=>:number).should == 0
@@ -1357,7 +1357,7 @@ describe "Dataset identifier methods" do
     @db.drop_table(:a)
   end
   
-  cspecify "#identifier_output_method should change how identifiers are output", [:mysql2], [:swift] do
+  cspecify "#identifier_output_method should change how identifiers are output", [:swift] do
     @ds.identifier_output_method = :upcase
     @ds.first.should == {:AB=>1}
     @ds.identifier_output_method = :uprev

data/spec/integration/plugin_test.rb

@@ -1179,9 +1179,9 @@ describe "List plugin without a scope" do
   end
   before do
     @c.delete
-    @c.create :name => "hig", :position => 3
-    @c.create :name => "def", :position => 2
-    @c.create :name => "abc", :position => 1
+    @c.create :name => "abc"
+    @c.create :name => "def"
+    @c.create :name => "hig"
   end
   after(:all) do
     @db.drop_table(:sites)
@@ -1254,12 +1254,12 @@ describe "List plugin with a scope" do
   end
   before do
     @c.delete
-    p1 = @c.create :name => "Hm", :pos => 1, :parent_id => 0
-    p2 = @c.create :name => "Ps", :pos => 1, :parent_id => p1.id
-    @c.create :name => "P1", :pos => 1, :parent_id => p2.id
-    @c.create :name => "P2", :pos => 2, :parent_id => p2.id
-    @c.create :name => "P3", :pos => 3, :parent_id => p2.id
-    @c.create :name => "Au", :pos => 2, :parent_id => p1.id
+    p1 = @c.create :name => "Hm", :parent_id => 0
+    p2 = @c.create :name => "Ps", :parent_id => p1.id
+    @c.create :name => "P1", :parent_id => p2.id
+    @c.create :name => "P2", :parent_id => p2.id
+    @c.create :name => "P3", :parent_id => p2.id
+    @c.create :name => "Au", :parent_id => p1.id
   end
   after(:all) do
     @db.drop_table(:pages)

data/spec/integration/schema_test.rb

@@ -441,7 +441,9 @@ describe "Database schema modifiers" do
   end
 
   cspecify "should remove columns from tables correctly", :h2, :mssql, [:jdbc, :db2], :hsqldb do
-    @db.create_table!(:items) do
+    # MySQL with InnoDB cannot drop foreign key columns unless you know the
+    # name of the constraint, see Bug #14347
+    @db.create_table!(:items, :engine=>:MyISAM) do
       primary_key :id
       String :name
       Integer :number

data/spec/integration/transaction_test.rb

@@ -156,7 +156,7 @@ describe "Database transactions" do
       @d.select_order_map(:name).should == []
     end
 
-    if INTEGRATION_DB.supports_savepoints?
+    if INTEGRATION_DB.supports_savepoints_in_prepared_transactions?
       specify "should support savepoints when using prepared transactions" do
         @db.transaction(:prepare=>'XYZ'){@db.transaction(:savepoint=>true){@d << {:name => '1'}}}
         @db.commit_prepared_transaction('XYZ')
@@ -252,7 +252,7 @@ describe "Database transactions" do
       proc{@db.transaction(:prepare=>'XYZ'){@db.after_rollback{}}}.should raise_error(Sequel::Error)
     end
 
-    if INTEGRATION_DB.supports_savepoints?
+    if INTEGRATION_DB.supports_savepoints_in_prepared_transactions?
       specify "should raise an error if you attempt to use after_commit or after rollback inside a savepoint in a prepared transaction" do
         proc{@db.transaction(:prepare=>'XYZ'){@db.transaction(:savepoint=>true){@db.after_commit{}}}}.should raise_error(Sequel::Error)
         proc{@db.transaction(:prepare=>'XYZ'){@db.transaction(:savepoint=>true){@db.after_rollback{}}}}.should raise_error(Sequel::Error)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 3.32.0
+  version: 3.33.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-01 00:00:00.000000000 Z
+date: 2012-03-01 00:00:00.000000000 Z
 dependencies: []
 description: The Database Toolkit for Ruby
 email: code@jeremyevans.net
@@ -91,6 +91,7 @@ extra_rdoc_files:
 - doc/release_notes/3.30.0.txt
 - doc/release_notes/3.31.0.txt
 - doc/release_notes/3.32.0.txt
+- doc/release_notes/3.33.0.txt
 files:
 - MIT-LICENSE
 - CHANGELOG
@@ -160,6 +161,7 @@ files:
 - doc/release_notes/3.30.0.txt
 - doc/release_notes/3.31.0.txt
 - doc/release_notes/3.32.0.txt
+- doc/release_notes/3.33.0.txt
 - doc/sharding.rdoc
 - doc/sql.rdoc
 - doc/validations.rdoc
@@ -246,6 +248,8 @@ files:
 - spec/extensions/prepared_statements_with_pk_spec.rb
 - spec/extensions/prepared_statements_associations_spec.rb
 - spec/extensions/dataset_associations_spec.rb
+- spec/extensions/arbitrary_servers_spec.rb
+- spec/extensions/server_block_spec.rb
 - spec/extensions/columns_introspection_spec.rb
 - spec/integration/associations_test.rb
 - spec/integration/database_test.rb
@@ -315,6 +319,10 @@ files:
 - spec/files/reversible_migrations/003_reversible.rb
 - spec/files/reversible_migrations/004_reversible.rb
 - spec/files/reversible_migrations/005_reversible.rb
+- spec/files/transaction_migrations/001_create_alt_basic.rb
+- spec/files/transaction_migrations/002_create_basic.rb
+- spec/files/transactionless_migrations/001_create_alt_basic.rb
+- spec/files/transactionless_migrations/002_create_basic.rb
 - lib/sequel.rb
 - lib/sequel/adapters/ado.rb
 - lib/sequel/adapters/ado/mssql.rb
@@ -411,6 +419,8 @@ files:
 - lib/sequel/extensions/string_date_time.rb
 - lib/sequel/extensions/thread_local_timezones.rb
 - lib/sequel/extensions/to_dot.rb
+- lib/sequel/extensions/arbitrary_servers.rb
+- lib/sequel/extensions/server_block.rb
 - lib/sequel/extensions/columns_introspection.rb
 - lib/sequel/metaprogramming.rb
 - lib/sequel/model.rb