sequel 2.11.0 → 2.12.0

data/lib/{sequel_core → sequel}/version.rb

@@ -1,10 +1,11 @@
 module Sequel
   MAJOR = 2
-  MINOR = 11
+  MINOR = 12
   TINY  = 0
   
   VERSION = [MAJOR, MINOR, TINY].join('.')
   
+  # The version of Sequel you are using, as a string (e.g. "2.11.0")
   def self.version
     VERSION
   end

data/lib/sequel_core.rb

@@ -1,172 +1 @@
-%w'bigdecimal bigdecimal/util date enumerator thread time uri yaml'.each do |f|
-  require f
-end
-%w"core_ext sql core_sql connection_pool exceptions pretty_table
-  dataset migration schema database object_graph version".each do |f|
-  require "sequel_core/#{f}"
-end
-
-# Top level module for Sequel
-#
-# There are some class methods that are added via metaprogramming, one for
-# each supported adapter.  For example:
-#
-#   DB = Sequel.sqlite # Memory database
-#   DB = Sequel.sqlite('blog.db')
-#   DB = Sequel.postgres('database_name', :user=>'user', 
-#          :password=>'password', :host=>'host', :port=>5432, 
-#          :max_connections=>10)
-#
-# If a block is given to these methods, it is passed the opened Database
-# object, which is closed (disconnected) when the block exits.  For example:
-#
-#   Sequel.sqlite('blog.db'){|db| puts db.users.count}  
-#
-# Sequel converts the column type tinyint to a boolean by default,
-# you can override the conversion to use tinyint as an integer:
-#
-#   Sequel.convert_tinyint_to_bool = false
-#
-# Sequel converts two digit years in Dates and DateTimes by default,
-# so 01/02/03 is interpreted at January 2nd, 2003, and 12/13/99 is interpreted
-# as December 13, 1999.. You can override this # to treat those dates as
-# January 2nd, 0003 and December 13, 0099, respectively, by setting: 
-#
-#   Sequel.convert_two_digit_years = false
-#
-# Sequel can use either Time or DateTime for times returned from the
-# database.  It defaults to Time.  To change it to DateTime, use:
-#
-#   Sequel.datetime_class = DateTime
-module Sequel
-  @convert_tinyint_to_bool = true
-  @convert_two_digit_years = true
-  @datetime_class = Time
-  
-  metaattr_accessor :convert_tinyint_to_bool
-  metaattr_accessor :convert_two_digit_years
-  metaattr_accessor :datetime_class
-
-  # Creates a new database object based on the supplied connection string
-  # and optional arguments.  The specified scheme determines the database
-  # class used, and the rest of the string specifies the connection options.
-  # For example:
-  #
-  #   DB = Sequel.connect('sqlite:/') # Memory database
-  #   DB = Sequel.connect('sqlite://blog.db') # ./blog.db
-  #   DB = Sequel.connect('sqlite:///blog.db') # /blog.db
-  #   DB = Sequel.connect('postgres://user:password@host:port/database_name')
-  #   DB = Sequel.connect('sqlite:///blog.db', :max_connections=>10)
-  #
-  # If a block is given, it is passed the opened Database object, which is
-  # closed when the block exits.  For example:
-  #
-  #   Sequel.connect('sqlite://blog.db'){|db| puts db.users.count}  
-  #
-  # This is also aliased as Sequel.open.
-  def self.connect(*args, &block)
-    Database.connect(*args, &block)
-  end
-  metaalias :open, :connect
-  
-  # Set the method to call on identifiers going into the database.  This affects
-  # the literalization of identifiers by calling this method on them before they are input.
-  # Sequel upcases identifiers in all SQL strings for most databases, so to turn that off:
-  #
-  #   Sequel.identifier_input_method = nil
-  # 
-  # to downcase instead:
-  #
-  #   Sequel.identifier_input_method = :downcase
-  #
-  # Other string methods work as well.
-  def self.identifier_input_method=(value)
-    Database.identifier_input_method = value
-  end
-  
-  # Set the method to call on identifiers coming out of the database.  This affects
-  # the literalization of identifiers by calling this method on them when they are
-  # retrieved from the database.  Sequel downcases identifiers retrieved for most
-  # databases, so to turn that off:
-  #
-  #   Sequel.identifier_output_method = nil
-  # 
-  # to upcase instead:
-  #
-  #   Sequel.identifier_output_method = :upcase
-  #
-  # Other string methods work as well.
-  def self.identifier_output_method=(value)
-    Database.identifier_output_method = value
-  end
-  
-  # Set whether to quote identifiers for all databases by default. By default,
-  # Sequel quotes identifiers in all SQL strings, so to turn that off:
-  #
-  #   Sequel.quote_identifiers = false
-  def self.quote_identifiers=(value)
-    Database.quote_identifiers = value
-  end
-  
-  # Set whether to set the single threaded mode for all databases by default. By default,
-  # Sequel uses a threadsafe connection pool, which isn't as fast as the
-  # single threaded connection pool.  If your program will only have one thread,
-  # and speed is a priority, you may want to set this to true:
-  #
-  #   Sequel.single_threaded = true
-  def self.single_threaded=(value)
-    Database.single_threaded = value
-  end
-
-  # Set whether to upcase identifiers for all databases by default. By default,
-  # Sequel upcases identifiers unless the database folds unquoted identifiers to
-  # lower case (MySQL, PostgreSQL, and SQLite).
-  #
-  #   Sequel.upcase_identifiers = false
-  #
-  # This will set the indentifier_input_method to :upcase if value is true
-  # or nil if value is false.
-  def self.upcase_identifiers=(value)
-    Database.upcase_identifiers = value
-  end
-  
-  # Always returns false, since ParseTree support has been removed.
-  def self.use_parse_tree
-    false
-  end
-
-  # Raises an error if attempting to turn ParseTree support on (since it no longer exists).
-  # Otherwise, is a no-op.
-  def self.use_parse_tree=(val)
-    raise(Error, 'ParseTree support has been removed from Sequel') if val
-  end
-  
-  ### Private Class Methods ###
-
-  # Helper method that the database adapter class methods that are added to Sequel via
-  # metaprogramming use to parse arguments.
-  def self.adapter_method(adapter, *args, &block) # :nodoc:
-    raise(::Sequel::Error, "Wrong number of arguments, 0-2 arguments valid") if args.length > 2
-    opts = {:adapter=>adapter.to_sym}
-    opts[:database] = args.shift if args.length >= 1 && !(args[0].is_a?(Hash))
-    if Hash === (arg = args[0])
-      opts.merge!(arg)
-    elsif !arg.nil?
-      raise ::Sequel::Error, "Wrong format of arguments, either use (), (String), (Hash), or (String, Hash)"
-    end
-    connect(opts, &block)
-  end
-
-  # Method that adds a database adapter class method to Sequel that calls
-  # Sequel.adapter_method.
-  def self.def_adapter_method(*adapters) # :nodoc:
-    adapters.each do |adapter|
-      instance_eval("def #{adapter}(*args, &block); adapter_method('#{adapter}', *args, &block) end")
-    end
-  end
-
-  private_class_method :adapter_method, :def_adapter_method
-  
-  # Add the database adapter class methods to Sequel via metaprogramming
-  def_adapter_method(*Database::ADAPTERS)
-end
+require 'sequel/core'

data/lib/sequel_model.rb

@@ -1,91 +1 @@
-require 'sequel_core'
-%w"inflector base hooks record schema association_reflection dataset_methods 
-  associations caching plugins validations eager_loading exceptions".each do |f|
-  require "sequel_model/#{f}"
-end
-
-module Sequel
-  # Holds the nameless subclasses that are created with
-  # Sequel::Model(), necessary for reopening subclasses with the
-  # Sequel::Model() superclass specified.
-  @models = {}
-
-  # Lets you create a Model subclass with its dataset already set.
-  # source can be an existing dataset or a symbol (in which case
-  # it will create a dataset using the default database with 
-  # source as the table name).
-  #
-  # Example:
-  #   class Comment < Sequel::Model(:something)
-  #     table_name # => :something
-  #   end
-  def self.Model(source)
-    @models[source] ||= Class.new(Model).set_dataset(source)
-  end
-
-  # Model has some methods that are added via metaprogramming:
-  #
-  # * All of the methods in DATASET_METHODS have class methods created that call
-  #   the Model's dataset with the method of the same name with the given
-  #   arguments.
-  # * All of the methods in HOOKS have class methods created that accept
-  #   either a method name symbol or an optional tag and a block.  These
-  #   methods run the code as a callback at the specified time.  For example:
-  #
-  #     Model.before_save :do_something
-  #     Model.before_save(:do_something_else){ self.something_else = 42}
-  #     object = Model.new
-  #     object.save
-  #
-  #   Would run the object's :do_something method following by the code
-  #   block related to :do_something_else.  Note that if you specify a
-  #   block, a tag is optional.  If the tag is not nil, it will overwrite
-  #   a previous block with the same tag.  This allows hooks to work with
-  #   systems that reload code.
-  # * All of the methods in HOOKS also create instance methods, but you
-  #   should not override these instance methods.
-  # * The following instance_methods all call the class method of the same
-  #   name: columns, dataset, db, primary_key, str_columns.
-  # * The following class level attr_readers are created: allowed_columns,
-  #   cache_store, cache_ttl, dataset_methods, primary_key, restricted_columns,
-  #   sti_dataset, and sti_key.  You should not usually need to
-  #   access these directly.
-  # * All validation methods also accept the options specified in #validates_each,
-  #   in addition to the options specified in the RDoc for that method.
-  # * The following class level attr_accessors are created: raise_on_typecast_failure,
-  #   raise_on_save_failure, strict_param_setting, typecast_empty_string_to_nil,
-  #   and typecast_on_assignment:
-  #
-  #     # Don't raise an error if a validation attempt fails in
-  #     # save/create/save_changes/etc.
-  #     Model.raise_on_save_failure = false
-  #     Model.before_save{false}
-  #     Model.new.save # => nil
-  #     # Don't raise errors in new/set/update/etc. if an attempt to
-  #     # access a missing/restricted method occurs (just silently
-  #     # skip it)
-  #     Model.strict_param_setting = false
-  #     Model.new(:id=>1) # No Error
-  #     # Don't typecast attribute values on assignment
-  #     Model.typecast_on_assignment = false
-  #     m = Model.new
-  #     m.number = '10'
-  #     m.number # => '10' instead of 10
-  #     # Don't typecast empty string to nil for non-string, non-blob columns.
-  #     Model.typecast_empty_string_to_nil = false
-  #     m.number = ''
-  #     m.number # => '' instead of nil
-  #     # Don't raise if unable to typecast data for a column
-  #     Model.typecast_empty_string_to_nil = true
-  #     Model.raise_on_typecast_failure = false
-  #     m.not_null_column = '' # => nil
-  #     m.number = 'A' # => 'A'
-  #
-  # * The following class level method aliases are defined:
-  #   * Model.dataset= => set_dataset
-  #   * Model.is_a => is
-  class Model
-    extend Enumerable
-    extend Associations
-  end
-end
+require 'sequel/model'

data/spec/adapters/firebird_spec.rb

@@ -26,7 +26,7 @@ FIREBIRD_DB.create_table! :test5 do
 end
 
 context "A Firebird database" do
-  setup do
+  before do
     @db = FIREBIRD_DB
   end
 
@@ -43,7 +43,7 @@ context "A Firebird database" do
 end
 
 context "A Firebird dataset" do
-  setup do
+  before do
     @d = FIREBIRD_DB[:test]
     @d.delete # remove all records
   end
@@ -212,7 +212,7 @@ context "A Firebird dataset" do
 end
 
 context "A Firebird dataset with a timestamp field" do
-  setup do
+  before do
     @d = FIREBIRD_DB[:test3]
     @d.delete
   end
@@ -226,7 +226,7 @@ context "A Firebird dataset with a timestamp field" do
 end
 
 context "A Firebird database" do
-  setup do
+  before do
     @db = FIREBIRD_DB
   end
 
@@ -342,7 +342,7 @@ context "A Firebird database" do
 end
 
 context "Postgres::Dataset#insert" do
-  setup do
+  before do
     @ds = FIREBIRD_DB[:test5]
     @ds.delete
   end

data/spec/adapters/informix_spec.rb

@@ -24,7 +24,7 @@ context "A Informix database" do
 end
 
 context "A Informix dataset" do
-  setup do
+  before do
     @d = INFORMIX_DB[:test]
     @d.delete # remove all records
   end

data/spec/adapters/mysql_spec.rb

@@ -44,7 +44,7 @@ else
 end
 
 context "MySQL", '#create_table' do
-  setup do
+  before do
     @db = MYSQL_DB
   end
   after(:each) do
@@ -57,10 +57,10 @@ context "MySQL", '#create_table' do
 end
 
 context "A MySQL database" do
-  setup do
+  before do
     @db = MYSQL_DB
   end
-  teardown do
+  after do
     Sequel.convert_tinyint_to_bool = true
   end
 
@@ -96,14 +96,10 @@ context "A MySQL database" do
     Sequel.convert_tinyint_to_bool = false
     @db.schema(:booltest, :reload=>true).should == [[:value, {:type=>:integer, :allow_null=>true, :primary_key=>false, :default=>nil, :db_type=>"tinyint(4)"}]]
   end
-
-  specify "should get the schema all database tables if no table name is used" do
-    @db.schema(:booltest, :reload=>true).should == @db.schema(nil, :reload=>true)[:booltest]
-  end
 end
 
 context "A MySQL dataset" do
-  setup do
+  before do
     @d = MYSQL_DB[:items]
     @d.delete # remove all records
     MYSQL_DB.sqls.clear
@@ -274,10 +270,10 @@ context "A MySQL dataset" do
 end
 
 context "MySQL datasets" do
-  setup do
+  before do
     @d = MYSQL_DB[:orders]
   end
-  teardown do
+  after do
     Sequel.convert_tinyint_to_bool = true
   end
   
@@ -285,11 +281,9 @@ context "MySQL datasets" do
     @d.quote_identifiers = true
     market = 'ICE'
     ack_stamp = Time.now - 15 * 60 # 15 minutes ago
-    @d.query do
-      select :market, :minute.sql_function(:from_unixtime.sql_function(:ack)).as(:minute)
-      where {(:ack.sql_number > ack_stamp) & {:market => market}}
-      group_by :minute.sql_function(:from_unixtime.sql_function(:ack))
-    end.sql.should == \
+    @d.select(:market, :minute.sql_function(:from_unixtime.sql_function(:ack)).as(:minute)).
+      where{|o|(:ack.sql_number > ack_stamp) & {:market => market}}.
+      group_by(:minute.sql_function(:from_unixtime.sql_function(:ack))).sql.should == \
       "SELECT `market`, minute(from_unixtime(`ack`)) AS `minute` FROM `orders` WHERE ((`ack` > #{@d.literal(ack_stamp)}) AND (`market` = 'ICE')) GROUP BY minute(from_unixtime(`ack`))"
   end
 
@@ -319,7 +313,7 @@ context "MySQL datasets" do
 end
 
 context "MySQL join expressions" do
-  setup do
+  before do
     @ds = MYSQL_DB[:nodes]
     @ds.db.meta_def(:server_version) {50014}
   end
@@ -370,7 +364,7 @@ context "MySQL join expressions" do
 end
 
 context "Joined MySQL dataset" do
-  setup do
+  before do
     @ds = MYSQL_DB[:nodes]
   end
   
@@ -394,7 +388,7 @@ context "Joined MySQL dataset" do
 end
 
 context "A MySQL database" do
-  setup do
+  before do
     @db = MYSQL_DB
   end
 
@@ -485,21 +479,21 @@ context "A MySQL database", "with table options" do
   end
   
   specify "should allow to pass custom options (engine, charset, collate) for table creation" do
-    statements = @db.create_table_sql_list(:items, *(@g.create_info << @options))
+    statements = @db.send(:create_table_sql_list, :items, *(@g.create_info << @options))
     statements.should == [
       "CREATE TABLE items (size integer, name text) ENGINE=MyISAM DEFAULT CHARSET=latin2 DEFAULT COLLATE=swedish"
     ]
   end
   
   specify "should use default options if specified (engine, charset, collate) for table creation" do
-    statements = @db.create_table_sql_list(:items, *(@g.create_info))
+    statements = @db.send(:create_table_sql_list, :items, *(@g.create_info))
     statements.should == [
       "CREATE TABLE items (size integer, name text) ENGINE=InnoDB DEFAULT CHARSET=utf8 DEFAULT COLLATE=utf8"
     ]
   end
   
   specify "should not use default if option has a nil value" do
-    statements = @db.create_table_sql_list(:items, *(@g.create_info << {:engine=>nil, :charset=>nil, :collate=>nil}))
+    statements = @db.send(:create_table_sql_list, :items, *(@g.create_info << {:engine=>nil, :charset=>nil, :collate=>nil}))
     statements.should == [
       "CREATE TABLE items (size integer, name text)"
     ]
@@ -507,7 +501,7 @@ context "A MySQL database", "with table options" do
 end
 
 context "A MySQL database" do
-  setup do
+  before do
     @db = MYSQL_DB
   end
   
@@ -516,7 +510,7 @@ context "A MySQL database" do
       boolean :active1, :default => true
       boolean :active2, :default => false
     end
-    statements = @db.create_table_sql_list(:items, *g.create_info)
+    statements = @db.send(:create_table_sql_list, :items, *g.create_info)
     statements.should == [
       "CREATE TABLE items (active1 boolean DEFAULT 1, active2 boolean DEFAULT 0)"
     ]
@@ -527,7 +521,7 @@ context "A MySQL database" do
       foreign_key :p_id, :table => :users, :key => :id, 
         :null => false, :on_delete => :cascade
     end
-    @db.create_table_sql_list(:items, *g.create_info).should == [
+    @db.send(:create_table_sql_list, :items, *g.create_info).should == [
       "CREATE TABLE items (p_id integer NOT NULL, FOREIGN KEY (p_id) REFERENCES users(id) ON DELETE CASCADE)"
     ]
   end
@@ -536,7 +530,7 @@ specify "should correctly format ALTER TABLE statements with foreign keys" do
   g = Sequel::Schema::AlterTableGenerator.new(@db) do
     add_foreign_key :p_id, :users, :key => :id, :null => false, :on_delete => :cascade
   end
-  @db.alter_table_sql_list(:items, g.operations).should == [[
+  @db.send(:alter_table_sql_list, :items, g.operations).should == [[
     "ALTER TABLE items ADD COLUMN p_id integer NOT NULL",
     "ALTER TABLE items ADD FOREIGN KEY (p_id) REFERENCES users(id) ON DELETE CASCADE"
   ]]
@@ -584,7 +578,7 @@ if %w'localhost 127.0.0.1 ::1'.include?(MYSQL_URI.host) and MYSQL_DB.class.adapt
 end
 
 context "A grouped MySQL dataset" do
-  setup do
+  before do
     MYSQL_DB[:test2].delete
     MYSQL_DB[:test2] << {:name => '11', :value => 10}
     MYSQL_DB[:test2] << {:name => '11', :value => 20}
@@ -606,16 +600,13 @@ context "A grouped MySQL dataset" do
 end
 
 context "A MySQL database" do
-  setup do
-  end
-  
   specify "should support fulltext indexes" do
     g = Sequel::Schema::Generator.new(MYSQL_DB) do
       text :title
       text :body
       full_text_index [:title, :body]
     end
-    MYSQL_DB.create_table_sql_list(:posts, *g.create_info).should == [
+    MYSQL_DB.send(:create_table_sql_list, :posts, *g.create_info).should == [
       "CREATE TABLE posts (title text, body text)",
       "CREATE FULLTEXT INDEX posts_title_body_index ON posts (title, body)"
     ]
@@ -637,7 +628,7 @@ context "A MySQL database" do
       point :geom
       spatial_index [:geom]
     end
-    MYSQL_DB.create_table_sql_list(:posts, *g.create_info).should == [
+    MYSQL_DB.send(:create_table_sql_list, :posts, *g.create_info).should == [
       "CREATE TABLE posts (geom point)",
       "CREATE SPATIAL INDEX posts_geom_index ON posts (geom)"
     ]
@@ -648,7 +639,7 @@ context "A MySQL database" do
       text :title
       index :title, :type => :hash
     end
-    MYSQL_DB.create_table_sql_list(:posts, *g.create_info).should == [
+    MYSQL_DB.send(:create_table_sql_list, :posts, *g.create_info).should == [
       "CREATE TABLE posts (title text)",
       "CREATE INDEX posts_title_index ON posts (title) USING hash"
     ]
@@ -659,7 +650,7 @@ context "A MySQL database" do
       text :title
       index :title, :type => :hash, :unique => true
     end
-    MYSQL_DB.create_table_sql_list(:posts, *g.create_info).should == [
+    MYSQL_DB.send(:create_table_sql_list, :posts, *g.create_info).should == [
       "CREATE TABLE posts (title text)",
       "CREATE UNIQUE INDEX posts_title_index ON posts (title) USING hash"
     ]
@@ -667,9 +658,9 @@ context "A MySQL database" do
 end
 
 context "MySQL::Dataset#insert" do
-  setup do
+  before do
     @d = MYSQL_DB[:items]
-    @d.delete # remove all records
+    @d.delete
     MYSQL_DB.sqls.clear
   end
 
@@ -711,9 +702,9 @@ context "MySQL::Dataset#insert" do
 end
 
 context "MySQL::Dataset#multi_insert" do
-  setup do
+  before do
     @d = MYSQL_DB[:items]
-    @d.delete # remove all records
+    @d.delete
     MYSQL_DB.sqls.clear
   end
   
@@ -774,7 +765,7 @@ context "MySQL::Dataset#multi_insert" do
   end
   
   specify "should support inserting using columns and values arrays" do
-    @d.multi_insert([:name, :value], [['abc', 1], ['def', 2]])
+    @d.import([:name, :value], [['abc', 1], ['def', 2]])
 
     MYSQL_DB.sqls.should == [
       SQL_BEGIN,
@@ -789,8 +780,70 @@ context "MySQL::Dataset#multi_insert" do
   end
 end
 
+context "MySQL::Dataset#insert_ignore" do
+  before do
+    @d = MYSQL_DB[:items]
+    @d.delete
+    MYSQL_DB.sqls.clear
+  end
+  
+  specify "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')",
+      SQL_COMMIT
+    ]
+
+    @d.all.should == [
+      {:name => 'abc', :value => nil}, {:name => 'def', :value => nil}
+    ]
+  end
+end
+
+context "MySQL::Dataset#on_duplicate_key_update" do
+  before do
+    @d = MYSQL_DB[:items]
+    @d.delete
+    MYSQL_DB.sqls.clear
+  end
+  
+  specify "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 == [
+      SQL_BEGIN,
+      "INSERT INTO items (name, value) VALUES ('abc', 1), ('def', 2) ON DUPLICATE KEY UPDATE name=VALUES(name), value=VALUES(value)",
+      SQL_COMMIT
+    ]
+
+    @d.all.should == [
+      {:name => 'abc', :value => 1}, {:name => 'def', :value => 2}
+    ]
+  end
+  specify "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)",
+      SQL_COMMIT
+    ]
+
+    @d.all.should == [
+      {:name => 'abc', :value => 1}, {:name => 'def', :value => 2}
+    ]
+  end
+  
+end
+
 context "MySQL::Dataset#replace" do
-  setup do
+  before do
     MYSQL_DB.drop_table(:items) if MYSQL_DB.table_exists?(:items)
     MYSQL_DB.create_table :items do
       integer :id, :unique => true
@@ -814,7 +867,7 @@ context "MySQL::Dataset#replace" do
 end
 
 context "MySQL::Dataset#complex_expression_sql" do
-  setup do
+  before do
     @d = MYSQL_DB.dataset
   end
 
@@ -832,7 +885,7 @@ context "MySQL::Dataset#complex_expression_sql" do
   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|1)).should == "CONCAT(x(y), y[1], '1', y[1], z)"
+    @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
@@ -843,7 +896,7 @@ end
 
 unless MYSQL_DB.class.adapter_scheme == :do
   context "MySQL Stored Procedures" do
-    teardown do
+    after do
       MYSQL_DB.execute('DROP PROCEDURE test_sproc')
     end
     
@@ -879,3 +932,36 @@ unless MYSQL_DB.class.adapter_scheme == :do
     end
   end
 end
+
+if MYSQL_DB.class.adapter_scheme == :mysql
+  context "MySQL bad date/time conversions" do
+    after do
+      Sequel::MySQL.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
+      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["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["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["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
+end