sequel 4.45.0 → 4.46.0

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

@@ -8,7 +8,28 @@ module Sequel
   module JDBC
     Sequel.synchronize do
       DATABASE_SETUP[:db2] = proc do |db|
+        (class << db; self; end).class_eval do
+          alias jdbc_schema_parse_table schema_parse_table
+          alias jdbc_tables tables
+          alias jdbc_views views
+          alias jdbc_indexes indexes
+        end
         db.extend(Sequel::JDBC::DB2::DatabaseMethods)
+        (class << db; self; end).class_eval do
+          alias schema_parse_table jdbc_schema_parse_table
+          alias tables jdbc_tables
+          alias views jdbc_views
+          alias indexes jdbc_indexes
+          %w'schema_parse_table tables views indexes'.each do |s|
+            class_eval(<<-END, __FILE__, __LINE__+1)
+              def jdbc_#{s}(*a)
+                Sequel::Deprecation.deprecate("Database#jdbc_#{s} in the jdbc/db2 adapter", "Use Database\##{s} instead")
+                #{s}(*a)
+              end
+            END
+            # remove_method(:"jdbc_#{s}") # SEQUEL5
+          end
+        end
         db.dataset_class = Sequel::JDBC::DB2::Dataset
         com.ibm.db2.jcc.DB2Driver
       end
@@ -24,29 +45,19 @@ module Sequel
       end
     end
 
-    class Database
-      # Alias the generic JDBC versions so they can be called directly later
-      alias jdbc_schema_parse_table schema_parse_table
-      alias jdbc_tables tables
-      alias jdbc_views views
-      alias jdbc_indexes indexes
-    end
-    
     # Database and Dataset instance methods for DB2 specific
     # support via JDBC.
     module DB2
       # Database instance methods for DB2 databases accessed via JDBC.
       module DatabaseMethods
-        PRIMARY_KEY_INDEX_RE = /\Asql\d+\z/i.freeze
-
         include Sequel::DB2::DatabaseMethods
         include Sequel::JDBC::Transactions
+
+        PRIMARY_KEY_INDEX_RE = /\Asql\d+\z/i.freeze
+        Sequel::Deprecation.deprecate_constant(self, :PRIMARY_KEY_INDEX_RE)
         IDENTITY_VAL_LOCAL = "SELECT IDENTITY_VAL_LOCAL() FROM SYSIBM.SYSDUMMY1".freeze
+        Sequel::Deprecation.deprecate_constant(self, :IDENTITY_VAL_LOCAL)
         
-        %w'schema_parse_table tables views indexes'.each do |s|
-          class_eval("def #{s}(*a) jdbc_#{s}(*a) end", __FILE__, __LINE__)
-        end
-
         private
 
         def set_ps_arg(cps, arg, i)
@@ -64,7 +75,7 @@ module Sequel
         
         def last_insert_id(conn, opts=OPTS)
           statement(conn) do |stmt|
-            sql = IDENTITY_VAL_LOCAL
+            sql = "SELECT IDENTITY_VAL_LOCAL() FROM SYSIBM.SYSDUMMY1"
             rs = log_connection_yield(sql, conn){stmt.executeQuery(sql)}
             rs.next
             rs.getLong(1)
@@ -73,7 +84,7 @@ module Sequel
         
         # Primary key indexes appear to be named sqlNNNN on DB2
         def primary_key_index_re
-          PRIMARY_KEY_INDEX_RE
+          /\Asql\d+\z/i
         end
 
         def setup_type_convertor_map

data/lib/sequel/adapters/jdbc/derby.rb

@@ -18,6 +18,7 @@ module Sequel
       # Instance methods for Derby Database objects accessed via JDBC.
       module DatabaseMethods
         PRIMARY_KEY_INDEX_RE = /\Asql\d+\z/i.freeze
+        Sequel::Deprecation.deprecate_constant(self, :PRIMARY_KEY_INDEX_RE)
 
         include ::Sequel::JDBC::Transactions
 
@@ -159,7 +160,7 @@ module Sequel
 
         # Primary key indexes appear to be named sqlNNNN on Derby
         def primary_key_index_re
-          PRIMARY_KEY_INDEX_RE
+          /\Asql\d+\z/i
         end
 
         # If an :identity option is present in the column, add the necessary IDENTITY SQL.
@@ -190,23 +191,40 @@ module Sequel
       
       # Dataset class for Derby datasets accessed via JDBC.
       class Dataset < JDBC::Dataset
-        PAREN_CLOSE = Dataset::PAREN_CLOSE
-        PAREN_OPEN = Dataset::PAREN_OPEN
-        OFFSET = Dataset::OFFSET
+        PAREN_CLOSE = ')'.freeze
+        Sequel::Deprecation.deprecate_constant(self, :PAREN_CLOSE)
+        PAREN_OPEN = '('.freeze
+        Sequel::Deprecation.deprecate_constant(self, :PAREN_OPEN)
+        OFFSET = " OFFSET ".freeze
+        Sequel::Deprecation.deprecate_constant(self, :OFFSET)
         CAST_STRING_OPEN = "RTRIM(".freeze
+        Sequel::Deprecation.deprecate_constant(self, :CAST_STRING_OPEN)
         BLOB_OPEN = "CAST(X'".freeze
+        Sequel::Deprecation.deprecate_constant(self, :BLOB_OPEN)
         BLOB_CLOSE = "' AS BLOB)".freeze
+        Sequel::Deprecation.deprecate_constant(self, :BLOB_CLOSE)
         HSTAR = "H*".freeze
+        Sequel::Deprecation.deprecate_constant(self, :HSTAR)
         TIME_FORMAT = "'%H:%M:%S'".freeze
+        Sequel::Deprecation.deprecate_constant(self, :TIME_FORMAT)
         DEFAULT_FROM = " FROM sysibm.sysdummy1".freeze
+        Sequel::Deprecation.deprecate_constant(self, :DEFAULT_FROM)
         ROWS = " ROWS".freeze
+        Sequel::Deprecation.deprecate_constant(self, :ROWS)
         FETCH_FIRST = " FETCH FIRST ".freeze
+        Sequel::Deprecation.deprecate_constant(self, :FETCH_FIRST)
         ROWS_ONLY = " ROWS ONLY".freeze
+        Sequel::Deprecation.deprecate_constant(self, :ROWS_ONLY)
         BOOL_TRUE_OLD = '(1 = 1)'.freeze
+        Sequel::Deprecation.deprecate_constant(self, :BOOL_TRUE_OLD)
         BOOL_FALSE_OLD = '(1 = 0)'.freeze
+        Sequel::Deprecation.deprecate_constant(self, :BOOL_FALSE_OLD)
         BOOL_TRUE = 'TRUE'.freeze
+        Sequel::Deprecation.deprecate_constant(self, :BOOL_TRUE)
         BOOL_FALSE = 'FALSE'.freeze
+        Sequel::Deprecation.deprecate_constant(self, :BOOL_FALSE)
         EMULATED_FUNCTION_MAP = {:char_length=>'length'.freeze}
+        Sequel::Deprecation.deprecate_constant(self, :EMULATED_FUNCTION_MAP)
 
         # Derby doesn't support an expression between CASE and WHEN,
         # so remove 
@@ -220,9 +238,9 @@ module Sequel
         # a string and the ending whitespace is important.
         def cast_sql_append(sql, expr, type)
           if type == String
-            sql << CAST_STRING_OPEN
+            sql << "RTRIM("
             super
-            sql << PAREN_CLOSE
+            sql << ')'
           else
             super
           end
@@ -241,9 +259,9 @@ module Sequel
             literal_append(sql, args[0])
             sql << "))"
           when :extract
-            sql << args.at(0).to_s << PAREN_OPEN
-            literal_append(sql, args.at(1))
-            sql << PAREN_CLOSE
+            sql << args[0].to_s << '('
+            literal_append(sql, args[1])
+            sql << ')'
           else
             super
           end
@@ -267,12 +285,12 @@ module Sequel
         private
 
         def empty_from_sql
-          DEFAULT_FROM
+          " FROM sysibm.sysdummy1"
         end
 
         # Derby needs a hex string casted to BLOB for blobs.
         def literal_blob_append(sql, v)
-          sql << BLOB_OPEN << v.unpack(HSTAR).first << BLOB_CLOSE
+          sql << "CAST(X'" << v.unpack("H*").first << "' AS BLOB)"
         end
 
         # Derby needs the standard workaround to insert all default values into
@@ -285,24 +303,24 @@ module Sequel
         # Newer versions can use the FALSE literal, but the latest gem version cannot.
         def literal_false
           if db.svn_version >= 1040133
-            BOOL_FALSE
+            'FALSE'
           else
-            BOOL_FALSE_OLD
+            '(1 = 0)'
           end
         end
 
         # Derby handles fractional seconds in timestamps, but not in times
         def literal_sqltime(v)
-          v.strftime(TIME_FORMAT)
+          v.strftime("'%H:%M:%S'")
         end
 
         # Derby uses an expression yielding true for true values.
         # Newer versions can use the TRUE literal, but the latest gem version cannot.
         def literal_true
           if db.svn_version >= 1040133
-            BOOL_TRUE
+            'TRUE'
           else
-            BOOL_TRUE_OLD
+            '(1 = 1)'
           end
         end
 
@@ -311,17 +329,26 @@ module Sequel
           :values
         end
 
+        # Emulate the char_length function with length
+        def native_function_name(emulated_function)
+          if emulated_function == :char_length
+            'length'
+          else
+            super
+          end
+        end
+
         # Offset comes before limit in Derby
         def select_limit_sql(sql)
           if o = @opts[:offset]
-            sql << OFFSET
+            sql << " OFFSET "
             literal_append(sql, o)
-            sql << ROWS
+            sql << " ROWS"
           end
           if l = @opts[:limit]
-            sql << FETCH_FIRST
+            sql << " FETCH FIRST "
             literal_append(sql, l)
-            sql << ROWS_ONLY
+            sql << " ROWS ONLY"
           end
         end
       end

data/lib/sequel/adapters/jdbc/h2.rb

@@ -17,6 +17,7 @@ module Sequel
       # Instance methods for H2 Database objects accessed via JDBC.
       module DatabaseMethods
         PRIMARY_KEY_INDEX_RE = /\Aprimary_key/i.freeze
+        Sequel::Deprecation.deprecate_constant(self, :PRIMARY_KEY_INDEX_RE)
       
         # Commit an existing prepared transaction with the given transaction
         # identifier string.
@@ -150,7 +151,7 @@ module Sequel
         end
         
         def primary_key_index_re
-          PRIMARY_KEY_INDEX_RE
+          /\Aprimary_key/i
         end
 
         # H2 does not support named column constraints.
@@ -167,17 +168,22 @@ module Sequel
       
       # Dataset class for H2 datasets accessed via JDBC.
       class Dataset < JDBC::Dataset
-        APOS = Dataset::APOS
-        HSTAR = "H*".freeze
         ILIKE_PLACEHOLDER = ["CAST(".freeze, " AS VARCHAR_IGNORECASE)".freeze].freeze
+
+        APOS = "'".freeze
+        Sequel::Deprecation.deprecate_constant(self, :APOS)
+        HSTAR = "H*".freeze
+        Sequel::Deprecation.deprecate_constant(self, :HSTAR)
         TIME_FORMAT = "'%H:%M:%S'".freeze
+        Sequel::Deprecation.deprecate_constant(self, :TIME_FORMAT)
         ONLY_OFFSET = " LIMIT -1 OFFSET ".freeze
+        Sequel::Deprecation.deprecate_constant(self, :ONLY_OFFSET)
 
         # Emulate the case insensitive LIKE operator and the bitwise operators.
         def complex_expression_sql_append(sql, op, args)
           case op
           when :ILIKE, :"NOT ILIKE"
-            super(sql, (op == :ILIKE ? :LIKE : :"NOT LIKE"), [SQL::PlaceholderLiteralString.new(ILIKE_PLACEHOLDER, [args.at(0)]), args.at(1)])
+            super(sql, (op == :ILIKE ? :LIKE : :"NOT LIKE"), [SQL::PlaceholderLiteralString.new(ILIKE_PLACEHOLDER, [args[0]]), args[1]])
           when :&, :|, :^, :<<, :>>, :'B~'
             complex_expression_emulate_append(sql, op, args)
           else
@@ -214,12 +220,12 @@ module Sequel
 
         # H2 expects hexadecimal strings for blob values
         def literal_blob_append(sql, v)
-          sql << APOS << v.unpack(HSTAR).first << APOS
+          sql << "'" << v.unpack("H*").first << "'"
         end
         
         # H2 handles fractional seconds in timestamps, but not in times
         def literal_sqltime(v)
-          v.strftime(TIME_FORMAT)
+          v.strftime("'%H:%M:%S'")
         end
 
         # H2 supports multiple rows in INSERT.
@@ -228,7 +234,7 @@ module Sequel
         end
 
         def select_only_offset_sql(sql)
-          sql << ONLY_OFFSET
+          sql << " LIMIT -1 OFFSET "
           literal_append(sql, @opts[:offset])
         end
 

data/lib/sequel/adapters/jdbc/hsqldb.rb

@@ -18,6 +18,7 @@ module Sequel
       # Instance methods for HSQLDB Database objects accessed via JDBC.
       module DatabaseMethods
         PRIMARY_KEY_INDEX_RE = /\Asys_idx_sys_pk_/i.freeze
+        Sequel::Deprecation.deprecate_constant(self, :PRIMARY_KEY_INDEX_RE)
 
         include ::Sequel::JDBC::Transactions
 
@@ -40,7 +41,7 @@ module Sequel
         # The version of the database, as an integer (e.g 2.2.5 -> 20205)
         def db_version
           return @db_version if defined?(@db_version)
-          v = get{DATABASE_VERSION(){}}
+          v = get(Sequel.function(:DATABASE_VERSION))
           @db_version = if v =~ /(\d+)\.(\d+)\.(\d+)/
             $1.to_i * 10000 + $2.to_i * 100 + $3.to_i
           end
@@ -112,7 +113,7 @@ module Sequel
         
         # Primary key indexes appear to start with sys_idx_sys_pk_ on HSQLDB
         def primary_key_index_re
-          PRIMARY_KEY_INDEX_RE
+          /\Asys_idx_sys_pk_/i
         end
 
         # If an :identity option is present in the column, add the necessary IDENTITY SQL.
@@ -146,13 +147,21 @@ module Sequel
       # Dataset class for HSQLDB datasets accessed via JDBC.
       class Dataset < JDBC::Dataset
         BOOL_TRUE = 'TRUE'.freeze
+        Sequel::Deprecation.deprecate_constant(self, :BOOL_TRUE)
         BOOL_FALSE = 'FALSE'.freeze
+        Sequel::Deprecation.deprecate_constant(self, :BOOL_FALSE)
         SQL_WITH_RECURSIVE = "WITH RECURSIVE ".freeze
-        APOS = Dataset::APOS
+        Sequel::Deprecation.deprecate_constant(self, :SQL_WITH_RECURSIVE)
+        APOS = "'".freeze
+        Sequel::Deprecation.deprecate_constant(self, :APOS)
         HSTAR = "H*".freeze
+        Sequel::Deprecation.deprecate_constant(self, :HSTAR)
         BLOB_OPEN = "X'".freeze
+        Sequel::Deprecation.deprecate_constant(self, :BLOB_OPEN)
         DEFAULT_FROM = " FROM (VALUES (0))".freeze
+        Sequel::Deprecation.deprecate_constant(self, :DEFAULT_FROM)
         TIME_FORMAT = "'%H:%M:%S'".freeze
+        Sequel::Deprecation.deprecate_constant(self, :TIME_FORMAT)
 
         # Handle HSQLDB specific case insensitive LIKE and bitwise operator support.
         def complex_expression_sql_append(sql, op, args)
@@ -198,27 +207,27 @@ module Sequel
         private
 
         def empty_from_sql
-          DEFAULT_FROM
+          " FROM (VALUES (0))"
         end
         
         # Use string in hex format for blob data.
         def literal_blob_append(sql, v)
-          sql << BLOB_OPEN << v.unpack(HSTAR).first << APOS
+          sql << "X'" << v.unpack("H*").first << "'"
         end
 
         # HSQLDB uses FALSE for false values.
         def literal_false
-          BOOL_FALSE
+          'FALSE'
         end
 
         # HSQLDB handles fractional seconds in timestamps, but not in times
         def literal_sqltime(v)
-          v.strftime(TIME_FORMAT)
+          v.strftime("'%H:%M:%S'")
         end
 
         # HSQLDB uses TRUE for true values.
         def literal_true
-          BOOL_TRUE
+          'TRUE'
         end
 
         # HSQLDB supports multiple rows in INSERT.
@@ -228,7 +237,7 @@ module Sequel
 
         # Use WITH RECURSIVE instead of WITH if any of the CTEs is recursive
         def select_with_sql_base
-          opts[:with].any?{|w| w[:recursive]} ? SQL_WITH_RECURSIVE : super
+          opts[:with].any?{|w| w[:recursive]} ? "WITH RECURSIVE " : super
         end
       end
     end

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

@@ -10,8 +10,11 @@ module Sequel
       # Database instance methods for MSSQL databases accessed via JDBC.
       module DatabaseMethods
         PRIMARY_KEY_INDEX_RE = /\Apk__/i.freeze
+        Sequel::Deprecation.deprecate_constant(self, :PRIMARY_KEY_INDEX_RE)
         ATAT_IDENTITY = 'SELECT @@IDENTITY'.freeze
+        Sequel::Deprecation.deprecate_constant(self, :ATAT_IDENTITY)
         SCOPE_IDENTITY = 'SELECT SCOPE_IDENTITY()'.freeze
+        Sequel::Deprecation.deprecate_constant(self, :SCOPE_IDENTITY)
         
         include Sequel::MSSQL::DatabaseMethods
         
@@ -20,7 +23,7 @@ module Sequel
         # Get the last inserted id using SCOPE_IDENTITY().
         def last_insert_id(conn, opts=OPTS)
           statement(conn) do |stmt|
-            sql = opts[:prepared] ? ATAT_IDENTITY : SCOPE_IDENTITY
+            sql = opts[:prepared] ? 'SELECT @@IDENTITY' : 'SELECT SCOPE_IDENTITY()'
             rs = log_connection_yield(sql, conn){stmt.executeQuery(sql)}
             rs.next
             rs.getLong(1)
@@ -29,7 +32,7 @@ module Sequel
         
         # Primary key indexes appear to start with pk__ on MSSQL
         def primary_key_index_re
-          PRIMARY_KEY_INDEX_RE
+          /\Apk__/i
         end
       end
     end

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

@@ -20,6 +20,7 @@ module Sequel
       module DatabaseMethods
         include Sequel::MySQL::DatabaseMethods
         LAST_INSERT_ID = 'SELECT LAST_INSERT_ID()'.freeze
+        Sequel::Deprecation.deprecate_constant(self, :LAST_INSERT_ID)
         
         private
         
@@ -27,7 +28,7 @@ module Sequel
         # of the connection string, since the JDBC does no parsing on the
         # given connection string by default.
         def database_name
-          Sequel::Deprecation.deprecate("Database#database_name", "Instead, use .get{DATABASE{}}")
+          Sequel::Deprecation.deprecate("Database#database_name", "Instead, use .get(Sequel.function(:DATABASE))")
           u = URI.parse(uri.sub(/\Ajdbc:/, ''))
           (m = /\/(.*)/.match(u.path)) && m[1]
         end
@@ -57,7 +58,7 @@ module Sequel
             end
           else
             statement(conn) do |st|
-              rs = st.executeQuery(LAST_INSERT_ID)
+              rs = st.executeQuery('SELECT LAST_INSERT_ID()')
               rs.next
               rs.getLong(1)
             end

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

@@ -34,6 +34,7 @@ module Sequel
       # Instance methods for Oracle Database objects accessed via JDBC.
       module DatabaseMethods
         PRIMARY_KEY_INDEX_RE = /\Asys_/i.freeze
+        Sequel::Deprecation.deprecate_constant(self, :PRIMARY_KEY_INDEX_RE)
 
         include Sequel::Oracle::DatabaseMethods
         include Sequel::JDBC::Transactions
@@ -83,7 +84,7 @@ module Sequel
 
         # Primary key indexes appear to start with sys_ on Oracle
         def primary_key_index_re
-          PRIMARY_KEY_INDEX_RE
+          /\Asys_/i
         end
 
         def schema_parse_table(*)
@@ -119,7 +120,7 @@ module Sequel
 
         NUMERIC_TYPE = Java::JavaSQL::Types::NUMERIC
         TIMESTAMP_TYPE = Java::JavaSQL::Types::TIMESTAMP
-        TIMESTAMPTZ_TYPES = [Java::oracle.jdbc.OracleTypes::TIMESTAMPTZ, Java::oracle.jdbc.OracleTypes::TIMESTAMPLTZ]
+        TIMESTAMPTZ_TYPES = [Java::oracle.jdbc.OracleTypes::TIMESTAMPTZ, Java::oracle.jdbc.OracleTypes::TIMESTAMPLTZ]#.freeze # SEQUEL5
 
         def type_convertor(map, meta, type, i)
           case type