sequel 4.41.0 → 4.42.0

data/doc/testing.rdoc

@@ -156,9 +156,11 @@ SEQUEL_COLUMNS_INTROSPECTION :: Use the columns_introspection extension when run
 SEQUEL_CONNECTION_VALIDATOR :: Use the connection validator extension when running the specs
 SEQUEL_DUPLICATE_COLUMNS_HANDLER :: Use the duplicate columns handler extension with value given when running the specs
 SEQUEL_ERROR_SQL :: Use the error_sql extension when running the specs
+SEQUEL_FREEZE_DATASETS :: Use the freeze_datasets extension when running the specs
 SEQUEL_NO_AUTO_LITERAL_STRINGS :: Use the no_auto_string_literals extension when running the specs
 SEQUEL_NO_CACHE_ASSOCIATIONS :: Don't cache association metadata when running the specs
 SEQUEL_NO_CHECK_SQLS :: Don't check for specific SQL syntax when running the specs
-SEQUEL_NO_SPLIT_SYMBOLS :: Turn off symbol splitting when running the specs
+SEQUEL_NO_MANGLE :: Don't use the identifier_mangling extension when runnsing the specs
 SEQUEL_NO_PENDING :: Don't skip any specs, try running all specs (note, can cause lockups for some adapters)
+SEQUEL_NO_SPLIT_SYMBOLS :: Turn off symbol splitting when running the specs
 SKIPPED_TEST_WARN :: Warn when skipping any tests because libraries aren't available

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

@@ -86,7 +86,6 @@ module Sequel
       end      
 
       module DatabaseMethods
-        extend Sequel::Database::ResetIdentifierMangling
         include Sequel::Access::DatabaseMethods
         include Sequel::Database::SplitAlterTable
     

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

@@ -8,7 +8,6 @@ module Sequel
     # support via ADO.
     module MSSQL
       module DatabaseMethods
-        extend Sequel::Database::ResetIdentifierMangling
         include Sequel::MSSQL::DatabaseMethods
         # Query to use to get the number of rows affected by an update or
         # delete query.

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

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

data/lib/sequel/adapters/do/postgres.rb

@@ -20,7 +20,6 @@ module Sequel
       # Methods to add to Database instances that access PostgreSQL via
       # DataObjects.
       module DatabaseMethods
-        extend Sequel::Database::ResetIdentifierMangling
         include Sequel::Postgres::DatabaseMethods
         
         # Add the primary_keys and primary_key_sequences instance variables,

data/lib/sequel/adapters/do/sqlite3.rb

@@ -17,7 +17,6 @@ module Sequel
     module SQLite
       # Instance methods for SQLite Database objects accessed via DataObjects.
       module DatabaseMethods
-        extend Sequel::Database::ResetIdentifierMangling
         include Sequel::SQLite::DatabaseMethods
         
         private

data/lib/sequel/adapters/ibmdb.rb

@@ -308,10 +308,8 @@ module Sequel
       # dataset, since the DB2 metadata does not use
       # boolean columns, and some smallint columns are
       # accidently treated as booleans.
-      def metadata_dataset
-        ds = super
-        ds.convert_smallint_to_bool = false
-        ds
+      def _metadata_dataset
+        super.with_convert_smallint_to_bool(false)
       end
 
       # Format Numeric, Date, and Time types specially for use
@@ -359,31 +357,31 @@ module Sequel
         # Extend given dataset with this module so subselects inside subselects in
         # prepared statements work.
         def subselect_sql_append(sql, ds)
-          ps = ds.to_prepared_statement(:select).clone(:append_sql=>sql)
-          ps.extend(CallableStatementMethods)
+          ps = ds.to_prepared_statement(:select).
+            clone(:append_sql=>sql, :prepared_args=>prepared_args).
+            with_extend(CallableStatementMethods)
           ps = ps.bind(@opts[:bind_vars]) if @opts[:bind_vars]
-          ps.prepared_args = prepared_args
           ps.prepared_sql
         end
       end
       
       PreparedStatementMethods = prepared_statements_module(:prepare_bind, Sequel::Dataset::UnnumberedArgumentMapper)
 
-      # Emulate support of bind arguments in called statements.
-      def call(type, bind_arguments={}, *values, &block)
-        ps = to_prepared_statement(type, values)
-        ps.extend(CallableStatementMethods)
-        ps.call(bind_arguments, &block)
+      # Override the default IBMDB.convert_smallint_to_bool setting for this dataset.
+      def convert_smallint_to_bool=(v)
+        @opts[:convert_smallint_to_bool] = v
       end
 
       # Whether to convert smallint to boolean arguments for this dataset.
       # Defaults to the IBMDB module setting.
       def convert_smallint_to_bool
-        defined?(@convert_smallint_to_bool) ? @convert_smallint_to_bool : (@convert_smallint_to_bool = IBMDB.convert_smallint_to_bool)
+        opts.has_key?(:convert_smallint_to_bool) ? opts[:convert_smallint_to_bool] : IBMDB.convert_smallint_to_bool
       end
 
-      # Override the default IBMDB.convert_smallint_to_bool setting for this dataset.
-      attr_writer :convert_smallint_to_bool
+      # Return a cloned dataset with the convert_smallint_to_bool option set.
+      def with_convert_smallint_to_bool(v)
+        clone(:convert_smallint_to_bool=>v)
+      end
 
       # Fetch the rows from the database and yield plain hashes.
       def fetch_rows(sql)
@@ -414,16 +412,14 @@ module Sequel
         self
       end
 
-      # Store the given type of prepared statement in the associated database
-      # with the given name.
-      def prepare(type, name=nil, *values)
-        ps = to_prepared_statement(type, values)
-        ps.extend(PreparedStatementMethods)
-        if name
-          ps.prepared_statement_name = name
-          db.set_prepared_statement(name, ps)
-        end
-        ps
+      private
+
+      def bound_variable_modules
+        [CallableStatementMethods]
+      end
+
+      def prepared_statement_modules
+        [PreparedStatementMethods]
       end
     end
   end

data/lib/sequel/adapters/jdbc.rb

@@ -712,16 +712,16 @@ module Sequel
       end
       
       StoredProcedureMethods = prepared_statements_module(
-        "sql = @sproc_name; opts = Hash[opts]; opts[:args] = @sproc_args; opts[:sproc] = true",
+        "sql = @opts[:sproc_name]; opts = Hash[opts]; opts[:args] = @opts[:sproc_args]; opts[:sproc] = true",
         Sequel::Dataset::StoredProcedureMethods,
         %w"execute execute_dui") do
           private
 
           # Same as execute, explicit due to intricacies of alias and super.
           def execute_insert(sql, opts=OPTS)
-            sql = @sproc_name
+            sql = @opts[:sproc_name]
             opts = Hash[opts]
-            opts[:args] = @sproc_args
+            opts[:args] = @opts[:sproc_args]
             opts[:sproc] = true
             opts[:type] = :insert
             super
@@ -739,18 +739,6 @@ module Sequel
         self
       end
       
-      # Create a named prepared statement that is stored in the
-      # database (and connection) for reuse.
-      def prepare(type, name=nil, *values)
-        ps = to_prepared_statement(type, values)
-        ps.extend(PreparedStatementMethods)
-        if name
-          ps.prepared_statement_name = name
-          db.set_prepared_statement(name, ps)
-        end
-        ps
-      end
-
       # Set the fetch size on JDBC ResultSets created from this dataset.
       def with_fetch_size(size)
         clone(:fetch_size=>size)
@@ -766,7 +754,7 @@ module Sequel
 
       # Extend the dataset with the JDBC stored procedure methods.
       def prepare_extend_sproc(ds)
-        ds.extend(StoredProcedureMethods)
+        ds.with_extend(StoredProcedureMethods)
       end
 
       # The type conversion proc to use for the given column number i,
@@ -784,6 +772,10 @@ module Sequel
         map[type]
       end
 
+      def prepared_statement_modules
+        [PreparedStatementMethods]
+      end
+
       # Split out from fetch rows to allow processing of JDBC result sets
       # that don't come from issuing an SQL string.
       def process_result_set(result)

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

@@ -18,7 +18,6 @@ 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

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

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

@@ -37,7 +37,6 @@ 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

@@ -17,7 +17,6 @@ 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/firebirdsql.rb

@@ -19,7 +19,6 @@ 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

@@ -16,7 +16,6 @@ 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

@@ -17,7 +17,6 @@ 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-sqli.rb

@@ -18,7 +18,6 @@ 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/jdbcprogress.rb

@@ -19,7 +19,6 @@ 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/jtds.rb

@@ -18,7 +18,6 @@ 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

@@ -9,7 +9,6 @@ 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

@@ -18,7 +18,6 @@ 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

@@ -33,7 +33,6 @@ 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

@@ -41,7 +41,6 @@ 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,
@@ -189,18 +188,6 @@ module Sequel
         include Sequel::Postgres::DatasetMethods
         APOS = Dataset::APOS
         
-        # Add the shared PostgreSQL prepared statement methods
-        def prepare(type, name=nil, *values)
-          ps = to_prepared_statement(type, values)
-          ps.extend(JDBC::Dataset::PreparedStatementMethods)
-          ps.extend(::Sequel::Postgres::DatasetMethods::PreparedStatementMethods)
-          if name
-            ps.prepared_statement_name = name
-            db.set_prepared_statement(name, ps)
-          end
-          ps
-        end
-
         private
         
         # Literalize strings similar to the native postgres adapter

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

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

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

@@ -18,7 +18,6 @@ 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

@@ -19,7 +19,6 @@ 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
@@ -48,12 +47,12 @@ module Sequel
           end
         end
         
-        def metadata_dataset
+        private
+
+        def _metadata_dataset
           super.extend(MetadataDatasetMethods)
         end
 
-        private
-
         def disconnect_error?(exception, opts)
           super || (exception.message =~ /connection is closed/)
         end

data/lib/sequel/adapters/mock.rb

@@ -1,5 +1,7 @@
 # frozen-string-literal: true
 
+Sequel.require 'adapters/utils/unmodified_identifiers'
+
 module Sequel
   module Mock
     # Connection class for Sequel's mock adapter.
@@ -134,7 +136,7 @@ module Sequel
         case v
         when Integer
           if ds
-            ds.autoid += 1 if ds.autoid.is_a?(Integer)
+            ds.send(:cache_set, :_autoid, ds.autoid + 1) if ds.autoid.is_a?(Integer)
           else
             @autoid += 1
           end
@@ -259,6 +261,11 @@ module Sequel
           end
         end
 
+        unless @shared_adapter
+          extend UnmodifiedIdentifiers::DatabaseMethods
+          extend_datasets UnmodifiedIdentifiers::DatasetMethods
+        end
+
         self.autoid = opts[:autoid]
         self.columns = opts[:columns]
         self.fetch = opts[:fetch]
@@ -290,14 +297,6 @@ module Sequel
         shared_adapter? ? super : false
       end
 
-      def identifier_input_method_default
-        shared_adapter? ? super : nil
-      end
-
-      def identifier_output_method_default
-        shared_adapter? ? super : nil
-      end
-
       def shared_adapter?
         @shared_adapter
       end
@@ -306,14 +305,38 @@ module Sequel
     class Dataset < Sequel::Dataset
       Database::DatasetClass = self
 
+      # The autoid setting for this dataset, if it has been overridden
+      def autoid
+        cache_get(:_autoid) || @opts[:autoid]
+      end
+
       # Override the databases's autoid setting for this dataset
-      attr_accessor :autoid
+      def autoid=(v)
+        cache_set(:_autoid, nil)
+        @opts[:autoid] = v
+      end
+
+      # The fetch setting for this dataset, if it has been overridden
+      def _fetch
+        cache_get(:_fetch) || @opts[:fetch]
+      end
 
       # Override the databases's fetch setting for this dataset
-      attr_accessor :_fetch
+      def _fetch=(v)
+        cache_set(:_fetch, nil)
+        @opts[:fetch] = v
+      end
+
+      # The numrows setting for this dataset, if it has been overridden
+      def numrows
+        cache_get(:_numrows) || @opts[:numrows]
+      end
 
       # Override the databases's numrows setting for this dataset
-      attr_accessor :numrows
+      def numrows=(v)
+        cache_set(:_numrows, nil)
+        @opts[:numrows] = v
+      end
 
       # If arguments are provided, use them to set the columns
       # for this dataset and return self.  Otherwise, use the
@@ -331,6 +354,25 @@ module Sequel
         execute(sql, &block)
       end
 
+      def quote_identifiers?
+        @opts.fetch(:quote_identifiers, db.send(:quote_identifiers_default))
+      end
+
+      # Return cloned dataset with the autoid setting modified
+      def with_autoid(autoid)
+        clone(:autoid=>autoid)
+      end
+
+      # Return cloned dataset with the fetch setting modified
+      def with_fetch(fetch)
+        clone(:fetch=>fetch)
+      end
+
+      # Return cloned dataset with the numrows setting modified
+      def with_numrows(numrows)
+        clone(:numrows=>numrows)
+      end
+
       private
 
       def execute(sql, opts=OPTS, &block)