sequel 4.49.0 → 5.3.0

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
@@ -145,6 +74,7 @@ module Sequel
 
       def freeze
         server_version
+        mariadb?
         supports_timestamp_usecs?
         super
       end
@@ -163,7 +93,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,16 +113,20 @@ 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
 
+      # Whether the database is MariaDB and not MySQL
+      def mariadb?
+        return @is_mariadb if defined?(@is_mariadb)
+        @is_mariadb = !(fetch('SELECT version()').single_value! !~ /mariadb/i)
+      end
+
       # Get version of MySQL server, used for determined capabilities.
       def server_version
         @server_version ||= begin
-          m = /(\d+)\.(\d+)\.(\d+)/.match(get(SQL::Function.new(:version)))
+          m = /(\d+)\.(\d+)\.(\d+)/.match(fetch('SELECT version()').single_value!)
           (m[1].to_i * 10000) + (m[2].to_i * 100) + m[3].to_i
         end
       end
@@ -241,16 +174,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:
@@ -321,10 +244,13 @@ module Sequel
           "DROP FOREIGN KEY #{quote_identifier(name)}"
         when :unique
           "DROP INDEX #{quote_identifier(op[:name])}"
+        when :check, nil 
+          if supports_check_constraints?
+            "DROP CONSTRAINT #{quote_identifier(op[:name])}"
+          end
         end
       end
 
-      # MySQL server requires table names when dropping indexes.
       def alter_table_sql(table, op)
         case op[:op]
         when :drop_index
@@ -350,6 +276,11 @@ module Sequel
         super(default, type)
       end
 
+      def column_schema_to_ruby_default(default, type)
+        return Sequel::CURRENT_DATE if mariadb? && server_version >= 100200 && default == 'curdate()'
+        super
+      end
+
       # Don't allow combining adding foreign key operations with other
       # operations, since in some cases adding a foreign key constraint in
       # the same query as other operations results in MySQL error 150.
@@ -379,7 +310,6 @@ module Sequel
         sqls
       end
       
-      # Use MySQL specific AUTO_INCREMENT text.
       def auto_increment_sql
         'AUTO_INCREMENT'
       end
@@ -400,7 +330,6 @@ module Sequel
         end
       end
 
-      # The order of the column definition, as an array of symbols.
       def column_definition_order
         COLUMN_DEFINITION_ORDER
       end
@@ -477,6 +406,7 @@ module Sequel
         /foreign key constraint fails/ => ForeignKeyConstraintViolation,
         /cannot be null/ => NotNullConstraintViolation,
         /Deadlock found when trying to get lock; try restarting transaction/ => SerializationFailure,
+        /CONSTRAINT .+ failed for/ => CheckConstraintViolation,
       }.freeze
       def database_error_regexps
         DATABASE_ERROR_REGEXPS
@@ -488,7 +418,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 +449,6 @@ module Sequel
         end
       end
 
-      # Recognize MySQL set type.
       def schema_column_type(db_type)
         case db_type
         when /\Aset/io
@@ -559,6 +487,11 @@ module Sequel
         server_version >= 50600 && (op[:op] == :drop_index || (op[:op] == :drop_constraint && op[:type] == :unique))
       end
 
+      # Whether the database supports CHECK constraints
+      def supports_check_constraints?
+        mariadb? && server_version >= 100200
+      end
+
       # MySQL can combine multiple alter table ops into a single query.
       def supports_combining_alter_table_ops?
         true
@@ -629,112 +562,17 @@ 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
 
       Dataset.def_sql_method(self, :delete, %w'delete from where order limit')
       Dataset.def_sql_method(self, :insert, %w'insert ignore into columns values on_duplicate_key_update')
-      Dataset.def_sql_method(self, :select, %w'select distinct calc_found_rows columns from join where group having compounds order limit lock')
+      Dataset.def_sql_method(self, :select, %w'with select distinct calc_found_rows columns from join where group having compounds order limit lock')
       Dataset.def_sql_method(self, :update, %w'update ignore table set where order limit')
 
       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 +640,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 +676,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 +690,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 +708,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)
@@ -913,6 +735,10 @@ module Sequel
         sql << '`' << c.to_s.gsub('`', '``') << '`'
       end
 
+      def supports_cte?(type=:select)
+        type == :select && db.mariadb? && db.server_version >= 100200
+      end
+
       # MySQL does not support derived column lists
       def supports_derived_column_lists?
         false
@@ -945,7 +771,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,18 +781,21 @@ 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
-      
+
+      def supports_window_functions?
+        db.mariadb? && db.server_version >= 100200
+      end
+
       # Sets up the update methods to use UPDATE IGNORE.
       # 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 +934,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
@@ -1130,6 +959,11 @@ module Sequel
         sql << ' SQL_CALC_FOUND_ROWS' if opts[:calc_found_rows]
       end
 
+      # Use WITH RECURSIVE instead of WITH if any of the CTEs is recursive
+      def select_with_sql_base
+        opts[:with].any?{|w| w[:recursive]} ? "WITH RECURSIVE " : super
+      end
+
       # MySQL uses WITH ROLLUP syntax.
       def uses_with_rollup?
         true

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

@@ -1,24 +1,19 @@
 # frozen-string-literal: true
 
-Sequel.require 'adapters/utils/emulate_offset_with_row_number'
+require_relative '../utils/emulate_offset_with_row_number'
 
 module Sequel
   module Oracle
     Sequel::Database.set_shared_adapter_scheme(:oracle, self)
     
     def self.mock_adapter_setup(db)
-      db.instance_eval do
+      db.instance_exec do
         @server_version = 11000000
         @primary_key_sequences = {}
       end
     end
 
     module DatabaseMethods
-      TEMPORARY = 'GLOBAL TEMPORARY '.freeze
-      Sequel::Deprecation.deprecate_constant(self, :TEMPORARY)
-      AUTOINCREMENT = ''.freeze
-      Sequel::Deprecation.deprecate_constant(self, :AUTOINCREMENT)
-
       attr_accessor :autosequence
 
       def create_sequence(name, opts=OPTS)
@@ -37,7 +32,6 @@ module Sequel
         self << drop_sequence_sql(name)
       end
 
-      # Oracle uses the :oracle database type
       def database_type
         :oracle
       end
@@ -88,7 +82,7 @@ module Sequel
         false
       end
 
-      IGNORE_OWNERS = %w'APEX_040000 CTXSYS EXFSYS MDSYS OLAPSYS ORDDATA ORDSYS SYS SYSTEM XDB XDBMETADATA XDBPM XFILES WMSYS'#.freeze # SEQUEL5
+      IGNORE_OWNERS = %w'APEX_040000 CTXSYS EXFSYS MDSYS OLAPSYS ORDDATA ORDSYS SYS SYSTEM XDB XDBMETADATA XDBPM XFILES WMSYS'.freeze
 
       def tables(opts=OPTS)
         m = output_identifier_meth
@@ -146,7 +140,6 @@ module Sequel
 
       private
 
-      # Handle Oracle specific ALTER TABLE SQL
       def alter_table_sql(table, op)
         case op[:op]
         when :add_column
@@ -253,7 +246,7 @@ module Sequel
       TRANSACTION_ISOLATION_LEVELS = {:uncommitted=>'READ COMMITTED'.freeze,
         :committed=>'READ COMMITTED'.freeze,
         :repeatable=>'SERIALIZABLE'.freeze,
-        :serializable=>'SERIALIZABLE'.freeze}#.freeze # SEQUEL5
+        :serializable=>'SERIALIZABLE'.freeze}.freeze
       # Oracle doesn't support READ UNCOMMITTED OR REPEATABLE READ transaction
       # isolation levels, so upgrade to the next highest level in those cases.
       def set_transaction_isolation_sql(level)
@@ -322,31 +315,6 @@ module Sequel
       ROW_NUMBER_EXPRESSION = LiteralString.new('ROWNUM').freeze
       BITAND_PROC = lambda{|a, b| Sequel.lit(["CAST(BITAND(", ", ", ") AS INTEGER)"], a, b)}
 
-      SPACE = ' '.freeze
-      Sequel::Deprecation.deprecate_constant(self, :SPACE)
-      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)
-      FROM = ' FROM '.freeze
-      Sequel::Deprecation.deprecate_constant(self, :FROM)
-      TIMESTAMP_FORMAT = "TIMESTAMP '%Y-%m-%d %H:%M:%S%N %z'".freeze
-      Sequel::Deprecation.deprecate_constant(self, :TIMESTAMP_FORMAT)
-      TIMESTAMP_OFFSET_FORMAT = "%+03i:%02i".freeze
-      Sequel::Deprecation.deprecate_constant(self, :TIMESTAMP_OFFSET_FORMAT)
-      BOOL_FALSE = "'N'".freeze
-      Sequel::Deprecation.deprecate_constant(self, :BOOL_FALSE)
-      BOOL_TRUE = "'Y'".freeze
-      Sequel::Deprecation.deprecate_constant(self, :BOOL_TRUE)
-      HSTAR = "H*".freeze
-      Sequel::Deprecation.deprecate_constant(self, :HSTAR)
-      DUAL = ' FROM DUAL'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :DUAL)
-      SKIP_LOCKED = " SKIP LOCKED".freeze
-      Sequel::Deprecation.deprecate_constant(self, :SKIP_LOCKED)
-
       include(Module.new do
         Dataset.def_sql_method(self, :select, %w'with select distinct columns from join where group having compounds order limit lock')
       end)
@@ -418,7 +386,8 @@ module Sequel
         clone(:sequence=>s)
       end
 
-      # Handle LIMIT by using a unlimited subselect filtered with ROWNUM.
+      # Handle LIMIT by using a unlimited subselect filtered with ROWNUM,
+      # unless Oracle 12 is used.
       def select_sql
         return super if @opts[:sql]
         return super if supports_fetch_next_rows?
@@ -467,6 +436,7 @@ module Sequel
           sql << " ROWS ONLY"
         end
       end
+
       # Oracle requires recursive CTEs to have column aliases.
       def recursive_cte_requires_column_aliases?
         true
@@ -481,7 +451,8 @@ module Sequel
         false
       end
 
-      # Oracle supports FETCH NEXT ROWS since 12c
+      # Oracle supports FETCH NEXT ROWS since 12c, but it doesn't work when
+      # locking or when skipping locked rows.
       def supports_fetch_next_rows?
         server_version >= 12000000 && !(@opts[:lock] || @opts[:skip_locked])
       end
@@ -551,7 +522,7 @@ module Sequel
         db.server_version(@opts[:server])
       end
 
-      # Oracle supports pattern matching via regular expressions
+      # Oracle 10+ supports pattern matching via regular expressions
       def supports_regexp?
         server_version >= 10010002
       end
@@ -565,7 +536,8 @@ module Sequel
       end
 
       # Oracle doesn't support the use of AS when aliasing a dataset.  It doesn't require
-      # the use of AS anywhere, so this disables it in all cases.
+      # the use of AS anywhere, so this disables it in all cases.  Oracle also does not support
+      # derived column lists in aliases.
       def as_sql_append(sql, aliaz, column_aliases=nil)
         raise Error, "oracle does not support derived column lists" if column_aliases
         sql << ' '
@@ -581,7 +553,7 @@ module Sequel
         ' FROM DUAL'
       end
 
-      # There is no function on Microsoft SQL Server that does character length
+      # There is no function on Oracle that does character length
       # and respects trailing spaces (datalength respects trailing spaces, but
       # counts bytes instead of characters).  Use a hack to work around the
       # trailing spaces issue.