sequel 4.45.0 → 4.46.0

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

@@ -40,10 +40,14 @@ module Sequel
       include UnmodifiedIdentifiers::DatabaseMethods
 
       AUTO_INCREMENT = 'AUTO_INCREMENT'.freeze
-      CAST_TYPES = {String=>:CHAR, Integer=>:SIGNED, Time=>:DATETIME, DateTime=>:DATETIME, Numeric=>:DECIMAL, BigDecimal=>:DECIMAL, File=>:BINARY}
-      COLUMN_DEFINITION_ORDER = [:collate, :null, :default, :unique, :primary_key, :auto_increment, :references]
+      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
 
       include Sequel::Database::SplitAlterTable
       
@@ -121,7 +125,7 @@ module Sequel
 
         metadata_dataset.with_sql(sql).each do |r|
           name = r[:Key_name]
-          next if name == PRIMARY
+          next if name == 'PRIMARY'
           name = m.call(name)
           remove_indexes << name if r[:Sub_part] && ! opts[:partial]
           i = indexes[name] ||= {:columns=>[], :unique=>r[:Non_unique] != 1}
@@ -290,7 +294,7 @@ module Sequel
       # Handle MySQL specific default format.
       def column_schema_normalize_default(default, type)
         if column_schema_default_string_type?(type)
-          return if [:date, :datetime, :time].include?(type) && MYSQL_TIMESTAMP_RE.match(default)
+          return if [:date, :datetime, :time].include?(type) && /\ACURRENT_(?:DATE|TIMESTAMP)?\z/.match(default)
           default = "'#{default.gsub("'", "''").gsub('\\', '\\\\')}'"
         end
         super(default, type)
@@ -327,7 +331,7 @@ module Sequel
       
       # Use MySQL specific AUTO_INCREMENT text.
       def auto_increment_sql
-        AUTO_INCREMENT
+        'AUTO_INCREMENT'
       end
       
       # MySQL needs to set transaction isolation before begining a transaction
@@ -576,55 +580,98 @@ 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
-      APOS = Dataset::APOS
-      APOS_RE = Dataset::APOS_RE
-      DOUBLE_APOS = Dataset::DOUBLE_APOS
-      SPACE = Dataset::SPACE
-      PAREN_OPEN = Dataset::PAREN_OPEN
-      PAREN_CLOSE = Dataset::PAREN_CLOSE
-      NOT_SPACE = Dataset::NOT_SPACE
-      FROM = Dataset::FROM
-      COMMA = Dataset::COMMA
-      LIMIT = Dataset::LIMIT
-      GROUP_BY = Dataset::GROUP_BY
-      ESCAPE = Dataset::ESCAPE
-      BACKSLASH = Dataset::BACKSLASH
+      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
-      MATCH_AGAINST = ["(MATCH ".freeze, " AGAINST (".freeze, "))".freeze].freeze
-      MATCH_AGAINST_BOOLEAN = ["(MATCH ".freeze, " AGAINST (".freeze, " IN BOOLEAN MODE))".freeze].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
-
-      # Comes directly from MySQL's documentation, used for queries with limits without offsets
+      Sequel::Deprecation.deprecate_constant(self, :CURRENT_TIMESTAMP_56)
       ONLY_OFFSET = ",18446744073709551615".freeze
+      Sequel::Deprecation.deprecate_constant(self, :ONLY_OFFSET)
 
+      MATCH_AGAINST = ["MATCH ".freeze, " AGAINST (".freeze, ")".freeze].freeze
+      MATCH_AGAINST_BOOLEAN = ["MATCH ".freeze, " AGAINST (".freeze, " IN BOOLEAN MODE)".freeze].freeze
       NON_SQL_OPTIONS = (Dataset::NON_SQL_OPTIONS + [:insert_ignore, :update_ignore, :on_duplicate_key_update]).freeze
 
       Dataset.def_sql_method(self, :delete, %w'delete from where order limit')
@@ -640,37 +687,37 @@ module Sequel
       def complex_expression_sql_append(sql, op, args)
         case op
         when :IN, :"NOT IN"
-          ds = args.at(1)
+          ds = args[1]
           if ds.is_a?(Sequel::Dataset) && ds.opts[:limit]
-            super(sql, op, [args.at(0), ds.from_self])
+            super(sql, op, [args[0], ds.from_self])
           else
             super
           end
         when :~, :'!~', :'~*', :'!~*', :LIKE, :'NOT LIKE', :ILIKE, :'NOT ILIKE'
-          sql << PAREN_OPEN
-          literal_append(sql, args.at(0))
-          sql << SPACE
+          sql << '('
+          literal_append(sql, args[0])
+          sql << ' '
           sql << 'NOT ' if [:'NOT LIKE', :'NOT ILIKE', :'!~', :'!~*'].include?(op)
-          sql << ([:~, :'!~', :'~*', :'!~*'].include?(op) ? REGEXP : LIKE)
-          sql << SPACE
-          sql << BINARY if [:~, :'!~', :LIKE, :'NOT LIKE'].include?(op)
-          literal_append(sql, args.at(1))
+          sql << ([:~, :'!~', :'~*', :'!~*'].include?(op) ? 'REGEXP' : 'LIKE')
+          sql << ' '
+          sql << 'BINARY ' if [:~, :'!~', :LIKE, :'NOT LIKE'].include?(op)
+          literal_append(sql, args[1])
           if [:LIKE, :'NOT LIKE', :ILIKE, :'NOT ILIKE'].include?(op)
-            sql << ESCAPE
-            literal_append(sql, BACKSLASH)
+            sql << " ESCAPE "
+            literal_append(sql, "\\")
           end
-          sql << PAREN_CLOSE
+          sql << ')'
         when :'||'
           if args.length > 1
-            sql << CONCAT
+            sql << "CONCAT"
             array_sql_append(sql, args)
           else
-            literal_append(sql, args.at(0))
+            literal_append(sql, args[0])
           end
         when :'B~'
-          sql << CAST_BITCOMP_OPEN
-          literal_append(sql, args.at(0))
-          sql << CAST_BITCOMP_CLOSE
+          sql << "CAST(~"
+          literal_append(sql, args[0])
+          sql << " AS SIGNED INTEGER)"
         else
           super
         end
@@ -682,7 +729,7 @@ module Sequel
       # fractional seconds.
       def constant_sql_append(sql, constant)
         if constant == :CURRENT_TIMESTAMP && supports_timestamp_usecs?
-          sql << CURRENT_TIMESTAMP_56
+          sql << 'CURRENT_TIMESTAMP(6)'
         else
           super
         end
@@ -719,7 +766,7 @@ module Sequel
         # Load the PrettyTable class, needed for explain output
         Sequel.extension(:_pretty_table) unless defined?(Sequel::PrettyTable)
 
-        ds = db.send(:metadata_dataset).with_sql((opts[:extended] ? EXPLAIN_EXTENDED : EXPLAIN) + select_sql).naked
+        ds = db.send(:metadata_dataset).with_sql((opts[:extended] ? 'EXPLAIN EXTENDED ' : 'EXPLAIN ') + select_sql).naked
         rows = ds.all
         Sequel::PrettyTable.string(rows, ds.columns)
       end
@@ -753,9 +800,9 @@ module Sequel
       def join_type_sql(join_type)
         case join_type
         when :straight
-          STRAIGHT_JOIN
+          'STRAIGHT_JOIN'
         when :natural_inner
-          NATURAL_LEFT_JOIN
+          'NATURAL LEFT JOIN'
         else
           super
         end
@@ -808,7 +855,7 @@ module Sequel
 
       # MySQL uses the nonstandard ` (backtick) for quoting identifiers.
       def quoted_identifier_append(sql, c)
-        sql << BACKTICK << c.to_s.gsub(BACKTICK_RE, DOUBLE_BACKTICK) << BACKTICK
+        sql << '`' << c.to_s.gsub('`', '``') << '`'
       end
 
       # MySQL does not support derived column lists
@@ -881,10 +928,10 @@ module Sequel
       # from, but include the others for the purposes of selecting rows.
       def delete_from_sql(sql)
         if joined_dataset?
-          sql << SPACE
+          sql << ' '
           tables = @opts[:delete_from] || @opts[:from][0..0]
           source_list_append(sql, tables)
-          sql << FROM
+          sql << ' FROM '
           source_list_append(sql, @opts[:from])
           select_join_sql(sql)
         else
@@ -896,7 +943,7 @@ module Sequel
       def insert_columns_sql(sql)
         values = opts[:values]
         if values.is_a?(Array) && values.empty?
-          sql << EMPTY_COLUMNS
+          sql << " ()"
         else
           super
         end
@@ -904,12 +951,12 @@ module Sequel
 
       # MySQL supports INSERT IGNORE INTO
       def insert_ignore_sql(sql)
-        sql << IGNORE if opts[:insert_ignore]
+        sql << " IGNORE" if opts[:insert_ignore]
       end
 
       # MySQL supports UPDATE IGNORE
       def update_ignore_sql(sql)
-        sql << IGNORE if opts[:update_ignore]
+        sql << " IGNORE" if opts[:update_ignore]
       end
 
       # MySQL supports INSERT ... ON DUPLICATE KEY UPDATE
@@ -924,11 +971,11 @@ module Sequel
             update_cols = update_cols[0..-2]
           end
 
-          sql << ON_DUPLICATE_KEY_UPDATE
+          sql << " ON DUPLICATE KEY UPDATE "
           c = false
-          co = COMMA
-          values = EQ_VALUES
-          endp = PAREN_CLOSE
+          co = ', '
+          values = '=VALUES('
+          endp = ')'
           update_cols.each do |col|
             sql << co if c
             quote_identifier_append(sql, col)
@@ -938,7 +985,7 @@ module Sequel
             c ||= true
           end
           if update_vals
-            eq = EQ
+            eq = '='
             update_vals.map do |col,v| 
               sql << co if c
               quote_identifier_append(sql, col)
@@ -954,7 +1001,7 @@ module Sequel
       def insert_values_sql(sql)
         values = opts[:values]
         if values.is_a?(Array) && values.empty?
-          sql << EMPTY_VALUES
+          sql << " VALUES ()"
         else
           super
         end
@@ -963,7 +1010,7 @@ module Sequel
       # MySQL allows a LIMIT in DELETE and UPDATE statements.
       def limit_sql(sql)
         if l = @opts[:limit]
-          sql << LIMIT
+          sql << " LIMIT "
           literal_append(sql, l)
         end
       end
@@ -973,15 +1020,15 @@ module Sequel
       # MySQL uses a preceding X for hex escaping strings
       def literal_blob_append(sql, v)
         if v.empty?
-          sql << EMPTY_BLOB
+          sql << "''"
         else
-          sql << BLOB_START << v.unpack(HSTAR).first
+          sql << "0x" << v.unpack("H*").first
         end
       end
 
       # Use 0 for false on MySQL
       def literal_false
-        BOOL_FALSE
+        '0'
       end
 
       # Raise error for infinitate and NaN values
@@ -995,12 +1042,12 @@ module Sequel
 
       # SQL fragment for String.  Doubles \ and ' by default.
       def literal_string_append(sql, v)
-        sql << APOS << v.gsub(BACKSLASH_RE, QUAD_BACKSLASH).gsub(APOS_RE, DOUBLE_APOS) << APOS
+        sql << "'" << v.gsub("\\", "\\\\\\\\").gsub("'", "''") << "'"
       end
 
       # Use 1 for true on MySQL
       def literal_true
-        BOOL_TRUE
+        '1'
       end
       
       # MySQL supports multiple rows in INSERT.
@@ -1014,19 +1061,19 @@ module Sequel
       end
 
       def select_only_offset_sql(sql)
-        sql << LIMIT
+        sql << " LIMIT "
         literal_append(sql, @opts[:offset])
-        sql << ONLY_OFFSET
+        sql << ",18446744073709551615"
       end
   
       # Support FOR SHARE locking when using the :share lock style.
       def select_lock_sql(sql)
-        @opts[:lock] == :share ? (sql << FOR_SHARE) : super
+        @opts[:lock] == :share ? (sql << ' LOCK IN SHARE MODE') : super
       end
 
       # MySQL specific SQL_CALC_FOUND_ROWS option
       def select_calc_found_rows_sql(sql)
-        sql << SQL_CALC_FOUND_ROWS if opts[:calc_found_rows]
+        sql << ' SQL_CALC_FOUND_ROWS' if opts[:calc_found_rows]
       end
 
       # MySQL uses WITH ROLLUP syntax.

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

@@ -15,7 +15,9 @@ module Sequel
 
     module DatabaseMethods
       TEMPORARY = 'GLOBAL TEMPORARY '.freeze
+      Sequel::Deprecation.deprecate_constant(self, :TEMPORARY)
       AUTOINCREMENT = ''.freeze
+      Sequel::Deprecation.deprecate_constant(self, :AUTOINCREMENT)
 
       attr_accessor :autosequence
 
@@ -86,7 +88,7 @@ module Sequel
         false
       end
 
-      IGNORE_OWNERS = %w'APEX_040000 CTXSYS EXFSYS MDSYS OLAPSYS ORDDATA ORDSYS SYS SYSTEM XDB XDBMETADATA XDBPM XFILES WMSYS'
+      IGNORE_OWNERS = %w'APEX_040000 CTXSYS EXFSYS MDSYS OLAPSYS ORDDATA ORDSYS SYS SYSTEM XDB XDBMETADATA XDBPM XFILES WMSYS'#.freeze # SEQUEL5
 
       def tables(opts=OPTS)
         m = output_identifier_meth
@@ -174,7 +176,7 @@ module Sequel
       end
 
       def auto_increment_sql
-        AUTOINCREMENT
+        ''
       end
 
       def create_sequence_sql(name, opts=OPTS)
@@ -251,7 +253,7 @@ module Sequel
       TRANSACTION_ISOLATION_LEVELS = {:uncommitted=>'READ COMMITTED'.freeze,
         :committed=>'READ COMMITTED'.freeze,
         :repeatable=>'SERIALIZABLE'.freeze,
-        :serializable=>'SERIALIZABLE'.freeze}
+        :serializable=>'SERIALIZABLE'.freeze}#.freeze # SEQUEL5
       # 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)
@@ -302,7 +304,7 @@ module Sequel
 
       # SQL fragment for showing a table is temporary
       def temporary_table_sql
-        TEMPORARY
+        'GLOBAL TEMPORARY '
       end
 
       # Oracle uses clob for text types.
@@ -318,19 +320,32 @@ module Sequel
 
     module DatasetMethods
       ROW_NUMBER_EXPRESSION = LiteralString.new('ROWNUM').freeze
-      SPACE = Dataset::SPACE
-      APOS = Dataset::APOS
-      APOS_RE = Dataset::APOS_RE
-      DOUBLE_APOS = Dataset::DOUBLE_APOS
-      FROM = Dataset::FROM
+      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
-      BITAND_PROC = lambda{|a, b| Sequel.lit(["CAST(BITAND(", ", ", ") AS INTEGER)"], a, b)}
+      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 lock')
@@ -354,9 +369,9 @@ module Sequel
             sql << 'NOT '
           end
           sql << 'REGEXP_LIKE('
-          literal_append(sql, args.at(0))
+          literal_append(sql, args[0])
           sql << ','
-          literal_append(sql, args.at(1))
+          literal_append(sql, args[1])
           if op == :'~*' || op == :'!~*'
             sql << ", 'i'"
           end
@@ -530,17 +545,17 @@ module Sequel
       # the use of AS anywhere, so this disables it in all cases.
       def as_sql_append(sql, aliaz, column_aliases=nil)
         raise Error, "oracle does not support derived column lists" if column_aliases
-        sql << SPACE
+        sql << ' '
         quote_identifier_append(sql, aliaz)
       end
 
       # The strftime format to use when literalizing the time.
       def default_timestamp_format
-        TIMESTAMP_FORMAT
+        "TIMESTAMP '%Y-%m-%d %H:%M:%S%N %z'"
       end
 
       def empty_from_sql
-        DUAL
+        ' FROM DUAL'
       end
 
       # There is no function on Microsoft SQL Server that does character length
@@ -575,7 +590,7 @@ module Sequel
 
       # Use a colon for the timestamp offset, since Oracle appears to require it.
       def format_timestamp_offset(hour, minute)
-        sprintf(TIMESTAMP_OFFSET_FORMAT, hour, minute)
+        sprintf("%+03i:%02i", hour, minute)
       end
 
       # Oracle doesn't support empty values when inserting.
@@ -585,22 +600,22 @@ module Sequel
 
       # Use string in hex format for blob data.
       def literal_blob_append(sql, v)
-        sql << APOS << v.unpack(HSTAR).first << APOS
+        sql << "'" << v.unpack("H*").first << "'"
       end
 
       # Oracle uses 'N' for false values.
       def literal_false
-        BOOL_FALSE
+        "'N'"
       end
 
       # Oracle uses the SQL standard of only doubling ' inside strings.
       def literal_string_append(sql, v)
-        sql << APOS << v.gsub(APOS_RE, DOUBLE_APOS) << APOS
+        sql << "'" << v.gsub("'", "''") << "'"
       end
 
       # Oracle uses 'Y' for true values.
       def literal_true
-        BOOL_TRUE
+        "'Y'"
       end
 
       # Oracle can insert multiple rows using a UNION
@@ -613,7 +628,7 @@ module Sequel
         super
 
         if @opts[:skip_locked]
-          sql << SKIP_LOCKED
+          sql << " SKIP LOCKED"
         end
       end