sequel 4.49.0 → 5.0.0

data/lib/sequel/adapters/shared/db2.rb

@@ -1,43 +1,15 @@
 # frozen-string-literal: true
 
-Sequel.require 'adapters/utils/emulate_offset_with_row_number'
+require_relative '../utils/emulate_offset_with_row_number'
 
 module Sequel
   module DB2
     Sequel::Database.set_shared_adapter_scheme(:db2, self)
 
-    # SEQUEL5: Remove
-    @use_clob_as_blob = false
-    class << self
-      def use_clob_as_blob
-        Sequel::Deprecation.deprecate("Sequel::DB2.use_clob_as_blob", "Call this method on the Database instance")
-        @use_clob_as_blob
-      end
-      def use_clob_as_blob=(v)
-        Sequel::Deprecation.deprecate("Sequel::DB2.use_clob_as_blob=", "Call this method on the Database instance")
-        @use_clob_as_blob = v
-      end
-    end
-
     module DatabaseMethods
-      AUTOINCREMENT = 'GENERATED ALWAYS AS IDENTITY'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :AUTOINCREMENT)
-      NOT_NULL      = ' NOT NULL'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :NOT_NULL)
-      NULL          = ''.freeze
-      Sequel::Deprecation.deprecate_constant(self, :NULL)
-
       # Whether to use clob as the generic File type, false by default.
-      #attr_accessor :use_clob_as_blob # SEQUEL5
+      attr_accessor :use_clob_as_blob
 
-      # SEQUEL5: Remove
-      attr_writer :use_clob_as_blob
-      def use_clob_as_blob
-        v = @use_clob_as_blob
-        v.nil? ? Sequel::DB2.instance_variable_get(:@use_clob_as_blob) : v
-      end
-    
-      # DB2 always uses :db2 as it's database type
       def database_type
         :db2
       end
@@ -145,7 +117,6 @@ module Sequel
 
       private
 
-      # Handle DB2 specific alter table operations.
       def alter_table_sql(table, op)
         case op[:op]
         when :add_column
@@ -302,36 +273,7 @@ module Sequel
     module DatasetMethods
       include EmulateOffsetWithRowNumber
 
-      BITWISE_METHOD_MAP = {:& =>:BITAND, :| => :BITOR, :^ => :BITXOR, :'B~'=>:BITNOT}#.freeze # SEQUEL5
-
-      PAREN_CLOSE = ')'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :PAREN_CLOSE)
-      PAREN_OPEN = '('.freeze
-      Sequel::Deprecation.deprecate_constant(self, :PAREN_OPEN)
-      BOOL_TRUE = '1'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :BOOL_TRUE)
-      BOOL_FALSE = '0'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :BOOL_FALSE)
-      CAST_STRING_OPEN = "RTRIM(CHAR(".freeze
-      Sequel::Deprecation.deprecate_constant(self, :CAST_STRING_OPEN)
-      CAST_STRING_CLOSE = "))".freeze
-      Sequel::Deprecation.deprecate_constant(self, :CAST_STRING_CLOSE)
-      FETCH_FIRST_ROW_ONLY = " FETCH FIRST ROW ONLY".freeze
-      Sequel::Deprecation.deprecate_constant(self, :FETCH_FIRST_ROW_ONLY)
-      FETCH_FIRST = " FETCH FIRST ".freeze
-      Sequel::Deprecation.deprecate_constant(self, :FETCH_FIRST)
-      ROWS_ONLY = " ROWS ONLY".freeze
-      Sequel::Deprecation.deprecate_constant(self, :ROWS_ONLY)
-      EMPTY_FROM_TABLE = ' FROM "SYSIBM"."SYSDUMMY1"'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :EMPTY_FROM_TABLE)
-      HSTAR = "H*".freeze
-      Sequel::Deprecation.deprecate_constant(self, :HSTAR)
-      BLOB_OPEN = "BLOB(X'".freeze
-      Sequel::Deprecation.deprecate_constant(self, :BLOB_OPEN)
-      BLOB_CLOSE = "')".freeze
-      Sequel::Deprecation.deprecate_constant(self, :BLOB_CLOSE)
-      EMULATED_FUNCTION_MAP = {:char_length=>'length'.freeze}
-      Sequel::Deprecation.deprecate_constant(self, :EMULATED_FUNCTION_MAP)
+      BITWISE_METHOD_MAP = {:& =>:BITAND, :| => :BITOR, :^ => :BITXOR, :'B~'=>:BITNOT}.freeze
 
       # DB2 casts strings using RTRIM and CHAR instead of VARCHAR.
       def cast_sql_append(sql, expr, type)

data/lib/sequel/adapters/shared/mssql.rb

@@ -1,39 +1,19 @@
 # frozen-string-literal: true
 
-Sequel.require %w'emulate_offset_with_row_number split_alter_table', 'adapters/utils'
+require_relative '../utils/emulate_offset_with_row_number'
+require_relative '../utils/split_alter_table'
 
 module Sequel
   module MSSQL
     Sequel::Database.set_shared_adapter_scheme(:mssql, self)
 
     def self.mock_adapter_setup(db)
-      db.instance_eval do
+      db.instance_exec do
         @server_version = 11000000
       end
     end
 
     module DatabaseMethods
-      AUTO_INCREMENT = 'IDENTITY(1,1)'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :AUTO_INCREMENT)
-      SERVER_VERSION_RE = /^(\d+)\.(\d+)\.(\d+)/.freeze
-      Sequel::Deprecation.deprecate_constant(self, :SERVER_VERSION_RE)
-      SERVER_VERSION_SQL = "SELECT CAST(SERVERPROPERTY('ProductVersion') AS varchar)".freeze
-      Sequel::Deprecation.deprecate_constant(self, :SERVER_VERSION_SQL)
-      SQL_BEGIN = "BEGIN TRANSACTION".freeze
-      Sequel::Deprecation.deprecate_constant(self, :SQL_BEGIN)
-      SQL_COMMIT = "COMMIT TRANSACTION".freeze
-      Sequel::Deprecation.deprecate_constant(self, :SQL_COMMIT)
-      SQL_ROLLBACK = "IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION".freeze
-      Sequel::Deprecation.deprecate_constant(self, :SQL_ROLLBACK)
-      SQL_ROLLBACK_TO_SAVEPOINT = 'IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION autopoint_%d'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :SQL_ROLLBACK_TO_SAVEPOINT)
-      SQL_SAVEPOINT = 'SAVE TRANSACTION autopoint_%d'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :SQL_SAVEPOINT)
-      MSSQL_DEFAULT_RE = /\A(?:\(N?('.*')\)|\(\((-?\d+(?:\.\d+)?)\)\))\z/
-      Sequel::Deprecation.deprecate_constant(self, :MSSQL_DEFAULT_RE)
-      DECIMAL_TYPE_RE = /number|numeric|decimal/io
-      Sequel::Deprecation.deprecate_constant(self, :DECIMAL_TYPE_RE)
-
       FOREIGN_KEY_ACTION_MAP = {0 => :no_action, 1 => :cascade, 2 => :set_null, 3 => :set_default}.freeze
 
       include Sequel::Database::SplitAlterTable
@@ -42,12 +22,7 @@ module Sequel
       # strings.  True by default for compatibility, can be set to false for a possible
       # performance increase.  This sets the default for all datasets created from this
       # Database object.
-      attr_reader :mssql_unicode_strings
-
-      def mssql_unicode_strings=(v)
-        @mssql_unicode_strings = v
-        reset_default_dataset
-      end
+      attr_accessor :mssql_unicode_strings
 
       # Execute the given stored procedure with the given name.
       #
@@ -67,11 +42,11 @@ module Sequel
       #
       # Examples:
       #
-      #     DB.call_mssql_sproc(:SequelTest, {:args => ['input arg', :output]})
-      #     DB.call_mssql_sproc(:SequelTest, {:args => ['input arg', [:output, 'int', 'varname']]})
+      #     DB.call_mssql_sproc(:SequelTest, {args: ['input arg', :output]})
+      #     DB.call_mssql_sproc(:SequelTest, {args: ['input arg', [:output, 'int', 'varname']]})
       #
       #     named params:
-      #     DB.call_mssql_sproc(:SequelTest, :args => {
+      #     DB.call_mssql_sproc(:SequelTest, args: {
       #       'input_arg1_name' => 'input arg1 value',
       #       'input_arg2_name' => 'input arg2 value',
       #       'output_arg_name' => [:output, 'int', 'varname']
@@ -90,7 +65,7 @@ module Sequel
           method = :each_with_index
         end
 
-        args.send(method) do |v, i|
+        args.public_send(method) do |v, i|
           if named_args
             k = v
             v, type, select = i
@@ -128,7 +103,6 @@ module Sequel
         ds.first
       end
 
-      # Microsoft SQL Server uses the :mssql type.
       def database_type
         :mssql
       end
@@ -234,7 +208,7 @@ module Sequel
         dataset.send(:is_2008_or_later?)
       end
 
-      # MSSQL supports savepoints, though it doesn't support committing/releasing them savepoint
+      # MSSQL supports savepoints, though it doesn't support releasing them
       def supports_savepoints?
         true
       end
@@ -276,7 +250,6 @@ module Sequel
         'IDENTITY(1,1)'
       end
       
-      # MSSQL specific syntax for altering tables.
       def alter_table_sql(table, op)
         case op[:op]
         when :add_column
@@ -316,12 +289,10 @@ module Sequel
         end
       end
       
-      # SQL to start a new savepoint
       def begin_savepoint_sql(depth)
         "SAVE TRANSACTION autopoint_#{depth}"
       end
 
-      # SQL to BEGIN a transaction.
       def begin_transaction_sql
         "BEGIN TRANSACTION"
       end
@@ -339,13 +310,11 @@ module Sequel
         super(default, type)
       end
 
-      # Commit the active transaction on the connection, does not commit/release
-      # savepoints.
+      # Commit the active transaction on the connection, does not release savepoints.
       def commit_transaction(conn, opts=OPTS)
         log_connection_execute(conn, commit_transaction_sql) unless savepoint_level(conn) > 1
       end
 
-      # SQL to COMMIT a transaction.
       def commit_transaction_sql
         "COMMIT TRANSACTION"
       end
@@ -389,12 +358,10 @@ module Sequel
         end
       end
 
-      # The SQL to drop an index for the table.
       def drop_index_sql(table, op)
         "DROP INDEX #{quote_identifier(op[:name] || default_index_name(table, op[:columns]))} ON #{quote_schema_table(table)}"
       end
       
-      # support for clustered index type
       def index_definition_sql(table_name, index)
         index_name = index[:name] || default_index_name(table_name, index[:columns])
         raise Error, "Partial indexes are not supported for this database" if index[:where] && !supports_partial_indexes?
@@ -424,17 +391,14 @@ module Sequel
         "sp_rename #{literal(quote_schema_table(name))}, #{quote_identifier(schema_and_table(new_name).pop)}"
       end
       
-      # SQL to rollback to a savepoint
       def rollback_savepoint_sql(depth)
         "IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION autopoint_#{depth}"
       end
       
-      # SQL to ROLLBACK a transaction.
       def rollback_transaction_sql
         "IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION"
       end
       
-      # The closest MSSQL equivalent of a boolean datatype is the bit type.
       def schema_column_type(db_type)
         case db_type
         when /\A(?:bit)\z/io
@@ -537,111 +501,15 @@ module Sequel
       end)
       include EmulateOffsetWithRowNumber
 
-      CONSTANT_MAP = {:CURRENT_DATE=>'CAST(CURRENT_TIMESTAMP AS DATE)'.freeze, :CURRENT_TIME=>'CAST(CURRENT_TIMESTAMP AS TIME)'.freeze}#.freeze # SEQUEL5
-      EXTRACT_MAP = {:year=>"yy", :month=>"m", :day=>"d", :hour=>"hh", :minute=>"n", :second=>"s"}#.freeze # SEQUEL5
-      #EXTRACT_MAP.each_value(&:freeze) # SEQUEL5
+      CONSTANT_MAP = {:CURRENT_DATE=>'CAST(CURRENT_TIMESTAMP AS DATE)'.freeze, :CURRENT_TIME=>'CAST(CURRENT_TIMESTAMP AS TIME)'.freeze}.freeze
+      EXTRACT_MAP = {:year=>"yy", :month=>"m", :day=>"d", :hour=>"hh", :minute=>"n", :second=>"s"}.freeze
+      EXTRACT_MAP.each_value(&:freeze)
       LIMIT_ALL = Object.new.freeze
 
-      BOOL_TRUE = '1'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :BOOL_TRUE)
-      BOOL_FALSE = '0'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :BOOL_FALSE)
-      COMMA_SEPARATOR = ', '.freeze
-      Sequel::Deprecation.deprecate_constant(self, :COMMA_SEPARATOR)
-      TABLE_HINT = " WITH (".freeze
-      Sequel::Deprecation.deprecate_constant(self, :TABLE_HINT)
-      READPAST = "READPAST".freeze
-      Sequel::Deprecation.deprecate_constant(self, :READPAST)
-      NOLOCK = 'NOLOCK'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :NOLOCK)
-      UPDLOCK = 'UPDLOCK'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :UPDLOCK)
-      WILDCARD = LiteralString.new('*').freeze
-      Sequel::Deprecation.deprecate_constant(self, :WILDCARD)
-      BRACKET_CLOSE =  ']'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :BRACKET_CLOSE)
-      BRACKET_OPEN = '['.freeze
-      Sequel::Deprecation.deprecate_constant(self, :BRACKET_OPEN)
-      COMMA = ', '.freeze
-      Sequel::Deprecation.deprecate_constant(self, :COMMA)
-      PAREN_CLOSE = ')'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :PAREN_CLOSE)
-      PAREN_SPACE_OPEN = ' ('.freeze
-      Sequel::Deprecation.deprecate_constant(self, :PAREN_SPACE_OPEN)
-      SPACE = ' '.freeze
-      Sequel::Deprecation.deprecate_constant(self, :SPACE)
-      FROM = ' FROM '.freeze
-      Sequel::Deprecation.deprecate_constant(self, :FROM)
-      APOS = "'".freeze
-      Sequel::Deprecation.deprecate_constant(self, :APOS)
-      APOS_RE = /'/.freeze
-      Sequel::Deprecation.deprecate_constant(self, :APOS_RE)
-      DOUBLE_APOS = "''".freeze
-      Sequel::Deprecation.deprecate_constant(self, :DOUBLE_APOS)
-      INTO = " INTO ".freeze
-      Sequel::Deprecation.deprecate_constant(self, :INTO)
-      DOUBLE_BRACKET_CLOSE = ']]'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :DOUBLE_BRACKET_CLOSE)
-      DATEPART_SECOND_OPEN = "CAST((datepart(".freeze
-      Sequel::Deprecation.deprecate_constant(self, :DATEPART_SECOND_OPEN)
-      DATEPART_SECOND_MIDDLE = ') + datepart(ns, '.freeze
-      Sequel::Deprecation.deprecate_constant(self, :DATEPART_SECOND_MIDDLE)
-      DATEPART_SECOND_CLOSE = ")/1000000000.0) AS double precision)".freeze
-      Sequel::Deprecation.deprecate_constant(self, :DATEPART_SECOND_CLOSE)
-      DATEPART_OPEN = "datepart(".freeze
-      Sequel::Deprecation.deprecate_constant(self, :DATEPART_OPEN)
-      OUTPUT_INSERTED = " OUTPUT INSERTED.*".freeze
-      Sequel::Deprecation.deprecate_constant(self, :OUTPUT_INSERTED)
-      HEX_START = '0x'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :HEX_START)
-      UNICODE_STRING_START = "N'".freeze
-      Sequel::Deprecation.deprecate_constant(self, :UNICODE_STRING_START)
-      BACKSLASH_CRLF_RE = /\\((?:\r\n)|\n)/.freeze
-      Sequel::Deprecation.deprecate_constant(self, :BACKSLASH_CRLF_RE)
-      BACKSLASH_CRLF_REPLACE = '\\\\\\\\\\1\\1'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :BACKSLASH_CRLF_REPLACE)
-      TOP_PAREN = " TOP (".freeze
-      Sequel::Deprecation.deprecate_constant(self, :TOP_PAREN)
-      TOP = " TOP ".freeze
-      Sequel::Deprecation.deprecate_constant(self, :TOP)
-      OUTPUT = " OUTPUT ".freeze
-      Sequel::Deprecation.deprecate_constant(self, :OUTPUT)
-      HSTAR = "H*".freeze
-      Sequel::Deprecation.deprecate_constant(self, :HSTAR)
-      CASE_SENSITIVE_COLLATION = 'Latin1_General_CS_AS'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :CASE_SENSITIVE_COLLATION)
-      CASE_INSENSITIVE_COLLATION = 'Latin1_General_CI_AS'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :CASE_INSENSITIVE_COLLATION)
-      DEFAULT_TIMESTAMP_FORMAT = "'%Y-%m-%dT%H:%M:%S%N%z'".freeze
-      Sequel::Deprecation.deprecate_constant(self, :DEFAULT_TIMESTAMP_FORMAT)
-      FORMAT_DATE = "'%Y%m%d'".freeze
-      Sequel::Deprecation.deprecate_constant(self, :FORMAT_DATE)
-      CROSS_APPLY = 'CROSS APPLY'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :CROSS_APPLY)
-      OUTER_APPLY = 'OUTER APPLY'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :OUTER_APPLY)
-      OFFSET = " OFFSET ".freeze
-      Sequel::Deprecation.deprecate_constant(self, :OFFSET)
-      ROWS = " ROWS".freeze
-      Sequel::Deprecation.deprecate_constant(self, :ROWS)
-      ROWS_ONLY = " ROWS ONLY".freeze
-      Sequel::Deprecation.deprecate_constant(self, :ROWS_ONLY)
-      FETCH_NEXT = " FETCH NEXT ".freeze
-      Sequel::Deprecation.deprecate_constant(self, :FETCH_NEXT)
-      NON_SQL_OPTIONS = (Dataset::NON_SQL_OPTIONS + [:disable_insert_output, :mssql_unicode_strings]).freeze
-      Sequel::Deprecation.deprecate_constant(self, :NON_SQL_OPTIONS)
-
-      Dataset.def_mutation_method(:disable_insert_output, :output, :module=>self)
       Dataset.def_sql_method(self, :delete, %w'with delete limit from output from2 where')
       Dataset.def_sql_method(self, :insert, %w'with insert into columns output values')
       Dataset.def_sql_method(self, :update, [['if is_2005_or_later?', %w'with update limit table set output from where'], ['else', %w'update table set output from where']])
 
-      # Allow overriding of the mssql_unicode_strings option at the dataset level.
-      def mssql_unicode_strings=(v)
-        Sequel::Deprecation.deprecate("Dataset#mssql_unicode_strings=", "Switch to using with_mssql_unicode_strings, which returns a modified copy")
-        @opts[:mssql_unicode_strings] = v
-      end
-
       # Use the database's mssql_unicode_strings setting if the dataset hasn't overridden it.
       def mssql_unicode_strings
         opts.has_key?(:mssql_unicode_strings) ? opts[:mssql_unicode_strings] : db.mssql_unicode_strings
@@ -652,7 +520,6 @@ module Sequel
         clone(:mssql_unicode_strings=>v)
       end
 
-      # MSSQL uses + for string concatenation, and LIKE is case insensitive by default.
       def complex_expression_sql_append(sql, op, args)
         case op
         when :'||'
@@ -751,8 +618,8 @@ module Sequel
       #
       # Examples:
       #
-      #   dataset.output(:output_table, [:deleted__id, :deleted__name])
-      #   dataset.output(:output_table, :id => :inserted__id, :name => :inserted__name)
+      #   dataset.output(:output_table, [Sequel[:deleted][:id], Sequel[:deleted][:name]])
+      #   dataset.output(:output_table, id: Sequel[:inserted][:id], name: Sequel[:inserted][:name])
       def output(into, values)
         raise(Error, "SQL Server versions 2000 and earlier do not support the OUTPUT clause") unless supports_output_clause?
         output = {}
@@ -897,7 +764,7 @@ module Sequel
         end
       end
 
-      # MSSQL does not allow ordering in sub-clauses unless 'top' (limit) is specified
+      # MSSQL does not allow ordering in sub-clauses unless TOP (limit) is specified
       def aggregate_dataset
         (options_overlap(Sequel::Dataset::COUNT_FROM_SELF_OPTS) && !options_overlap([:limit])) ? unordered.from_self : super
       end
@@ -924,9 +791,7 @@ module Sequel
       # Allow update and delete for unordered, limited datasets only.
       def check_not_limited!(type)
         return if @opts[:skip_limit_check] && type != :truncate
-        #SEQUEL5
-        #raise Sequel::InvalidOperation, "Dataset##{type} not suppored on ordered, limited datasets" if opts[:order] && opts[:limit]
-        Sequel::Deprecation.deprecate("Dataset##{type} on ordered, limited datasets", "Call unlimited to not use a limit, or unordered to not use an order, or skip_limit_check to ignore the limit") if @opts[:order] && @opts[:limit]
+        raise Sequel::InvalidOperation, "Dataset##{type} not suppored on ordered, limited datasets" if opts[:order] && opts[:limit]
         super if type == :truncate || @opts[:offset]
       end
 
@@ -988,7 +853,7 @@ module Sequel
         end
       end
       
-      # Microsoft SQL Server 2012 has native support for offsets, but only for ordered datasets.
+      # Microsoft SQL Server 2012+ has native support for offsets, but only for ordered datasets.
       def emulate_offset_with_row_number?
         super && !(is_2012_or_later? && @opts[:order])
       end
@@ -1021,7 +886,7 @@ module Sequel
         sql << '0x' << v.unpack("H*").first
       end
       
-      # Use YYYYmmdd format, since that's the only want that is
+      # Use YYYYmmdd format, since that's the only format that is
       # multilanguage and not DATEFORMAT dependent.
       def literal_date(v)
         v.strftime("'%Y%m%d'")
@@ -1061,7 +926,7 @@ module Sequel
         end
       end
 
-      # MSSQL uses TOP N for limit.  For MSSQL 2005+ TOP (N) is used
+      # MSSQL 2000 uses TOP N for limit.  For MSSQL 2005+ TOP (N) is used
       # to allow the limit to be a bound variable.
       def select_limit_sql(sql)
         if l = @opts[:limit]
@@ -1092,7 +957,7 @@ module Sequel
       end
       alias delete_limit_sql update_limit_sql
 
-      # Support different types of locking styles
+      # Handle dirty, skip locked, and for update locking
       def select_lock_sql(sql)
         lock = @opts[:lock]
         skip_locked = @opts[:skip_locked]
@@ -1144,7 +1009,6 @@ module Sequel
         end
       end
 
-      # SQL fragment for MSSQL's OUTPUT clause.
       def output_sql(sql, type)
         return unless supports_output_clause?
         if output = @opts[:output]

data/lib/sequel/adapters/shared/mysql.rb

@@ -1,105 +1,37 @@
 # frozen-string-literal: true
 
-Sequel.require %w'replace split_alter_table unmodified_identifiers', 'adapters/utils'
+require_relative '../utils/replace'
+require_relative '../utils/split_alter_table'
+require_relative '../utils/unmodified_identifiers'
 
 module Sequel
   module MySQL
     Sequel::Database.set_shared_adapter_scheme(:mysql, self)
 
     def self.mock_adapter_setup(db)
-      db.instance_eval do
+      db.instance_exec do
         @server_version = 50617
       end
     end
 
-    # SEQUEL5: Remove
-    @convert_tinyint_to_bool = true
-    @default_charset = nil
-    @default_collate = nil
-    @default_engine = nil
-    class << self
-      def convert_tinyint_to_bool
-        Sequel::Deprecation.deprecate("Sequel::MySQL.convert_tinyint_to_bool", "Call this method on the Database instance")
-        @convert_tinyint_to_bool
-      end
-      def convert_tinyint_to_bool=(v)
-        Sequel::Deprecation.deprecate("Sequel::MySQL.convert_tinyint_to_bool=", "Call this method on the Database instance")
-        @convert_tinyint_to_bool = v
-      end
-
-      def default_charset
-        Sequel::Deprecation.deprecate("Sequel::MySQL.default_charset", "Call this method on the Database instance")
-        @default_charset
-      end
-      def default_charset=(v)
-        Sequel::Deprecation.deprecate("Sequel::MySQL.default_charset=", "Call this method on the Database instance")
-        @default_charset = v
-      end
-
-      def default_collate
-        Sequel::Deprecation.deprecate("Sequel::MySQL.default_collate", "Call this method on the Database instance")
-        @default_collate
-      end
-      def default_collate=(v)
-        Sequel::Deprecation.deprecate("Sequel::MySQL.default_collate=", "Call this method on the Database instance")
-        @default_collate = v
-      end
-
-      def default_engine
-        Sequel::Deprecation.deprecate("Sequel::MySQL.default_engine", "Call this method on the Database instance")
-        @default_engine
-      end
-      def default_engine=(v)
-        Sequel::Deprecation.deprecate("Sequel::MySQL.default_engine=", "Call this method on the Database instance")
-        @default_engine = v
-      end
-    end
-
-    # Methods shared by Database instances that connect to MySQL,
-    # currently supported by the native and JDBC adapters.
     module DatabaseMethods
       include UnmodifiedIdentifiers::DatabaseMethods
       include Sequel::Database::SplitAlterTable
 
-      AUTO_INCREMENT = 'AUTO_INCREMENT'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :AUTO_INCREMENT)
-      PRIMARY = 'PRIMARY'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :PRIMARY)
-      MYSQL_TIMESTAMP_RE = /\ACURRENT_(?:DATE|TIMESTAMP)?\z/
-      Sequel::Deprecation.deprecate_constant(self, :MYSQL_TIMESTAMP_RE)
-
-      CAST_TYPES = {String=>:CHAR, Integer=>:SIGNED, Time=>:DATETIME, DateTime=>:DATETIME, Numeric=>:DECIMAL, BigDecimal=>:DECIMAL, File=>:BINARY}#.freeze # SEQUEL5
-      COLUMN_DEFINITION_ORDER = [:collate, :null, :default, :unique, :primary_key, :auto_increment, :references]#.freeze # SEQUEL5
-
+      CAST_TYPES = {String=>:CHAR, Integer=>:SIGNED, Time=>:DATETIME, DateTime=>:DATETIME, Numeric=>:DECIMAL, BigDecimal=>:DECIMAL, File=>:BINARY}.freeze
+      COLUMN_DEFINITION_ORDER = [:collate, :null, :default, :unique, :primary_key, :auto_increment, :references].freeze
       
       # Set the default charset used for CREATE TABLE.  You can pass the
       # :charset option to create_table to override this setting.
-      #attr_accessor :default_charset # SEQUEL5
+      attr_accessor :default_charset
 
       # Set the default collation used for CREATE TABLE.  You can pass the
       # :collate option to create_table to override this setting.
-      #attr_accessor :default_collate # SEQUEL5
+      attr_accessor :default_collate
 
       # Set the default engine used for CREATE TABLE.  You can pass the
       # :engine option to create_table to override this setting.
-      #attr_accessor :default_engine # SEQUEL5
-
-      # SEQUEL5: Remove
-      attr_writer :default_charset
-      def default_charset
-        v = @default_charset
-        v.nil? ? Sequel::MySQL.instance_variable_get(:@default_charset) : v
-      end
-      attr_writer :default_collate
-      def default_collate
-        v = @default_collate
-        v.nil? ? Sequel::MySQL.instance_variable_get(:@default_collate) : v
-      end
-      attr_writer :default_engine
-      def default_engine
-        v = @default_engine
-        v.nil? ? Sequel::MySQL.instance_variable_get(:@default_engine) : v
-      end
+      attr_accessor :default_engine
 
       # MySQL's cast rules are restrictive in that you can't just cast to any possible
       # database type.
@@ -107,13 +39,10 @@ module Sequel
         CAST_TYPES[type] || super
       end
 
-      # Commit an existing prepared transaction with the given transaction
-      # identifier string.
       def commit_prepared_transaction(transaction_id, opts=OPTS)
         run("XA COMMIT #{literal(transaction_id)}", opts)
       end
 
-      # MySQL uses the :mysql database type
       def database_type
         :mysql
       end
@@ -163,7 +92,6 @@ module Sequel
         indexes = {}
         remove_indexes = []
         m = output_identifier_meth
-        im = input_identifier_meth
         schema, table = schema_and_table(table)
 
         table = Sequel::SQL::Identifier.new(table)
@@ -184,8 +112,6 @@ module Sequel
         indexes.reject{|k,v| remove_indexes.include?(k)}
       end
 
-      # Rollback an existing prepared transaction with the given transaction
-      # identifier string.
       def rollback_prepared_transaction(transaction_id, opts=OPTS)
         run("XA ROLLBACK #{literal(transaction_id)}", opts)
       end
@@ -241,16 +167,6 @@ module Sequel
         full_tables('BASE TABLE', opts)
       end
       
-      # Changes the database in use by issuing a USE statement.  I would be
-      # very careful if I used this.
-      def use(db_name)
-        Sequel::Deprecation.deprecate("Database#use", "Create a new Sequel::Database instance instead of using Database#use")
-        disconnect
-        @opts[:database] = db_name if self << "USE #{db_name}"
-        @schemas = {}
-        self
-      end
-      
       # Return an array of symbols specifying view names in the current database.
       #
       # Options:
@@ -324,7 +240,6 @@ module Sequel
         end
       end
 
-      # MySQL server requires table names when dropping indexes.
       def alter_table_sql(table, op)
         case op[:op]
         when :drop_index
@@ -379,7 +294,6 @@ module Sequel
         sqls
       end
       
-      # Use MySQL specific AUTO_INCREMENT text.
       def auto_increment_sql
         'AUTO_INCREMENT'
       end
@@ -400,7 +314,6 @@ module Sequel
         end
       end
 
-      # The order of the column definition, as an array of symbols.
       def column_definition_order
         COLUMN_DEFINITION_ORDER
       end
@@ -488,7 +401,6 @@ module Sequel
         metadata_dataset.with_sql('SHOW FULL TABLES').server(opts[:server]).map{|r| m.call(r.values.first) if r.delete(:Table_type) == type}.compact
       end
 
-      # Handle MySQL specific index SQL syntax
       def index_definition_sql(table_name, index)
         index_name = quote_identifier(index[:name] || default_index_name(table_name, index[:columns]))
         raise Error, "Partial indexes are not supported for this database" if index[:where] && !supports_partial_indexes?
@@ -520,7 +432,6 @@ module Sequel
         end
       end
 
-      # Recognize MySQL set type.
       def schema_column_type(db_type)
         case db_type
         when /\Aset/io
@@ -629,99 +540,6 @@ module Sequel
   
     # Dataset methods shared by datasets that use MySQL databases.
     module DatasetMethods
-      BOOL_TRUE = '1'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :BOOL_TRUE)
-      BOOL_FALSE = '0'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :BOOL_FALSE)
-      COMMA_SEPARATOR = ', '.freeze
-      Sequel::Deprecation.deprecate_constant(self, :COMMA_SEPARATOR)
-      FOR_SHARE = ' LOCK IN SHARE MODE'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :FOR_SHARE)
-      SQL_CALC_FOUND_ROWS = ' SQL_CALC_FOUND_ROWS'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :SQL_CALC_FOUND_ROWS)
-      APOS = "'".freeze
-      Sequel::Deprecation.deprecate_constant(self, :APOS)
-      APOS_RE = /'/.freeze
-      Sequel::Deprecation.deprecate_constant(self, :APOS_RE)
-      DOUBLE_APOS = "''".freeze
-      Sequel::Deprecation.deprecate_constant(self, :DOUBLE_APOS)
-      SPACE = ' '.freeze
-      Sequel::Deprecation.deprecate_constant(self, :SPACE)
-      PAREN_CLOSE = ')'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :PAREN_CLOSE)
-      PAREN_OPEN = '('.freeze
-      Sequel::Deprecation.deprecate_constant(self, :PAREN_OPEN)
-      NOT_SPACE = 'NOT '.freeze
-      Sequel::Deprecation.deprecate_constant(self, :NOT_SPACE)
-      FROM = ' FROM '.freeze
-      Sequel::Deprecation.deprecate_constant(self, :FROM)
-      COMMA = ', '.freeze
-      Sequel::Deprecation.deprecate_constant(self, :COMMA)
-      LIMIT = " LIMIT ".freeze
-      Sequel::Deprecation.deprecate_constant(self, :LIMIT)
-      GROUP_BY = " GROUP BY ".freeze
-      Sequel::Deprecation.deprecate_constant(self, :GROUP_BY)
-      ESCAPE = " ESCAPE ".freeze
-      Sequel::Deprecation.deprecate_constant(self, :ESCAPE)
-      BACKSLASH = "\\".freeze
-      Sequel::Deprecation.deprecate_constant(self, :BACKSLASH)
-      REGEXP = 'REGEXP'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :REGEXP)
-      LIKE = 'LIKE'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :LIKE)
-      BINARY = 'BINARY '.freeze
-      Sequel::Deprecation.deprecate_constant(self, :BINARY)
-      CONCAT = "CONCAT".freeze
-      Sequel::Deprecation.deprecate_constant(self, :CONCAT)
-      CAST_BITCOMP_OPEN = "CAST(~".freeze
-      Sequel::Deprecation.deprecate_constant(self, :CAST_BITCOMP_OPEN)
-      CAST_BITCOMP_CLOSE = " AS SIGNED INTEGER)".freeze
-      Sequel::Deprecation.deprecate_constant(self, :CAST_BITCOMP_CLOSE)
-      STRAIGHT_JOIN = 'STRAIGHT_JOIN'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :STRAIGHT_JOIN)
-      NATURAL_LEFT_JOIN = 'NATURAL LEFT JOIN'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :NATURAL_LEFT_JOIN)
-      BACKTICK = '`'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :BACKTICK)
-      BACKTICK_RE = /`/.freeze
-      Sequel::Deprecation.deprecate_constant(self, :BACKTICK_RE)
-      DOUBLE_BACKTICK = '``'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :DOUBLE_BACKTICK)
-      EMPTY_COLUMNS = " ()".freeze
-      Sequel::Deprecation.deprecate_constant(self, :EMPTY_COLUMNS)
-      EMPTY_VALUES = " VALUES ()".freeze
-      Sequel::Deprecation.deprecate_constant(self, :EMPTY_VALUES)
-      IGNORE = " IGNORE".freeze
-      Sequel::Deprecation.deprecate_constant(self, :IGNORE)
-      ON_DUPLICATE_KEY_UPDATE = " ON DUPLICATE KEY UPDATE ".freeze
-      Sequel::Deprecation.deprecate_constant(self, :ON_DUPLICATE_KEY_UPDATE)
-      EQ_VALUES = '=VALUES('.freeze
-      Sequel::Deprecation.deprecate_constant(self, :EQ_VALUES)
-      EQ = '='.freeze
-      Sequel::Deprecation.deprecate_constant(self, :EQ)
-      WITH_ROLLUP = ' WITH ROLLUP'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :WITH_ROLLUP)
-      EXPLAIN = 'EXPLAIN '.freeze
-      Sequel::Deprecation.deprecate_constant(self, :EXPLAIN)
-      EXPLAIN_EXTENDED = 'EXPLAIN EXTENDED '.freeze
-      Sequel::Deprecation.deprecate_constant(self, :EXPLAIN_EXTENDED)
-      BACKSLASH_RE = /\\/.freeze
-      Sequel::Deprecation.deprecate_constant(self, :BACKSLASH_RE)
-      QUAD_BACKSLASH = "\\\\\\\\".freeze
-      Sequel::Deprecation.deprecate_constant(self, :QUAD_BACKSLASH)
-      BLOB_START = "0x".freeze
-      Sequel::Deprecation.deprecate_constant(self, :BLOB_START)
-      EMPTY_BLOB = "''".freeze
-      Sequel::Deprecation.deprecate_constant(self, :EMPTY_BLOB)
-      HSTAR = "H*".freeze
-      Sequel::Deprecation.deprecate_constant(self, :HSTAR)
-      CURRENT_TIMESTAMP_56 = 'CURRENT_TIMESTAMP(6)'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :CURRENT_TIMESTAMP_56)
-      ONLY_OFFSET = ",18446744073709551615".freeze
-      Sequel::Deprecation.deprecate_constant(self, :ONLY_OFFSET)
-      NON_SQL_OPTIONS = (Dataset::NON_SQL_OPTIONS + [:insert_ignore, :update_ignore, :on_duplicate_key_update]).freeze
-      Sequel::Deprecation.deprecate_constant(self, :NON_SQL_OPTIONS)
-
       MATCH_AGAINST = ["MATCH ".freeze, " AGAINST (".freeze, ")".freeze].freeze
       MATCH_AGAINST_BOOLEAN = ["MATCH ".freeze, " AGAINST (".freeze, " IN BOOLEAN MODE)".freeze].freeze
 
@@ -733,8 +551,6 @@ module Sequel
       include Sequel::Dataset::Replace
       include UnmodifiedIdentifiers::DatasetMethods
 
-      # MySQL specific syntax for LIKE/REGEXP searches, as well as
-      # string concatenation.
       def complex_expression_sql_append(sql, op, args)
         case op
         when :IN, :"NOT IN"
@@ -802,10 +618,10 @@ module Sequel
       # Sets up the select methods to delete from if deleting from a
       # joined dataset:
       #
-      #   DB[:a].join(:b, :a_id=>:id).delete
+      #   DB[:a].join(:b, a_id: :id).delete
       #   # DELETE a FROM a INNER JOIN b ON (b.a_id = a.id)
       #
-      #   DB[:a].join(:b, :a_id=>:id).delete_from(:a, :b).delete
+      #   DB[:a].join(:b, a_id: :id).delete_from(:a, :b).delete
       #   # DELETE a, b FROM a INNER JOIN b ON (b.a_id = a.id)
       def delete_from(*tables)
         clone(:delete_from=>tables)
@@ -838,26 +654,10 @@ module Sequel
         SQL::PlaceholderLiteralString.new((opts[:boolean] ? MATCH_AGAINST_BOOLEAN : MATCH_AGAINST), [Array(cols), terms])
       end
 
-      # Transforms an CROSS JOIN to an INNER JOIN if the expr is not nil.
-      # Raises an error on use of :full_outer type, since MySQL doesn't support it.
-      def join_table(type, table, expr=nil, opts=OPTS, &block)
-        if (type == :cross) && !expr.nil?
-           Sequel::Deprecation.deprecate(":cross join type with conditions being converted to INNER JOIN on MySQL", "Use :inner join type instead")
-          type = :inner
-        end
-        raise(Sequel::Error, "MySQL doesn't support FULL OUTER JOIN or NATURAL FULL JOIN") if type == :full_outer || type == :natural_full
-        super(type, table, expr, opts, &block)
-      end
-      
-      # Transforms :natural_inner to NATURAL LEFT JOIN and straight to
-      # STRAIGHT_JOIN.
+      # Transforms :straight to STRAIGHT_JOIN.
       def join_type_sql(join_type)
-        case join_type
-        when :straight
+        if join_type == :straight
           'STRAIGHT_JOIN'
-        when :natural_inner
-           Sequel::Deprecation.deprecate(":natural_inner join type being converted to NATURAL LEFT JOIN on MySQL", "Use :natural_left join type for NATURAL LEFT JOIN, or :natural join type for NATURAL JOIN")
-          'NATURAL LEFT JOIN'
         else
           super
         end
@@ -868,7 +668,7 @@ module Sequel
       # inserting rows that violate the unique key restriction.
       #
       #   dataset.insert_ignore.multi_insert(
-      #    [{:name => 'a', :value => 1}, {:name => 'b', :value => 2}]
+      #     [{name: 'a', value: 1}, {name: 'b', value: 2}]
       #   )
       #   # INSERT IGNORE INTO tablename (name, value) VALUES (a, 1), (b, 2)
       def insert_ignore
@@ -886,21 +686,21 @@ module Sequel
       # inserting rows that violate the unique key restriction.
       #
       #   dataset.on_duplicate_key_update.multi_insert(
-      #    [{:name => 'a', :value => 1}, {:name => 'b', :value => 2}]
+      #     [{name: 'a', value: 1}, {name: 'b', value: 2}]
       #   )
       #   # INSERT INTO tablename (name, value) VALUES (a, 1), (b, 2)
       #   # ON DUPLICATE KEY UPDATE name=VALUES(name), value=VALUES(value)
       #
       #   dataset.on_duplicate_key_update(:value).multi_insert(
-      #     [{:name => 'a', :value => 1}, {:name => 'b', :value => 2}]
+      #     [{name: 'a', value: 1}, {name: 'b', value: 2}]
       #   )
       #   # INSERT INTO tablename (name, value) VALUES (a, 1), (b, 2)
       #   # ON DUPLICATE KEY UPDATE value=VALUES(value)
       #
       #   dataset.on_duplicate_key_update(
-      #     :value => Sequel.lit('value + VALUES(value)')
+      #     value: Sequel.lit('value + VALUES(value)')
       #   ).multi_insert(
-      #     [{:name => 'a', :value => 1}, {:name => 'b', :value => 2}]
+      #     [{name: 'a', value: 1}, {name: 'b', value: 2}]
       #   )
       #   # INSERT INTO tablename (name, value) VALUES (a, 1), (b, 2)
       #   # ON DUPLICATE KEY UPDATE value=value + VALUES(value)
@@ -945,7 +745,7 @@ module Sequel
       end
 
       # MySQL's DISTINCT ON emulation using GROUP BY does not respect the
-      # queries ORDER BY clause.
+      # query's ORDER BY clause.
       def supports_ordered_distinct_on?
         false
       end
@@ -955,9 +755,8 @@ module Sequel
         true
       end
 
-      # MySQL does support fractional timestamps in literal timestamps, but it
-      # ignores them.  Also, using them seems to cause problems on 1.9.  Since
-      # they are ignored anyway, not using them is probably best.
+      # Check the database setting for whether fractional timestamps
+      # are suppported.
       def supports_timestamp_usecs?
         db.supports_timestamp_usecs?
       end
@@ -966,7 +765,7 @@ module Sequel
       # Useful if you have a unique key and want to just skip
       # updating rows that violate the unique key restriction.
       #
-      #   dataset.update_ignore.update({:name => 'a', :value => 1})
+      #   dataset.update_ignore.update(name: 'a', value: 1)
       #   # UPDATE IGNORE tablename SET name = 'a', value = 1
       def update_ignore
         clone(:update_ignore=>true)
@@ -1105,7 +904,7 @@ module Sequel
         '1'
       end
       
-      # MySQL supports multiple rows in INSERT.
+      # MySQL supports multiple rows in VALUES in INSERT.
       def multi_insert_sql_strategy
         :values
       end