sequel 3.21.0 → 3.36.0

data/spec/adapters/mysql_spec.rb

@@ -26,9 +26,7 @@ def logger.method_missing(m, msg)
   MYSQL_DB.sqls << msg
 end
 MYSQL_DB.loggers = [logger]
-MYSQL_DB.drop_table(:items) rescue nil
-MYSQL_DB.drop_table(:dolls) rescue nil
-MYSQL_DB.drop_table(:booltest) rescue nil
+MYSQL_DB.drop_table?(:items, :dolls, :booltest)
 
 SQL_BEGIN = 'BEGIN'
 SQL_ROLLBACK = 'ROLLBACK'
@@ -40,29 +38,29 @@ describe "MySQL", '#create_table' do
     MYSQL_DB.sqls.clear
   end
   after do
-    @db.drop_table(:dolls) rescue nil
+    @db.drop_table?(:dolls)
   end
-  
+
   specify "should allow to specify options for MySQL" do
     @db.create_table(:dolls, :engine => 'MyISAM', :charset => 'latin2'){text :name}
-    @db.sqls.should == ["CREATE TABLE dolls (name text) ENGINE=MyISAM DEFAULT CHARSET=latin2"]
+    @db.sqls.should == ["CREATE TABLE `dolls` (`name` text) ENGINE=MyISAM DEFAULT CHARSET=latin2"]
   end
-  
+
   specify "should create a temporary table" do
     @db.create_table(:tmp_dolls, :temp => true, :engine => 'MyISAM', :charset => 'latin2'){text :name}
-    @db.sqls.should == ["CREATE TEMPORARY TABLE tmp_dolls (name text) ENGINE=MyISAM DEFAULT CHARSET=latin2"]
+    @db.sqls.should == ["CREATE TEMPORARY TABLE `tmp_dolls` (`name` text) ENGINE=MyISAM DEFAULT CHARSET=latin2"]
   end
-  
+
   specify "should not use a default for a String :text=>true type" do
     @db.create_table(:dolls){String :name, :text=>true, :default=>'blah'}
-    @db.sqls.should == ["CREATE TABLE dolls (name text)"]
+    @db.sqls.should == ["CREATE TABLE `dolls` (`name` text)"]
   end
-  
+
   specify "should not use a default for a File type" do
     @db.create_table(:dolls){File :name, :default=>'blah'}
-    @db.sqls.should == ["CREATE TABLE dolls (name blob)"]
+    @db.sqls.should == ["CREATE TABLE `dolls` (`name` blob)"]
   end
-  
+
   specify "should respect the size option for File type" do
     @db.create_table(:dolls) do
       File :n1
@@ -82,17 +80,23 @@ describe "MySQL", '#create_table' do
     end
     @db.schema(:dolls).map{|k, v| v[:auto_increment]}.should == [nil, nil, true]
   end
+
+  cspecify "should support collate with various other column options", :swift do
+    @db.create_table!(:dolls){ String :name, :size=>128, :collate=>:utf8_bin, :default=>'foo', :null=>false, :unique=>true}
+    @db[:dolls].insert
+    @db[:dolls].select_map(:name).should == ["foo"]
+  end
 end
 
 describe "A MySQL database" do
   specify "should provide the server version" do
     MYSQL_DB.server_version.should >= 40000
   end
-  
+
   specify "should handle the creation and dropping of an InnoDB table with foreign keys" do
     proc{MYSQL_DB.create_table!(:test_innodb, :engine=>:InnoDB){primary_key :id; foreign_key :fk, :test_innodb, :key=>:id}}.should_not raise_error
   end
-  
+
   specify "should support for_share" do
     MYSQL_DB.transaction{MYSQL_DB[:test2].for_share.all.should == []}
   end
@@ -106,18 +110,18 @@ if MYSQL_DB.adapter_scheme == :mysql
       @ds = @db[:booltest]
     end
     after do
-      Sequel::MySQL.convert_tinyint_to_bool = true
-      @db.drop_table(:booltest)
+      @db.convert_tinyint_to_bool = true
+      @db.drop_table?(:booltest)
     end
-    
+
     specify "should consider tinyint(1) datatypes as boolean if set, but not larger tinyints" do
       @db.schema(:booltest, :reload=>true).should == [[:b, {:type=>:boolean, :allow_null=>true, :primary_key=>false, :default=>nil, :ruby_default=>nil, :db_type=>"tinyint(1)"}, ], [:i, {:type=>:integer, :allow_null=>true, :primary_key=>false, :default=>nil, :ruby_default=>nil, :db_type=>"tinyint(4)"}, ]]
-      Sequel::MySQL.convert_tinyint_to_bool = false
+      @db.convert_tinyint_to_bool = false
       @db.schema(:booltest, :reload=>true).should == [[:b, {:type=>:integer, :allow_null=>true, :primary_key=>false, :default=>nil, :ruby_default=>nil, :db_type=>"tinyint(1)"}, ], [:i, {:type=>:integer, :allow_null=>true, :primary_key=>false, :default=>nil, :ruby_default=>nil, :db_type=>"tinyint(4)"}, ]]
     end
-    
+
     specify "should return tinyint(1)s as bools and tinyint(4)s as integers when set" do
-      Sequel::MySQL.convert_tinyint_to_bool = true
+      @db.convert_tinyint_to_bool = true
       @ds.delete
       @ds << {:b=>true, :i=>10}
       @ds.all.should == [{:b=>true, :i=>10}]
@@ -130,14 +134,14 @@ if MYSQL_DB.adapter_scheme == :mysql
     end
 
     specify "should return all tinyints as integers when unset" do
-      Sequel::MySQL.convert_tinyint_to_bool = false
+      @db.convert_tinyint_to_bool = false
       @ds.delete
       @ds << {:b=>true, :i=>10}
       @ds.all.should == [{:b=>1, :i=>10}]
       @ds.delete
       @ds << {:b=>false, :i=>0}
       @ds.all.should == [{:b=>0, :i=>0}]
-      
+
       @ds.delete
       @ds << {:b=>1, :i=>10}
       @ds.all.should == [{:b=>1, :i=>10}]
@@ -155,20 +159,20 @@ describe "A MySQL dataset" do
     MYSQL_DB.sqls.clear
   end
   after do
-    MYSQL_DB.drop_table(:items)
+    MYSQL_DB.drop_table?(:items)
   end
-  
+
   specify "should quote columns and tables using back-ticks if quoting identifiers" do
     @d.quote_identifiers = true
     @d.select(:name).sql.should == \
       'SELECT `name` FROM `items`'
-      
+
     @d.select('COUNT(*)'.lit).sql.should == \
       'SELECT COUNT(*) FROM `items`'
 
     @d.select(:max.sql_function(:value)).sql.should == \
       'SELECT max(`value`) FROM `items`'
-      
+
     @d.select(:NOW.sql_function).sql.should == \
     'SELECT NOW() FROM `items`'
 
@@ -180,13 +184,13 @@ describe "A MySQL dataset" do
 
     @d.select('items.name AS item_name'.lit).sql.should == \
       'SELECT items.name AS item_name FROM `items`'
-      
+
     @d.select('`name`'.lit).sql.should == \
       'SELECT `name` FROM `items`'
 
     @d.select('max(items.`name`) AS `max_name`'.lit).sql.should == \
       'SELECT max(items.`name`) AS `max_name` FROM `items`'
-      
+
     @d.select(:test.sql_function(:abc, 'hello')).sql.should == \
       "SELECT test(`abc`, 'hello') FROM `items`"
 
@@ -202,7 +206,7 @@ describe "A MySQL dataset" do
     @d.insert_sql(:x => :y).should == \
       'INSERT INTO `items` (`x`) VALUES (`y`)'
   end
-  
+
   specify "should quote fields correctly when reversing the order" do
     @d.quote_identifiers = true
     @d.reverse_order(:name).sql.should == \
@@ -217,37 +221,53 @@ describe "A MySQL dataset" do
     @d.reverse_order(:name.desc, :test).sql.should == \
       'SELECT * FROM `items` ORDER BY `name` ASC, `test` DESC'
   end
-  
+
   specify "should support ORDER clause in UPDATE statements" do
     @d.order(:name).update_sql(:value => 1).should == \
-      'UPDATE items SET value = 1 ORDER BY name'
+      'UPDATE `items` SET `value` = 1 ORDER BY `name`'
   end
-  
+
   specify "should support LIMIT clause in UPDATE statements" do
     @d.limit(10).update_sql(:value => 1).should == \
-      'UPDATE items SET value = 1 LIMIT 10'
+      'UPDATE `items` SET `value` = 1 LIMIT 10'
   end
-  
+
   specify "should support regexps" do
     @d << {:name => 'abc', :value => 1}
     @d << {:name => 'bcd', :value => 2}
     @d.filter(:name => /bc/).count.should == 2
     @d.filter(:name => /^bc/).count.should == 1
   end
-  
+
+  specify "should have explain output" do
+    @d.explain.should be_a_kind_of(String)
+    @d.explain(:extended=>true).should be_a_kind_of(String)
+    @d.explain.should_not == @d.explain(:extended=>true)
+  end
+
   specify "should correctly literalize strings with comment backslashes in them" do
     @d.delete
     proc {@d << {:name => ':\\'}}.should_not raise_error
-    
+
     @d.first[:name].should == ':\\'
   end
+
+  specify "should handle prepared statements with on_duplicate_key_update" do
+    @d.db.add_index :items, :value, :unique=>true
+    ds = @d.on_duplicate_key_update
+    ps = ds.prepare(:insert, :insert_user_id_feature_name, :value => :$v, :name => :$n)
+    ps.call(:v => 1, :n => 'a')
+    ds.all.should == [{:value=>1, :name=>'a'}]
+    ps.call(:v => 1, :n => 'b')
+    ds.all.should == [{:value=>1, :name=>'b'}]
+  end
 end
 
 describe "MySQL datasets" do
   before do
     @d = MYSQL_DB[:orders]
   end
-  
+
   specify "should correctly quote column references" do
     @d.quote_identifiers = true
     market = 'ICE'
@@ -269,9 +289,9 @@ describe "Dataset#distinct" do
     @ds = @db[:a]
   end
   after do
-    @db.drop_table(:a)
+    @db.drop_table?(:a)
   end
-  
+
   it "#distinct with arguments should return results distinct on those arguments" do
     @ds.insert(20, 10)
     @ds.insert(30, 10)
@@ -293,43 +313,43 @@ describe "MySQL join expressions" do
   end
   specify "should support natural left joins" do
     @ds.join_table(:natural_left, :nodes).sql.should == \
-      'SELECT * FROM nodes NATURAL LEFT JOIN nodes'
+      'SELECT * FROM `nodes` NATURAL LEFT JOIN `nodes`'
   end
   specify "should support natural right joins" do
     @ds.join_table(:natural_right, :nodes).sql.should == \
-      'SELECT * FROM nodes NATURAL RIGHT JOIN nodes'
+      'SELECT * FROM `nodes` NATURAL RIGHT JOIN `nodes`'
   end
   specify "should support natural left outer joins" do
     @ds.join_table(:natural_left_outer, :nodes).sql.should == \
-      'SELECT * FROM nodes NATURAL LEFT OUTER JOIN nodes'
+      'SELECT * FROM `nodes` NATURAL LEFT OUTER JOIN `nodes`'
   end
   specify "should support natural right outer joins" do
     @ds.join_table(:natural_right_outer, :nodes).sql.should == \
-      'SELECT * FROM nodes NATURAL RIGHT OUTER JOIN nodes'
+      'SELECT * FROM `nodes` NATURAL RIGHT OUTER JOIN `nodes`'
   end
   specify "should support natural inner joins" do
     @ds.join_table(:natural_inner, :nodes).sql.should == \
-      'SELECT * FROM nodes NATURAL LEFT JOIN nodes'
+      'SELECT * FROM `nodes` NATURAL LEFT JOIN `nodes`'
   end
   specify "should support cross joins" do
     @ds.join_table(:cross, :nodes).sql.should == \
-      'SELECT * FROM nodes CROSS JOIN nodes'
+      'SELECT * FROM `nodes` CROSS JOIN `nodes`'
   end
   specify "should support cross joins as inner joins if conditions are used" do
     @ds.join_table(:cross, :nodes, :id=>:id).sql.should == \
-      'SELECT * FROM nodes INNER JOIN nodes ON (nodes.id = nodes.id)'
+      'SELECT * FROM `nodes` INNER JOIN `nodes` ON (`nodes`.`id` = `nodes`.`id`)'
   end
   specify "should support straight joins (force left table to be read before right)" do
     @ds.join_table(:straight, :nodes).sql.should == \
-      'SELECT * FROM nodes STRAIGHT_JOIN nodes'
+      'SELECT * FROM `nodes` STRAIGHT_JOIN `nodes`'
   end
   specify "should support natural joins on multiple tables." do
     @ds.join_table(:natural_left_outer, [:nodes, :branches]).sql.should == \
-      'SELECT * FROM nodes NATURAL LEFT OUTER JOIN (nodes, branches)'
+      'SELECT * FROM `nodes` NATURAL LEFT OUTER JOIN (`nodes`, `branches`)'
   end
   specify "should support straight joins on multiple tables." do
     @ds.join_table(:straight, [:nodes,:branches]).sql.should == \
-      'SELECT * FROM nodes STRAIGHT_JOIN (nodes, branches)'
+      'SELECT * FROM `nodes` STRAIGHT_JOIN (`nodes`, `branches`)'
   end
 end
 
@@ -337,23 +357,23 @@ describe "Joined MySQL dataset" do
   before do
     @ds = MYSQL_DB[:nodes]
   end
-  
+
   specify "should quote fields correctly" do
     @ds.quote_identifiers = true
     @ds.join(:attributes, :node_id => :id).sql.should == \
       "SELECT * FROM `nodes` INNER JOIN `attributes` ON (`attributes`.`node_id` = `nodes`.`id`)"
   end
-  
+
   specify "should allow a having clause on ungrouped datasets" do
     proc {@ds.having('blah')}.should_not raise_error
 
     @ds.having('blah').sql.should == \
-      "SELECT * FROM nodes HAVING (blah)"
+      "SELECT * FROM `nodes` HAVING (blah)"
   end
-  
+
   specify "should put a having clause before an order by clause" do
     @ds.order(:aaa).having(:bbb => :ccc).sql.should == \
-      "SELECT * FROM nodes HAVING (bbb = ccc) ORDER BY aaa"
+      "SELECT * FROM `nodes` HAVING (`bbb` = `ccc`) ORDER BY `aaa`"
   end
 end
 
@@ -364,19 +384,19 @@ describe "A MySQL database" do
 
   specify "should support add_column operations" do
     @db.add_column :test2, :xyz, :text
-    
+
     @db[:test2].columns.should == [:name, :value, :xyz]
     @db[:test2] << {:name => 'mmm', :value => 111, :xyz => '000'}
     @db[:test2].first[:xyz].should == '000'
   end
-  
+
   specify "should support drop_column operations" do
     @db[:test2].columns.should == [:name, :value, :xyz]
     @db.drop_column :test2, :xyz
-    
+
     @db[:test2].columns.should == [:name, :value]
   end
-  
+
   specify "should support rename_column operations" do
     @db[:test2].delete
     @db.add_column :test2, :xyz, :text
@@ -387,7 +407,7 @@ describe "A MySQL database" do
     @db[:test2].columns.should == [:name, :value, :zyx]
     @db[:test2].first[:zyx].should == 'qqqq'
   end
-  
+
   specify "should support rename_column operations with types like varchar(255)" do
     @db[:test2].delete
     @db.add_column :test2, :tre, :text
@@ -398,26 +418,27 @@ describe "A MySQL database" do
     @db[:test2].columns.should == [:name, :value, :zyx, :ert]
     @db[:test2].first[:ert].should == 'qqqq'
   end
-  
+
   specify "should support set_column_type operations" do
     @db.add_column :test2, :xyz, :float
     @db[:test2].delete
     @db[:test2] << {:name => 'mmm', :value => 111, :xyz => 56.78}
     @db.set_column_type :test2, :xyz, :integer
-    
+
     @db[:test2].first[:xyz].should == 57
   end
-  
+
   specify "should support add_index" do
     @db.add_index :test2, :value
   end
-  
+
   specify "should support drop_index" do
     @db.drop_index :test2, :value
   end
-  
+
   specify "should support add_foreign_key" do
     @db.alter_table :test2 do
+      add_index :value, :unique=>true
       add_foreign_key :value2, :test2, :key=>:value
     end
     @db[:test2].columns.should == [:name, :value, :zyx, :ert, :xyz, :value2]
@@ -427,79 +448,83 @@ end
 describe "A MySQL database with table options" do
   before do
     @options = {:engine=>'MyISAM', :charset=>'latin1', :collate => 'latin1_swedish_ci'}
-    
+
     Sequel::MySQL.default_engine = 'InnoDB'
     Sequel::MySQL.default_charset = 'utf8'
     Sequel::MySQL.default_collate = 'utf8_general_ci'
-    
+
     @db = MYSQL_DB
-    @db.drop_table(:items) rescue nil
-    
+    @db.drop_table?(:items)
+
     MYSQL_DB.sqls.clear
   end
   after do
-    @db.drop_table(:items) rescue nil
+    @db.drop_table?(:items)
 
     Sequel::MySQL.default_engine = nil
     Sequel::MySQL.default_charset = nil
     Sequel::MySQL.default_collate = nil
   end
-  
+
   specify "should allow to pass custom options (engine, charset, collate) for table creation" do
     @db.create_table(:items, @options){Integer :size; text :name}
-    @db.sqls.should == ["CREATE TABLE items (size integer, name text) ENGINE=MyISAM DEFAULT CHARSET=latin1 DEFAULT COLLATE=latin1_swedish_ci"]
+    @db.sqls.should == ["CREATE TABLE `items` (`size` integer, `name` text) ENGINE=MyISAM DEFAULT CHARSET=latin1 DEFAULT COLLATE=latin1_swedish_ci"]
   end
-  
+
   specify "should use default options if specified (engine, charset, collate) for table creation" do
     @db.create_table(:items){Integer :size; text :name}
-    @db.sqls.should == ["CREATE TABLE items (size integer, name text) ENGINE=InnoDB DEFAULT CHARSET=utf8 DEFAULT COLLATE=utf8_general_ci"]
+    @db.sqls.should == ["CREATE TABLE `items` (`size` integer, `name` text) ENGINE=InnoDB DEFAULT CHARSET=utf8 DEFAULT COLLATE=utf8_general_ci"]
   end
-  
+
   specify "should not use default if option has a nil value" do
     @db.create_table(:items, :engine=>nil, :charset=>nil, :collate=>nil){Integer :size; text :name}
-    @db.sqls.should == ["CREATE TABLE items (size integer, name text)"]
+    @db.sqls.should == ["CREATE TABLE `items` (`size` integer, `name` text)"]
   end
 end
 
 describe "A MySQL database" do
   before do
     @db = MYSQL_DB
-    @db.drop_table(:items) rescue nil
+    @db.drop_table?(:items)
     MYSQL_DB.sqls.clear
   end
   after do
-    @db.drop_table(:items) rescue nil
+    @db.drop_table?(:items, :users)
   end
-  
+
   specify "should support defaults for boolean columns" do
     @db.create_table(:items){TrueClass :active1, :default=>true; FalseClass :active2, :default => false}
-    @db.sqls.should == ["CREATE TABLE items (active1 tinyint(1) DEFAULT 1, active2 tinyint(1) DEFAULT 0)"]
+    @db.sqls.should == ["CREATE TABLE `items` (`active1` tinyint(1) DEFAULT 1, `active2` tinyint(1) DEFAULT 0)"]
   end
-  
+
   specify "should correctly format CREATE TABLE statements with foreign keys" do
-    @db.create_table(:items){Integer :id; foreign_key :p_id, :items, :key => :id, :null => false, :on_delete => :cascade}
-    @db.sqls.should == ["CREATE TABLE items (id integer, p_id integer NOT NULL, FOREIGN KEY (p_id) REFERENCES items(id) ON DELETE CASCADE)"]
+    @db.create_table(:items){primary_key :id; foreign_key :p_id, :items, :key => :id, :null => false, :on_delete => :cascade}
+    @db.sqls.should == ["CREATE TABLE `items` (`id` integer PRIMARY KEY AUTO_INCREMENT, `p_id` integer NOT NULL, UNIQUE (`id`), FOREIGN KEY (`p_id`) REFERENCES `items`(`id`) ON DELETE CASCADE)"]
   end
-  
+
   specify "should correctly format ALTER TABLE statements with foreign keys" do
     @db.create_table(:items){Integer :id}
+    @db.create_table(:users){primary_key :id}
     @db.alter_table(:items){add_foreign_key :p_id, :users, :key => :id, :null => false, :on_delete => :cascade}
-    @db.sqls.should == ["CREATE TABLE items (id integer)", "ALTER TABLE items ADD COLUMN p_id integer NOT NULL", "ALTER TABLE items ADD FOREIGN KEY (p_id) REFERENCES users(id) ON DELETE CASCADE"]
+    @db.sqls.should == ["CREATE TABLE `items` (`id` integer)",
+      "CREATE TABLE `users` (`id` integer PRIMARY KEY AUTO_INCREMENT)",
+      "ALTER TABLE `items` ADD COLUMN `p_id` integer NOT NULL",
+      "ALTER TABLE `items` ADD FOREIGN KEY (`p_id`) REFERENCES `users`(`id`) ON DELETE CASCADE"]
   end
-  
+
   specify "should have rename_column support keep existing options" do
     @db.create_table(:items){String :id, :null=>false, :default=>'blah'}
     @db.alter_table(:items){rename_column :id, :nid}
-    @db.sqls.should == ["CREATE TABLE items (id varchar(255) NOT NULL DEFAULT 'blah')", "DESCRIBE items", "ALTER TABLE items CHANGE COLUMN id nid varchar(255) NOT NULL DEFAULT 'blah'"]
+    @db.sqls.should == ["CREATE TABLE `items` (`id` varchar(255) NOT NULL DEFAULT 'blah')", "DESCRIBE `items`", "ALTER TABLE `items` CHANGE COLUMN `id` `nid` varchar(255) NOT NULL DEFAULT 'blah'"]
     @db[:items].insert
     @db[:items].all.should == [{:nid=>'blah'}]
     proc{@db[:items].insert(:nid=>nil)}.should raise_error(Sequel::DatabaseError)
   end
-  
+
   specify "should have set_column_type support keep existing options" do
     @db.create_table(:items){Integer :id, :null=>false, :default=>5}
     @db.alter_table(:items){set_column_type :id, Bignum}
-    @db.sqls.should == ["CREATE TABLE items (id integer NOT NULL DEFAULT 5)", "DESCRIBE items", "ALTER TABLE items CHANGE COLUMN id id bigint NOT NULL DEFAULT 5"]
+    @db.sqls.should == ["CREATE TABLE `items` (`id` integer NOT NULL DEFAULT 5)", "DESCRIBE `items`", "ALTER TABLE `items` CHANGE COLUMN `id` `id` bigint NOT NULL DEFAULT 5"]
     @db[:items].insert
     @db[:items].all.should == [{:id=>5}]
     proc{@db[:items].insert(:id=>nil)}.should raise_error(Sequel::DatabaseError)
@@ -511,35 +536,35 @@ describe "A MySQL database" do
   specify "should have set_column_type pass through options" do
     @db.create_table(:items){integer :id; enum :list, :elements=>%w[one]}
     @db.alter_table(:items){set_column_type :id, :int, :unsigned=>true, :size=>8; set_column_type :list, :enum, :elements=>%w[two]}
-    @db.sqls.should == ["CREATE TABLE items (id integer, list enum('one'))", "DESCRIBE items", "ALTER TABLE items CHANGE COLUMN id id int(8) UNSIGNED NULL", "ALTER TABLE items CHANGE COLUMN list list enum('two') NULL"]
+    @db.sqls.should == ["CREATE TABLE `items` (`id` integer, `list` enum('one'))", "DESCRIBE `items`", "ALTER TABLE `items` CHANGE COLUMN `id` `id` int(8) UNSIGNED NULL", "ALTER TABLE `items` CHANGE COLUMN `list` `list` enum('two') NULL"]
   end
-  
+
   specify "should have set_column_default support keep existing options" do
     @db.create_table(:items){Integer :id, :null=>false, :default=>5}
     @db.alter_table(:items){set_column_default :id, 6}
-    @db.sqls.should == ["CREATE TABLE items (id integer NOT NULL DEFAULT 5)", "DESCRIBE items", "ALTER TABLE items CHANGE COLUMN id id int(11) NOT NULL DEFAULT 6"]
+    @db.sqls.should == ["CREATE TABLE `items` (`id` integer NOT NULL DEFAULT 5)", "DESCRIBE `items`", "ALTER TABLE `items` CHANGE COLUMN `id` `id` int(11) NOT NULL DEFAULT 6"]
     @db[:items].insert
     @db[:items].all.should == [{:id=>6}]
     proc{@db[:items].insert(:id=>nil)}.should raise_error(Sequel::DatabaseError)
   end
-  
+
   specify "should have set_column_allow_null support keep existing options" do
     @db.create_table(:items){Integer :id, :null=>false, :default=>5}
     @db.alter_table(:items){set_column_allow_null :id, true}
-    @db.sqls.should == ["CREATE TABLE items (id integer NOT NULL DEFAULT 5)", "DESCRIBE items", "ALTER TABLE items CHANGE COLUMN id id int(11) NULL DEFAULT 5"]
+    @db.sqls.should == ["CREATE TABLE `items` (`id` integer NOT NULL DEFAULT 5)", "DESCRIBE `items`", "ALTER TABLE `items` CHANGE COLUMN `id` `id` int(11) NULL DEFAULT 5"]
     @db[:items].insert
     @db[:items].all.should == [{:id=>5}]
     proc{@db[:items].insert(:id=>nil)}.should_not
   end
-  
+
   specify "should accept repeated raw sql statements using Database#<<" do
     @db.create_table(:items){String :name; Integer :value}
     @db << 'DELETE FROM items'
     @db[:items].count.should == 0
-    
+
     @db << "INSERT INTO items (name, value) VALUES ('tutu', 1234)"
     @db[:items].first.should == {:name => 'tutu', :value => 1234}
-    
+
     @db << 'DELETE FROM items'
     @db[:items].first.should == nil
   end
@@ -552,12 +577,12 @@ if %w'localhost 127.0.0.1 ::1'.include?(MYSQL_URI.host) and MYSQL_DB.adapter_sch
       db = Sequel.mysql(MYSQL_DB.opts[:database], :host => 'localhost', :user => MYSQL_DB.opts[:user], :password => MYSQL_DB.opts[:password], :socket => MYSQL_SOCKET_FILE)
       proc {db.test_connection}.should_not raise_error
     end
-    
+
     specify "should accept a socket option without host option" do
       db = Sequel.mysql(MYSQL_DB.opts[:database], :user => MYSQL_DB.opts[:user], :password => MYSQL_DB.opts[:password], :socket => MYSQL_SOCKET_FILE)
       proc {db.test_connection}.should_not raise_error
     end
-    
+
     specify "should fail to connect with invalid socket" do
       db = Sequel.mysql(MYSQL_DB.opts[:database], :user => MYSQL_DB.opts[:user], :password => MYSQL_DB.opts[:password], :socket =>'blah')
       proc {db.test_connection}.should raise_error
@@ -577,9 +602,58 @@ describe "A MySQL database" do
   end
 end
 
+describe "MySQL foreign key support" do
+  after do
+    MYSQL_DB.drop_table?(:testfk, :testpk)
+  end
+
+  specify "should create table without :key" do
+    MYSQL_DB.create_table!(:testpk){primary_key :id}
+    MYSQL_DB.create_table!(:testfk){foreign_key :fk, :testpk}
+  end
+
+  specify "should create table with composite keys without :key" do
+    MYSQL_DB.create_table!(:testpk){Integer :id; Integer :id2; primary_key([:id, :id2])}
+    MYSQL_DB.create_table!(:testfk){Integer :fk; Integer :fk2; foreign_key([:fk, :fk2], :testpk)}
+  end
+
+  specify "should create table with self referential without :key" do
+    MYSQL_DB.create_table!(:testfk){primary_key :id; foreign_key :fk, :testfk}
+  end
+
+  specify "should create table with self referential with composite keys without :key" do
+    MYSQL_DB.create_table!(:testfk){Integer :id; Integer :id2; Integer :fk; Integer :fk2; primary_key([:id, :id2]); foreign_key([:fk, :fk2], :testfk)}
+  end
+
+  specify "should alter table without :key" do
+    MYSQL_DB.create_table!(:testpk){primary_key :id}
+    MYSQL_DB.create_table!(:testfk){Integer :id}
+    MYSQL_DB.alter_table(:testfk){add_foreign_key :fk, :testpk}
+  end
+
+  specify "should alter table with composite keys without :key" do
+    MYSQL_DB.create_table!(:testpk){Integer :id; Integer :id2; primary_key([:id, :id2])}
+    MYSQL_DB.create_table!(:testfk){Integer :fk; Integer :fk2}
+    MYSQL_DB.alter_table(:testfk){add_foreign_key([:fk, :fk2], :testpk)}
+  end
+
+  specify "should alter table with self referential without :key" do
+    MYSQL_DB.create_table!(:testfk){primary_key :id}
+    MYSQL_DB.alter_table(:testfk){add_foreign_key :fk, :testfk}
+  end
+
+  specify "should alter table with self referential with composite keys without :key" do
+    MYSQL_DB.create_table!(:testfk){Integer :id; Integer :id2; Integer :fk; Integer :fk2; primary_key([:id, :id2])}
+    MYSQL_DB.alter_table(:testfk){add_foreign_key [:fk, :fk2], :testfk}
+  end
+end
+
 describe "A grouped MySQL dataset" do
   before do
-    MYSQL_DB[:test2].delete
+    MYSQL_DB.create_table! :test2 do
+      text :name
+      integer :value
+    end
     MYSQL_DB[:test2] << {:name => '11', :value => 10}
     MYSQL_DB[:test2] << {:name => '11', :value => 20}
     MYSQL_DB[:test2] << {:name => '11', :value => 30}
@@ -587,12 +661,12 @@ describe "A grouped MySQL dataset" do
     MYSQL_DB[:test2] << {:name => '12', :value => 20}
     MYSQL_DB[:test2] << {:name => '13', :value => 10}
   end
-  
+
   specify "should return the correct count for raw sql query" do
     ds = MYSQL_DB["select name FROM test2 WHERE name = '11' GROUP BY name"]
     ds.count.should == 1
   end
-  
+
   specify "should return the correct count for a normal dataset" do
     ds = MYSQL_DB[:test2].select(:name).where(:name => '11').group(:name)
     ds.count.should == 1
@@ -602,21 +676,21 @@ end
 describe "A MySQL database" do
   before do
     @db = MYSQL_DB
-    @db.drop_table(:posts) rescue nil
+    @db.drop_table?(:posts)
     @db.sqls.clear
   end
   after do
-    @db.drop_table(:posts) rescue nil
+    @db.drop_table?(:posts)
   end
-  
+
   specify "should support fulltext indexes and full_text_search" do
-    @db.create_table(:posts){text :title; text :body; full_text_index :title; full_text_index [:title, :body]}
+    @db.create_table(:posts, :engine=>:MyISAM){text :title; text :body; full_text_index :title; full_text_index [:title, :body]}
     @db.sqls.should == [
-      "CREATE TABLE posts (title text, body text)",
-      "CREATE FULLTEXT INDEX posts_title_index ON posts (title)",
-      "CREATE FULLTEXT INDEX posts_title_body_index ON posts (title, body)"
+      "CREATE TABLE `posts` (`title` text, `body` text) ENGINE=MyISAM",
+      "CREATE FULLTEXT INDEX `posts_title_index` ON `posts` (`title`)",
+      "CREATE FULLTEXT INDEX `posts_title_body_index` ON `posts` (`title`, `body`)"
     ]
-    
+
     @db[:posts].insert(:title=>'ruby rails', :body=>'y')
     @db[:posts].insert(:title=>'sequel', :body=>'ruby')
     @db[:posts].insert(:title=>'ruby scooby', :body=>'x')
@@ -626,32 +700,35 @@ describe "A MySQL database" do
     @db[:posts].full_text_search([:title, :body], ['sequel', 'ruby']).all.should == [{:title=>'sequel', :body=>'ruby'}]
     @db[:posts].full_text_search(:title, '+ruby -rails', :boolean => true).all.should == [{:title=>'ruby scooby', :body=>'x'}]
     @db.sqls.should == [
-      "SELECT * FROM posts WHERE (MATCH (title) AGAINST ('rails'))",
-      "SELECT * FROM posts WHERE (MATCH (title, body) AGAINST ('sequel ruby'))",
-      "SELECT * FROM posts WHERE (MATCH (title) AGAINST ('+ruby -rails' IN BOOLEAN MODE))"]
+      "SELECT * FROM `posts` WHERE (MATCH (`title`) AGAINST ('rails'))",
+      "SELECT * FROM `posts` WHERE (MATCH (`title`, `body`) AGAINST ('sequel ruby'))",
+      "SELECT * FROM `posts` WHERE (MATCH (`title`) AGAINST ('+ruby -rails' IN BOOLEAN MODE))"]
+
+    @db[:posts].full_text_search(:title, :$n).call(:select, :n=>'rails').should == [{:title=>'ruby rails', :body=>'y'}]
+    @db[:posts].full_text_search(:title, :$n).prepare(:select, :fts_select).call(:n=>'rails').should == [{:title=>'ruby rails', :body=>'y'}]
   end
 
   specify "should support spatial indexes" do
-    @db.create_table(:posts){point :geom, :null=>false; spatial_index [:geom]}
+    @db.create_table(:posts, :engine=>:MyISAM){point :geom, :null=>false; spatial_index [:geom]}
     @db.sqls.should == [
-      "CREATE TABLE posts (geom point NOT NULL)",
-      "CREATE SPATIAL INDEX posts_geom_index ON posts (geom)"
+      "CREATE TABLE `posts` (`geom` point NOT NULL) ENGINE=MyISAM",
+      "CREATE SPATIAL INDEX `posts_geom_index` ON `posts` (`geom`)"
     ]
   end
 
   specify "should support indexes with index type" do
     @db.create_table(:posts){Integer :id; index :id, :type => :btree}
     @db.sqls.should == [
-      "CREATE TABLE posts (id integer)",
-      "CREATE INDEX posts_id_index USING btree ON posts (id)"
+      "CREATE TABLE `posts` (`id` integer)",
+      "CREATE INDEX `posts_id_index` USING btree ON `posts` (`id`)"
     ]
   end
 
   specify "should support unique indexes with index type" do
     @db.create_table(:posts){Integer :id; index :id, :type => :btree, :unique => true}
     @db.sqls.should == [
-      "CREATE TABLE posts (id integer)",
-      "CREATE UNIQUE INDEX posts_id_index USING btree ON posts (id)"
+      "CREATE TABLE `posts` (`id` integer)",
+      "CREATE UNIQUE INDEX `posts_id_index` USING btree ON `posts` (`id`)"
     ]
   end
 
@@ -675,43 +752,25 @@ describe "MySQL::Dataset#insert and related methods" do
     MYSQL_DB.sqls.clear
   end
   after do
-    MYSQL_DB.drop_table(:items)
+    MYSQL_DB.drop_table?(:items)
   end
 
   specify "#insert should insert record with default values when no arguments given" do
     @d.insert
-    
-    MYSQL_DB.sqls.should == [
-      "INSERT INTO items () VALUES ()"
-    ]
-    
-    @d.all.should == [
-      {:name => nil, :value => nil}
-    ]
+    MYSQL_DB.sqls.should == ["INSERT INTO `items` () VALUES ()"]
+    @d.all.should == [{:name => nil, :value => nil}]
   end
 
   specify "#insert  should insert record with default values when empty hash given" do
     @d.insert({})
-    
-    MYSQL_DB.sqls.should == [
-      "INSERT INTO items () VALUES ()"
-    ]
-    
-    @d.all.should == [
-      {:name => nil, :value => nil}
-    ]
+    MYSQL_DB.sqls.should == ["INSERT INTO `items` () VALUES ()"]
+    @d.all.should == [{:name => nil, :value => nil}]
   end
 
   specify "#insert should insert record with default values when empty array given" do
     @d.insert []
-    
-    MYSQL_DB.sqls.should == [
-      "INSERT INTO items () VALUES ()"
-    ]
-    
-    @d.all.should == [
-      {:name => nil, :value => nil}
-    ]
+    MYSQL_DB.sqls.should == ["INSERT INTO `items` () VALUES ()"]
+    @d.all.should == [{:name => nil, :value => nil}]
   end
 
   specify "#on_duplicate_key_update should work with regular inserts" do
@@ -722,19 +781,75 @@ describe "MySQL::Dataset#insert and related methods" do
     @d.on_duplicate_key_update(:name, :value => 6).insert(:name => 'def', :value => 2)
 
     MYSQL_DB.sqls.length.should == 3
-    MYSQL_DB.sqls[0].should =~ /\AINSERT INTO items \((name|value), (name|value)\) VALUES \(('abc'|1), (1|'abc')\)\z/
-    MYSQL_DB.sqls[1].should =~ /\AINSERT INTO items \((name|value), (name|value)\) VALUES \(('abc'|1), (1|'abc')\) ON DUPLICATE KEY UPDATE name=VALUES\(name\), value=6\z/
-    MYSQL_DB.sqls[2].should =~ /\AINSERT INTO items \((name|value), (name|value)\) VALUES \(('def'|2), (2|'def')\) ON DUPLICATE KEY UPDATE name=VALUES\(name\), value=6\z/
+    MYSQL_DB.sqls[0].should =~ /\AINSERT INTO `items` \(`(name|value)`, `(name|value)`\) VALUES \(('abc'|1), (1|'abc')\)\z/
+    MYSQL_DB.sqls[1].should =~ /\AINSERT INTO `items` \(`(name|value)`, `(name|value)`\) VALUES \(('abc'|1), (1|'abc')\) ON DUPLICATE KEY UPDATE `name`=VALUES\(`name`\), `value`=6\z/
+    MYSQL_DB.sqls[2].should =~ /\AINSERT INTO `items` \(`(name|value)`, `(name|value)`\) VALUES \(('def'|2), (2|'def')\) ON DUPLICATE KEY UPDATE `name`=VALUES\(`name`\), `value`=6\z/
 
     @d.all.should == [{:name => 'abc', :value => 6}, {:name => 'def', :value => 2}]
   end
 
+  specify "#multi_replace should insert multiple records in a single statement" do
+    @d.multi_replace([{:name => 'abc'}, {:name => 'def'}])
+
+    MYSQL_DB.sqls.should == [
+      SQL_BEGIN,
+      "REPLACE INTO `items` (`name`) VALUES ('abc'), ('def')",
+      SQL_COMMIT
+    ]
+
+    @d.all.should == [
+      {:name => 'abc', :value => nil}, {:name => 'def', :value => nil}
+    ]
+  end
+
+  specify "#multi_replace should split the list of records into batches if :commit_every option is given" do
+    @d.multi_replace([{:value => 1}, {:value => 2}, {:value => 3}, {:value => 4}],
+      :commit_every => 2)
+
+    MYSQL_DB.sqls.should == [
+      SQL_BEGIN,
+      "REPLACE INTO `items` (`value`) VALUES (1), (2)",
+      SQL_COMMIT,
+      SQL_BEGIN,
+      "REPLACE INTO `items` (`value`) VALUES (3), (4)",
+      SQL_COMMIT
+    ]
+
+    @d.all.should == [
+      {:name => nil, :value => 1}, 
+      {:name => nil, :value => 2},
+      {:name => nil, :value => 3}, 
+      {:name => nil, :value => 4}
+    ]
+  end
+
+  specify "#multi_replace should split the list of records into batches if :slice option is given" do
+    @d.multi_replace([{:value => 1}, {:value => 2}, {:value => 3}, {:value => 4}],
+      :slice => 2)
+
+    MYSQL_DB.sqls.should == [
+      SQL_BEGIN,
+      "REPLACE INTO `items` (`value`) VALUES (1), (2)",
+      SQL_COMMIT,
+      SQL_BEGIN,
+      "REPLACE INTO `items` (`value`) VALUES (3), (4)",
+      SQL_COMMIT
+    ]
+
+    @d.all.should == [
+      {:name => nil, :value => 1}, 
+      {:name => nil, :value => 2},
+      {:name => nil, :value => 3}, 
+      {:name => nil, :value => 4}
+    ]
+  end
+
   specify "#multi_insert should insert multiple records in a single statement" do
     @d.multi_insert([{:name => 'abc'}, {:name => 'def'}])
-    
+
     MYSQL_DB.sqls.should == [
       SQL_BEGIN,
-      "INSERT INTO items (name) VALUES ('abc'), ('def')",
+      "INSERT INTO `items` (`name`) VALUES ('abc'), ('def')",
       SQL_COMMIT
     ]
 
@@ -749,13 +864,13 @@ describe "MySQL::Dataset#insert and related methods" do
 
     MYSQL_DB.sqls.should == [
       SQL_BEGIN,
-      "INSERT INTO items (value) VALUES (1), (2)",
+      "INSERT INTO `items` (`value`) VALUES (1), (2)",
       SQL_COMMIT,
       SQL_BEGIN,
-      "INSERT INTO items (value) VALUES (3), (4)",
+      "INSERT INTO `items` (`value`) VALUES (3), (4)",
       SQL_COMMIT
     ]
-    
+
     @d.all.should == [
       {:name => nil, :value => 1}, 
       {:name => nil, :value => 2},
@@ -770,13 +885,13 @@ describe "MySQL::Dataset#insert and related methods" do
 
     MYSQL_DB.sqls.should == [
       SQL_BEGIN,
-      "INSERT INTO items (value) VALUES (1), (2)",
+      "INSERT INTO `items` (`value`) VALUES (1), (2)",
       SQL_COMMIT,
       SQL_BEGIN,
-      "INSERT INTO items (value) VALUES (3), (4)",
+      "INSERT INTO `items` (`value`) VALUES (3), (4)",
       SQL_COMMIT
     ]
-    
+
     @d.all.should == [
       {:name => nil, :value => 1}, 
       {:name => nil, :value => 2},
@@ -784,28 +899,28 @@ describe "MySQL::Dataset#insert and related methods" do
       {:name => nil, :value => 4}
     ]
   end
-  
+
   specify "#import should support inserting using columns and values arrays" do
     @d.import([:name, :value], [['abc', 1], ['def', 2]])
 
     MYSQL_DB.sqls.should == [
       SQL_BEGIN,
-      "INSERT INTO items (name, value) VALUES ('abc', 1), ('def', 2)",
+      "INSERT INTO `items` (`name`, `value`) VALUES ('abc', 1), ('def', 2)",
       SQL_COMMIT
     ]
-    
+
     @d.all.should == [
       {:name => 'abc', :value => 1}, 
       {:name => 'def', :value => 2}
     ]
   end
-  
+
   specify "#insert_ignore should add the IGNORE keyword when inserting" do
     @d.insert_ignore.multi_insert([{:name => 'abc'}, {:name => 'def'}])
-    
+
     MYSQL_DB.sqls.should == [
       SQL_BEGIN,
-      "INSERT IGNORE INTO items (name) VALUES ('abc'), ('def')",
+      "INSERT IGNORE INTO `items` (`name`) VALUES ('abc'), ('def')",
       SQL_COMMIT
     ]
 
@@ -813,20 +928,20 @@ describe "MySQL::Dataset#insert and related methods" do
       {:name => 'abc', :value => nil}, {:name => 'def', :value => nil}
     ]
   end
-  
+
   specify "#insert_ignore should add the IGNORE keyword for single inserts" do
     @d.insert_ignore.insert(:name => 'ghi')
-    MYSQL_DB.sqls.should == ["INSERT IGNORE INTO items (name) VALUES ('ghi')"]
+    MYSQL_DB.sqls.should == ["INSERT IGNORE INTO `items` (`name`) VALUES ('ghi')"]
     @d.all.should == [{:name => 'ghi', :value => nil}]
   end
-  
+
   specify "#on_duplicate_key_update should add the ON DUPLICATE KEY UPDATE and ALL columns when no args given" do
     @d.on_duplicate_key_update.import([:name,:value], [['abc', 1], ['def',2]])
-    
+
     MYSQL_DB.sqls.should == [
-      "SELECT * FROM items LIMIT 1",
+      "SELECT * FROM `items` LIMIT 1",
       SQL_BEGIN,
-      "INSERT INTO items (name, value) VALUES ('abc', 1), ('def', 2) ON DUPLICATE KEY UPDATE name=VALUES(name), value=VALUES(value)",
+      "INSERT INTO `items` (`name`, `value`) VALUES ('abc', 1), ('def', 2) ON DUPLICATE KEY UPDATE `name`=VALUES(`name`), `value`=VALUES(`value`)",
       SQL_COMMIT
     ]
 
@@ -834,15 +949,15 @@ describe "MySQL::Dataset#insert and related methods" do
       {:name => 'abc', :value => 1}, {:name => 'def', :value => 2}
     ]
   end
-  
+
   specify "#on_duplicate_key_update should add the ON DUPLICATE KEY UPDATE and columns specified when args are given" do
     @d.on_duplicate_key_update(:value).import([:name,:value], 
       [['abc', 1], ['def',2]]
     )
-    
+
     MYSQL_DB.sqls.should == [
       SQL_BEGIN,
-      "INSERT INTO items (name, value) VALUES ('abc', 1), ('def', 2) ON DUPLICATE KEY UPDATE value=VALUES(value)",
+      "INSERT INTO `items` (`name`, `value`) VALUES ('abc', 1), ('def', 2) ON DUPLICATE KEY UPDATE `value`=VALUES(`value`)",
       SQL_COMMIT
     ]
 
@@ -850,7 +965,27 @@ describe "MySQL::Dataset#insert and related methods" do
       {:name => 'abc', :value => 1}, {:name => 'def', :value => 2}
     ]
   end
-  
+
+end
+
+describe "MySQL::Dataset#update and related methods" do
+  before do
+    MYSQL_DB.create_table(:items){String :name; Integer :value; index :name, :unique=>true}
+    @d = MYSQL_DB[:items]
+  end
+  after do
+    MYSQL_DB.drop_table?(:items)
+  end
+
+  specify "#update_ignore should not raise error where normal update would fail" do
+    @d.insert(:name => 'cow', :value => 0)
+    @d.insert(:name => 'cat', :value => 1)
+    proc{@d.where(:value => 1).update(:name => 'cow')}.should raise_error(Sequel::DatabaseError)
+    MYSQL_DB.sqls.clear
+    @d.update_ignore.where(:value => 1).update(:name => 'cow')
+    MYSQL_DB.sqls.should == ["UPDATE IGNORE `items` SET `name` = 'cow' WHERE (`value` = 1)"]
+    @d.order(:name).all.should == [{:name => 'cat', :value => 1}, {:name => 'cow', :value => 0}]
+  end
 end
 
 describe "MySQL::Dataset#replace" do
@@ -860,9 +995,9 @@ describe "MySQL::Dataset#replace" do
     MYSQL_DB.sqls.clear
   end
   after do
-    MYSQL_DB.drop_table(:items)
+    MYSQL_DB.drop_table?(:items)
   end
-  
+
   specify "should use default values if they exist" do
     MYSQL_DB.alter_table(:items){set_column_default :id, 1; set_column_default :value, 2}
     @d.replace
@@ -872,7 +1007,7 @@ describe "MySQL::Dataset#replace" do
     @d.replace({})
     @d.all.should == [{:id=>1, :value=>2}]
   end
-  
+
   specify "should use support arrays, datasets, and multiple values" do
     @d.replace([1, 2])
     @d.all.should == [{:id=>1, :value=>2}]
@@ -881,12 +1016,12 @@ describe "MySQL::Dataset#replace" do
     @d.replace(@d)
     @d.all.should == [{:id=>1, :value=>2}]
   end
-  
+
   specify "should create a record if the condition is not met" do
     @d.replace(:id => 111, :value => 333)
     @d.all.should == [{:id => 111, :value => 333}]
   end
-  
+
   specify "should update a record if the condition is met" do
     @d << {:id => 111}
     @d.all.should == [{:id => 111, :value => nil}]
@@ -901,25 +1036,25 @@ describe "MySQL::Dataset#complex_expression_sql" do
   end
 
   specify "should handle pattern matches correctly" do
-    @d.literal(:x.like('a')).should == "(x LIKE BINARY 'a')"
-    @d.literal(~:x.like('a')).should == "(x NOT LIKE BINARY 'a')"
-    @d.literal(:x.ilike('a')).should == "(x LIKE 'a')"
-    @d.literal(~:x.ilike('a')).should == "(x NOT LIKE 'a')"
-    @d.literal(:x.like(/a/)).should == "(x REGEXP BINARY 'a')"
-    @d.literal(~:x.like(/a/)).should == "(x NOT REGEXP BINARY 'a')"
-    @d.literal(:x.like(/a/i)).should == "(x REGEXP 'a')"
-    @d.literal(~:x.like(/a/i)).should == "(x NOT REGEXP 'a')"
+    @d.literal(:x.like('a')).should == "(`x` LIKE BINARY 'a')"
+    @d.literal(~:x.like('a')).should == "(`x` NOT LIKE BINARY 'a')"
+    @d.literal(:x.ilike('a')).should == "(`x` LIKE 'a')"
+    @d.literal(~:x.ilike('a')).should == "(`x` NOT LIKE 'a')"
+    @d.literal(:x.like(/a/)).should == "(`x` REGEXP BINARY 'a')"
+    @d.literal(~:x.like(/a/)).should == "(`x` NOT REGEXP BINARY 'a')"
+    @d.literal(:x.like(/a/i)).should == "(`x` REGEXP 'a')"
+    @d.literal(~:x.like(/a/i)).should == "(`x` NOT REGEXP 'a')"
   end
 
   specify "should handle string concatenation with CONCAT if more than one record" do
-    @d.literal([:x, :y].sql_string_join).should == "CONCAT(x, y)"
-    @d.literal([:x, :y].sql_string_join(' ')).should == "CONCAT(x, ' ', y)"
-    @d.literal([:x.sql_function(:y), 1, 'z'.lit].sql_string_join(:y.sql_subscript(1))).should == "CONCAT(x(y), y[1], '1', y[1], z)"
+    @d.literal([:x, :y].sql_string_join).should == "CONCAT(`x`, `y`)"
+    @d.literal([:x, :y].sql_string_join(' ')).should == "CONCAT(`x`, ' ', `y`)"
+    @d.literal([:x.sql_function(:y), 1, 'z'.lit].sql_string_join(:y.sql_subscript(1))).should == "CONCAT(x(`y`), `y`[1], '1', `y`[1], z)"
   end
 
   specify "should handle string concatenation as simple string if just one record" do
-    @d.literal([:x].sql_string_join).should == "x"
-    @d.literal([:x].sql_string_join(' ')).should == "x"
+    @d.literal([:x].sql_string_join).should == "`x`"
+    @d.literal([:x].sql_string_join(' ')).should == "`x`"
   end
 end
 
@@ -928,12 +1063,12 @@ describe "MySQL::Dataset#calc_found_rows" do
     MYSQL_DB.create_table!(:items){Integer :a}
   end
   after do
-    MYSQL_DB.drop_table(:items)
+    MYSQL_DB.drop_table?(:items)
   end
 
   specify "should add the SQL_CALC_FOUND_ROWS keyword when selecting" do
     MYSQL_DB[:items].select(:a).calc_found_rows.limit(1).sql.should == \
-      'SELECT SQL_CALC_FOUND_ROWS a FROM items LIMIT 1'
+      'SELECT SQL_CALC_FOUND_ROWS `a` FROM `items` LIMIT 1'
   end
 
   specify "should count matching rows disregarding LIMIT clause" do
@@ -944,13 +1079,13 @@ describe "MySQL::Dataset#calc_found_rows" do
     MYSQL_DB.dataset.select(:FOUND_ROWS.sql_function.as(:rows)).all.should == [{:rows => 2 }]
 
     MYSQL_DB.sqls.should == [
-      'SELECT SQL_CALC_FOUND_ROWS * FROM items WHERE (a = 1) LIMIT 1',
-      'SELECT FOUND_ROWS() AS rows',
+      'SELECT SQL_CALC_FOUND_ROWS * FROM `items` WHERE (`a` = 1) LIMIT 1',
+      'SELECT FOUND_ROWS() AS `rows`',
     ]
   end
 end
 
-if MYSQL_DB.adapter_scheme == :mysql or MYSQL_DB.adapter_scheme == :jdbc
+if MYSQL_DB.adapter_scheme == :mysql or MYSQL_DB.adapter_scheme == :jdbc or MYSQL_DB.adapter_scheme == :mysql2
   describe "MySQL Stored Procedures" do
     before do
       MYSQL_DB.create_table(:items){Integer :id; Integer :value}
@@ -958,10 +1093,10 @@ if MYSQL_DB.adapter_scheme == :mysql or MYSQL_DB.adapter_scheme == :jdbc
       MYSQL_DB.sqls.clear
     end
     after do
-      MYSQL_DB.drop_table(:items)
+      MYSQL_DB.drop_table?(:items)
       MYSQL_DB.execute('DROP PROCEDURE test_sproc')
     end
-    
+
     specify "should be callable on the database object" do
       MYSQL_DB.execute_ddl('CREATE PROCEDURE test_sproc() BEGIN DELETE FROM items; END')
       MYSQL_DB[:items].delete
@@ -970,27 +1105,38 @@ if MYSQL_DB.adapter_scheme == :mysql or MYSQL_DB.adapter_scheme == :jdbc
       MYSQL_DB.call_sproc(:test_sproc)
       MYSQL_DB[:items].count.should == 0
     end
-    
-    specify "should be callable on the dataset object" do
-      MYSQL_DB.execute_ddl('CREATE PROCEDURE test_sproc(a INTEGER) BEGIN SELECT *, a AS b FROM items; END')
-      MYSQL_DB[:items].delete
-      @d = MYSQL_DB[:items]
-      @d.call_sproc(:select, :test_sproc, 3).should == []
-      @d.insert(:value=>1)
-      @d.call_sproc(:select, :test_sproc, 4).should == [{:id=>nil, :value=>1, :b=>4}]
-      @d.row_proc = proc{|r| r.keys.each{|k| r[k] *= 2 if r[k].is_a?(Integer)}; r}
-      @d.call_sproc(:select, :test_sproc, 3).should == [{:id=>nil, :value=>2, :b=>6}]
+
+    # Mysql2 doesn't support stored procedures that return result sets, probably because
+    # CLIENT_MULTI_RESULTS is not set.
+    unless MYSQL_DB.adapter_scheme == :mysql2
+      specify "should be callable on the dataset object" do
+        MYSQL_DB.execute_ddl('CREATE PROCEDURE test_sproc(a INTEGER) BEGIN SELECT *, a AS b FROM items; END')
+        MYSQL_DB[:items].delete
+        @d = MYSQL_DB[:items]
+        @d.call_sproc(:select, :test_sproc, 3).should == []
+        @d.insert(:value=>1)
+        @d.call_sproc(:select, :test_sproc, 4).should == [{:id=>nil, :value=>1, :b=>4}]
+        @d.row_proc = proc{|r| r.keys.each{|k| r[k] *= 2 if r[k].is_a?(Integer)}; r}
+        @d.call_sproc(:select, :test_sproc, 3).should == [{:id=>nil, :value=>2, :b=>6}]
+      end
+
+      specify "should be callable on the dataset object with multiple arguments" do
+        MYSQL_DB.execute_ddl('CREATE PROCEDURE test_sproc(a INTEGER, c INTEGER) BEGIN SELECT *, a AS b, c AS d FROM items; END')
+        MYSQL_DB[:items].delete
+        @d = MYSQL_DB[:items]
+        @d.call_sproc(:select, :test_sproc, 3, 4).should == []
+        @d.insert(:value=>1)
+        @d.call_sproc(:select, :test_sproc, 4, 5).should == [{:id=>nil, :value=>1, :b=>4, :d=>5}]
+        @d.row_proc = proc{|r| r.keys.each{|k| r[k] *= 2 if r[k].is_a?(Integer)}; r}
+        @d.call_sproc(:select, :test_sproc, 3, 4).should == [{:id=>nil, :value=>2, :b=>6, :d => 8}]
+      end
     end
-    
-    specify "should be callable on the dataset object with multiple arguments" do
-      MYSQL_DB.execute_ddl('CREATE PROCEDURE test_sproc(a INTEGER, c INTEGER) BEGIN SELECT *, a AS b, c AS d FROM items; END')
+
+    specify "should deal with nil values" do
+      MYSQL_DB.execute_ddl('CREATE PROCEDURE test_sproc(i INTEGER, v INTEGER) BEGIN INSERT INTO items VALUES (i, v); END')
       MYSQL_DB[:items].delete
-      @d = MYSQL_DB[:items]
-      @d.call_sproc(:select, :test_sproc, 3, 4).should == []
-      @d.insert(:value=>1)
-      @d.call_sproc(:select, :test_sproc, 4, 5).should == [{:id=>nil, :value=>1, :b=>4, :d=>5}]
-      @d.row_proc = proc{|r| r.keys.each{|k| r[k] *= 2 if r[k].is_a?(Integer)}; r}
-      @d.call_sproc(:select, :test_sproc, 3, 4).should == [{:id=>nil, :value=>2, :b=>6, :d => 8}]
+      MYSQL_DB.call_sproc(:test_sproc, :args=>[1, nil])
+      MYSQL_DB[:items].all.should == [{:id=>1, :value=>nil}]
     end
   end
 end
@@ -998,35 +1144,35 @@ end
 if MYSQL_DB.adapter_scheme == :mysql
   describe "MySQL bad date/time conversions" do
     after do
-      Sequel::MySQL.convert_invalid_date_time = false
+      MYSQL_DB.convert_invalid_date_time = false
     end
-  
+
     specify "should raise an exception when a bad date/time is used and convert_invalid_date_time is false" do
-      Sequel::MySQL.convert_invalid_date_time = false
+      MYSQL_DB.convert_invalid_date_time = false
       proc{MYSQL_DB["SELECT CAST('0000-00-00' AS date)"].single_value}.should raise_error(Sequel::InvalidValue)
       proc{MYSQL_DB["SELECT CAST('0000-00-00 00:00:00' AS datetime)"].single_value}.should raise_error(Sequel::InvalidValue)
       proc{MYSQL_DB["SELECT CAST('25:00:00' AS time)"].single_value}.should raise_error(Sequel::InvalidValue)
     end
-  
+
     specify "should not use a nil value bad date/time is used and convert_invalid_date_time is nil or :nil" do
-      Sequel::MySQL.convert_invalid_date_time = nil
+      MYSQL_DB.convert_invalid_date_time = nil
       MYSQL_DB["SELECT CAST('0000-00-00' AS date)"].single_value.should == nil
       MYSQL_DB["SELECT CAST('0000-00-00 00:00:00' AS datetime)"].single_value.should == nil
       MYSQL_DB["SELECT CAST('25:00:00' AS time)"].single_value.should == nil
-      Sequel::MySQL.convert_invalid_date_time = :nil
+      MYSQL_DB.convert_invalid_date_time = :nil
       MYSQL_DB["SELECT CAST('0000-00-00' AS date)"].single_value.should == nil
       MYSQL_DB["SELECT CAST('0000-00-00 00:00:00' AS datetime)"].single_value.should == nil
       MYSQL_DB["SELECT CAST('25:00:00' AS time)"].single_value.should == nil
     end
-  
+
     specify "should not use a nil value bad date/time is used and convert_invalid_date_time is :string" do
-      Sequel::MySQL.convert_invalid_date_time = :string
+      MYSQL_DB.convert_invalid_date_time = :string
       MYSQL_DB["SELECT CAST('0000-00-00' AS date)"].single_value.should == '0000-00-00'
       MYSQL_DB["SELECT CAST('0000-00-00 00:00:00' AS datetime)"].single_value.should == '0000-00-00 00:00:00'
       MYSQL_DB["SELECT CAST('25:00:00' AS time)"].single_value.should == '25:00:00'
     end
   end
-  
+
   describe "MySQL multiple result sets" do
     before do
       MYSQL_DB.create_table!(:a){Integer :a}
@@ -1038,41 +1184,41 @@ if MYSQL_DB.adapter_scheme == :mysql
       MYSQL_DB[:b].insert(25)
     end
     after do
-      MYSQL_DB.drop_table(:a, :b)
+      MYSQL_DB.drop_table?(:a, :b)
     end
-    
+
     specify "should combine all results by default" do
       @ds.all.should == [{:a=>10}, {:a=>15}, {:b=>20}, {:b=>25}]
     end
-    
+
     specify "should work with Database#run" do
       proc{MYSQL_DB.run('SELECT * FROM a; SELECT * FROM b')}.should_not raise_error
       proc{MYSQL_DB.run('SELECT * FROM a; SELECT * FROM b')}.should_not raise_error
     end
-    
+
     specify "should work with Database#run and other statements" do
       proc{MYSQL_DB.run('UPDATE a SET a = 1; SELECT * FROM a; DELETE FROM b')}.should_not raise_error
       MYSQL_DB[:a].select_order_map(:a).should == [1, 1]
       MYSQL_DB[:b].all.should == []
     end
-    
+
     specify "should split results returned into arrays if split_multiple_result_sets is used" do
       @ds.split_multiple_result_sets.all.should == [[{:a=>10}, {:a=>15}], [{:b=>20}, {:b=>25}]]
     end
-    
+
     specify "should have regular row_procs work when splitting multiple result sets" do
       @ds.row_proc = proc{|x| x[x.keys.first] *= 2; x}
       @ds.split_multiple_result_sets.all.should == [[{:a=>20}, {:a=>30}], [{:b=>40}, {:b=>50}]]
     end
-    
+
     specify "should use the columns from the first result set when splitting result sets" do
       @ds.split_multiple_result_sets.columns.should == [:a]
     end
-    
+
     specify "should not allow graphing a dataset that splits multiple statements" do
       proc{@ds.split_multiple_result_sets.graph(:b, :b=>:a)}.should raise_error(Sequel::Error)
     end
-    
+
     specify "should not allow splitting a graphed dataset" do
       proc{MYSQL_DB[:a].graph(:b, :b=>:a).split_multiple_result_sets}.should raise_error(Sequel::Error)
     end