sequel 4.44.0 → 4.45.0

data/lib/sequel/adapters/cubrid.rb

@@ -1,5 +1,7 @@
 # frozen-string-literal: true
 
+#SEQUEL5: Remove
+
 require 'cubrid'
 Sequel.require 'adapters/shared/cubrid'
 

data/lib/sequel/adapters/do.rb

@@ -1,5 +1,7 @@
 # frozen-string-literal: true
 
+Sequel::Deprecation.deprecate("The do (DataObjects) adapter", "Please consider maintaining it yourself as an external gem if you want to continue using it")
+
 require 'data_objects'
 
 module Sequel

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

@@ -1,5 +1,7 @@
 # frozen-string-literal: true
 
+Sequel::Deprecation.deprecate("The jdbc/as400 adapter", "Please consider maintaining it yourself as an external gem if you want to continue using it")
+
 Sequel::JDBC.load_driver('com.ibm.as400.access.AS400JDBCDriver')
 Sequel.require 'adapters/jdbc/transactions'
 Sequel.require 'adapters/utils/emulate_offset_with_row_number'

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

@@ -1,5 +1,7 @@
 # frozen-string-literal: true
 
+#SEQUEL5: Remove
+
 Sequel::JDBC.load_driver('Java::cubrid.jdbc.driver.CUBRIDDriver')
 Sequel.require 'adapters/shared/cubrid'
 Sequel.require 'adapters/jdbc/transactions'

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

@@ -1,5 +1,7 @@
 # frozen-string-literal: true
 
+#SEQUEL5: Remove
+
 Sequel::JDBC.load_driver('org.firebirdsql.jdbc.FBDriver')
 Sequel.require 'adapters/shared/firebird'
 Sequel.require 'adapters/jdbc/transactions'

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

@@ -1,5 +1,7 @@
 # frozen-string-literal: true
 
+#SEQUEL5: Remove
+
 Sequel::JDBC.load_driver('com.informix.jdbc.IfxDriver')
 Sequel.require 'adapters/shared/informix'
 

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

@@ -1,5 +1,7 @@
 # frozen-string-literal: true
 
+#SEQUEL5: Remove
+
 Sequel::JDBC.load_driver('com.progress.sql.jdbc.JdbcProgressDriver')
 Sequel.require 'adapters/shared/progress'
 Sequel.require 'adapters/jdbc/transactions'

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

@@ -27,6 +27,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{}}")
           u = URI.parse(uri.sub(/\Ajdbc:/, ''))
           (m = /\/(.*)/.match(u.path)) && m[1]
         end

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

@@ -195,6 +195,11 @@ module Sequel
           sql << APOS << db.synchronize(@opts[:server]){|c| c.escape_string(v)} << APOS
         end
 
+        # SQL fragment for Sequel::SQLTime, containing just the time part
+        def literal_sqltime(v)
+          v.strftime("'%H:%M:%S#{sprintf(".%03d", (v.usec/1000.0).round)}'")
+        end
+
         STRING_TYPE = Java::JavaSQL::Types::VARCHAR
         ARRAY_TYPE = Java::JavaSQL::Types::ARRAY
         PG_SPECIFIC_TYPES = [ARRAY_TYPE, Java::JavaSQL::Types::OTHER, Java::JavaSQL::Types::STRUCT]

data/lib/sequel/adapters/mysql.rb

@@ -282,6 +282,7 @@ module Sequel
       # The database name when using the native adapter is always stored in
       # the :database option.
       def database_name
+        Sequel::Deprecation.deprecate("Database#database_name", "Instead, use .get{DATABASE{}}")
         @opts[:database]
       end
       

data/lib/sequel/adapters/mysql2.rb

@@ -218,6 +218,7 @@ module Sequel
       # The database name when using the native adapter is always stored in
       # the :database option.
       def database_name
+        Sequel::Deprecation.deprecate("Database#database_name", "Instead, use .get{DATABASE{}}")
         @opts[:database]
       end
 

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

@@ -0,0 +1,11 @@
+# frozen-string-literal: true
+
+Sequel.require 'adapters/shared/oracle'
+
+Sequel.synchronize do
+  Sequel::ODBC::DATABASE_SETUP[:oracle] = proc do |db|
+    db.extend ::Sequel::Oracle::DatabaseMethods
+    db.extend_datasets ::Sequel::Oracle::DatasetMethods
+  end
+end
+

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

@@ -1,5 +1,7 @@
 # frozen-string-literal: true
 
+#SEQUEL5: Remove
+
 Sequel.require 'adapters/shared/progress'
 
 Sequel.synchronize do

data/lib/sequel/adapters/postgres.rb

@@ -141,8 +141,6 @@ module Sequel
       # errors.
       DISCONNECT_ERROR_RE = /\A#{Regexp.union(disconnect_errors)}/
       
-      self.translate_results = false if respond_to?(:translate_results=)
-      
       # Hash of prepared statements for this connection.  Keys are
       # string names of the server side prepared statement, and values
       # are SQL strings.

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

@@ -1,5 +1,7 @@
 # frozen-string-literal: true
 
+Sequel::Deprecation.deprecate("Sequel support for Cubrid", "Please consider maintaining it yourself as an external sequel adapter if you want to continue using it")
+
 Sequel.require %w'split_alter_table unmodified_identifiers', 'adapters/utils'
 
 module Sequel

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

@@ -1,5 +1,7 @@
 # frozen-string-literal: true
 
+Sequel::Deprecation.deprecate("Sequel support for Firebird", "Please consider maintaining it yourself as an external sequel adapter if you want to continue using it")
+
 module Sequel
   module Firebird
     Sequel::Database.set_shared_adapter_scheme(:firebird, self)

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

@@ -1,5 +1,7 @@
 # frozen-string-literal: true
 
+Sequel::Deprecation.deprecate("Sequel support for Informix", "Please consider maintaining it yourself as an external sequel adapter if you want to continue using it")
+
 module Sequel
   module Informix
     Sequel::Database.set_shared_adapter_scheme(:informix, self)

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

@@ -525,7 +525,7 @@ module Sequel
   
     module DatasetMethods
       include(Module.new do
-        Dataset.def_sql_method(self, :select, %w'with select distinct limit columns into from lock join where group having order compounds')
+        Dataset.def_sql_method(self, :select, %w'with select distinct limit columns into from lock join where group having compounds order')
       end)
       include EmulateOffsetWithRowNumber
 
@@ -576,9 +576,10 @@ module Sequel
       FETCH_NEXT = " FETCH NEXT ".freeze
 
       NON_SQL_OPTIONS = (Dataset::NON_SQL_OPTIONS + [:disable_insert_output, :mssql_unicode_strings]).freeze
+      LIMIT_ALL = Object.new.freeze
 
       Dataset.def_mutation_method(:disable_insert_output, :output, :module=>self)
-      Dataset.def_sql_method(self, :delete, %w'with delete from output from2 where')
+      Dataset.def_sql_method(self, :delete, %w'with delete limit from output from2 where')
       Dataset.def_sql_method(self, :insert, %w'with insert into columns output values')
       Dataset.def_sql_method(self, :update, [['if is_2005_or_later?', %w'with update limit table set output from where'], ['else', %w'update table set output from where']])
 
@@ -847,8 +848,34 @@ module Sequel
         (options_overlap(Sequel::Dataset::COUNT_FROM_SELF_OPTS) && !options_overlap([:limit])) ? unordered.from_self : super
       end
 
+      # If the dataset using a order without a limit or offset or custom SQL, 
+      # remove the order.  Compounds on Microsoft SQL Server have undefined
+      # order unless the result is specifically ordered.  Applying the current
+      # order before the compound doesn't work in all cases, such as when
+      # qualified identifiers are used.  If you want to ensure a order
+      # for a compound dataset, apply the order after all compounds have been
+      # added.
+      def compound_from_self
+        if @opts[:offset] && !@opts[:limit] && !is_2012_or_later?
+          clone(:limit=>LIMIT_ALL).from_self
+        elsif @opts[:order]  && !(@opts[:sql] || @opts[:limit] || @opts[:offset])
+          unordered
+        else
+          super
+        end
+      end
+
       private
 
+      # Allow update and delete for unordered, limited datasets only.
+      def check_not_limited!(type)
+        return if @opts[:skip_limit_check] && type != :truncate
+        #SEQUEL5
+        #raise Sequel::InvalidOperation, "Dataset##{type} not suppored on ordered, limited datasets" if opts[:order] && opts[:limit]
+        Sequel::Deprecation.deprecate("Dataset##{type} on ordered, limited datasets", "Call unlimited to not use a limit, or unordered to not use an order, or skip_limit_check to ignore the limit") if @opts[:order] && @opts[:limit]
+        super if type == :truncate || @opts[:offset]
+      end
+
       # Whether we are using SQL Server 2005 or later.
       def is_2005_or_later?
         server_version >= 9000000
@@ -986,18 +1013,31 @@ module Sequel
       def select_limit_sql(sql)
         if l = @opts[:limit]
           return if is_2012_or_later? && @opts[:order] && @opts[:offset]
+          shared_limit_sql(sql, l)
+        end
+      end
 
-          if is_2005_or_later?
+      def shared_limit_sql(sql, l)
+        if is_2005_or_later?
+          if l == LIMIT_ALL
+            sql << " TOP (100) PERCENT"
+          else
             sql << TOP_PAREN
             literal_append(sql, l)
             sql << PAREN_CLOSE
-          else
-            sql << TOP
-            literal_append(sql, l)
           end
+        else
+          sql << TOP
+          literal_append(sql, l)
+        end
+      end
+
+      def update_limit_sql(sql)
+        if l = @opts[:limit]
+          shared_limit_sql(sql, l)
         end
       end
-      alias update_limit_sql select_limit_sql
+      alias delete_limit_sql update_limit_sql
 
       # Support different types of locking styles
       def select_lock_sql(sql)

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

@@ -110,7 +110,16 @@ module Sequel
         remove_indexes = []
         m = output_identifier_meth
         im = input_identifier_meth
-        metadata_dataset.with_sql("SHOW INDEX FROM ?", SQL::Identifier.new(im.call(table))).each do |r|
+        schema, table = schema_and_table(table)
+
+        table = Sequel::SQL::Identifier.new(table)
+        sql = "SHOW INDEX FROM #{literal(table)}"
+        if schema
+          schema = Sequel::SQL::Identifier.new(schema)
+          sql += " FROM #{literal(schema)}"
+        end
+
+        metadata_dataset.with_sql(sql).each do |r|
           name = r[:Key_name]
           next if name == PRIMARY
           name = m.call(name)
@@ -181,6 +190,7 @@ module Sequel
       # 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 = {}
@@ -862,6 +872,11 @@ module Sequel
       
       private
 
+      # Allow update and delete for limited datasets, unless there is an offset.
+      def check_not_limited!(type)
+        super if type == :truncate || @opts[:offset]
+      end
+
       # Consider the first table in the joined dataset is the table to delete
       # from, but include the others for the purposes of selecting rows.
       def delete_from_sql(sql)

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

@@ -182,7 +182,12 @@ module Sequel
       # a block is given, it is used as the conversion proc, otherwise
       # the conversion proc is looked up in the PG_NAMED_TYPES hash.
       def add_named_conversion_proc(name, &block)
-        add_named_conversion_procs(conversion_procs, name=>(block || PG_NAMED_TYPES[name]))
+        unless block
+          if block = PG_NAMED_TYPES[name]
+            Sequel::Deprecation.deprecate("Sequel::PG_NAMED_TYPES", "Call Database#add_named_conversion_proc directly for each database you want to support the #{name} type")
+          end
+        end
+        add_named_conversion_procs(conversion_procs, name=>block)
       end
 
       # Commit an existing prepared transaction with the given transaction
@@ -1009,6 +1014,9 @@ module Sequel
       def get_conversion_procs
         procs = PG_TYPES.dup
         procs[1184] = procs[1114] = method(:to_application_timestamp)
+        unless PG_NAMED_TYPES.empty?
+          Sequel::Deprecation.deprecate("Sequel::PG_NAMED_TYPES", "Call Database#add_named_conversion_proc directly for each Database instance where you want to support the following type(s): #{PG_NAMED_TYPES.keys.join(', ')}")
+        end
         add_named_conversion_procs(procs, PG_NAMED_TYPES)
         procs
       end

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

@@ -1,5 +1,7 @@
 # frozen-string-literal: true
 
+Sequel::Deprecation.deprecate("Sequel support for Progress", "Please consider maintaining it yourself as an external sequel adapter if you want to continue using it")
+
 module Sequel
   module Progress
     module DatabaseMethods

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

@@ -289,7 +289,7 @@ module Sequel
       ONLY_OFFSET = " TOP 2147483647".freeze
 
       Dataset.def_sql_method(self, :insert, %w'with insert into columns values')
-      Dataset.def_sql_method(self, :select, %w'with select distinct limit columns into from join where group having order compounds lock')
+      Dataset.def_sql_method(self, :select, %w'with select distinct limit columns into from join where group having compounds order lock')
 
       # Whether to convert smallint to boolean arguments for this dataset.
       # Defaults to the SqlAnywhere module setting.

data/lib/sequel/adapters/swift.rb

@@ -1,5 +1,7 @@
 # frozen-string-literal: true
 
+Sequel::Deprecation.deprecate("The swift adapter", "Please consider maintaining it yourself as an external gem if you want to continue using it")
+
 module Sequel
   # Module holding the Swift DB support for Sequel.  Swift DB is a
   # collection of drivers used in Swift ORM.

data/lib/sequel/ast_transformer.rb

@@ -89,11 +89,16 @@ module Sequel
   # Handles qualifying existing datasets, so that unqualified columns
   # in the dataset are qualified with a given table name.
   class Qualifier < ASTTransformer
-    # Store the dataset to use as the basis for qualification, 
-    # and the table used to qualify unqualified columns. 
-    def initialize(ds, table)
-      @ds = ds
-      @table = table
+    # Set the table used to qualify unqualified columns
+    def initialize(table, unused=nil)
+      if unused
+        # :nocov:
+        Sequel::Deprecation.deprecate("Passing two arguments to Sequel::Qualifier.new", 'Pass only the second arguument specifying the table used for qualification')
+        @table = unused
+        # :nocov:
+      else
+        @table = table
+      end
     end
 
     private
@@ -105,7 +110,7 @@ module Sequel
     def v(o)
       case o
       when Symbol
-        t, column, aliaz = @ds.send(:split_symbol, o)
+        t, column, aliaz = Sequel.split_symbol(o)
         if t
           o
         elsif aliaz
@@ -160,6 +165,7 @@ module Sequel
 
     # Intialize an empty +binds+ hash.
     def initialize
+      Sequel::Deprecation.deprecate("Sequel::Unbinder", 'There is no replacement')
       @binds = {}
     end
 
@@ -205,4 +211,5 @@ module Sequel
       end
     end
   end
+  Sequel::Deprecation.deprecate_constant(self, :Unbinder)
 end

data/lib/sequel/core.rb

@@ -25,8 +25,6 @@ module Sequel
   @convert_two_digit_years = true
   @datetime_class = Time
   @split_symbols = true
-
-  # Whether Sequel is being run in single threaded mode
   @single_threaded = false
 
   class << self
@@ -51,6 +49,15 @@ module Sequel
     # they often implement them differently (e.g. + using seconds on +Time+ and
     # days on +DateTime+).
     attr_accessor :datetime_class
+
+    # Set whether sequel is being used in single threaded mode. by default,
+    # Sequel uses a thread-safe connection pool, which isn't as fast as the
+    # single threaded connection pool, and also has some additional thread
+    # safety checks.  If your program will only have one thread,
+    # and speed is a priority, you should set this to true:
+    #
+    #   Sequel.single_threaded = true
+    attr_accessor :single_threaded
   end
 
   # Returns true if the passed object could be a specifier of conditions, false otherwise.
@@ -152,6 +159,7 @@ module Sequel
   #
   # Other String instance methods work as well.
   def self.identifier_input_method=(value)
+    # SEQUEL5: Remove
     Database.identifier_input_method = value
   end
 
@@ -168,6 +176,7 @@ module Sequel
   #
   # Other String instance methods work as well.
   def self.identifier_output_method=(value)
+    # SEQUEL5: Remove
     Database.identifier_output_method = value
   end
 
@@ -194,6 +203,7 @@ module Sequel
   #
   #   Sequel.quote_identifiers = false
   def self.quote_identifiers=(value)
+    # SEQUEL5: Remove
     Database.quote_identifiers = value
   end
 
@@ -218,18 +228,6 @@ module Sequel
     Array(files).each{|f| super("#{File.dirname(__FILE__).untaint}/#{"#{subdir}/" if subdir}#{f}")}
   end
 
-  # Set whether Sequel is being used in single threaded mode. By default,
-  # Sequel uses a thread-safe connection pool, which isn't as fast as the
-  # single threaded connection pool, and also has some additional thread
-  # safety checks.  If your program will only have one thread,
-  # and speed is a priority, you should set this to true:
-  #
-  #   Sequel.single_threaded = true
-  def self.single_threaded=(value)
-    @single_threaded = value
-    Database.single_threaded = value
-  end
-
   COLUMN_REF_RE1 = /\A((?:(?!__).)+)__((?:(?!___).)+)___(.+)\z/.freeze
   COLUMN_REF_RE2 = /\A((?:(?!___).)+)___(.+)\z/.freeze
   COLUMN_REF_RE3 = /\A((?:(?!__).)+)__(.+)\z/.freeze
@@ -358,14 +356,13 @@ module Sequel
 
   # Uses a transaction on all given databases with the given options. This:
   #
-  #   Sequel.transaction([DB1, DB2, DB3]){...}
+  #   Sequel.transaction([DB1, DB2, DB3]){}
   #
   # is equivalent to:
   #
   #   DB1.transaction do
   #     DB2.transaction do
   #       DB3.transaction do
-  #         ...
   #       end
   #     end
   #   end