sequel 3.28.0 → 3.29.0

data/spec/adapters/sqlite_spec.rb

@@ -144,13 +144,6 @@ describe "An SQLite dataset" do
     @d = SQLITE_DB[:items]
   end
   
-  specify "should handle string pattern matches correctly" do
-    @d.literal(:x.like('a')).should == "(x LIKE 'a')"
-    @d.literal(~:x.like('a')).should == "NOT (x LIKE 'a')"
-    @d.literal(:x.ilike('a')).should == "(x LIKE 'a')"
-    @d.literal(~:x.ilike('a')).should == "NOT (x LIKE 'a')"
-  end
-
   specify "should raise errors if given a regexp pattern match" do
     proc{@d.literal(:x.like(/a/))}.should raise_error(Sequel::Error)
     proc{@d.literal(~:x.like(/a/))}.should raise_error(Sequel::Error)
@@ -175,27 +168,27 @@ end
 
 describe "An SQLite dataset AS clause" do
   specify "should use a string literal for :col___alias" do
-    SQLITE_DB.literal(:c___a).should == "c AS 'a'"
+    SQLITE_DB.literal(:c___a).should == "`c` AS 'a'"
   end
 
   specify "should use a string literal for :table__col___alias" do
-    SQLITE_DB.literal(:t__c___a).should == "t.c AS 'a'"
+    SQLITE_DB.literal(:t__c___a).should == "`t`.`c` AS 'a'"
   end
 
   specify "should use a string literal for :column.as(:alias)" do
-    SQLITE_DB.literal(:c.as(:a)).should == "c AS 'a'"
+    SQLITE_DB.literal(:c.as(:a)).should == "`c` AS 'a'"
   end
 
   specify "should use a string literal in the SELECT clause" do
-    SQLITE_DB[:t].select(:c___a).sql.should == "SELECT c AS 'a' FROM t"
+    SQLITE_DB[:t].select(:c___a).sql.should == "SELECT `c` AS 'a' FROM `t`"
   end
 
   specify "should use a string literal in the FROM clause" do
-    SQLITE_DB[:t___a].sql.should == "SELECT * FROM t AS 'a'"
+    SQLITE_DB[:t___a].sql.should == "SELECT * FROM `t` AS 'a'"
   end
 
   specify "should use a string literal in the JOIN clause" do
-    SQLITE_DB[:t].join_table(:natural, :j, nil, :a).sql.should == "SELECT * FROM t NATURAL JOIN j AS 'a'"
+    SQLITE_DB[:t].join_table(:natural, :j, nil, :a).sql.should == "SELECT * FROM `t` NATURAL JOIN `j` AS 'a'"
   end
 end
 
@@ -324,6 +317,15 @@ describe "A SQLite database" do
     @db[:test2].first.should == {:name => 'mmm'}
   end
 
+  specify "should keep a composite primary key when dropping columns" do
+    @db.create_table!(:test2){Integer :a; Integer :b; Integer :c; primary_key [:a, :b]}
+    @db.drop_column :test2, :c
+    @db[:test2].columns.should == [:a, :b]
+    @db[:test2] << {:a=>1, :b=>2}
+    @db[:test2] << {:a=>2, :b=>3}
+    proc{@db[:test2] << {:a=>2, :b=>3}}.should raise_error(Sequel::Error)
+  end
+
   specify "should keep column attributes when dropping a column" do
     @db.create_table! :test3 do
       primary_key :id
@@ -423,14 +425,15 @@ describe "A SQLite database" do
   specify "should choose a temporary table name that isn't already used when dropping or renaming columns" do
     sqls = []
     @db.loggers << (l=Class.new{%w'info error'.each{|m| define_method(m){|sql| sqls << sql}}}.new)
-    @db.create_table! :test3 do
+    @db.tables.each{|t| @db.drop_table(t) if t.to_s =~ /test3/}
+    @db.create_table :test3 do
       Integer :h
       Integer :i
     end
-    @db.create_table! :test3_backup0 do
+    @db.create_table :test3_backup0 do
       Integer :j
     end
-    @db.create_table! :test3_backup1 do
+    @db.create_table :test3_backup1 do
       Integer :k
     end
 
@@ -439,20 +442,20 @@ describe "A SQLite database" do
     @db[:test3_backup1].columns.should == [:k]
     sqls.clear
     @db.drop_column(:test3, :i)
-    sqls.any?{|x| x =~ /\ACREATE TABLE.*test3_backup2/}.should == true
-    sqls.any?{|x| x =~ /\ACREATE TABLE.*test3_backup[01]/}.should == false
+    sqls.any?{|x| x =~ /\AALTER TABLE.*test3.*RENAME TO.*test3_backup2/}.should == true
+    sqls.any?{|x| x =~ /\AALTER TABLE.*test3.*RENAME TO.*test3_backup[01]/}.should == false
     @db[:test3].columns.should == [:h]
     @db[:test3_backup0].columns.should == [:j]
     @db[:test3_backup1].columns.should == [:k]
 
-    @db.create_table! :test3_backup2 do
+    @db.create_table :test3_backup2 do
       Integer :l
     end
 
     sqls.clear
     @db.rename_column(:test3, :h, :i)
-    sqls.any?{|x| x =~ /\ACREATE TABLE.*test3_backup3/}.should == true
-    sqls.any?{|x| x =~ /\ACREATE TABLE.*test3_backup[012]/}.should == false
+    sqls.any?{|x| x =~ /\AALTER TABLE.*test3.*RENAME TO.*test3_backup3/}.should == true
+    sqls.any?{|x| x =~ /\AALTER TABLE.*test3.*RENAME TO.*test3_backup[012]/}.should == false
     @db[:test3].columns.should == [:i]
     @db[:test3_backup0].columns.should == [:j]
     @db[:test3_backup1].columns.should == [:k]

data/spec/core/connection_pool_spec.rb

@@ -124,36 +124,30 @@ describe "A connection pool handling connection errors" do
   end
 end
 
-class DummyConnection
-  @@value = 0
-  def initialize
-    @@value += 1
-  end
-  
-  def value
-    @@value
-  end
-end
-
 describe "ConnectionPool#hold" do
   before do
-    @pool = Sequel::ConnectionPool.get_pool(CONNECTION_POOL_DEFAULTS) {DummyConnection.new}
+    value = 0
+    @c = Class.new do
+      define_method(:initialize){value += 1}
+      define_method(:value){value}
+    end
+    @pool = Sequel::ConnectionPool.get_pool(CONNECTION_POOL_DEFAULTS){@c.new}
   end
   
   specify "should pass the result of the connection maker proc to the supplied block" do
     res = nil
     @pool.hold {|c| res = c}
-    res.should be_a_kind_of(DummyConnection)
+    res.should be_a_kind_of(@c)
     res.value.should == 1
     @pool.hold {|c| res = c}
-    res.should be_a_kind_of(DummyConnection)
+    res.should be_a_kind_of(@c)
     res.value.should == 1 # the connection maker is invoked only once
   end
   
   specify "should be re-entrant by the same thread" do
     cc = nil
     @pool.hold {|c| @pool.hold {|c| @pool.hold {|c| cc = c}}}
-    cc.should be_a_kind_of(DummyConnection)
+    cc.should be_a_kind_of(@c)
   end
   
   specify "should catch exceptions and reraise them" do

data/spec/core/core_sql_spec.rb

@@ -75,16 +75,16 @@ end
 
 describe "String#lit" do
   before do
-    @ds = ds = MockDatabase.new.dataset
+    @ds = ds = Sequel::Database.new[:t]
   end
+
   specify "should return an LiteralString object" do
     'xyz'.lit.should be_a_kind_of(Sequel::LiteralString)
     'xyz'.lit.to_s.should == 'xyz'
   end
   
   specify "should inhibit string literalization" do
-    Sequel::Database.new[:t].update_sql(:stamp => "NOW()".lit).should == \
-      "UPDATE t SET stamp = NOW()"
+    @ds.update_sql(:stamp => "NOW()".lit).should == "UPDATE t SET stamp = NOW()"
   end
 
   specify "should return a PlaceholderLiteralString object if args are given" do
@@ -176,10 +176,8 @@ end
 
 describe "Column references" do
   before do
-    @c = Class.new(Sequel::Dataset) do
-      def quoted_identifier(c); "`#{c}`"; end
-    end
-    @ds = @c.new(MockDatabase.new)
+    @ds = Sequel::Database.new.dataset
+    def @ds.quoted_identifier(c); "`#{c}`"; end
     @ds.quote_identifiers = true
   end
   
@@ -289,7 +287,7 @@ end
 
 describe "Dataset#literal" do
   before do
-    @ds = MockDataset.new(nil)
+    @ds = Sequel::Database.new.dataset
   end
   
   specify "should convert qualified symbol notation into dot notation" do
@@ -325,17 +323,12 @@ end
 
 describe "Symbol" do
   before do
-    @ds = Sequel::Dataset.new(MockDatabase.new)
+    @ds = Sequel::Database.new.dataset
   end
   
-  specify "should support upper case outer functions" do
+  specify "should support sql_function method" do
     :COUNT.sql_function('1').to_s(@ds).should == "COUNT('1')"
-  end
-  
-  specify "should inhibit string literalization" do
-    db = Sequel::Database.new
-    ds = db[:t]
-    ds.select(:COUNT.sql_function('1')).sql.should == "SELECT COUNT('1') FROM t"
+    @ds.select(:COUNT.sql_function('1')).sql.should == "SELECT COUNT('1')"
   end
   
   specify "should support cast method" do
@@ -367,22 +360,18 @@ describe "Symbol" do
   end
   
   specify "should allow database independent types when casting" do
-    m = MockDatabase.new
-    m.instance_eval do
-       def cast_type_literal(type)
-         return :foo if type == Integer
-         return :bar if type == String
-         type
-       end
+    db = @ds.db
+    def db.cast_type_literal(type)
+      return :foo if type == Integer
+      return :bar if type == String
+      type
     end
-    @ds2 = Sequel::Dataset.new(m)
-    :abc.cast(String).to_s(@ds).should == "CAST(abc AS varchar(255))"
-    :abc.cast(String).to_s(@ds2).should == "CAST(abc AS bar)"
-    :abc.cast(String).to_s(@ds2).should == "CAST(abc AS bar)"
-    :abc.cast_string.to_s(@ds2).should == "CAST(abc AS bar)"
-    :abc.cast_string(Integer).to_s(@ds2).should == "CAST(abc AS foo)"
-    :abc.cast_numeric.to_s(@ds2).should == "CAST(abc AS foo)"
-    :abc.cast_numeric(String).to_s(@ds2).should == "CAST(abc AS bar)"
+    :abc.cast(String).to_s(@ds).should == "CAST(abc AS bar)"
+    :abc.cast(String).to_s(@ds).should == "CAST(abc AS bar)"
+    :abc.cast_string.to_s(@ds).should == "CAST(abc AS bar)"
+    :abc.cast_string(Integer).to_s(@ds).should == "CAST(abc AS foo)"
+    :abc.cast_numeric.to_s(@ds).should == "CAST(abc AS foo)"
+    :abc.cast_numeric(String).to_s(@ds).should == "CAST(abc AS bar)"
   end
 
   specify "should support SQL EXTRACT function via #extract " do

data/spec/core/database_spec.rb

@@ -74,46 +74,46 @@ describe "A new Database" do
     Sequel.identifier_input_method = nil
     Sequel::Database.identifier_input_method.should == ""
     db = Sequel::Database.new(:identifier_input_method=>nil)
-    db.identifier_input_method.should == nil
+    db.identifier_input_method.should be_nil
     db.identifier_input_method = :downcase
     db.identifier_input_method.should == :downcase
     db = Sequel::Database.new(:identifier_input_method=>:upcase)
     db.identifier_input_method.should == :upcase
     db.identifier_input_method = nil
-    db.identifier_input_method.should == nil
+    db.identifier_input_method.should be_nil
     Sequel.identifier_input_method = :downcase
     Sequel::Database.identifier_input_method.should == :downcase
     db = Sequel::Database.new(:identifier_input_method=>nil)
-    db.identifier_input_method.should == nil
+    db.identifier_input_method.should be_nil
     db.identifier_input_method = :upcase
     db.identifier_input_method.should == :upcase
     db = Sequel::Database.new(:identifier_input_method=>:upcase)
     db.identifier_input_method.should == :upcase
     db.identifier_input_method = nil
-    db.identifier_input_method.should == nil
+    db.identifier_input_method.should be_nil
   end
   
   specify "should respect the :identifier_output_method option" do
     Sequel.identifier_output_method = nil
     Sequel::Database.identifier_output_method.should == ""
     db = Sequel::Database.new(:identifier_output_method=>nil)
-    db.identifier_output_method.should == nil
+    db.identifier_output_method.should be_nil
     db.identifier_output_method = :downcase
     db.identifier_output_method.should == :downcase
     db = Sequel::Database.new(:identifier_output_method=>:upcase)
     db.identifier_output_method.should == :upcase
     db.identifier_output_method = nil
-    db.identifier_output_method.should == nil
+    db.identifier_output_method.should be_nil
     Sequel.identifier_output_method = :downcase
     Sequel::Database.identifier_output_method.should == :downcase
     db = Sequel::Database.new(:identifier_output_method=>nil)
-    db.identifier_output_method.should == nil
+    db.identifier_output_method.should be_nil
     db.identifier_output_method = :upcase
     db.identifier_output_method.should == :upcase
     db = Sequel::Database.new(:identifier_output_method=>:upcase)
     db.identifier_output_method.should == :upcase
     db.identifier_output_method = nil
-    db.identifier_output_method.should == nil
+    db.identifier_output_method.should be_nil
   end
 
   specify "should use the default Sequel.quote_identifiers value" do
@@ -384,10 +384,85 @@ describe "Database#dataset" do
   end
 end
 
+describe "Database#dataset_class" do
+  before do
+    @db = Sequel::Database.new
+    @dsc = Class.new(Sequel::Dataset)
+  end
+  
+  specify "should have setter set the class to use to create datasets" do
+    @db.dataset_class = @dsc
+    ds = @db.dataset
+    ds.should be_a_kind_of(@dsc)
+    ds.opts.should == {}
+    ds.db.should be(@db)
+  end
+
+  specify "should have getter return the class to use to create datasets" do
+    @db.dataset_class.should == Sequel::Dataset
+    @db.dataset_class = @dsc
+    @db.dataset_class.should == @dsc
+  end
+end
+  
+describe "Database#extend_datasets" do
+  before do
+    @db = Sequel::Database.new
+    @m = Module.new{def foo() [3] end}
+    @m2 = Module.new{def foo() [4] + super end}
+    @db.extend_datasets(@m)
+  end
+  
+  specify "should change the dataset class to a subclass the first time it is called" do
+    @db.dataset_class.superclass.should == Sequel::Dataset
+  end
+
+  specify "should not create a subclass of the dataset class if called more than once" do
+    @db.extend_datasets(@m2)
+    @db.dataset_class.superclass.should == Sequel::Dataset
+  end
+
+  specify "should make the dataset class include the module" do
+    @db.dataset_class.ancestors.should include(@m)
+    @db.dataset_class.ancestors.should_not include(@m2)
+    @db.extend_datasets(@m2)
+    @db.dataset_class.ancestors.should include(@m)
+    @db.dataset_class.ancestors.should include(@m2)
+  end
+
+  specify "should have datasets respond to the module's methods" do
+    @db.dataset.foo.should == [3]
+    @db.extend_datasets(@m2)
+    @db.dataset.foo.should == [4, 3]
+  end
+
+  specify "should take a block and create a module from it to use" do
+    @db.dataset.foo.should == [3]
+    @db.extend_datasets{def foo() [5] + super end}
+    @db.dataset.foo.should == [5, 3]
+  end
+
+  specify "should raise an error if both a module and a block are provided" do
+    proc{@db.extend_datasets(@m2){def foo() [5] + super end}}.should raise_error(Sequel::Error)
+  end
+
+  specify "should be able to override methods defined in the original Dataset class" do
+    @db.extend_datasets(Module.new{def select(*a, &block) super.order(*a, &block) end})
+    @db[:t].select(:a, :b).sql.should == 'SELECT a, b FROM t ORDER BY a, b'
+  end
+
+  specify "should reapply settings if dataset_class is chagned" do
+    c = Class.new(Sequel::Dataset)
+    @db.dataset_class = c
+    @db.dataset_class.superclass.should == c
+    @db.dataset_class.ancestors.should include(@m)
+    @db.dataset.foo.should == [3]
+  end
+end
+  
 describe "Database#execute" do
   specify "should raise Sequel::NotImplemented" do
     proc {Sequel::Database.new.execute('blah blah')}.should raise_error(Sequel::NotImplemented)
-    proc {Sequel::Database.new << 'blah blah'}.should raise_error(Sequel::NotImplemented)
   end
 end
 
@@ -409,30 +484,39 @@ describe "Database#indexes" do
   end
 end
 
-describe "Database#<< and run" do
+describe "Database#run" do
   before do
-    sqls = @sqls = []
-    @c = Class.new(Sequel::Database) do
-      define_method(:execute_ddl){|sql, *opts| sqls.clear; sqls << sql; sqls.concat(opts)}
-    end
-    @db = @c.new({})
+    @db = Sequel.mock(:servers=>{:s1=>{}})
   end
   
-  specify "should pass the supplied sql to #execute_ddl" do
-    (@db << "DELETE FROM items")
-    @sqls.should == ["DELETE FROM items", {}]
-    @db.run("DELETE FROM items2")
-    @sqls.should == ["DELETE FROM items2", {}]
+  specify "should execute the code on the database" do
+    @db.run("DELETE FROM items")
+    @db.sqls.should == ["DELETE FROM items"]
   end
   
   specify "should return nil" do
-    (@db << "DELETE FROM items").should == nil
-    @db.run("DELETE FROM items").should == nil
+    @db.run("DELETE FROM items").should be_nil
   end
   
   specify "should accept options passed to execute_ddl" do
     @db.run("DELETE FROM items", :server=>:s1)
-    @sqls.should == ["DELETE FROM items", {:server=>:s1}]
+    @db.sqls.should == ["DELETE FROM items -- s1"]
+  end
+end
+
+describe "Database#<<" do
+  before do
+    @db = Sequel.mock
+  end
+
+  specify "should execute the code on the database" do
+    @db << "DELETE FROM items"
+    @db.sqls.should == ["DELETE FROM items"]
+  end
+  
+  specify "should be chainable" do
+    @db << "DELETE FROM items" << "DELETE FROM items2"
+    @db.sqls.should == ["DELETE FROM items", "DELETE FROM items2"]
   end
 end
 
@@ -442,19 +526,19 @@ describe "Database#synchronize" do
   end
   
   specify "should wrap the supplied block in pool.hold" do
-    stop = false
+    q, q1, q2, q3 = Queue.new, Queue.new, Queue.new, Queue.new
     c1, c2 = nil
-    t1 = Thread.new {@db.synchronize {|c| c1 = c; while !stop;sleep 0.1;end}}
-    while !c1;end
+    t1 = Thread.new{@db.synchronize{|c| c1 = c; q.push nil; q1.pop}; q.push nil}
+    q.pop
     c1.should == 12345
-    t2 = Thread.new {@db.synchronize {|c| c2 = c}}
-    sleep 0.2
+    t2 = Thread.new{@db.synchronize{|c| c2 = c; q2.push nil}}
     @db.pool.available_connections.should be_empty
     c2.should be_nil
-    stop = true
-    t1.join
-    sleep 0.1
+    q1.push nil
+    q.pop
+    q2.pop
     c2.should == 12345
+    t1.join
     t2.join
   end
 end
@@ -464,7 +548,7 @@ describe "Database#test_connection" do
     @db = Sequel::Database.new{@test = rand(100)}
   end
   
-  specify "should pool#hold" do
+  specify "should attempt to get a connection" do
     @db.test_connection
     @test.should_not be_nil
   end
@@ -480,30 +564,21 @@ end
 
 describe "Database#table_exists?" do
   specify "should try to select the first record from the table's dataset" do
-    db2 = DummyDatabase.new
-    db2.table_exists?(:a).should be_false
-    db2.table_exists?(:b).should be_true
-  end
-end
-
-class Dummy3Database < Sequel::Database
-  attr_reader :sql, :transactions
-  def execute(sql, opts={}); @sql ||= []; @sql << sql; end
-
-  class DummyConnection
-    def initialize(db); @db = db; end
-    def execute(sql); @db.execute(sql); end
+    db = Sequel.mock(:fetch=>[Sequel::Error, [], [{:a=>1}]])
+    db.table_exists?(:a).should be_false
+    db.table_exists?(:b).should be_true
+    db.table_exists?(:c).should be_true
   end
 end
 
 describe "Database#transaction" do
   before do
-    @db = Dummy3Database.new{Dummy3Database::DummyConnection.new(@db)}
+    @db = Sequel.mock(:servers=>{:test=>{}})
   end
   
   specify "should wrap the supplied block with BEGIN + COMMIT statements" do
     @db.transaction{@db.execute 'DROP TABLE test;'}
-    @db.sql.should == ['BEGIN', 'DROP TABLE test;', 'COMMIT']
+    @db.sqls.should == ['BEGIN', 'DROP TABLE test;', 'COMMIT']
   end
   
   specify "should support transaction isolation levels" do
@@ -511,7 +586,7 @@ describe "Database#transaction" do
     [:uncommitted, :committed, :repeatable, :serializable].each do |l|
       @db.transaction(:isolation=>l){@db.run "DROP TABLE #{l}"}
     end
-    @db.sql.should == ['BEGIN', 'SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED', 'DROP TABLE uncommitted', 'COMMIT',
+    @db.sqls.should == ['BEGIN', 'SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED', 'DROP TABLE uncommitted', 'COMMIT',
                        'BEGIN', 'SET TRANSACTION ISOLATION LEVEL READ COMMITTED', 'DROP TABLE committed', 'COMMIT',
                        'BEGIN', 'SET TRANSACTION ISOLATION LEVEL REPEATABLE READ', 'DROP TABLE repeatable', 'COMMIT',
                        'BEGIN', 'SET TRANSACTION ISOLATION LEVEL SERIALIZABLE', 'DROP TABLE serializable', 'COMMIT']
@@ -523,7 +598,7 @@ describe "Database#transaction" do
       @db.transaction_isolation_level = l
       @db.transaction{@db.run "DROP TABLE #{l}"}
     end
-    @db.sql.should == ['BEGIN', 'SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED', 'DROP TABLE uncommitted', 'COMMIT',
+    @db.sqls.should == ['BEGIN', 'SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED', 'DROP TABLE uncommitted', 'COMMIT',
                        'BEGIN', 'SET TRANSACTION ISOLATION LEVEL READ COMMITTED', 'DROP TABLE committed', 'COMMIT',
                        'BEGIN', 'SET TRANSACTION ISOLATION LEVEL REPEATABLE READ', 'DROP TABLE repeatable', 'COMMIT',
                        'BEGIN', 'SET TRANSACTION ISOLATION LEVEL SERIALIZABLE', 'DROP TABLE serializable', 'COMMIT']
@@ -538,12 +613,12 @@ describe "Database#transaction" do
       end
     end
     @db.ret_commit
-    @db.sql.should == ['BEGIN', 'DROP TABLE test;', 'COMMIT']
+    @db.sqls.should == ['BEGIN', 'DROP TABLE test;', 'COMMIT']
   end
   
   specify "should issue ROLLBACK if an exception is raised, and re-raise" do
     @db.transaction {@db.execute 'DROP TABLE test'; raise RuntimeError} rescue nil
-    @db.sql.should == ['BEGIN', 'DROP TABLE test', 'ROLLBACK']
+    @db.sqls.should == ['BEGIN', 'DROP TABLE test', 'ROLLBACK']
     
     proc {@db.transaction {raise RuntimeError}}.should raise_error(RuntimeError)
   end
@@ -555,7 +630,50 @@ describe "Database#transaction" do
       @db.drop_table(:b)
     end
     
-    @db.sql.should == ['BEGIN', 'DROP TABLE a', 'ROLLBACK']
+    @db.sqls.should == ['BEGIN', 'DROP TABLE a', 'ROLLBACK']
+  end
+  
+  specify "should have in_transaction? return true if inside a transaction" do
+    c = nil
+    @db.transaction{c = @db.in_transaction?}
+    c.should be_true
+  end
+  
+  specify "should have in_transaction? handle sharding correctly" do
+    c = []
+    @db.transaction(:server=>:test){c << @db.in_transaction?}
+    @db.transaction(:server=>:test){c << @db.in_transaction?(:server=>:test)}
+    c.should == [false, true]
+  end
+  
+  specify "should have in_transaction? return false if not in a transaction" do
+    @db.in_transaction?.should be_false
+  end
+  
+  specify "should return nil if Sequel::Rollback is called in the transaction" do
+    @db.transaction{raise Sequel::Rollback}.should be_nil
+  end
+  
+  specify "should reraise Sequel::Rollback errors when using :rollback=>:reraise option is given" do
+    proc {@db.transaction(:rollback=>:reraise){raise Sequel::Rollback}}.should raise_error(Sequel::Rollback)
+    @db.sqls.should == ['BEGIN', 'ROLLBACK']
+    proc {@db.transaction(:rollback=>:reraise){raise ArgumentError}}.should raise_error(ArgumentError)
+    @db.sqls.should == ['BEGIN', 'ROLLBACK']
+    @db.transaction(:rollback=>:reraise){1}.should == 1
+    @db.sqls.should == ['BEGIN', 'COMMIT']
+  end
+  
+  specify "should always rollback if :rollback=>:always option is given" do
+    proc {@db.transaction(:rollback=>:always){raise ArgumentError}}.should raise_error(ArgumentError)
+    @db.sqls.should == ['BEGIN', 'ROLLBACK']
+    @db.transaction(:rollback=>:always){raise Sequel::Rollback}.should be_nil
+    @db.sqls.should == ['BEGIN', 'ROLLBACK']
+    @db.transaction(:rollback=>:always){1}.should be_nil
+    @db.sqls.should == ['BEGIN', 'ROLLBACK']
+    catch (:foo) do
+      @db.transaction(:rollback=>:always){throw :foo}
+    end
+    @db.sqls.should == ['BEGIN', 'ROLLBACK']
   end
   
   specify "should raise database errors when commiting a transaction as Sequel::DatabaseError" do
@@ -567,22 +685,36 @@ describe "Database#transaction" do
   end
   
   specify "should be re-entrant" do
-    stop = false
+    q, q1 = Queue.new, Queue.new
     cc = nil
     t = Thread.new do
       @db.transaction {@db.transaction {@db.transaction {|c|
         cc = c
-        while !stop; sleep 0.1; end
+        q.pop
+        q1.push nil
+        q.pop
       }}}
     end
-    while cc.nil?; sleep 0.1; end
-    cc.should be_a_kind_of(Dummy3Database::DummyConnection)
-    @db.transactions.should == [t]
-    stop = true
+    q.push nil
+    q1.pop
+    cc.should be_a_kind_of(Sequel::Mock::Connection)
+    tr = @db.instance_variable_get(:@transactions)
+    tr.should == {cc=>{:savepoint_level=>1}}
+    q.push nil
     t.join
-    @db.transactions.should be_empty
+    tr.should be_empty
   end
 
+  specify "should correctly handle nested transacation use with separate shards" do
+    @db.transaction do |c1|
+      @db.transaction(:server=>:test) do |c2|
+        c1.should_not == c2
+        @db.execute 'DROP TABLE test;'
+      end
+    end
+    @db.sqls.should == ['BEGIN', 'BEGIN -- test', 'DROP TABLE test;', 'COMMIT -- test', 'COMMIT']
+  end
+  
   if (!defined?(RUBY_ENGINE) or RUBY_ENGINE == 'ruby' or RUBY_ENGINE == 'rbx') and RUBY_VERSION < '1.9'
     specify "should handle Thread#kill for transactions inside threads" do
       q = Queue.new
@@ -598,35 +730,173 @@ describe "Database#transaction" do
       q1.pop
       t.kill
       t.join
-      @db.sql.should == ['BEGIN', 'DROP TABLE test', 'ROLLBACK']
+      @db.sqls.should == ['BEGIN', 'DROP TABLE test', 'ROLLBACK']
     end
   end
+
+  specify "should raise an Error if after_commit or after_rollback is called without a block" do
+    proc{@db.after_commit}.should raise_error(Sequel::Error)
+    proc{@db.after_rollback}.should raise_error(Sequel::Error)
+  end
+
+  specify "should execute after_commit outside transactions" do
+    @db.after_commit{@db.execute('foo')}
+    @db.sqls.should == ['foo']
+  end
+
+  specify "should ignore after_rollback outside transactions" do
+    @db.after_rollback{@db.execute('foo')}
+    @db.sqls.should == []
+  end
+
+  specify "should support after_commit inside transactions" do
+    @db.transaction{@db.after_commit{@db.execute('foo')}}
+    @db.sqls.should == ['BEGIN', 'COMMIT', 'foo']
+  end
+
+  specify "should support after_rollback inside transactions" do
+    @db.transaction{@db.after_rollback{@db.execute('foo')}}
+    @db.sqls.should == ['BEGIN', 'COMMIT']
+  end
+
+  specify "should not call after_commit if the transaction rolls back" do
+    @db.transaction{@db.after_commit{@db.execute('foo')}; raise Sequel::Rollback}
+    @db.sqls.should == ['BEGIN', 'ROLLBACK']
+  end
+
+  specify "should call after_rollback if the transaction rolls back" do
+    @db.transaction{@db.after_rollback{@db.execute('foo')}; raise Sequel::Rollback}
+    @db.sqls.should == ['BEGIN', 'ROLLBACK', 'foo']
+  end
+
+  specify "should call multiple after_commit blocks in order if called inside transactions" do
+    @db.transaction{@db.after_commit{@db.execute('foo')}; @db.after_commit{@db.execute('bar')}}
+    @db.sqls.should == ['BEGIN', 'COMMIT', 'foo', 'bar']
+  end
+
+  specify "should call multiple after_rollback blocks in order if called inside transactions" do
+    @db.transaction{@db.after_rollback{@db.execute('foo')}; @db.after_rollback{@db.execute('bar')}; raise Sequel::Rollback}
+    @db.sqls.should == ['BEGIN', 'ROLLBACK', 'foo', 'bar']
+  end
+
+  specify "should support after_commit inside nested transactions" do
+    @db.transaction{@db.transaction{@db.after_commit{@db.execute('foo')}}}
+    @db.sqls.should == ['BEGIN', 'COMMIT', 'foo']
+  end
+
+  specify "should support after_rollback inside nested transactions" do
+    @db.transaction{@db.transaction{@db.after_rollback{@db.execute('foo')}}; raise Sequel::Rollback}
+    @db.sqls.should == ['BEGIN', 'ROLLBACK', 'foo']
+  end
+
+  specify "should support after_commit inside savepoints" do
+    @db.meta_def(:supports_savepoints?){true}
+    @db.transaction do
+      @db.after_commit{@db.execute('foo')}
+      @db.transaction(:savepoint=>true){@db.after_commit{@db.execute('bar')}}
+      @db.after_commit{@db.execute('baz')}
+    end
+    @db.sqls.should == ['BEGIN', 'SAVEPOINT autopoint_1', 'RELEASE SAVEPOINT autopoint_1', 'COMMIT', 'foo', 'bar', 'baz']
+  end
+
+  specify "should support after_rollback inside savepoints" do
+    @db.meta_def(:supports_savepoints?){true}
+    @db.transaction do
+      @db.after_rollback{@db.execute('foo')}
+      @db.transaction(:savepoint=>true){@db.after_rollback{@db.execute('bar')}}
+      @db.after_rollback{@db.execute('baz')}
+      raise Sequel::Rollback
+    end
+    @db.sqls.should == ['BEGIN', 'SAVEPOINT autopoint_1', 'RELEASE SAVEPOINT autopoint_1', 'ROLLBACK', 'foo', 'bar', 'baz']
+  end
+
+  specify "should raise an error if you attempt to use after_commit inside a prepared transaction" do
+    @db.meta_def(:supports_prepared_transactions?){true}
+    proc{@db.transaction(:prepare=>'XYZ'){@db.after_commit{@db.execute('foo')}}}.should raise_error(Sequel::Error)
+    @db.sqls.should == ['BEGIN', 'ROLLBACK']
+  end
+
+  specify "should raise an error if you attempt to use after_rollback inside a prepared transaction" do
+    @db.meta_def(:supports_prepared_transactions?){true}
+    proc{@db.transaction(:prepare=>'XYZ'){@db.after_rollback{@db.execute('foo')}}}.should raise_error(Sequel::Error)
+    @db.sqls.should == ['BEGIN', 'ROLLBACK']
+  end
+
+  specify "should raise an error if you attempt to use after_commit inside a savepoint in a prepared transaction" do
+    @db.meta_def(:supports_savepoints?){true}
+    @db.meta_def(:supports_prepared_transactions?){true}
+    proc{@db.transaction(:prepare=>'XYZ'){@db.transaction(:savepoint=>true){@db.after_commit{@db.execute('foo')}}}}.should raise_error(Sequel::Error)
+    @db.sqls.should == ['BEGIN', 'SAVEPOINT autopoint_1','ROLLBACK TO SAVEPOINT autopoint_1', 'ROLLBACK']
+  end
+
+  specify "should raise an error if you attempt to use after_rollback inside a savepoint in a prepared transaction" do
+    @db.meta_def(:supports_savepoints?){true}
+    @db.meta_def(:supports_prepared_transactions?){true}
+    proc{@db.transaction(:prepare=>'XYZ'){@db.transaction(:savepoint=>true){@db.after_rollback{@db.execute('foo')}}}}.should raise_error(Sequel::Error)
+    @db.sqls.should == ['BEGIN', 'SAVEPOINT autopoint_1','ROLLBACK TO SAVEPOINT autopoint_1', 'ROLLBACK']
+  end
 end
 
+describe "Sequel.transaction" do
+  before do
+    @sqls = []
+    @db1 = Sequel.mock(:append=>'1', :sqls=>@sqls)
+    @db2 = Sequel.mock(:append=>'2', :sqls=>@sqls)
+    @db3 = Sequel.mock(:append=>'3', :sqls=>@sqls)
+  end
+  
+  specify "should run the block inside transacitons on all three databases" do
+    Sequel.transaction([@db1, @db2, @db3]){1}.should == 1
+    @sqls.should == ['BEGIN -- 1', 'BEGIN -- 2', 'BEGIN -- 3', 'COMMIT -- 3', 'COMMIT -- 2', 'COMMIT -- 1']
+  end
+  
+  specify "should pass options to all the blocks" do
+    Sequel.transaction([@db1, @db2, @db3], :rollback=>:always){1}.should be_nil
+    @sqls.should == ['BEGIN -- 1', 'BEGIN -- 2', 'BEGIN -- 3', 'ROLLBACK -- 3', 'ROLLBACK -- 2', 'ROLLBACK -- 1']
+  end
+  
+  specify "should handle Sequel::Rollback exceptions raised by the block to rollback on all databases" do
+    Sequel.transaction([@db1, @db2, @db3]){raise Sequel::Rollback}.should be_nil
+    @sqls.should == ['BEGIN -- 1', 'BEGIN -- 2', 'BEGIN -- 3', 'ROLLBACK -- 3', 'ROLLBACK -- 2', 'ROLLBACK -- 1']
+  end
+  
+  specify "should handle nested transactions" do
+    Sequel.transaction([@db1, @db2, @db3]){Sequel.transaction([@db1, @db2, @db3]){1}}.should == 1
+    @sqls.should == ['BEGIN -- 1', 'BEGIN -- 2', 'BEGIN -- 3', 'COMMIT -- 3', 'COMMIT -- 2', 'COMMIT -- 1']
+  end
+  
+  specify "should handle savepoints" do
+    Sequel.transaction([@db1, @db2, @db3]){Sequel.transaction([@db1, @db2, @db3], :savepoint=>true){1}}.should == 1
+    @sqls.should == ['BEGIN -- 1', 'BEGIN -- 2', 'BEGIN -- 3',
+      'SAVEPOINT autopoint_1 -- 1', 'SAVEPOINT autopoint_1 -- 2', 'SAVEPOINT autopoint_1 -- 3',
+      'RELEASE SAVEPOINT autopoint_1 -- 3', 'RELEASE SAVEPOINT autopoint_1 -- 2', 'RELEASE SAVEPOINT autopoint_1 -- 1',
+      'COMMIT -- 3', 'COMMIT -- 2', 'COMMIT -- 1']
+  end
+end
+  
 describe "Database#transaction with savepoints" do
   before do
-    @db = Dummy3Database.new{Dummy3Database::DummyConnection.new(@db)}
-    @db.meta_def(:supports_savepoints?){true}
+    @db = Sequel.mock
   end
   
   specify "should wrap the supplied block with BEGIN + COMMIT statements" do
     @db.transaction {@db.execute 'DROP TABLE test;'}
-    @db.sql.should == ['BEGIN', 'DROP TABLE test;', 'COMMIT']
+    @db.sqls.should == ['BEGIN', 'DROP TABLE test;', 'COMMIT']
   end
   
   specify "should use savepoints if given the :savepoint option" do
     @db.transaction{@db.transaction(:savepoint=>true){@db.execute 'DROP TABLE test;'}}
-    @db.sql.should == ['BEGIN', 'SAVEPOINT autopoint_1', 'DROP TABLE test;', 'RELEASE SAVEPOINT autopoint_1', 'COMMIT']
+    @db.sqls.should == ['BEGIN', 'SAVEPOINT autopoint_1', 'DROP TABLE test;', 'RELEASE SAVEPOINT autopoint_1', 'COMMIT']
   end
   
   specify "should not use a savepoints if no transaction is in progress" do
     @db.transaction(:savepoint=>true){@db.execute 'DROP TABLE test;'}
-    @db.sql.should == ['BEGIN', 'DROP TABLE test;', 'COMMIT']
+    @db.sqls.should == ['BEGIN', 'DROP TABLE test;', 'COMMIT']
   end
   
   specify "should reuse the current transaction if no :savepoint option is given" do
     @db.transaction{@db.transaction{@db.execute 'DROP TABLE test;'}}
-    @db.sql.should == ['BEGIN', 'DROP TABLE test;', 'COMMIT']
+    @db.sqls.should == ['BEGIN', 'DROP TABLE test;', 'COMMIT']
   end
   
   specify "should handle returning inside of the block by committing" do
@@ -638,7 +908,7 @@ describe "Database#transaction with savepoints" do
       end
     end
     @db.ret_commit
-    @db.sql.should == ['BEGIN', 'DROP TABLE test;', 'COMMIT']
+    @db.sqls.should == ['BEGIN', 'DROP TABLE test;', 'COMMIT']
   end
   
   specify "should handle returning inside of a savepoint by committing" do
@@ -652,34 +922,34 @@ describe "Database#transaction with savepoints" do
       end
     end
     @db.ret_commit
-    @db.sql.should == ['BEGIN', 'SAVEPOINT autopoint_1', 'DROP TABLE test;', 'RELEASE SAVEPOINT autopoint_1', 'COMMIT']
+    @db.sqls.should == ['BEGIN', 'SAVEPOINT autopoint_1', 'DROP TABLE test;', 'RELEASE SAVEPOINT autopoint_1', 'COMMIT']
   end
   
   specify "should issue ROLLBACK if an exception is raised, and re-raise" do
     @db.transaction {@db.execute 'DROP TABLE test'; raise RuntimeError} rescue nil
-    @db.sql.should == ['BEGIN', 'DROP TABLE test', 'ROLLBACK']
+    @db.sqls.should == ['BEGIN', 'DROP TABLE test', 'ROLLBACK']
     
     proc {@db.transaction {raise RuntimeError}}.should raise_error(RuntimeError)
   end
   
   specify "should issue ROLLBACK SAVEPOINT if an exception is raised inside a savepoint, and re-raise" do
     @db.transaction{@db.transaction(:savepoint=>true){@db.execute 'DROP TABLE test'; raise RuntimeError}} rescue nil
-    @db.sql.should == ['BEGIN', 'SAVEPOINT autopoint_1', 'DROP TABLE test', 'ROLLBACK TO SAVEPOINT autopoint_1', 'ROLLBACK']
+    @db.sqls.should == ['BEGIN', 'SAVEPOINT autopoint_1', 'DROP TABLE test', 'ROLLBACK TO SAVEPOINT autopoint_1', 'ROLLBACK']
     
     proc {@db.transaction {raise RuntimeError}}.should raise_error(RuntimeError)
   end
   
-  specify "should issue ROLLBACK if Sequel::Rollback is called in the transaction" do
+  specify "should issue ROLLBACK if Sequel::Rollback is raised in the transaction" do
     @db.transaction do
       @db.drop_table(:a)
       raise Sequel::Rollback
       @db.drop_table(:b)
     end
     
-    @db.sql.should == ['BEGIN', 'DROP TABLE a', 'ROLLBACK']
+    @db.sqls.should == ['BEGIN', 'DROP TABLE a', 'ROLLBACK']
   end
   
-  specify "should issue ROLLBACK SAVEPOINT if Sequel::Rollback is called in a savepoint" do
+  specify "should issue ROLLBACK SAVEPOINT if Sequel::Rollback is raised in a savepoint" do
     @db.transaction do
       @db.transaction(:savepoint=>true) do
         @db.drop_table(:a)
@@ -688,7 +958,7 @@ describe "Database#transaction with savepoints" do
       @db.drop_table(:b)
     end
     
-    @db.sql.should == ['BEGIN', 'SAVEPOINT autopoint_1', 'DROP TABLE a', 'ROLLBACK TO SAVEPOINT autopoint_1', 'DROP TABLE b', 'COMMIT']
+    @db.sqls.should == ['BEGIN', 'SAVEPOINT autopoint_1', 'DROP TABLE a', 'ROLLBACK TO SAVEPOINT autopoint_1', 'DROP TABLE b', 'COMMIT']
   end
   
   specify "should raise database errors when commiting a transaction as Sequel::DatabaseError" do
@@ -704,37 +974,28 @@ end
 
 describe "A Database adapter with a scheme" do
   before do
-    class CCC < Sequel::Database
-      if defined?(DISCONNECTS)
-        DISCONNECTS.clear
-      else
-        DISCONNECTS = []
-      end
-      set_adapter_scheme :ccc
-      def disconnect
-        DISCONNECTS << self
-      end
-    end
+    @ccc = Class.new(Sequel::Database)
+    @ccc.send(:set_adapter_scheme, :ccc)
   end
 
   specify "should be registered in the ADAPTER_MAP" do
-    Sequel::ADAPTER_MAP[:ccc].should == CCC
+    Sequel::ADAPTER_MAP[:ccc].should == @ccc
   end
   
   specify "should give the database_type as the adapter scheme by default" do
-    CCC.new.database_type.should == :ccc
+    @ccc.new.database_type.should == :ccc
   end
   
   specify "should be instantiated when its scheme is specified" do
     c = Sequel::Database.connect('ccc://localhost/db')
-    c.should be_a_kind_of(CCC)
+    c.should be_a_kind_of(@ccc)
     c.opts[:host].should == 'localhost'
     c.opts[:database].should == 'db'
   end
   
   specify "should be accessible through Sequel.connect" do
     c = Sequel.connect 'ccc://localhost/db'
-    c.should be_a_kind_of(CCC)
+    c.should be_a_kind_of(@ccc)
     c.opts[:host].should == 'localhost'
     c.opts[:database].should == 'db'
   end
@@ -746,7 +1007,7 @@ describe "A Database adapter with a scheme" do
     returnValue = 'anything'
 
     p = proc do |c|
-      c.should be_a_kind_of(CCC)
+      c.should be_a_kind_of(@ccc)
       c.opts[:host].should == 'localhost'
       c.opts[:database].should == 'db'
       z = y
@@ -754,15 +1015,22 @@ describe "A Database adapter with a scheme" do
       x = c
       returnValue
     end
+
+    @ccc.class_eval do
+      self::DISCONNECTS = []
+      def disconnect
+        self.class::DISCONNECTS << self
+      end
+    end
     Sequel::Database.connect('ccc://localhost/db', &p).should == returnValue
-    CCC::DISCONNECTS.should == [x]
+    @ccc::DISCONNECTS.should == [x]
 
     Sequel.connect('ccc://localhost/db', &p).should == returnValue
-    CCC::DISCONNECTS.should == [y, x]
+    @ccc::DISCONNECTS.should == [y, x]
 
     Sequel.send(:def_adapter_method, :ccc)
     Sequel.ccc('db', :host=>'localhost', &p).should == returnValue
-    CCC::DISCONNECTS.should == [z, y, x]
+    @ccc::DISCONNECTS.should == [z, y, x]
   end
 
   specify "should be accessible through Sequel.<adapter>" do
@@ -773,31 +1041,31 @@ describe "A Database adapter with a scheme" do
     
     c = Sequel.ccc('mydb')
     p = proc{c.opts.delete_if{|k,v| k == :disconnection_proc || k == :single_threaded}}
-    c.should be_a_kind_of(CCC)
-    p.call.should == {:adapter=>:ccc, :database => 'mydb', :adapter_class=>CCC}
+    c.should be_a_kind_of(@ccc)
+    p.call.should == {:adapter=>:ccc, :database => 'mydb', :adapter_class=>@ccc}
     
     c = Sequel.ccc('mydb', :host => 'localhost')
-    c.should be_a_kind_of(CCC)
-    p.call.should == {:adapter=>:ccc, :database => 'mydb', :host => 'localhost', :adapter_class=>CCC}
+    c.should be_a_kind_of(@ccc)
+    p.call.should == {:adapter=>:ccc, :database => 'mydb', :host => 'localhost', :adapter_class=>@ccc}
     
     c = Sequel.ccc
-    c.should be_a_kind_of(CCC)
-    p.call.should == {:adapter=>:ccc, :adapter_class=>CCC}
+    c.should be_a_kind_of(@ccc)
+    p.call.should == {:adapter=>:ccc, :adapter_class=>@ccc}
     
     c = Sequel.ccc(:database => 'mydb', :host => 'localhost')
-    c.should be_a_kind_of(CCC)
-    p.call.should == {:adapter=>:ccc, :database => 'mydb', :host => 'localhost', :adapter_class=>CCC}
+    c.should be_a_kind_of(@ccc)
+    p.call.should == {:adapter=>:ccc, :database => 'mydb', :host => 'localhost', :adapter_class=>@ccc}
   end
   
   specify "should be accessible through Sequel.connect with options" do
     c = Sequel.connect(:adapter => :ccc, :database => 'mydb')
-    c.should be_a_kind_of(CCC)
+    c.should be_a_kind_of(@ccc)
     c.opts[:adapter].should == :ccc
   end
 
   specify "should be accessible through Sequel.connect with URL parameters" do
     c = Sequel.connect 'ccc:///db?host=/tmp&user=test'
-    c.should be_a_kind_of(CCC)
+    c.should be_a_kind_of(@ccc)
     c.opts[:host].should == '/tmp'
     c.opts[:database].should == 'db'
     c.opts[:user].should == 'test'
@@ -805,14 +1073,14 @@ describe "A Database adapter with a scheme" do
   
   specify "should have URL parameters take precedence over fixed URL parts" do
     c = Sequel.connect 'ccc://localhost/db?host=a&database=b'
-    c.should be_a_kind_of(CCC)
+    c.should be_a_kind_of(@ccc)
     c.opts[:host].should == 'a'
     c.opts[:database].should == 'b'
   end
   
   specify "should have hash options take predence over URL parameters or parts" do
     c = Sequel.connect 'ccc://localhost/db?host=/tmp', :host=>'a', :database=>'b', :user=>'c'
-    c.should be_a_kind_of(CCC)
+    c.should be_a_kind_of(@ccc)
     c.opts[:host].should == 'a'
     c.opts[:database].should == 'b'
     c.opts[:user].should == 'c'
@@ -820,7 +1088,7 @@ describe "A Database adapter with a scheme" do
 
   specify "should unescape values of URL parameters and parts" do
     c = Sequel.connect 'ccc:///d%5bb%5d?host=domain%5cinstance'
-    c.should be_a_kind_of(CCC)
+    c.should be_a_kind_of(@ccc)
     c.opts[:database].should == 'd[b]'
     c.opts[:host].should == 'domain\\instance'
   end
@@ -935,10 +1203,6 @@ describe "A single threaded database" do
 end
 
 describe "A database" do
-  before do
-    Sequel::Database.single_threaded = false
-  end
-  
   after do
     Sequel::Database.single_threaded = false
   end
@@ -983,11 +1247,7 @@ end
 
 describe "Database#fetch" do
   before do
-    @db = Sequel::Database.new
-    c = Class.new(Sequel::Dataset) do
-      def fetch_rows(sql); yield({:sql => sql}); end
-    end
-    @db.meta_def(:dataset) {c.new(self)}
+    @db = Sequel.mock(:fetch=>proc{|sql| {:sql => sql}})
   end
   
   specify "should create a dataset and invoke its fetch_rows method with the given sql" do
@@ -1034,21 +1294,17 @@ end
 
 describe "Database#[]" do
   before do
-    @db = Sequel::Database.new
+    @db = Sequel.mock
   end
   
   specify "should return a dataset when symbols are given" do
     ds = @db[:items]
-    ds.class.should == Sequel::Dataset
+    ds.should be_a_kind_of(Sequel::Dataset)
     ds.opts[:from].should == [:items]
   end
   
   specify "should return a dataset when a string is given" do
-    c = Class.new(Sequel::Dataset) do
-      def fetch_rows(sql); yield({:sql => sql}); end
-    end
-    @db.meta_def(:dataset) {c.new(self)}
-
+    @db.fetch = proc{|sql| {:sql=>sql}}
     sql = nil
     @db['select * from xyz where x = ? and y = ?', 15, 'abc'].each {|r| sql = r[:sql]}
     sql.should == "select * from xyz where x = 15 and y = 'abc'"
@@ -1056,53 +1312,36 @@ describe "Database#[]" do
 end
 
 describe "Database#inspect" do
-  before do
-    @db = DummyDatabase.new
-    
-    @db.meta_def(:uri) {'blah://blahblah/blah'}
-  end
-  
   specify "should include the class name and the connection url" do
-    @db.inspect.should == '#<DummyDatabase: "blah://blahblah/blah">'
+    Sequel.connect('mock://foo/bar').inspect.should == '#<Sequel::Mock::Database: "mock://foo/bar">'
   end
 end
 
 describe "Database#get" do
   before do
-    @c = Class.new(DummyDatabase) do
-      def dataset
-        ds = super
-        def ds.get(*args, &block)
-          @db.execute select(*args, &block).sql
-          args
-        end
-        ds
-      end
-    end
-    
-    @db = @c.new
+    @db = Sequel.mock(:fetch=>{:a=>1})
   end
   
   specify "should use Dataset#get to get a single value" do
-    @db.get(1).should == [1]
-    @db.sqls.last.should == 'SELECT 1'
+    @db.get(1).should == 1
+    @db.sqls.should == ['SELECT 1 LIMIT 1']
     
     @db.get(:version.sql_function)
-    @db.sqls.last.should == 'SELECT version()'
+    @db.sqls.should == ['SELECT version() LIMIT 1']
   end
 
   specify "should accept a block" do
     @db.get{1}
-    @db.sqls.last.should == 'SELECT 1'
+    @db.sqls.should == ['SELECT 1 LIMIT 1']
     
     @db.get{version(1)}
-    @db.sqls.last.should == 'SELECT version(1)'
+    @db.sqls.should == ['SELECT version(1) LIMIT 1']
   end
 end
 
 describe "Database#call" do
   specify "should call the prepared statement with the given name" do
-    db = MockDatabase.new
+    db = Sequel.mock(:fetch=>{:id => 1, :x => 1})
     db[:items].prepare(:select, :select_all)
     db.call(:select_all).should == [{:id => 1, :x => 1}]
     db[:items].filter(:n=>:$n).prepare(:select, :select_n)
@@ -1114,146 +1353,129 @@ end
 describe "Database#server_opts" do
   specify "should return the general opts if no :servers option is used" do
     opts = {:host=>1, :database=>2}
-    MockDatabase.new(opts).send(:server_opts, :server1)[:host].should == 1
+    Sequel::Database.new(opts).send(:server_opts, :server1)[:host].should == 1
   end
   
   specify "should return the general opts if entry for the server is present in the :servers option" do
     opts = {:host=>1, :database=>2, :servers=>{}}
-    MockDatabase.new(opts).send(:server_opts, :server1)[:host].should == 1
+    Sequel::Database.new(opts).send(:server_opts, :server1)[:host].should == 1
   end
   
   specify "should return the general opts merged with the specific opts if given as a hash" do
     opts = {:host=>1, :database=>2, :servers=>{:server1=>{:host=>3}}}
-    MockDatabase.new(opts).send(:server_opts, :server1)[:host].should == 3
+    Sequel::Database.new(opts).send(:server_opts, :server1)[:host].should == 3
   end
   
   specify "should return the sgeneral opts merged with the specific opts if given as a proc" do
     opts = {:host=>1, :database=>2, :servers=>{:server1=>proc{|db| {:host=>4}}}}
-    MockDatabase.new(opts).send(:server_opts, :server1)[:host].should == 4
+    Sequel::Database.new(opts).send(:server_opts, :server1)[:host].should == 4
   end
   
   specify "should raise an error if the specific opts is not a proc or hash" do
     opts = {:host=>1, :database=>2, :servers=>{:server1=>2}}
-    proc{MockDatabase.new(opts).send(:server_opts, :server1)}.should raise_error(Sequel::Error)
+    proc{Sequel::Database.new(opts).send(:server_opts, :server1)}.should raise_error(Sequel::Error)
   end
 end
 
 describe "Database#add_servers" do
   before do
-    @db = MockDatabase.new(:host=>1, :database=>2, :servers=>{:server1=>{:host=>3}})
-    def @db.connect(server)
-      server_opts(server)
-    end
-    def @db.disconnect_connection(c)
-    end
+    @db = Sequel.mock(:host=>1, :database=>2, :servers=>{:server1=>{:host=>3}})
   end
 
   specify "should add new servers to the connection pool" do
-    @db.synchronize{|c| c[:host].should == 1}
-    @db.synchronize(:server1){|c| c[:host].should == 3}
-    @db.synchronize(:server2){|c| c[:host].should == 1}
+    @db.synchronize{|c| c.opts[:host].should == 1}
+    @db.synchronize(:server1){|c| c.opts[:host].should == 3}
+    @db.synchronize(:server2){|c| c.opts[:host].should == 1}
 
     @db.add_servers(:server2=>{:host=>6})
-    @db.synchronize{|c| c[:host].should == 1}
-    @db.synchronize(:server1){|c| c[:host].should == 3}
-    @db.synchronize(:server2){|c| c[:host].should == 6}
+    @db.synchronize{|c| c.opts[:host].should == 1}
+    @db.synchronize(:server1){|c| c.opts[:host].should == 3}
+    @db.synchronize(:server2){|c| c.opts[:host].should == 6}
 
     @db.disconnect
-    @db.synchronize{|c| c[:host].should == 1}
-    @db.synchronize(:server1){|c| c[:host].should == 3}
-    @db.synchronize(:server2){|c| c[:host].should == 6}
+    @db.synchronize{|c| c.opts[:host].should == 1}
+    @db.synchronize(:server1){|c| c.opts[:host].should == 3}
+    @db.synchronize(:server2){|c| c.opts[:host].should == 6}
   end
 
   specify "should replace options for future connections to existing servers" do
-    @db.synchronize{|c| c[:host].should == 1}
-    @db.synchronize(:server1){|c| c[:host].should == 3}
-    @db.synchronize(:server2){|c| c[:host].should == 1}
+    @db.synchronize{|c| c.opts[:host].should == 1}
+    @db.synchronize(:server1){|c| c.opts[:host].should == 3}
+    @db.synchronize(:server2){|c| c.opts[:host].should == 1}
 
     @db.add_servers(:default=>proc{{:host=>4}}, :server1=>{:host=>8})
-    @db.synchronize{|c| c[:host].should == 1}
-    @db.synchronize(:server1){|c| c[:host].should == 3}
-    @db.synchronize(:server2){|c| c[:host].should == 1}
+    @db.synchronize{|c| c.opts[:host].should == 1}
+    @db.synchronize(:server1){|c| c.opts[:host].should == 3}
+    @db.synchronize(:server2){|c| c.opts[:host].should == 1}
 
     @db.disconnect
-    @db.synchronize{|c| c[:host].should == 4}
-    @db.synchronize(:server1){|c| c[:host].should == 8}
-    @db.synchronize(:server2){|c| c[:host].should == 4}
+    @db.synchronize{|c| c.opts[:host].should == 4}
+    @db.synchronize(:server1){|c| c.opts[:host].should == 8}
+    @db.synchronize(:server2){|c| c.opts[:host].should == 4}
   end
 end
 
 describe "Database#remove_servers" do
   before do
-    @db = MockDatabase.new(:host=>1, :database=>2, :servers=>{:server1=>{:host=>3}, :server2=>{:host=>4}})
-    def @db.connect(server)
-      server_opts(server)
-    end
-    def @db.disconnect_connection(c)
-    end
+    @db = Sequel.mock(:host=>1, :database=>2, :servers=>{:server1=>{:host=>3}, :server2=>{:host=>4}})
   end
 
   specify "should remove servers from the connection pool" do
-    @db.synchronize{|c| c[:host].should == 1}
-    @db.synchronize(:server1){|c| c[:host].should == 3}
-    @db.synchronize(:server2){|c| c[:host].should == 4}
+    @db.synchronize{|c| c.opts[:host].should == 1}
+    @db.synchronize(:server1){|c| c.opts[:host].should == 3}
+    @db.synchronize(:server2){|c| c.opts[:host].should == 4}
 
     @db.remove_servers(:server1, :server2)
-    @db.synchronize{|c| c[:host].should == 1}
-    @db.synchronize(:server1){|c| c[:host].should == 1}
-    @db.synchronize(:server2){|c| c[:host].should == 1}
+    @db.synchronize{|c| c.opts[:host].should == 1}
+    @db.synchronize(:server1){|c| c.opts[:host].should == 1}
+    @db.synchronize(:server2){|c| c.opts[:host].should == 1}
   end
   
   specify "should accept arrays of symbols" do
     @db.remove_servers([:server1, :server2])
-    @db.synchronize{|c| c[:host].should == 1}
-    @db.synchronize(:server1){|c| c[:host].should == 1}
-    @db.synchronize(:server2){|c| c[:host].should == 1}
+    @db.synchronize{|c| c.opts[:host].should == 1}
+    @db.synchronize(:server1){|c| c.opts[:host].should == 1}
+    @db.synchronize(:server2){|c| c.opts[:host].should == 1}
   end
 
   specify "should allow removal while connections are still open" do
     @db.synchronize do |c1|
-      c1[:host].should == 1
+      c1.opts[:host].should == 1
       @db.synchronize(:server1) do |c2|
-        c2[:host].should == 3
+        c2.opts[:host].should == 3
         @db.synchronize(:server2) do |c3|
-          c3[:host].should == 4
+          c3.opts[:host].should == 4
           @db.remove_servers(:server1, :server2)
             @db.synchronize(:server1) do |c4|
               c4.should_not == c2
               c4.should == c1
-              c4[:host].should == 1
+              c4.opts[:host].should == 1
               @db.synchronize(:server2) do |c5|
                 c5.should_not == c3
                 c5.should == c1
-                c5[:host].should == 1
+                c5.opts[:host].should == 1
               end
             end
-          c3[:host].should == 4
+          c3.opts[:host].should == 4
          end
-        c2[:host].should == 3
+        c2.opts[:host].should == 3
       end
-      c1[:host].should == 1
+      c1.opts[:host].should == 1
     end
   end
 end
 
 describe "Database#each_server with do/jdbc adapter connection string without :adapter option" do
-  before do
+  specify "should yield a separate database object for each server" do
     klass = Class.new(Sequel::Database)
-    klass.should_receive(:adapter_class).once.with(:jdbc).and_return(MockDatabase)
+    klass.should_receive(:adapter_class).once.with(:jdbc).and_return(Sequel::Mock::Database)
     @db = klass.connect('jdbc:blah:', :host=>1, :database=>2, :servers=>{:server1=>{:host=>3}})
-    def @db.connect(server)
-      server_opts(server)
-    end
-    def @db.disconnect_connection(c)
-    end
-  end
 
-  specify "should yield a separate database object for each server" do
     hosts = []
     @db.each_server do |db|
       db.should be_a_kind_of(Sequel::Database)
       db.should_not == @db
-      db.opts[:adapter_class].should == MockDatabase
+      db.opts[:adapter_class].should == Sequel::Mock::Database
       db.opts[:database].should == 2
       hosts << db.opts[:host]
     end
@@ -1263,12 +1485,7 @@ end
 
 describe "Database#each_server" do
   before do
-    @db = Sequel.connect(:adapter=>:mock, :host=>1, :database=>2, :servers=>{:server1=>{:host=>3}, :server2=>{:host=>4}})
-    def @db.connect(server)
-      server_opts(server)
-    end
-    def @db.disconnect_connection(c)
-    end
+    @db = Sequel.mock(:host=>1, :database=>2, :servers=>{:server1=>{:host=>3}, :server2=>{:host=>4}})
   end
 
   specify "should yield a separate database object for each server" do
@@ -1299,21 +1516,25 @@ describe "Database#each_server" do
 end
   
 describe "Database#raise_error" do
+  before do
+    @db = Sequel.mock
+  end
+
   specify "should reraise if the exception class is not in opts[:classes]" do
     e = Class.new(StandardError)
-    proc{MockDatabase.new.send(:raise_error, e.new(''), :classes=>[])}.should raise_error(e)
+    proc{@db.send(:raise_error, e.new(''), :classes=>[])}.should raise_error(e)
   end
 
-  specify "should convert the exception to a DatabaseError if the exception class is not in opts[:classes]" do
-    proc{MockDatabase.new.send(:raise_error, Interrupt.new(''), :classes=>[Interrupt])}.should raise_error(Sequel::DatabaseError)
+  specify "should convert the exception to a DatabaseError if the exception class is in opts[:classes]" do
+    proc{@db.send(:raise_error, Interrupt.new(''), :classes=>[Interrupt])}.should raise_error(Sequel::DatabaseError)
   end
 
   specify "should convert the exception to a DatabaseError if opts[:classes] if not present" do
-    proc{MockDatabase.new.send(:raise_error, Interrupt.new(''))}.should raise_error(Sequel::DatabaseError)
+    proc{@db.send(:raise_error, Interrupt.new(''))}.should raise_error(Sequel::DatabaseError)
   end
   
   specify "should convert the exception to a DatabaseDisconnectError if opts[:disconnect] is true" do
-    proc{MockDatabase.new.send(:raise_error, Interrupt.new(''), :disconnect=>true)}.should raise_error(Sequel::DatabaseDisconnectError)
+    proc{@db.send(:raise_error, Interrupt.new(''), :disconnect=>true)}.should raise_error(Sequel::DatabaseDisconnectError)
   end
 end
 
@@ -1373,6 +1594,49 @@ describe "Database#typecast_value" do
     @db.typecast_value(:date, :year=>Date.today.year, :month=>Date.today.month, :day=>Date.today.day).should == Date.today
   end
 
+  specify "should have Sequel.application_to_database_timestamp convert to Sequel.database_timezone" do
+    begin
+      t = Time.utc(2011, 1, 2, 3, 4, 5) # UTC Time
+      t2 = Time.mktime(2011, 1, 2, 3, 4, 5) # Local Time
+      t3 = Time.utc(2011, 1, 2, 3, 4, 5) - (t - t2) # Local Time in UTC Time
+      t4 = Time.mktime(2011, 1, 2, 3, 4, 5) + (t - t2) # UTC Time in Local Time
+      Sequel.application_timezone = :utc
+      Sequel.database_timezone = :local
+      Sequel.application_to_database_timestamp(t).should == t4
+      Sequel.application_timezone = :local
+      Sequel.database_timezone = :utc
+      Sequel.application_to_database_timestamp(t2).should == t3
+    ensure
+      Sequel.default_timezone = nil
+    end
+  end
+
+  specify "should have Database#to_application_timestamp convert values using the database's timezone" do
+    begin
+      t = Time.utc(2011, 1, 2, 3, 4, 5) # UTC Time
+      t2 = Time.mktime(2011, 1, 2, 3, 4, 5) # Local Time
+      t3 = Time.utc(2011, 1, 2, 3, 4, 5) - (t - t2) # Local Time in UTC Time
+      t4 = Time.mktime(2011, 1, 2, 3, 4, 5) + (t - t2) # UTC Time in Local Time
+      Sequel.default_timezone = :utc
+      @db.to_application_timestamp('2011-01-02 03:04:05').should == t
+      Sequel.database_timezone = :local
+      @db.to_application_timestamp('2011-01-02 03:04:05').should == t3
+      Sequel.default_timezone = :local
+      @db.to_application_timestamp('2011-01-02 03:04:05').should == t2
+      Sequel.database_timezone = :utc
+      @db.to_application_timestamp('2011-01-02 03:04:05').should == t4
+
+      Sequel.default_timezone = :utc
+      @db.timezone = :local
+      @db.to_application_timestamp('2011-01-02 03:04:05').should == t3
+      Sequel.default_timezone = :local
+      @db.timezone = :utc
+      @db.to_application_timestamp('2011-01-02 03:04:05').should == t4
+    ensure
+      Sequel.default_timezone = nil
+    end
+  end
+
   specify "should typecast datetime values to Sequel.datetime_class with correct timezone handling" do
     t = Time.utc(2011, 1, 2, 3, 4, 5) # UTC Time
     t2 = Time.mktime(2011, 1, 2, 3, 4, 5) # Local Time
@@ -1596,7 +1860,7 @@ describe "Database#blank_object?" do
 end
 
 describe "Database#schema_autoincrementing_primary_key?" do
-  specify "should whether the parsed schema row indicates a primary key" do
+  specify "should indicate whether the parsed schema row indicates a primary key" do
     m = Sequel::Database.new.method(:schema_autoincrementing_primary_key?)
     m.call(:primary_key=>true).should == true
     m.call(:primary_key=>false).should == false
@@ -1652,7 +1916,7 @@ describe "Database#column_schema_to_ruby_default" do
     db = Sequel::Database.new
     m = db.method(:column_schema_to_ruby_default)
     p = lambda{|d,t| m.call(d,t)}
-    p[nil, :integer].should == nil
+    p[nil, :integer].should be_nil
     p['1', :integer].should == 1
     p['-1', :integer].should == -1
     p['1.0', :float].should == 1.0
@@ -1672,12 +1936,12 @@ describe "Database#column_schema_to_ruby_default" do
     p["'\\a''b'", :string].should == "\\a'b"
     p["'NULL'", :string].should == "NULL"
     p["'2009-10-29'", :date].should == Date.new(2009,10,29)
-    p["CURRENT_TIMESTAMP", :date].should == nil
-    p["today()", :date].should == nil
+    p["CURRENT_TIMESTAMP", :date].should be_nil
+    p["today()", :date].should be_nil
     p["'2009-10-29T10:20:30-07:00'", :datetime].should == DateTime.parse('2009-10-29T10:20:30-07:00')
     p["'2009-10-29 10:20:30'", :datetime].should == DateTime.parse('2009-10-29 10:20:30')
     p["'10:20:30'", :time].should == Time.parse('10:20:30')
-    p["NaN", :float].should == nil
+    p["NaN", :float].should be_nil
 
     db.meta_def(:database_type){:postgres}
     p["''::text", :string].should == ""
@@ -1701,8 +1965,8 @@ describe "Database#column_schema_to_ruby_default" do
     p["2009-10-29", :date].should == Date.new(2009,10,29)
     p["2009-10-29 10:20:30", :datetime].should == DateTime.parse('2009-10-29 10:20:30')
     p["10:20:30", :time].should == Time.parse('10:20:30')
-    p["CURRENT_DATE", :date].should == nil
-    p["CURRENT_TIMESTAMP", :datetime].should == nil
+    p["CURRENT_DATE", :date].should be_nil
+    p["CURRENT_TIMESTAMP", :datetime].should be_nil
     p["a", :enum].should == "a"
     
     db.meta_def(:database_type){:mssql}