sequel 3.21.0 → 3.39.0

data/spec/integration/dataset_test.rb

@@ -2,16 +2,16 @@ require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
 describe "Simple Dataset operations" do
   before do
-    INTEGRATION_DB.create_table!(:items) do
+    @db = INTEGRATION_DB
+    @db.create_table!(:items) do
       primary_key :id
       Integer :number
     end
-    @ds = INTEGRATION_DB[:items]
+    @ds = @db[:items]
     @ds.insert(:number=>10)
-    clear_sqls
   end
   after do
-    INTEGRATION_DB.drop_table(:items)
+    @db.drop_table?(:items)
   end
 
   specify "should support sequential primary keys" do
@@ -23,7 +23,17 @@ describe "Simple Dataset operations" do
       {:id => 3, :number=>30} ]   
   end 
 
-  cspecify "should insert with a primary key specified", :mssql do
+  specify "should support sequential primary keys with a Bignum" do
+    @db.create_table!(:items) do
+      primary_key :id, :type=>Bignum
+      Integer :number
+    end
+    @ds << {:number=>20}
+    @ds << {:number=>30}
+    @ds.order(:number).all.should == [{:id => 1, :number=>20}, {:id => 2, :number=>30}]   
+  end 
+
+  cspecify "should insert with a primary key specified", :db2, :mssql do
     @ds.insert(:id=>100, :number=>20)
     @ds.count.should == 2
     @ds.order(:id).all.should == [{:id=>1, :number=>10}, {:id=>100, :number=>20}]
@@ -34,17 +44,54 @@ describe "Simple Dataset operations" do
     @ds.filter(:id=>2).first[:number].should == 20
   end
 
+  specify "should have insert work correctly with static SQL" do
+    @db["INSERT INTO #{@ds.literal(:items)} (#{@ds.literal(:number)}) VALUES (20)"].insert
+    @ds.filter(:id=>2).first[:number].should == 20
+  end
+
+  specify "should have insert_multiple return primary key values" do
+    @ds.insert_multiple([{:number=>20}, {:number=>30}]).should == [2, 3]
+    @ds.filter(:id=>2).get(:number).should == 20
+    @ds.filter(:id=>3).get(:number).should == 30
+  end
+
+  specify "should join correctly" do
+    @ds.join(:items___b, :id=>:id).select_all(:items).all.should == [{:id=>1, :number=>10}]
+  end
+
+  specify "should correctly deal with qualified columns and subselects" do
+    @ds.from_self(:alias=>:a).select(:a__id, Sequel.qualify(:a, :number)).all.should == [{:id=>1, :number=>10}]
+    @ds.join(@ds.as(:a), :id=>:id).select(:a__id, Sequel.qualify(:a, :number)).all.should == [{:id=>1, :number=>10}]
+  end
+
+  specify "should graph correctly" do
+    @ds.graph(:items, {:id=>:id}, :table_alias=>:b).all.should == [{:items=>{:id=>1, :number=>10}, :b=>{:id=>1, :number=>10}}]
+  end
+
+  specify "should graph correctly with a subselect" do
+    @ds.from_self(:alias=>:items).graph(@ds.from_self, {:id=>:id}, :table_alias=>:b).all.should == [{:items=>{:id=>1, :number=>10}, :b=>{:id=>1, :number=>10}}]
+  end
+
+  cspecify "should have insert work correctly when inserting a row with all NULL values", :hsqldb do
+    @db.create_table!(:items) do
+      String :name
+      Integer :number
+    end
+    proc{@ds.insert}.should_not raise_error
+    @ds.all.should == [{:name=>nil, :number=>nil}]
+  end
+
   specify "should delete correctly" do
     @ds.filter(1=>1).delete.should == 1
     @ds.count.should == 0
   end
   
   specify "should update correctly" do
-    @ds.update(:number=>:number+1).should == 1
+    @ds.update(:number=>Sequel.expr(:number)+1).should == 1
     @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
@@ -79,13 +126,87 @@ describe "Simple Dataset operations" do
     @ds.order(:id).limit(2, 1).all.should == [{:id=>2, :number=>20}]
   end
   
-  cspecify "should fetch correctly with a limit and offset without an order", :mssql do
+  specify "should provide correct columns when using a limit and offset" do
+    ds = @ds.order(:id).limit(1, 1)
+    ds.all
+    ds.columns.should == [:id, :number]
+    @ds.order(:id).limit(1, 1).columns.should == [:id, :number]
+  end
+
+  specify "should fetch correctly with a limit and offset for different combinations of from and join tables" do
+    @db.create_table!(:items2){primary_key :id2; Integer :number2}
+    @db[:items2].insert(:number2=>10)
+    @ds.from(:items, :items2).order(:id).limit(2, 0).all.should == [{:id=>1, :number=>10, :id2=>1, :number2=>10}]
+    @ds.from(:items___i, :items2___i2).order(:id).limit(2, 0).all.should == [{:id=>1, :number=>10, :id2=>1, :number2=>10}]
+    @ds.cross_join(:items2).order(:id).limit(2, 0).all.should ==[{:id=>1, :number=>10, :id2=>1, :number2=>10}]
+    @ds.from(:items___i).cross_join(:items2___i2).order(:id).limit(2, 0).all.should == [{:id=>1, :number=>10, :id2=>1, :number2=>10}]
+    @ds.cross_join(:items2___i).cross_join(@db[:items2].select(:id2___id3, :number2___number3)).order(:id).limit(2, 0).all.should == [{:id=>1, :number=>10, :id2=>1, :number2=>10, :id3=>1, :number3=>10}]
+
+    @ds.from(:items, :items2).order(:id).limit(2, 1).all.should == []
+    @ds.from(:items___i, :items2___i2).order(:id).limit(2, 1).all.should == []
+    @ds.cross_join(:items2).order(:id).limit(2, 1).all.should == []
+    @ds.from(:items___i).cross_join(:items2___i2).order(:id).limit(2, 1).all.should == []
+    @ds.cross_join(:items2___i).cross_join(@db[:items2].select(:id2___id3, :number2___number3)).order(:id).limit(2, 1).all.should == []
+    @db.drop_table(:items2)
+  end
+  
+  specify "should fetch correctly with a limit and offset without an order" do
     @ds.limit(2, 1).all.should == []
   end
 
+  specify "should fetch correctly with a limit in an IN subselect" do
+    @ds.where(:id=>@ds.select(:id).order(:id).limit(2)).all.should == [{:id=>1, :number=>10}]
+    @ds.insert(:number=>20)
+    @ds.where(:id=>@ds.select(:id).order(:id).limit(1)).all.should == [{:id=>1, :number=>10}]
+    @ds.where(:id=>@ds.select(:id).order(:id).limit(2)).order(:id).all.should == [{:id=>1, :number=>10}, {:id=>2, :number=>20}]
+  end
+  
+  specify "should fetch correctly with a limit and offset in an IN subselect" do
+    @ds.where(:id=>@ds.select(:id).order(:id).limit(2, 0)).all.should == [{:id=>1, :number=>10}]
+    @ds.where(:id=>@ds.select(:id).order(:id).limit(2, 1)).all.should == []
+    @ds.insert(:number=>20)
+    @ds.where(:id=>@ds.select(:id).order(:id).limit(1, 1)).all.should == [{:id=>2, :number=>20}]
+    @ds.where(:id=>@ds.select(:id).order(:id).limit(2, 0)).order(:id).all.should == [{:id=>1, :number=>10}, {:id=>2, :number=>20}]
+    @ds.where(:id=>@ds.select(:id).order(:id).limit(2, 1)).all.should == [{:id=>2, :number=>20}]
+  end
+  
   specify "should alias columns correctly" do
     @ds.select(:id___x, :number___n).first.should == {:x=>1, :n=>10}
   end
+
+  specify "should handle true/false properly" do
+    @ds.filter(Sequel::TRUE).select_map(:number).should == [10]
+    @ds.filter(Sequel::FALSE).select_map(:number).should == []
+    @ds.filter(true).select_map(:number).should == [10]
+    @ds.filter(false).select_map(:number).should == []
+  end
+end
+
+describe "Simple dataset operations with nasty table names" do
+  before do
+    @db = INTEGRATION_DB
+    @table = :"i`t' [e]\"m\\s" 
+    @qi = @db.quote_identifiers?
+    @db.quote_identifiers = true
+  end
+  after do
+    @db.quote_identifiers = @qi
+  end
+
+  cspecify "should work correctly", :mssql, :oracle do
+    @db.create_table!(@table) do
+      primary_key :id
+      Integer :number
+    end
+    @ds = @db[@table]
+    @ds.insert(:number=>10).should == 1
+    @ds.all.should == [{:id=>1, :number=>10}]
+    @ds.update(:number=>20).should == 1 
+    @ds.all.should == [{:id=>1, :number=>20}]
+    @ds.delete.should == 1
+    @ds.count.should == 0
+    proc{@db.drop_table?(@table)}.should_not raise_error
+  end 
 end
 
 describe Sequel::Dataset do
@@ -95,10 +216,9 @@ describe Sequel::Dataset do
       Integer :value
     end
     @d = INTEGRATION_DB[:test]
-    clear_sqls
   end
   after do
-    INTEGRATION_DB.drop_table(:test)
+    INTEGRATION_DB.drop_table?(:test)
   end
 
   specify "should return the correct record count" do
@@ -171,23 +291,38 @@ end
 
 describe Sequel::Database do
   specify "should correctly escape strings" do
-    INTEGRATION_DB.get("\\dingo".as(:a)) == "\\dingo"
-  end
-
-  specify "should correctly escape strings with quotes" do
-    INTEGRATION_DB.get("\\'dingo".as(:a)) == "\\'dingo"
+    ["\\\n",
+     "\\\\\n",
+     "\\\r\n",
+     "\\\\\r\n",
+     "\\\\\n\n", 
+     "\\\\\r\n\r\n",
+     "\\dingo",
+     "\\'dingo",
+     "\\\\''dingo",
+    ].each do |str|
+      INTEGRATION_DB.get(Sequel.cast(str, String)).should == str
+      str = "1#{str}1"
+      INTEGRATION_DB.get(Sequel.cast(str, String)).should == str
+      str = "#{str}#{str}"
+      INTEGRATION_DB.get(Sequel.cast(str, String)).should == str
+    end
   end
 
-  specify "should properly escape binary data" do
-    INTEGRATION_DB.get("\1\2\3".to_sequel_blob.as(:a)) == "\1\2\3"
+  cspecify "should properly escape binary data", [:odbc], [:jdbc, :hsqldb], :oracle do
+    INTEGRATION_DB.get(Sequel.cast(Sequel.blob("\1\2\3"), File).as(:a)).should == "\1\2\3"
   end
 
   specify "should have a working table_exists?" do
     t = :basdfdsafsaddsaf
-    INTEGRATION_DB.drop_table(t) rescue nil
+    INTEGRATION_DB.drop_table?(t)
     INTEGRATION_DB.table_exists?(t).should == false
     INTEGRATION_DB.create_table(t){Integer :a}
-    INTEGRATION_DB.table_exists?(t).should == true
+    begin
+      INTEGRATION_DB.table_exists?(t).should == true
+    ensure
+      INTEGRATION_DB.drop_table(t)
+    end
   end
 end
 
@@ -203,7 +338,7 @@ describe Sequel::Dataset do
     @d << {:value => 789}
   end 
   after do
-    INTEGRATION_DB.drop_table(:items)
+    INTEGRATION_DB.drop_table?(:items)
   end 
   
   specify "should correctly return avg" do
@@ -232,7 +367,7 @@ describe "Simple Dataset operations" do
     @ds = INTEGRATION_DB[:items]
   end
   after do
-    INTEGRATION_DB.drop_table(:items)
+    INTEGRATION_DB.drop_table?(:items)
   end
 
   specify "should deal with boolean conditions correctly" do
@@ -251,18 +386,17 @@ end
 
 describe "Simple Dataset operations in transactions" do
   before do
-    INTEGRATION_DB.create_table!(:items_insert_in_transaction) do
+    INTEGRATION_DB.create_table!(:items) do
       primary_key :id
       integer :number
     end
-    @ds = INTEGRATION_DB[:items_insert_in_transaction]
-    clear_sqls
+    @ds = INTEGRATION_DB[:items]
   end
   after do
-    INTEGRATION_DB.drop_table(:items_insert_in_transaction)
+    INTEGRATION_DB.drop_table?(:items)
   end
 
-  cspecify "should insert correctly with a primary key specified inside a transaction", :mssql do
+  cspecify "should insert correctly with a primary key specified inside a transaction", :db2, :mssql do
     INTEGRATION_DB.transaction do
       @ds.insert(:id=>100, :number=>20)
       @ds.count.should == 1
@@ -293,7 +427,9 @@ describe "Dataset UNION, EXCEPT, and INTERSECT" do
     @ds2 = INTEGRATION_DB[:i2]
     @ds2.insert(:number=>10)
     @ds2.insert(:number=>30)
-    clear_sqls
+  end
+  after do
+    INTEGRATION_DB.drop_table?(:i1, :i2, :i3)
   end
   
   specify "should give the correct results for simple UNION, EXCEPT, and INTERSECT" do
@@ -310,20 +446,20 @@ describe "Dataset UNION, EXCEPT, and INTERSECT" do
     @ds1.insert(:number=>38)
     @ds2.insert(:number=>39)
 
-    @ds1.order(:number.desc).union(@ds2).order(:number).map{|x| x[:number].to_s}.should == %w'8 9 10 20 30 38 39'
-    @ds1.union(@ds2.order(:number.desc)).order(:number).map{|x| x[:number].to_s}.should == %w'8 9 10 20 30 38 39'
+    @ds1.reverse_order(:number).union(@ds2).order(:number).map{|x| x[:number].to_s}.should == %w'8 9 10 20 30 38 39'
+    @ds1.union(@ds2.reverse_order(:number)).order(:number).map{|x| x[:number].to_s}.should == %w'8 9 10 20 30 38 39'
 
-    @ds1.order(:number.desc).limit(1).union(@ds2).order(:number).map{|x| x[:number].to_s}.should == %w'9 10 30 38 39'
-    @ds2.order(:number.desc).limit(1).union(@ds1).order(:number).map{|x| x[:number].to_s}.should == %w'8 10 20 38 39'
+    @ds1.reverse_order(:number).limit(1).union(@ds2).order(:number).map{|x| x[:number].to_s}.should == %w'9 10 30 38 39'
+    @ds2.reverse_order(:number).limit(1).union(@ds1).order(:number).map{|x| x[:number].to_s}.should == %w'8 10 20 38 39'
 
     @ds1.union(@ds2.order(:number).limit(1)).order(:number).map{|x| x[:number].to_s}.should == %w'8 9 10 20 38'
     @ds2.union(@ds1.order(:number).limit(1)).order(:number).map{|x| x[:number].to_s}.should == %w'8 9 10 30 39'
 
     @ds1.union(@ds2).limit(2).order(:number).map{|x| x[:number].to_s}.should == %w'8 9'
-    @ds2.union(@ds1).order(:number.desc).limit(2).map{|x| x[:number].to_s}.should == %w'39 38'
+    @ds2.union(@ds1).reverse_order(:number).limit(2).map{|x| x[:number].to_s}.should == %w'39 38'
 
-    @ds1.order(:number.desc).limit(2).union(@ds2.order(:number.desc).limit(2)).order(:number).limit(3).map{|x| x[:number].to_s}.should == %w'20 30 38'
-    @ds2.order(:number).limit(2).union(@ds1.order(:number).limit(2)).order(:number.desc).limit(3).map{|x| x[:number].to_s}.should == %w'10 9 8'
+    @ds1.reverse_order(:number).limit(2).union(@ds2.reverse_order(:number).limit(2)).order(:number).limit(3).map{|x| x[:number].to_s}.should == %w'20 30 38'
+    @ds2.order(:number).limit(2).union(@ds1.order(:number).limit(2)).reverse_order(:number).limit(3).map{|x| x[:number].to_s}.should == %w'10 9 8'
   end
 
   specify "should give the correct results for compound UNION, EXCEPT, and INTERSECT" do
@@ -359,7 +495,7 @@ end
 
 if INTEGRATION_DB.dataset.supports_cte?
   describe "Common Table Expressions" do
-    before do
+    before(:all) do
       @db = INTEGRATION_DB
       @db.create_table!(:i1){Integer :id; Integer :parent_id}
       @ds = @db[:i1]
@@ -370,15 +506,15 @@ if INTEGRATION_DB.dataset.supports_cte?
       @ds.insert(:id=>5, :parent_id=>3)
       @ds.insert(:id=>6, :parent_id=>5)
     end
-    after do
-      @db.drop_table(:i1)
+    after(:all) do
+      @db.drop_table?(:i1)
     end
     
     specify "should give correct results for WITH" do
       @db[:t].with(:t, @ds.filter(:parent_id=>nil).select(:id)).order(:id).map(:id).should == [1, 2]
     end
     
-    specify "should give correct results for recursive WITH" do
+    cspecify "should give correct results for recursive WITH", :db2 do
       ds = @db[:t].select(:i___id, :pi___parent_id).with_recursive(:t, @ds.filter(:parent_id=>nil), @ds.join(:t, :i=>:parent_id).select(:i1__id, :i1__parent_id), :args=>[:i, :pi])
       ds.all.should == [{:parent_id=>nil, :id=>1}, {:parent_id=>nil, :id=>2}, {:parent_id=>1, :id=>3}, {:parent_id=>1, :id=>4}, {:parent_id=>3, :id=>5}, {:parent_id=>5, :id=>6}]
       ps = @db[:t].select(:i___id, :pi___parent_id).with_recursive(:t, @ds.filter(:parent_id=>:$n), @ds.join(:t, :i=>:parent_id).filter(:t__i=>:parent_id).select(:i1__id, :i1__parent_id), :args=>[:i, :pi]).prepare(:select, :cte_sel)
@@ -391,12 +527,116 @@ if INTEGRATION_DB.dataset.supports_cte?
       @ds.inner_join(@db[:t].with(:t, @ds.filter(:parent_id=>nil)), :id => :id).select(:i1__id).order(:i1__id).map(:id).should == [1,2]
       @db[:t].with(:t, @ds).inner_join(@db[:s].with(:s, @ds.filter(:parent_id=>nil)), :id => :id).select(:t__id).order(:t__id).map(:id).should == [1,2]
     end
+
+    specify "should support a subselect in the FROM clause with a CTE" do
+      @ds.from(@db[:t].with(:t, @ds)).select_order_map(:id).should == [1,2,3,4,5,6]
+      @db[:t].with(:t, @ds).from_self.select_order_map(:id).should == [1,2,3,4,5,6]
+    end
+
+    specify "should support using a CTE inside a CTE" do
+      @db[:s].with(:s, @db[:t].with(:t, @ds)).select_order_map(:id).should == [1,2,3,4,5,6]
+      @db[:s].with_recursive(:s, @db[:t].with(:t, @ds), @db[:t2].with(:t2, @ds)).select_order_map(:id).should == [1,1,2,2,3,3,4,4,5,5,6,6]
+    end
+
+    specify "should support using a CTE inside UNION/EXCEPT/INTERSECT" do
+      @ds.union(@db[:t].with(:t, @ds)).select_order_map(:id).should == [1,2,3,4,5,6]
+      if @ds.supports_intersect_except?
+        @ds.intersect(@db[:t].with(:t, @ds)).select_order_map(:id).should == [1,2,3,4,5,6]
+        @ds.except(@db[:t].with(:t, @ds)).select_order_map(:id).should == []
+      end
+    end
+  end
+end
+
+if INTEGRATION_DB.dataset.supports_cte?(:update) # Assume INSERT and DELETE support as well
+  describe "Common Table Expressions in INSERT/UPDATE/DELETE" do
+    before do
+      @db = INTEGRATION_DB
+      @db.create_table!(:i1){Integer :id}
+      @ds = @db[:i1]
+      @ds2 = @ds.with(:t, @ds)
+      @ds.insert(:id=>1)
+      @ds.insert(:id=>2)
+    end
+    after do
+      @db.drop_table?(:i1)
+    end
+    
+    specify "should give correct results for WITH" do
+      @ds2.insert(@db[:t])
+      @ds.select_order_map(:id).should == [1, 1, 2, 2]
+      @ds2.filter(:id=>@db[:t].select{max(id)}).update(:id=>Sequel.+(:id, 1))
+      @ds.select_order_map(:id).should == [1, 1, 3, 3]
+      @ds2.filter(:id=>@db[:t].select{max(id)}).delete
+      @ds.select_order_map(:id).should == [1, 1]
+    end
+  end
+end
+
+if INTEGRATION_DB.dataset.supports_returning?(:insert)
+  describe "RETURNING clauses in INSERT" do
+    before do
+      @db = INTEGRATION_DB
+      @db.create_table!(:i1){Integer :id; Integer :foo}
+      @ds = @db[:i1]
+    end
+    after do
+      @db.drop_table?(:i1)
+    end
+    
+    specify "should give correct results" do
+      h = {}
+      @ds.returning(:foo).insert(1, 2){|r| h = r}
+      h.should == {:foo=>2}
+      @ds.returning(:id).insert(3, 4){|r| h = r}
+      h.should == {:id=>3}
+      @ds.returning.insert(5, 6){|r| h = r}
+      h.should == {:id=>5, :foo=>6}
+      @ds.returning(:id___foo, :foo___id).insert(7, 8){|r| h = r}
+      h.should == {:id=>8, :foo=>7}
+    end
+  end
+end
+
+if INTEGRATION_DB.dataset.supports_returning?(:update) # Assume DELETE support as well
+  describe "RETURNING clauses in UPDATE/DELETE" do
+    before do
+      @db = INTEGRATION_DB
+      @db.create_table!(:i1){Integer :id; Integer :foo}
+      @ds = @db[:i1]
+      @ds.insert(1, 2)
+    end
+    after do
+      @db.drop_table?(:i1)
+    end
+    
+    specify "should give correct results" do
+      h = []
+      @ds.returning(:foo).update(:id=>Sequel.+(:id, 1), :foo=>Sequel.*(:foo, 2)){|r| h << r}
+      h.should == [{:foo=>4}]
+      h.clear
+      @ds.returning(:id).update(:id=>Sequel.+(:id, 1), :foo=>Sequel.*(:foo, 2)){|r| h << r}
+      h.should == [{:id=>3}]
+      h.clear
+      @ds.returning.update(:id=>Sequel.+(:id, 1), :foo=>Sequel.*(:foo, 2)){|r| h << r}
+      h.should == [{:id=>4, :foo=>16}]
+      h.clear
+      @ds.returning(:id___foo, :foo___id).update(:id=>Sequel.+(:id, 1), :foo=>Sequel.*(:foo, 2)){|r| h << r}
+      h.should == [{:id=>32, :foo=>5}]
+      h.clear
+
+      @ds.returning.delete{|r| h << r}
+      h.should == [{:id=>5, :foo=>32}]
+      h.clear
+      @ds.returning.delete{|r| h << r}
+      h.should == []
+    end
   end
 end
 
 if INTEGRATION_DB.dataset.supports_window_functions?
   describe "Window Functions" do
-    before do
+    before(:all) do
       @db = INTEGRATION_DB
       @db.create_table!(:i1){Integer :id; Integer :group_id; Integer :amount}
       @ds = @db[:i1].order(:id)
@@ -407,8 +647,8 @@ if INTEGRATION_DB.dataset.supports_window_functions?
       @ds.insert(:id=>5, :group_id=>2, :amount=>10000)
       @ds.insert(:id=>6, :group_id=>2, :amount=>100000)
     end
-    after do
-      @db.drop_table(:i1)
+    after(:all) do
+      @db.drop_table?(:i1)
     end
     
     specify "should give correct results for aggregate window functions" do
@@ -435,21 +675,13 @@ if INTEGRATION_DB.dataset.supports_window_functions?
     cspecify "should give correct results for aggregate window functions with frames", :mssql do
       @ds.select(:id){sum(:over, :args=>amount, :partition=>group_id, :order=>id, :frame=>:all){}.as(:sum)}.all.should ==
         [{:sum=>111, :id=>1}, {:sum=>111, :id=>2}, {:sum=>111, :id=>3}, {:sum=>111000, :id=>4}, {:sum=>111000, :id=>5}, {:sum=>111000, :id=>6}]
-      @ds.select(:id){sum(:over, :args=>amount, :partition=>group_id, :frame=>:all){}.as(:sum)}.all.should ==
-        [{:sum=>111, :id=>1}, {:sum=>111, :id=>2}, {:sum=>111, :id=>3}, {:sum=>111000, :id=>4}, {:sum=>111000, :id=>5}, {:sum=>111000, :id=>6}]
       @ds.select(:id){sum(:over, :args=>amount, :order=>id, :frame=>:all){}.as(:sum)}.all.should ==
         [{:sum=>111111, :id=>1}, {:sum=>111111, :id=>2}, {:sum=>111111, :id=>3}, {:sum=>111111, :id=>4}, {:sum=>111111, :id=>5}, {:sum=>111111, :id=>6}]
-      @ds.select(:id){sum(:over, :args=>amount, :frame=>:all){}.as(:sum)}.all.should ==
-        [{:sum=>111111, :id=>1}, {:sum=>111111, :id=>2}, {:sum=>111111, :id=>3}, {:sum=>111111, :id=>4}, {:sum=>111111, :id=>5}, {:sum=>111111, :id=>6}]
         
       @ds.select(:id){sum(:over, :args=>amount, :partition=>group_id, :order=>id, :frame=>:rows){}.as(:sum)}.all.should ==
         [{:sum=>1, :id=>1}, {:sum=>11, :id=>2}, {:sum=>111, :id=>3}, {:sum=>1000, :id=>4}, {:sum=>11000, :id=>5}, {:sum=>111000, :id=>6}]
-      @ds.select(:id){sum(:over, :args=>amount, :partition=>group_id, :frame=>:rows){}.as(:sum)}.all.should ==
-        [{:sum=>1, :id=>1}, {:sum=>11, :id=>2}, {:sum=>111, :id=>3}, {:sum=>1000, :id=>4}, {:sum=>11000, :id=>5}, {:sum=>111000, :id=>6}]
       @ds.select(:id){sum(:over, :args=>amount, :order=>id, :frame=>:rows){}.as(:sum)}.all.should ==
         [{:sum=>1, :id=>1}, {:sum=>11, :id=>2}, {:sum=>111, :id=>3}, {:sum=>1111, :id=>4}, {:sum=>11111, :id=>5}, {:sum=>111111, :id=>6}]
-      @ds.select(:id){sum(:over, :args=>amount, :frame=>:rows){}.as(:sum)}.all.should ==
-        [{:sum=>1, :id=>1}, {:sum=>11, :id=>2}, {:sum=>111, :id=>3}, {:sum=>1111, :id=>4}, {:sum=>11111, :id=>5}, {:sum=>111111, :id=>6}]
     end
   end
 end
@@ -471,10 +703,10 @@ describe Sequel::SQL::Constants do
     @c2 = proc{|v| v.is_a?(Date) ? v : Date.parse(v) }
   end
   after do
-    @db.drop_table(:constants)
+    @db.drop_table?(:constants)
   end
   
-  cspecify "should have working CURRENT_DATE", [:odbc, :mssql], [:jdbc, :sqlite] do
+  cspecify "should have working CURRENT_DATE", [:odbc, :mssql], [:jdbc, :sqlite], :oracle do
     @db.create_table!(:constants){Date :d}
     @ds.insert(:d=>Sequel::CURRENT_DATE)
     d = @c2[@ds.get(:d)]
@@ -485,26 +717,33 @@ describe Sequel::SQL::Constants do
   cspecify "should have working CURRENT_TIME", [:do, :mysql], [:jdbc, :sqlite], [:mysql2] do
     @db.create_table!(:constants){Time :t, :only_time=>true}
     @ds.insert(:t=>Sequel::CURRENT_TIME)
-    (Time.now - @c[@ds.get(:t)]).should be_within(1).of(0)
+    (Time.now - @c[@ds.get(:t)]).should be_within(2).of(0)
   end
 
-  cspecify "should have working CURRENT_TIMESTAMP", [:jdbc, :sqlite] do
+  cspecify "should have working CURRENT_TIMESTAMP", [:jdbc, :sqlite], [:swift] do
     @db.create_table!(:constants){DateTime :ts}
     @ds.insert(:ts=>Sequel::CURRENT_TIMESTAMP)
-    (Time.now - @c[@ds.get(:ts)]).should be_within(1).of(0)
+    (Time.now - @c[@ds.get(:ts)]).should be_within(2).of(0)
+  end
+
+  cspecify "should have working CURRENT_TIMESTAMP when used as a column default", [:jdbc, :sqlite], [:swift] do
+    @db.create_table!(:constants){DateTime :ts, :default=>Sequel::CURRENT_TIMESTAMP}
+    @ds.insert
+    (Time.now - @c[@ds.get(:ts)]).should be_within(2).of(0)
   end
 end
 
 describe "Sequel::Dataset#import and #multi_insert" do
-  before do
+  before(:all) do
     @db = INTEGRATION_DB
     @db.create_table!(:imp){Integer :i}
-    @db.create_table!(:exp2){Integer :i}
     @ids = @db[:imp].order(:i)
-    @eds = @db[:exp2]
   end
-  after do
-    @db.drop_table(:imp, :exp2)
+  before do
+    @ids.delete
+  end
+  after(:all) do
+    @db.drop_table?(:imp)
   end
 
   it "should import with multi_insert and an array of hashes" do
@@ -518,9 +757,11 @@ describe "Sequel::Dataset#import and #multi_insert" do
   end
 
   it "should import with a dataset" do
-    @eds.import([:i], [[10], [20]])
-    @ids.import([:i], @eds)
+    @db.create_table!(:exp2){Integer :i}
+    @db[:exp2].import([:i], [[10], [20]])
+    @ids.import([:i], @db[:exp2])
     @ids.all.should == [{:i=>10}, {:i=>20}]
+    @db.drop_table(:exp2)
   end
   
   it "should have import work with the :slice_size option" do
@@ -535,14 +776,66 @@ describe "Sequel::Dataset#import and #multi_insert" do
   end
 end
 
-describe "Sequel::Dataset convenience methods" do
+describe "Sequel::Dataset#import and #multi_insert :return=>:primary_key " do
   before do
+    @db = INTEGRATION_DB
+    @db.create_table!(:imp){primary_key :id; Integer :i}
+    @ds = @db[:imp]
+  end
+  after do
+    @db.drop_table?(:imp)
+  end
+
+  specify "should return primary key values" do
+    @ds.multi_insert([{:i=>10}, {:i=>20}, {:i=>30}], :return=>:primary_key).should == [1, 2, 3]
+    @ds.import([:i], [[40], [50], [60]], :return=>:primary_key).should == [4, 5, 6]
+    @ds.order(:id).map([:id, :i]).should == [[1, 10], [2, 20], [3, 30], [4, 40], [5, 50], [6, 60]]
+  end
+
+  specify "should return primary key values when :slice is used" do
+    @ds.multi_insert([{:i=>10}, {:i=>20}, {:i=>30}], :return=>:primary_key, :slice=>2).should == [1, 2, 3]
+    @ds.import([:i], [[40], [50], [60]], :return=>:primary_key, :slice=>2).should == [4, 5, 6]
+    @ds.order(:id).map([:id, :i]).should == [[1, 10], [2, 20], [3, 30], [4, 40], [5, 50], [6, 60]]
+  end
+end
+
+describe "Sequel::Dataset convenience methods" do
+  before(:all) do
+    @db = INTEGRATION_DB
+    @db.create_table!(:a){Integer :a; Integer :b; Integer :c}
+    @ds = @db[:a]
+    @ds.insert(1, 3, 5)
+    @ds.insert(1, 3, 6)
+    @ds.insert(1, 4, 5)
+    @ds.insert(2, 3, 5)
+    @ds.insert(2, 4, 6)
+  end
+  after(:all) do
+    @db.drop_table?(:a)
+  end
+  
+  it "#group_rollup should include hierarchy of groupings" do
+    @ds.group_by(:a).group_rollup.select_map([:a, Sequel.function(:sum, :b).cast(Integer).as(:b), Sequel.function(:sum, :c).cast(Integer).as(:c)]).sort_by{|x| x.inspect}.should == [[1, 10, 16], [2, 7, 11], [nil, 17, 27]]
+    @ds.group_by(:a, :b).group_rollup.select_map([:a, :b, Sequel.function(:sum, :c).cast(Integer).as(:c)]).sort_by{|x| x.inspect}.should == [[1, 3, 11], [1, 4, 5], [1, nil, 16], [2, 3, 5], [2, 4, 6], [2, nil, 11], [nil, nil, 27]]
+  end if INTEGRATION_DB.dataset.supports_group_rollup?
+
+  it "#group_cube should include all combinations of groupings" do
+    @ds.group_by(:a).group_cube.select_map([:a, Sequel.function(:sum, :b).cast(Integer).as(:b), Sequel.function(:sum, :c).cast(Integer).as(:c)]).sort_by{|x| x.inspect}.should == [[1, 10, 16], [2, 7, 11], [nil, 17, 27]]
+    @ds.group_by(:a, :b).group_cube.select_map([:a, :b, Sequel.function(:sum, :c).cast(Integer).as(:c)]).sort_by{|x| x.inspect}.should == [[1, 3, 11], [1, 4, 5], [1, nil, 16], [2, 3, 5], [2, 4, 6], [2, nil, 11], [nil, 3, 16], [nil, 4, 11], [nil, nil, 27]]
+  end if INTEGRATION_DB.dataset.supports_group_cube?
+end
+
+describe "Sequel::Dataset convenience methods" do
+  before(:all) do
     @db = INTEGRATION_DB
     @db.create_table!(:a){Integer :a; Integer :b}
     @ds = @db[:a].order(:a)
   end
-  after do
-    @db.drop_table(:a)
+  before do
+    @ds.delete
+  end
+  after(:all) do
+    @db.drop_table?(:a)
   end
   
   it "#[]= should update matching rows" do
@@ -557,6 +850,22 @@ describe "Sequel::Dataset convenience methods" do
     @ds.empty?.should == false
   end
   
+  it "#empty? should work correctly for datasets with limits" do
+    ds = @ds.limit(1)
+    ds.empty?.should == true
+    ds.insert(20, 10)
+    ds.empty?.should == false
+  end
+  
+  it "#empty? should work correctly for datasets with limits and offsets" do
+    ds = @ds.limit(1, 1)
+    ds.empty?.should == true
+    ds.insert(20, 10)
+    ds.empty?.should == true
+    ds.insert(20, 10)
+    ds.empty?.should == false
+  end
+  
   it "#group_and_count should return a grouping by count" do
     @ds.group_and_count(:a).order(:count).all.should == []
     @ds.insert(20, 10)
@@ -577,7 +886,7 @@ describe "Sequel::Dataset convenience methods" do
     @ds.group_and_count(:a___c).order(:count).all.each{|h| h[:count] = h[:count].to_i}.should == [{:c=>30, :count=>1}, {:c=>20, :count=>2}]
   end
   
-  cspecify "#range should return the range between the maximum and minimum values", :sqlite do
+  specify "#range should return the range between the maximum and minimum values" do
     @ds = @ds.unordered
     @ds.insert(20, 10)
     @ds.insert(30, 10)
@@ -595,13 +904,16 @@ describe "Sequel::Dataset convenience methods" do
 end
   
 describe "Sequel::Dataset main SQL methods" do
-  before do
+  before(:all) do
     @db = INTEGRATION_DB
     @db.create_table!(:a){Integer :a; Integer :b}
     @ds = @db[:a].order(:a)
   end
-  after do
-    @db.drop_table(:a)
+  before do
+    @ds.delete
+  end
+  after(:all) do
+    @db.drop_table?(:a)
   end
   
   it "#exists should return a usable exists clause" do
@@ -625,6 +937,23 @@ describe "Sequel::Dataset main SQL methods" do
     @ds.filter(:a=>20).or(:b=>15).all.should == [{:a=>20, :b=>30}]
     @ds.filter(:a=>10).or(:b=>15).all.should == []
   end
+
+  it "#select_group should work correctly" do
+    @ds.unordered!
+    @ds.select_group(:a).all.should == []
+    @ds.insert(20, 30)
+    @ds.select_group(:a).all.should == [{:a=>20}]
+    @ds.select_group(:b).all.should == [{:b=>30}]
+    @ds.insert(20, 40)
+    @ds.select_group(:a).all.should == [{:a=>20}]
+    @ds.order(:b).select_group(:b).all.should == [{:b=>30}, {:b=>40}]
+  end
+
+  it "#select_group should work correctly when aliasing" do
+    @ds.unordered!
+    @ds.insert(20, 30)
+    @ds.select_group(:b___c).all.should == [{:c=>30}]
+  end
   
   it "#having should work correctly" do
     @ds.unordered!
@@ -645,14 +974,119 @@ describe "Sequel::Dataset main SQL methods" do
   end
 end
 
-describe "Sequel::Dataset DSL support" do
+describe "Sequel::Dataset convenience methods" do
+  before(:all) do
+    @db = INTEGRATION_DB
+    @db.create_table!(:a){Integer :a; Integer :b; Integer :c; Integer :d}
+    @ds = @db[:a].order(:a)
+  end
   before do
+    @ds.delete
+    @ds.insert(1, 2, 3, 4)
+    @ds.insert(5, 6, 7, 8)
+  end
+  after(:all) do
+    @db.drop_table?(:a)
+  end
+  
+  specify "should have working #map" do
+    @ds.map(:a).should == [1, 5]
+    @ds.map(:b).should == [2, 6]
+    @ds.map([:a, :b]).should == [[1, 2], [5, 6]]
+  end
+  
+  specify "should have working #to_hash" do
+    @ds.to_hash(:a).should == {1=>{:a=>1, :b=>2, :c=>3, :d=>4}, 5=>{:a=>5, :b=>6, :c=>7, :d=>8}}
+    @ds.to_hash(:b).should == {2=>{:a=>1, :b=>2, :c=>3, :d=>4}, 6=>{:a=>5, :b=>6, :c=>7, :d=>8}}
+    @ds.to_hash([:a, :b]).should == {[1, 2]=>{:a=>1, :b=>2, :c=>3, :d=>4}, [5, 6]=>{:a=>5, :b=>6, :c=>7, :d=>8}}
+
+    @ds.to_hash(:a, :b).should == {1=>2, 5=>6}
+    @ds.to_hash([:a, :c], :b).should == {[1, 3]=>2, [5, 7]=>6}
+    @ds.to_hash(:a, [:b, :c]).should == {1=>[2, 3], 5=>[6, 7]}
+    @ds.to_hash([:a, :c], [:b, :d]).should == {[1, 3]=>[2, 4], [5, 7]=>[6, 8]}
+  end
+
+  specify "should have working #to_hash_groups" do
+    ds = @ds.order(*@ds.columns)
+    ds.insert(1, 2, 3, 9)
+    ds.to_hash_groups(:a).should == {1=>[{:a=>1, :b=>2, :c=>3, :d=>4}, {:a=>1, :b=>2, :c=>3, :d=>9}], 5=>[{:a=>5, :b=>6, :c=>7, :d=>8}]}
+    ds.to_hash_groups(:b).should == {2=>[{:a=>1, :b=>2, :c=>3, :d=>4}, {:a=>1, :b=>2, :c=>3, :d=>9}], 6=>[{:a=>5, :b=>6, :c=>7, :d=>8}]}
+    ds.to_hash_groups([:a, :b]).should == {[1, 2]=>[{:a=>1, :b=>2, :c=>3, :d=>4}, {:a=>1, :b=>2, :c=>3, :d=>9}], [5, 6]=>[{:a=>5, :b=>6, :c=>7, :d=>8}]}
+
+    ds.to_hash_groups(:a, :d).should == {1=>[4, 9], 5=>[8]}
+    ds.to_hash_groups([:a, :c], :d).should == {[1, 3]=>[4, 9], [5, 7]=>[8]}
+    ds.to_hash_groups(:a, [:b, :d]).should == {1=>[[2, 4], [2, 9]], 5=>[[6, 8]]}
+    ds.to_hash_groups([:a, :c], [:b, :d]).should == {[1, 3]=>[[2, 4], [2, 9]], [5, 7]=>[[6, 8]]}
+  end
+
+  specify "should have working #select_map" do
+    @ds.select_map(:a).should == [1, 5]
+    @ds.select_map(:b).should == [2, 6]
+    @ds.select_map([:a]).should == [[1], [5]]
+    @ds.select_map([:a, :b]).should == [[1, 2], [5, 6]]
+
+    @ds.select_map(:a___e).should == [1, 5]
+    @ds.select_map(:b___e).should == [2, 6]
+    @ds.select_map([:a___e, :b___f]).should == [[1, 2], [5, 6]]
+    @ds.select_map([:a__a___e, :a__b___f]).should == [[1, 2], [5, 6]]
+    @ds.select_map([Sequel.expr(:a__a).as(:e), Sequel.expr(:a__b).as(:f)]).should == [[1, 2], [5, 6]]
+    @ds.select_map([Sequel.qualify(:a, :a).as(:e), Sequel.qualify(:a, :b).as(:f)]).should == [[1, 2], [5, 6]]
+    @ds.select_map([Sequel.identifier(:a).qualify(:a).as(:e), Sequel.qualify(:a, :b).as(:f)]).should == [[1, 2], [5, 6]]
+  end
+  
+  specify "should have working #select_order_map" do
+    @ds.select_order_map(:a).should == [1, 5]
+    @ds.select_order_map(Sequel.desc(:a__b)).should == [6, 2]
+    @ds.select_order_map(Sequel.desc(:a__b___e)).should == [6, 2]
+    @ds.select_order_map(Sequel.qualify(:a, :b).as(:e)).should == [2, 6]
+    @ds.select_order_map([:a]).should == [[1], [5]]
+    @ds.select_order_map([Sequel.desc(:a), :b]).should == [[5, 6], [1, 2]]
+
+    @ds.select_order_map(:a___e).should == [1, 5]
+    @ds.select_order_map(:b___e).should == [2, 6]
+    @ds.select_order_map([Sequel.desc(:a___e), :b___f]).should == [[5, 6], [1, 2]]
+    @ds.select_order_map([Sequel.desc(:a__a___e), :a__b___f]).should == [[5, 6], [1, 2]]
+    @ds.select_order_map([Sequel.desc(:a__a), Sequel.expr(:a__b).as(:f)]).should == [[5, 6], [1, 2]]
+    @ds.select_order_map([Sequel.qualify(:a, :a).desc, Sequel.qualify(:a, :b).as(:f)]).should == [[5, 6], [1, 2]]
+    @ds.select_order_map([Sequel.identifier(:a).qualify(:a).desc, Sequel.qualify(:a, :b).as(:f)]).should == [[5, 6], [1, 2]]
+  end
+
+  specify "should have working #select_hash" do
+    @ds.select_hash(:a, :b).should == {1=>2, 5=>6}
+    @ds.select_hash(:a__a___e, :b).should == {1=>2, 5=>6}
+    @ds.select_hash(Sequel.expr(:a__a).as(:e), :b).should == {1=>2, 5=>6}
+    @ds.select_hash(Sequel.qualify(:a, :a).as(:e), :b).should == {1=>2, 5=>6}
+    @ds.select_hash(Sequel.identifier(:a).qualify(:a).as(:e), :b).should == {1=>2, 5=>6}
+    @ds.select_hash([:a, :c], :b).should == {[1, 3]=>2, [5, 7]=>6}
+    @ds.select_hash(:a, [:b, :c]).should == {1=>[2, 3], 5=>[6, 7]}
+    @ds.select_hash([:a, :c], [:b, :d]).should == {[1, 3]=>[2, 4], [5, 7]=>[6, 8]}
+  end
+
+  specify "should have working #select_hash_groups" do
+    ds = @ds.order(*@ds.columns)
+    ds.insert(1, 2, 3, 9)
+    ds.select_hash_groups(:a, :d).should == {1=>[4, 9], 5=>[8]}
+    ds.select_hash_groups(:a__a___e, :d).should == {1=>[4, 9], 5=>[8]}
+    ds.select_hash_groups(Sequel.expr(:a__a).as(:e), :d).should == {1=>[4, 9], 5=>[8]}
+    ds.select_hash_groups(Sequel.qualify(:a, :a).as(:e), :d).should == {1=>[4, 9], 5=>[8]}
+    ds.select_hash_groups(Sequel.identifier(:a).qualify(:a).as(:e), :d).should == {1=>[4, 9], 5=>[8]}
+    ds.select_hash_groups([:a, :c], :d).should == {[1, 3]=>[4, 9], [5, 7]=>[8]}
+    ds.select_hash_groups(:a, [:b, :d]).should == {1=>[[2, 4], [2, 9]], 5=>[[6, 8]]}
+    ds.select_hash_groups([:a, :c], [:b, :d]).should == {[1, 3]=>[[2, 4], [2, 9]], [5, 7]=>[[6, 8]]}
+  end
+end
+
+describe "Sequel::Dataset DSL support" do
+  before(:all) do
     @db = INTEGRATION_DB
     @db.create_table!(:a){Integer :a; Integer :b}
     @ds = @db[:a].order(:a)
   end
-  after do
-    @db.drop_table(:a)
+  before do
+    @ds.delete
+  end
+  after(:all) do
+    @db.drop_table?(:a)
   end
   
   it "should work with standard mathematical operators" do
@@ -663,31 +1097,43 @@ describe "Sequel::Dataset DSL support" do
     @ds.get{a / b}.to_i.should == 2
   end
   
-  specify "should work with bitwise shift operators" do
+  cspecify "should work with bitwise shift operators", :derby do
     @ds.insert(3, 2)
     @ds.get{a.sql_number << b}.to_i.should == 12
     @ds.get{a.sql_number >> b}.to_i.should == 0
+    @ds.get{a.sql_number << b << 1}.to_i.should == 24
     @ds.delete
     @ds.insert(3, 1)
     @ds.get{a.sql_number << b}.to_i.should == 6
     @ds.get{a.sql_number >> b}.to_i.should == 1
+    @ds.get{a.sql_number >> b >> 1}.to_i.should == 0
   end
 
-  specify "should work with bitwise AND and OR operators" do
+  cspecify "should work with bitwise AND and OR operators", :derby do
     @ds.insert(3, 5)
     @ds.get{a.sql_number | b}.to_i.should == 7
     @ds.get{a.sql_number & b}.to_i.should == 1
+    @ds.get{a.sql_number | b | 8}.to_i.should == 15
+    @ds.get{a.sql_number & b & 8}.to_i.should == 0
   end
   
-  cspecify "should work with the bitwise compliment operator", :h2 do
+  specify "should work with the bitwise compliment operator" do
     @ds.insert(-3, 3)
     @ds.get{~a.sql_number}.to_i.should == 2
     @ds.get{~b.sql_number}.to_i.should == -4
   end
   
-  cspecify "should work with the bitwise xor operator", :sqlite do
+  cspecify "should work with the bitwise xor operator", :derby do
     @ds.insert(3, 5)
     @ds.get{a.sql_number ^ b}.to_i.should == 6
+    @ds.get{a.sql_number ^ b ^ 1}.to_i.should == 7
+  end
+  
+  specify "should work with the modulus operator" do
+    @ds.insert(3, 5)
+    @ds.get{a.sql_number % 4}.to_i.should == 3
+    @ds.get{b.sql_number % 4}.to_i.should == 1
+    @ds.get{a.sql_number % 4 % 2}.to_i.should == 1
   end
   
   specify "should work with inequality operators" do
@@ -703,35 +1149,35 @@ describe "Sequel::Dataset DSL support" do
   
   specify "should work with casting and string concatentation" do
     @ds.insert(20, 20)
-    @ds.get{a.cast_string + b.cast_string}.should == '2020'
+    @ds.get{Sequel.cast(a, String).sql_string + Sequel.cast(b, String)}.should == '2020'
   end
   
   it "should work with ordering" do
     @ds.insert(10, 20)
     @ds.insert(20, 10)
     @ds.order(:a, :b).all.should == [{:a=>10, :b=>20}, {:a=>20, :b=>10}]
-    @ds.order(:a.asc, :b.asc).all.should == [{:a=>10, :b=>20}, {:a=>20, :b=>10}]
-    @ds.order(:a.desc, :b.desc).all.should == [{:a=>20, :b=>10}, {:a=>10, :b=>20}]
+    @ds.order(Sequel.asc(:a), Sequel.asc(:b)).all.should == [{:a=>10, :b=>20}, {:a=>20, :b=>10}]
+    @ds.order(Sequel.desc(:a), Sequel.desc(:b)).all.should == [{:a=>20, :b=>10}, {:a=>10, :b=>20}]
   end
   
   it "should work with qualifying" do
     @ds.insert(10, 20)
     @ds.get(:a__b).should == 20
     @ds.get{a__b}.should == 20
-    @ds.get(:b.qualify(:a)).should == 20
+    @ds.get(Sequel.qualify(:a, :b)).should == 20
   end
   
   it "should work with aliasing" do
     @ds.insert(10, 20)
     @ds.get(:a__b___c).should == 20
     @ds.get{a__b.as(c)}.should == 20
-    @ds.get(:b.qualify(:a).as(:c)).should == 20
-    @ds.get(:b.as(:c)).should == 20
+    @ds.get(Sequel.qualify(:a, :b).as(:c)).should == 20
+    @ds.get(Sequel.as(:b, :c)).should == 20
   end
   
   it "should work with selecting all columns of a table" do
     @ds.insert(20, 10)
-    @ds.select(:a.*).all.should == [{:a=>20, :b=>10}]
+    @ds.select_all(:a).all.should == [{:a=>20, :b=>10}]
   end
   
   it "should work with ranges as hash values" do
@@ -772,24 +1218,24 @@ describe "Sequel::Dataset DSL support" do
   
   it "should work with CASE statements" do
     @ds.insert(20, 10)
-    @ds.filter({{:a=>20}=>20}.case(0) > 0).all.should == [{:a=>20, :b=>10}]
-    @ds.filter({{:a=>15}=>20}.case(0) > 0).all.should == []
-    @ds.filter({20=>20}.case(0, :a) > 0).all.should == [{:a=>20, :b=>10}]
-    @ds.filter({15=>20}.case(0, :a) > 0).all.should == []
+    @ds.filter(Sequel.case({{:a=>20}=>20}, 0) > 0).all.should == [{:a=>20, :b=>10}]
+    @ds.filter(Sequel.case({{:a=>15}=>20}, 0) > 0).all.should == []
+    @ds.filter(Sequel.case({20=>20}, 0, :a) > 0).all.should == [{:a=>20, :b=>10}]
+    @ds.filter(Sequel.case({15=>20}, 0, :a) > 0).all.should == []
   end
   
-  it "should work with multiple value arrays" do
+  specify "should work with multiple value arrays" do
     @ds.insert(20, 10)
     @ds.quote_identifiers = false
-    @ds.filter([:a, :b]=>[[20, 10]].sql_array).all.should == [{:a=>20, :b=>10}]
-    @ds.filter([:a, :b]=>[[10, 20]].sql_array).all.should == []
-    @ds.filter([:a, :b]=>[[20, 10], [1, 2]].sql_array).all.should == [{:a=>20, :b=>10}]
-    @ds.filter([:a, :b]=>[[10, 10], [20, 20]].sql_array).all.should == []
+    @ds.filter([:a, :b]=>[[20, 10]]).all.should == [{:a=>20, :b=>10}]
+    @ds.filter([:a, :b]=>[[10, 20]]).all.should == []
+    @ds.filter([:a, :b]=>[[20, 10], [1, 2]]).all.should == [{:a=>20, :b=>10}]
+    @ds.filter([:a, :b]=>[[10, 10], [20, 20]]).all.should == []
     
-    @ds.exclude([:a, :b]=>[[20, 10]].sql_array).all.should == []
-    @ds.exclude([:a, :b]=>[[10, 20]].sql_array).all.should == [{:a=>20, :b=>10}]
-    @ds.exclude([:a, :b]=>[[20, 10], [1, 2]].sql_array).all.should == []
-    @ds.exclude([:a, :b]=>[[10, 10], [20, 20]].sql_array).all.should == [{:a=>20, :b=>10}]
+    @ds.exclude([:a, :b]=>[[20, 10]]).all.should == []
+    @ds.exclude([:a, :b]=>[[10, 20]]).all.should == [{:a=>20, :b=>10}]
+    @ds.exclude([:a, :b]=>[[20, 10], [1, 2]]).all.should == []
+    @ds.exclude([:a, :b]=>[[10, 10], [20, 20]]).all.should == [{:a=>20, :b=>10}]
   end
 
   it "should work with IN/NOT in with datasets" do
@@ -822,18 +1268,49 @@ describe "Sequel::Dataset DSL support" do
   specify "should work empty arrays with nulls" do
     @ds.insert(nil, nil)
     @ds.filter(:a=>[]).all.should == []
-    @ds.exclude(:a=>[]).all.should == [{:a=>nil, :b=>nil}]
+    @ds.exclude(:a=>[]).all.should == []
     @ds.filter([:a, :b]=>[]).all.should == []
-    @ds.exclude([:a, :b]=>[]).all.should == [{:a=>nil, :b=>nil}]
+    @ds.exclude([:a, :b]=>[]).all.should == []
+
+    unless Sequel.guarded?(:mssql, :oracle, :db2)
+      # Some databases don't like boolean results in the select list
+      pr = proc{|r| r.is_a?(Integer) ? (r != 0) : r}
+      pr[@ds.get(Sequel.expr(:a=>[]))].should == nil
+      pr[@ds.get(~Sequel.expr(:a=>[]))].should == nil
+      pr[@ds.get(Sequel.expr([:a, :b]=>[]))].should == nil
+      pr[@ds.get(~Sequel.expr([:a, :b]=>[]))].should == nil
+    end
   end
   
+  specify "should work empty arrays with nulls and Sequel.empty_array_null_handling = true" do
+    begin
+      Sequel.empty_array_handle_nulls = false
+      @ds.insert(nil, nil)
+      @ds.filter(:a=>[]).all.should == []
+      @ds.exclude(:a=>[]).all.should == [{:a=>nil, :b=>nil}]
+      @ds.filter([:a, :b]=>[]).all.should == []
+      @ds.exclude([:a, :b]=>[]).all.should == [{:a=>nil, :b=>nil}]
+
+      unless Sequel.guarded?(:mssql, :oracle, :db2)
+        # Some databases don't like boolean results in the select list
+        pr = proc{|r| r.is_a?(Integer) ? (r != 0) : r}
+        pr[@ds.get(Sequel.expr(:a=>[]))].should == false
+        pr[@ds.get(~Sequel.expr(:a=>[]))].should == true
+        pr[@ds.get(Sequel.expr([:a, :b]=>[]))].should == false
+        pr[@ds.get(~Sequel.expr([:a, :b]=>[]))].should == true
+      end
+    ensure
+      Sequel.empty_array_handle_nulls = true
+    end
+  end
+
   it "should work multiple conditions" do
     @ds.insert(20, 10)
     @ds.filter(:a=>20, :b=>10).all.should == [{:a=>20, :b=>10}]
     @ds.filter([[:a, 20], [:b, 10]]).all.should == [{:a=>20, :b=>10}]
-    @ds.filter({:a=>20} & {:b=>10}).all.should == [{:a=>20, :b=>10}]
-    @ds.filter({:a=>20} | {:b=>5}).all.should == [{:a=>20, :b=>10}]
-    @ds.filter(~{:a=>10}).all.should == [{:a=>20, :b=>10}]
+    @ds.filter({:a=>20}, {:b=>10}).all.should == [{:a=>20, :b=>10}]
+    @ds.filter(Sequel.|({:a=>20}, {:b=>5})).all.should == [{:a=>20, :b=>10}]
+    @ds.filter(Sequel.~(:a=>10)).all.should == [{:a=>20, :b=>10}]
   end
 end
 
@@ -844,26 +1321,40 @@ describe "SQL Extract Function" do
     @ds = @db[:a].order(:a)
   end
   after do
-    @db.drop_table(:a)
+    @db.drop_table?(:a)
   end
   
-  cspecify "should return the part of the datetime asked for", :sqlite, :mssql do
+  specify "should return the part of the datetime asked for" do
     t = Time.now
+    def @ds.supports_timestamp_timezones?() false end
     @ds.insert(t)
     @ds.get{a.extract(:year)}.should == t.year
     @ds.get{a.extract(:month)}.should == t.month
     @ds.get{a.extract(:day)}.should == t.day
+    @ds.get{a.extract(:hour)}.should == t.hour
+    @ds.get{a.extract(:minute)}.should == t.min
+    @ds.get{a.extract(:second)}.to_i.should == t.sec
   end
 end
 
 describe "Dataset string methods" do
-  before do
+  before(:all) do
     @db = INTEGRATION_DB
-    @db.create_table!(:a){String :a; String :b}
+    csc = {}
+    cic = {}
+    csc[:collate] = @db.dataset_class::CASE_SENSITIVE_COLLATION if defined? @db.dataset_class::CASE_SENSITIVE_COLLATION
+    cic[:collate] = @db.dataset_class::CASE_INSENSITIVE_COLLATION if defined? @db.dataset_class::CASE_INSENSITIVE_COLLATION
+    @db.create_table!(:a) do
+      String :a, csc
+      String :b, cic
+    end
     @ds = @db[:a].order(:a)
   end
-  after do
-    @db.drop_table(:a)
+  before do
+    @ds.delete
+  end
+  after(:all) do
+    @db.drop_table?(:a)
   end
   
   it "#grep should return matching rows" do
@@ -877,15 +1368,15 @@ describe "Dataset string methods" do
   end
   
   it "#grep should work with :all_patterns and :all_columns options" do
-    @ds.insert('foo bar', '')
+    @ds.insert('foo bar', ' ')
     @ds.insert('foo d', 'bar')
-    @ds.insert('foo e', '')
-    @ds.insert('', 'bar')
+    @ds.insert('foo e', ' ')
+    @ds.insert(' ', 'bar')
     @ds.insert('foo f', 'baz')
     @ds.insert('foo baz', 'bar baz')
     @ds.insert('foo boo', 'boo foo')
 
-    @ds.grep([:a, :b], %w'%foo% %bar%', :all_patterns=>true).all.should == [{:a=>'foo bar', :b=>''}, {:a=>'foo baz', :b=>'bar baz'}, {:a=>'foo d', :b=>'bar'}]
+    @ds.grep([:a, :b], %w'%foo% %bar%', :all_patterns=>true).all.should == [{:a=>'foo bar', :b=>' '}, {:a=>'foo baz', :b=>'bar baz'}, {:a=>'foo d', :b=>'bar'}]
     @ds.grep([:a, :b], %w'%foo% %bar% %blob%', :all_patterns=>true).all.should == []
 
     @ds.grep([:a, :b], %w'%bar% %foo%', :all_columns=>true).all.should == [{:a=>"foo baz", :b=>"bar baz"}, {:a=>"foo boo", :b=>"boo foo"}, {:a=>"foo d", :b=>"bar"}]
@@ -897,27 +1388,82 @@ describe "Dataset string methods" do
   
   it "#like should return matching rows" do
     @ds.insert('foo', 'bar')
-    @ds.filter(:a.like('foo')).all.should == [{:a=>'foo', :b=>'bar'}]
-    @ds.filter(:a.like('bar')).all.should == []
-    @ds.filter(:a.like('foo', 'bar')).all.should == [{:a=>'foo', :b=>'bar'}]
+    @ds.filter(Sequel.expr(:a).like('foo')).all.should == [{:a=>'foo', :b=>'bar'}]
+    @ds.filter(Sequel.expr(:a).like('bar')).all.should == []
+    @ds.filter(Sequel.expr(:a).like('foo', 'bar')).all.should == [{:a=>'foo', :b=>'bar'}]
+    @ds.exclude(Sequel.expr(:a).like('foo')).all.should == []
+    @ds.exclude(Sequel.expr(:a).like('bar')).all.should == [{:a=>'foo', :b=>'bar'}]
+    @ds.exclude(Sequel.expr(:a).like('foo', 'bar')).all.should == []
+  end
+  
+  it "#like should be case sensitive" do
+    @ds.insert('foo', 'bar')
+    @ds.filter(Sequel.expr(:a).like('Foo')).all.should == []
+    @ds.filter(Sequel.expr(:b).like('baR')).all.should == []
+    @ds.filter(Sequel.expr(:a).like('FOO', 'BAR')).all.should == []
+    @ds.exclude(Sequel.expr(:a).like('Foo')).all.should == [{:a=>'foo', :b=>'bar'}]
+    @ds.exclude(Sequel.expr(:b).like('baR')).all.should == [{:a=>'foo', :b=>'bar'}]
+    @ds.exclude(Sequel.expr(:a).like('FOO', 'BAR')).all.should == [{:a=>'foo', :b=>'bar'}]
   end
   
   it "#ilike should return matching rows, in a case insensitive manner" do
     @ds.insert('foo', 'bar')
-    @ds.filter(:a.ilike('Foo')).all.should == [{:a=>'foo', :b=>'bar'}]
-    @ds.filter(:a.ilike('baR')).all.should == []
-    @ds.filter(:a.ilike('FOO', 'BAR')).all.should == [{:a=>'foo', :b=>'bar'}]
+    @ds.filter(Sequel.expr(:a).ilike('Foo')).all.should == [{:a=>'foo', :b=>'bar'}]
+    @ds.filter(Sequel.expr(:a).ilike('baR')).all.should == []
+    @ds.filter(Sequel.expr(:a).ilike('FOO', 'BAR')).all.should == [{:a=>'foo', :b=>'bar'}]
+    @ds.exclude(Sequel.expr(:a).ilike('Foo')).all.should == []
+    @ds.exclude(Sequel.expr(:a).ilike('baR')).all.should == [{:a=>'foo', :b=>'bar'}]
+    @ds.exclude(Sequel.expr(:a).ilike('FOO', 'BAR')).all.should == []
   end
   
-  it "should work with strings created with sql_string_join" do
+  if INTEGRATION_DB.dataset.supports_regexp?
+    it "#like with regexp return matching rows" do
+      @ds.insert('foo', 'bar')
+      @ds.filter(Sequel.expr(:a).like(/fo/)).all.should == [{:a=>'foo', :b=>'bar'}]
+      @ds.filter(Sequel.expr(:a).like(/fo$/)).all.should == []
+      @ds.filter(Sequel.expr(:a).like(/fo/, /ar/)).all.should == [{:a=>'foo', :b=>'bar'}]
+      @ds.exclude(Sequel.expr(:a).like(/fo/)).all.should == []
+      @ds.exclude(Sequel.expr(:a).like(/fo$/)).all.should == [{:a=>'foo', :b=>'bar'}]
+      @ds.exclude(Sequel.expr(:a).like(/fo/, /ar/)).all.should == []
+    end
+    
+    it "#like with regexp should be case sensitive if regexp is case sensitive" do
+      @ds.insert('foo', 'bar')
+      @ds.filter(Sequel.expr(:a).like(/Fo/)).all.should == []
+      @ds.filter(Sequel.expr(:b).like(/baR/)).all.should == []
+      @ds.filter(Sequel.expr(:a).like(/FOO/, /BAR/)).all.should == []
+      @ds.exclude(Sequel.expr(:a).like(/Fo/)).all.should == [{:a=>'foo', :b=>'bar'}]
+      @ds.exclude(Sequel.expr(:b).like(/baR/)).all.should == [{:a=>'foo', :b=>'bar'}]
+      @ds.exclude(Sequel.expr(:a).like(/FOO/, /BAR/)).all.should == [{:a=>'foo', :b=>'bar'}]
+
+      @ds.filter(Sequel.expr(:a).like(/Fo/i)).all.should == [{:a=>'foo', :b=>'bar'}]
+      @ds.filter(Sequel.expr(:b).like(/baR/i)).all.should == [{:a=>'foo', :b=>'bar'}]
+      @ds.filter(Sequel.expr(:a).like(/FOO/i, /BAR/i)).all.should == [{:a=>'foo', :b=>'bar'}]
+      @ds.exclude(Sequel.expr(:a).like(/Fo/i)).all.should == []
+      @ds.exclude(Sequel.expr(:b).like(/baR/i)).all.should == []
+      @ds.exclude(Sequel.expr(:a).like(/FOO/i, /BAR/i)).all.should == []
+    end
+    
+    it "#ilike with regexp should return matching rows, in a case insensitive manner" do
+      @ds.insert('foo', 'bar')
+      @ds.filter(Sequel.expr(:a).ilike(/Fo/)).all.should == [{:a=>'foo', :b=>'bar'}]
+      @ds.filter(Sequel.expr(:b).ilike(/baR/)).all.should == [{:a=>'foo', :b=>'bar'}]
+      @ds.filter(Sequel.expr(:a).ilike(/FOO/, /BAR/)).all.should == [{:a=>'foo', :b=>'bar'}]
+      @ds.exclude(Sequel.expr(:a).ilike(/Fo/)).all.should == []
+      @ds.exclude(Sequel.expr(:b).ilike(/baR/)).all.should == []
+      @ds.exclude(Sequel.expr(:a).ilike(/FOO/, /BAR/)).all.should == []
+    end
+  end
+  
+  it "should work with strings created with Sequel.join" do
     @ds.insert('foo', 'bar')
-    @ds.get([:a, :b].sql_string_join).should == 'foobar'
-    @ds.get([:a, :b].sql_string_join(' ')).should == 'foo bar'
+    @ds.get(Sequel.join([:a, "bar"])).should == 'foobar'
+    @ds.get(Sequel.join(["foo", :b], ' ')).should == 'foo bar'
   end
 end
 
 describe "Dataset identifier methods" do
-  before do
+  before(:all) do
     class ::String
       def uprev
         upcase.reverse
@@ -925,20 +1471,27 @@ describe "Dataset identifier methods" do
     end
     @db = INTEGRATION_DB
     @db.create_table!(:a){Integer :ab}
+    @db[:a].insert(1)
+  end
+  before do
     @ds = @db[:a].order(:ab)
-    @ds.insert(1)
   end
-  after do
-    @db.drop_table(:a)
+  after(:all) do
+    @db.drop_table?(:a)
   end
   
-  cspecify "#identifier_output_method should change how identifiers are output", [:mysql2], [:swift] do
+  specify "#identifier_output_method should change how identifiers are output" do
     @ds.identifier_output_method = :upcase
     @ds.first.should == {:AB=>1}
     @ds.identifier_output_method = :uprev
     @ds.first.should == {:BA=>1}
   end
   
+  it "should work with a nil identifier_output_method" do
+    @ds.identifier_output_method = nil
+    [{:ab=>1}, {:AB=>1}].should include(@ds.first)
+  end
+
   it "should work when not quoting identifiers" do
     @ds.quote_identifiers = false
     @ds.first.should == {:ab=>1}
@@ -946,13 +1499,16 @@ describe "Dataset identifier methods" do
 end
 
 describe "Dataset defaults and overrides" do
-  before do
+  before(:all) do
     @db = INTEGRATION_DB
     @db.create_table!(:a){Integer :a}
     @ds = @db[:a].order(:a)
   end
-  after do
-    @db.drop_table(:a)
+  before do
+    @ds.delete
+  end
+  after(:all) do
+    @db.drop_table?(:a)
   end
   
   it "#set_defaults should set defaults that can be overridden" do
@@ -977,7 +1533,7 @@ if INTEGRATION_DB.dataset.supports_modifying_joins?
       @db.create_table!(:a){Integer :a; Integer :d}
       @db.create_table!(:b){Integer :b; Integer :e}
       @db.create_table!(:c){Integer :c; Integer :f}
-      @ds = @db.from(:a, :b).join(:c, :c=>:e.identifier).where(:d=>:b, :f=>6)
+      @ds = @db.from(:a, :b).join(:c, :c=>Sequel.identifier(:e)).where(:d=>:b, :f=>6)
       @db[:a].insert(1, 2)
       @db[:a].insert(3, 4)
       @db[:b].insert(2, 5)
@@ -986,7 +1542,7 @@ if INTEGRATION_DB.dataset.supports_modifying_joins?
       @db[:c].insert(7, 8)
     end
     after do
-      @db.drop_table(:a, :b, :c)
+      @db.drop_table?(:a, :b, :c)
     end
     
     it "#update should allow updating joined datasets" do
@@ -1006,3 +1562,35 @@ if INTEGRATION_DB.dataset.supports_modifying_joins?
     end
   end
 end
+
+describe "Emulated functions" do
+  before(:all) do
+    @db = INTEGRATION_DB
+    @db.create_table!(:a){String :a}
+    @ds = @db[:a]
+  end
+  after(:all) do
+    @db.drop_table?(:a)
+  end
+  after do
+    @ds.delete
+  end
+  
+  specify "Sequel.char_length should return the length of characters in the string" do
+    @ds.get(Sequel.char_length(:a)).should == nil
+    @ds.insert(:a=>'foo')
+    @ds.get(Sequel.char_length(:a)).should == 3
+    # Check behavior with leading/trailing blanks
+    @ds.update(:a=>' foo22 ')
+    @ds.get(Sequel.char_length(:a)).should == 7
+  end
+  
+  specify "Sequel.trim should return the string with spaces trimmed from both sides" do
+    @ds.get(Sequel.trim(:a)).should == nil
+    @ds.insert(:a=>'foo')
+    @ds.get(Sequel.trim(:a)).should == 'foo'
+    # Check behavior with leading/trailing blanks
+    @ds.update(:a=>' foo22 ')
+    @ds.get(Sequel.trim(:a)).should == 'foo22'
+  end
+end