sequel 3.47.0 → 3.48.0

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

@@ -7,6 +7,7 @@ module Sequel
     module AS400
       # Instance methods for AS400 Database objects accessed via JDBC.
       module DatabaseMethods
+        extend Sequel::Database::ResetIdentifierMangling
         include Sequel::JDBC::Transactions
 
         TRANSACTION_BEGIN = 'Transaction.begin'.freeze

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

@@ -5,6 +5,7 @@ module Sequel
   module JDBC
     module Cubrid
       module DatabaseMethods
+        extend Sequel::Database::ResetIdentifierMangling
         include Sequel::Cubrid::DatabaseMethods
         include Sequel::JDBC::Transactions
 

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

@@ -16,6 +16,7 @@ module Sequel
     module DB2
       # Database instance methods for DB2 databases accessed via JDBC.
       module DatabaseMethods
+        extend Sequel::Database::ResetIdentifierMangling
         PRIMARY_KEY_INDEX_RE = /\Asql\d+\z/i.freeze
 
         include Sequel::DB2::DatabaseMethods

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

@@ -6,6 +6,7 @@ module Sequel
     module Derby
       # Instance methods for Derby Database objects accessed via JDBC.
       module DatabaseMethods
+        extend Sequel::Database::ResetIdentifierMangling
         PRIMARY_KEY_INDEX_RE = /\Asql\d+\z/i.freeze
 
         include ::Sequel::JDBC::Transactions

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

@@ -8,6 +8,7 @@ module Sequel
     module Firebird
       # Database instance methods for Firebird databases accessed via JDBC.
       module DatabaseMethods
+        extend Sequel::Database::ResetIdentifierMangling
         include Sequel::Firebird::DatabaseMethods
         include Sequel::JDBC::Transactions
         

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

@@ -4,6 +4,7 @@ module Sequel
     module H2
       # Instance methods for H2 Database objects accessed via JDBC.
       module DatabaseMethods
+        extend Sequel::Database::ResetIdentifierMangling
         PRIMARY_KEY_INDEX_RE = /\Aprimary_key/i.freeze
       
         # Commit an existing prepared transaction with the given transaction

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

@@ -6,6 +6,7 @@ module Sequel
     module HSQLDB
       # Instance methods for HSQLDB Database objects accessed via JDBC.
       module DatabaseMethods
+        extend Sequel::Database::ResetIdentifierMangling
         PRIMARY_KEY_INDEX_RE = /\Asys_idx_sys_pk_/i.freeze
 
         include ::Sequel::JDBC::Transactions

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

@@ -7,6 +7,7 @@ module Sequel
     module Informix
       # Database instance methods for Informix databases accessed via JDBC.
       module DatabaseMethods
+        extend Sequel::Database::ResetIdentifierMangling
         include Sequel::Informix::DatabaseMethods
         
         private

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

@@ -6,6 +6,7 @@ module Sequel
     # support via JDBC.
     module JTDS
       module DatabaseMethods
+        extend Sequel::Database::ResetIdentifierMangling
         include Sequel::JDBC::MSSQL::DatabaseMethods
 
         private

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

@@ -12,6 +12,7 @@ module Sequel
     module MSSQL
       # Database instance methods for MSSQL databases accessed via JDBC.
       module DatabaseMethods
+        extend Sequel::Database::ResetIdentifierMangling
         PRIMARY_KEY_INDEX_RE = /\Apk__/i.freeze
         ATAT_IDENTITY = 'SELECT @@IDENTITY'.freeze
         SCOPE_IDENTITY = 'SELECT SCOPE_IDENTITY()'.freeze

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

@@ -7,6 +7,7 @@ module Sequel
     module MySQL
       # Database instance methods for MySQL databases accessed via JDBC.
       module DatabaseMethods
+        extend Sequel::Database::ResetIdentifierMangling
         include Sequel::MySQL::DatabaseMethods
         LAST_INSERT_ID = 'SELECT LAST_INSERT_ID()'.freeze
         

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

@@ -7,6 +7,7 @@ module Sequel
     module Oracle
       # Instance methods for Oracle Database objects accessed via JDBC.
       module DatabaseMethods
+        extend Sequel::Database::ResetIdentifierMangling
         PRIMARY_KEY_INDEX_RE = /\Asys_/i.freeze
 
         include Sequel::Oracle::DatabaseMethods

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

@@ -10,11 +10,13 @@ module Sequel
       # Methods to add to Database instances that access PostgreSQL via
       # JDBC.
       module DatabaseMethods
+        extend Sequel::Database::ResetIdentifierMangling
         include Sequel::Postgres::DatabaseMethods
         
         # Add the primary_keys and primary_key_sequences instance variables,
         # so we can get the correct return values for inserted rows.
         def self.extended(db)
+          super
           db.send(:initialize_postgres_adapter)
         end
 

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

@@ -8,6 +8,7 @@ module Sequel
     module Progress
       # Database instance methods for Progress databases accessed via JDBC.
       module DatabaseMethods
+        extend Sequel::Database::ResetIdentifierMangling
         include Sequel::Progress::DatabaseMethods
         include Sequel::JDBC::Transactions
 

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

@@ -6,6 +6,7 @@ module Sequel
     module SQLite
       # Instance methods for SQLite Database objects accessed via JDBC.
       module DatabaseMethods
+        extend Sequel::Database::ResetIdentifierMangling
         include Sequel::SQLite::DatabaseMethods
         LAST_INSERT_ROWID = 'SELECT last_insert_rowid()'.freeze
         FOREIGN_KEY_ERROR_RE = /query does not return ResultSet/.freeze

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

@@ -7,6 +7,7 @@ module Sequel
     module SQLServer
       # Database instance methods for SQLServer databases accessed via JDBC.
       module DatabaseMethods
+        extend Sequel::Database::ResetIdentifierMangling
         include Sequel::JDBC::MSSQL::DatabaseMethods
 
         # Work around a bug in SQL Server JDBC Driver 3.0, where the metadata

data/lib/sequel/adapters/mock.rb

@@ -131,37 +131,6 @@ module Sequel
       # Mock the server version, useful when using the shared adapters
       attr_accessor :server_version
 
-      # Additional options supported:
-      #
-      # :autoid :: Call #autoid= with the value
-      # :columns :: Call #columns= with the value
-      # :fetch ::  Call #fetch= with the value
-      # :numrows :: Call #numrows= with the value
-      # :extend :: A module the object is extended with.
-      # :sqls :: The array to store the SQL queries in.
-      def initialize(opts={})
-        super
-        opts = @opts
-        @sqls = opts[:sqls] || []
-        if mod_name = SHARED_ADAPTERS[opts[:host]]
-          @shared_adapter = true
-          require "sequel/adapters/shared/#{opts[:host]}"
-          extend Sequel.const_get(mod_name)::DatabaseMethods
-          extend_datasets Sequel.const_get(mod_name)::DatasetMethods
-          if pr = SHARED_ADAPTER_SETUP[opts[:host]]
-            pr.call(self)
-          end
-        else
-          @shared_adapter = false
-        end
-        self.autoid = opts[:autoid]
-        self.columns = opts[:columns]
-        self.fetch = opts[:fetch]
-        self.numrows = opts[:numrows]
-        extend(opts[:extend]) if opts[:extend]
-        sqls
-      end
-
       # Return a related Connection option connecting to the given shard.
       def connect(server)
         Connection.new(self, server, server_opts(server))
@@ -297,6 +266,36 @@ module Sequel
         _nextres(v, sql, 0)
       end
 
+      # Additional options supported:
+      #
+      # :autoid :: Call #autoid= with the value
+      # :columns :: Call #columns= with the value
+      # :fetch ::  Call #fetch= with the value
+      # :numrows :: Call #numrows= with the value
+      # :extend :: A module the object is extended with.
+      # :sqls :: The array to store the SQL queries in.
+      def adapter_initialize
+        opts = @opts
+        @sqls = opts[:sqls] || []
+        if mod_name = SHARED_ADAPTERS[opts[:host]]
+          @shared_adapter = true
+          require "sequel/adapters/shared/#{opts[:host]}"
+          extend Sequel.const_get(mod_name)::DatabaseMethods
+          extend_datasets Sequel.const_get(mod_name)::DatasetMethods
+          if pr = SHARED_ADAPTER_SETUP[opts[:host]]
+            pr.call(self)
+          end
+        else
+          @shared_adapter = false
+        end
+        self.autoid = opts[:autoid]
+        self.columns = opts[:columns]
+        self.fetch = opts[:fetch]
+        self.numrows = opts[:numrows]
+        extend(opts[:extend]) if opts[:extend]
+        sqls
+      end
+
       def columns(ds, sql, cs=@columns)
         case cs
         when Array

data/lib/sequel/adapters/mysql.rb

@@ -59,13 +59,6 @@ module Sequel
       # it returns the strings as is.
       attr_reader :convert_invalid_date_time
       
-      def initialize(opts={})
-        super
-        @conversion_procs = MYSQL_TYPES.dup
-        self.convert_tinyint_to_bool = Sequel::MySQL.convert_tinyint_to_bool
-        self.convert_invalid_date_time = Sequel::MySQL.convert_invalid_date_time
-      end
-
       # Connect to the database.  In addition to the usual database options,
       # the following options have effect:
       #
@@ -221,6 +214,12 @@ module Sequel
         end
       end
       
+      def adapter_initialize
+        @conversion_procs = MYSQL_TYPES.dup
+        self.convert_tinyint_to_bool = Sequel::MySQL.convert_tinyint_to_bool
+        self.convert_invalid_date_time = Sequel::MySQL.convert_invalid_date_time
+      end
+
       # Try to get an accurate number of rows matched using the query
       # info.  Fall back to affected_rows if there was no match, but
       # that may be inaccurate.

data/lib/sequel/adapters/mysql2.rb

@@ -14,12 +14,6 @@ module Sequel
       # Whether to convert tinyint columns to bool for this database
       attr_accessor :convert_tinyint_to_bool
 
-      # Set the convert_tinyint_to_bool setting based on the default value.
-      def initialize(opts={})
-        super
-        self.convert_tinyint_to_bool = Sequel::MySQL.convert_tinyint_to_bool
-      end
-
       # Connect to the database.  In addition to the usual database options,
       # the following options have effect:
       #
@@ -89,6 +83,11 @@ module Sequel
         end
       end
 
+      # Set the convert_tinyint_to_bool setting based on the default value.
+      def adapter_initialize
+        self.convert_tinyint_to_bool = Sequel::MySQL.convert_tinyint_to_bool
+      end
+
       # MySQL connections use the query method to execute SQL without a result
       def connection_execute_method
         :query

data/lib/sequel/adapters/odbc.rb

@@ -9,25 +9,6 @@ module Sequel
       DRV_NAME_GUARDS = '{%s}'.freeze
       DISCONNECT_ERRORS = /\A08S01/.freeze 
 
-      def initialize(opts)
-        super
-        case @opts[:db_type]
-        when 'mssql'
-          Sequel.ts_require 'adapters/odbc/mssql'
-          extend Sequel::ODBC::MSSQL::DatabaseMethods
-          @dataset_class = Sequel::ODBC::MSSQL::Dataset
-          set_mssql_unicode_strings
-        when 'progress'
-          Sequel.ts_require 'adapters/shared/progress'
-          extend Sequel::Progress::DatabaseMethods
-          extend_datasets(Sequel::Progress::DatasetMethods)
-        when 'db2'
-          Sequel.ts_require 'adapters/shared/db2'
-          extend ::Sequel::DB2::DatabaseMethods
-          extend_datasets ::Sequel::DB2::DatasetMethods
-        end
-      end
-
       def connect(server)
         opts = server_opts(server)
         if opts.include? :driver
@@ -75,10 +56,31 @@ module Sequel
           end
         end
       end
-      alias do execute_dui
+      def do(*a, &block)
+        Sequel::Deprecation.deprecate('Database#do', 'Please use Database#execute_dui')
+        execute_dui(*a, &block)
+      end
 
       private
       
+      def adapter_initialize
+        case @opts[:db_type]
+        when 'mssql'
+          Sequel.require 'adapters/odbc/mssql'
+          extend Sequel::ODBC::MSSQL::DatabaseMethods
+          self.dataset_class = Sequel::ODBC::MSSQL::Dataset
+          set_mssql_unicode_strings
+        when 'progress'
+          Sequel.require 'adapters/shared/progress'
+          extend Sequel::Progress::DatabaseMethods
+          extend_datasets(Sequel::Progress::DatasetMethods)
+        when 'db2'
+          Sequel.require 'adapters/shared/db2'
+          extend ::Sequel::DB2::DatabaseMethods
+          extend_datasets ::Sequel::DB2::DatasetMethods
+        end
+      end
+
       def connection_execute_method
         :do
       end

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

@@ -6,6 +6,7 @@ module Sequel
     # support via ODBC.
     module MSSQL
       module DatabaseMethods
+        extend Sequel::Database::ResetIdentifierMangling
         include Sequel::MSSQL::DatabaseMethods
         LAST_INSERT_ID_SQL='SELECT SCOPE_IDENTITY()'.freeze
         

data/lib/sequel/adapters/openbase.rb

@@ -26,7 +26,10 @@ module Sequel
           r
         end
       end
-      alias_method :do, :execute
+      def do(*a, &block)
+        Sequel::Deprecation.deprecate('Database#do', 'Please use Database#execute')
+        execute(*a, &block)
+      end
     end
     
     class Dataset < Sequel::Dataset

data/lib/sequel/adapters/oracle.rb

@@ -21,13 +21,6 @@ module Sequel
       # Hash of conversion procs for this database.
       attr_reader :conversion_procs
 
-      def initialize(opts={})
-        super
-        @autosequence = opts[:autosequence]
-        @primary_key_sequences = {}
-        @conversion_procs = ORACLE_TYPES.dup
-      end
-
       def connect(server)
         opts = server_opts(server)
         if opts[:database]
@@ -71,7 +64,10 @@ module Sequel
       def execute(sql, opts={}, &block)
         _execute(nil, sql, opts, &block)
       end
-      alias do execute
+      def do(*a, &block)
+        Sequel::Deprecation.deprecate('Database#do', 'Please use Database#execute')
+        execute_dui(*a, &block)
+      end
 
       def execute_insert(sql, opts={})
         _execute(:insert, sql, opts)
@@ -109,6 +105,12 @@ module Sequel
         end
       end
 
+      def adapter_initialize
+        @autosequence = @opts[:autosequence]
+        @primary_key_sequences = {}
+        @conversion_procs = ORACLE_TYPES.dup
+      end
+
       PS_TYPES = {'string'.freeze=>String, 'integer'.freeze=>Integer, 'float'.freeze=>Float,
         'decimal'.freeze=>Float, 'date'.freeze=>Time, 'datetime'.freeze=>Time,
         'time'.freeze=>Time, 'boolean'.freeze=>String, 'blob'.freeze=>OCI8::BLOB}

data/lib/sequel/adapters/postgres.rb

@@ -175,16 +175,6 @@ module Sequel
       # as a string, or :float to convert to an infinite float.
       attr_reader :convert_infinite_timestamps
 
-      # Add the primary_keys and primary_key_sequences instance variables,
-      # so we can get the correct return values for inserted rows.
-      def initialize(*args)
-        super
-        @use_iso_date_format = typecast_value_boolean(@opts.fetch(:use_iso_date_format, Postgres.use_iso_date_format))
-        initialize_postgres_adapter
-        conversion_procs[1082] = TYPE_TRANSLATOR.method(:date) if @use_iso_date_format
-        self.convert_infinite_timestamps = @opts[:convert_infinite_timestamps]
-      end
-
       # Convert given argument so that it can be used directly by pg.  Currently, pg doesn't
       # handle fractional seconds in Time/DateTime or blobs with "\0", and it won't ever
       # handle Sequel::SQLTime values correctly.  Only public for use by the adapter, shouldn't
@@ -471,6 +461,15 @@ module Sequel
         conn.exec_prepared(ps_name, args)
       end
 
+      # Add the primary_keys and primary_key_sequences instance variables,
+      # so we can get the correct return values for inserted rows.
+      def adapter_initialize
+        @use_iso_date_format = typecast_value_boolean(@opts.fetch(:use_iso_date_format, Postgres.use_iso_date_format))
+        initialize_postgres_adapter
+        conversion_procs[1082] = TYPE_TRANSLATOR.method(:date) if @use_iso_date_format
+        self.convert_infinite_timestamps = @opts[:convert_infinite_timestamps]
+      end
+
       # Convert exceptions raised from the block into DatabaseErrors.
       def check_database_errors
         begin
@@ -650,6 +649,9 @@ module Sequel
               prepared_args << y
               i = prepared_args.length
             end
+            if type
+              Sequel::Deprecation.deprecate('Specifying prepared statement argument types via the __type suffix', "If a manual cast is really need, surround the prepared statement argument in Sequel.cast")
+            end
             LiteralString.new("#{prepared_arg_placeholder}#{i}#{"::#{type}" if type}")
           end
 

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

@@ -1,6 +1,10 @@
 module Sequel
+  require 'adapters/utils/emulate_offset_with_reverse_and_count'
+
   module Access
     module DatabaseMethods
+      extend Sequel::Database::ResetIdentifierMangling
+
       # Access uses type :access as the database_type
       def database_type
         :access
@@ -84,6 +88,8 @@ module Sequel
     end
   
     module DatasetMethods
+      include EmulateOffsetWithReverseAndCount
+
       SELECT_CLAUSE_METHODS = Dataset.clause_methods(:select, %w'select distinct limit columns into from join where group order having compounds')
       DATE_FORMAT = '#%Y-%m-%d#'.freeze
       TIMESTAMP_FORMAT = '#%Y-%m-%d %H:%M:%S#'.freeze