sequel 5.85.0 → 5.93.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecb752c20a2b59df814e873f04ac143aadd875b503b2400cca8929d9eabff572
-  data.tar.gz: d528c6d03626b725f27599c8cf624311517e4f4fe67c12139a2e815278fbb707
+  metadata.gz: dd35e8223b7f6d450cf4c1efeaad152236b4a1e360299aa46b03841bb45996c6
+  data.tar.gz: '096a62cc241cf6f48d0c2b3e0799402f21aa24a1196a332e022ef53ebaaeea85'
 SHA512:
-  metadata.gz: 4fcb91f8acb96a4a57152c9a0f41e78af1b42d6c393f8c90b2099e00d632676096c8ac27b0e31699fd31be0e22912b55e4372353fef93e967e548741dbc6406e
-  data.tar.gz: e2545b4dcca9ca1a13f47cbfdf2f38802d2564f7f0766d526e5041b93a94142560517f5d3ef5c9a5d2692e67a482c8044b4812c064fd35c2edf0c19a3df6b25c
+  metadata.gz: 0b66c7e30dfb69468ad41bfe64de4e0442ad62590ea735b2e4bb591c46b949794a7a453c21532999c89296694f0136d9353041ec56fc470ab2ba0483f0534d61
+  data.tar.gz: 978dcd457829ff39f1ae9769dc574049cf29d07a2dbc8e307aa806a7b1954cd72432257de37d9e5236269b5746f615f8d0f7feb4979e9b86b619f582344afc29

data/lib/sequel/adapters/ado.rb

@@ -179,7 +179,7 @@ module Sequel
       
       def adapter_initialize
         case @opts[:conn_string]
-        when /Microsoft\.(Jet|ACE)\.OLEDB/io
+        when /Microsoft\.(Jet|ACE)\.OLEDB/i
           require_relative 'ado/access'
           extend Sequel::ADO::Access::DatabaseMethods
           self.dataset_class = ADO::Access::Dataset

data/lib/sequel/adapters/ibmdb.rb

@@ -7,6 +7,7 @@ module Sequel
 
   module IBMDB
     tt = Class.new do
+      Sequel.set_temp_name(self){"Sequel::IBMDB::_TypeTranslator"}
       def boolean(s) !s.to_i.zero? end
       def int(s) s.to_i end
     end.new

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

@@ -1,6 +1,6 @@
 # frozen-string-literal: true
 
-Sequel::JDBC.load_driver('com.ibm.db2.jcc.DB2Driver')
+Sequel::JDBC.load_driver('Java::ComIbmDb2Jcc::DB2Driver')
 require_relative '../shared/db2'
 require_relative 'transactions'
 
@@ -25,7 +25,7 @@ module Sequel
           end
         end
         db.extend_datasets Sequel::DB2::DatasetMethods
-        com.ibm.db2.jcc.DB2Driver
+        Java::ComIbmDb2Jcc::DB2Driver
       end
     end
 

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

@@ -1,6 +1,6 @@
 # frozen-string-literal: true
 
-Sequel::JDBC.load_driver('org.apache.derby.jdbc.EmbeddedDriver', :Derby)
+Sequel::JDBC.load_driver('Java::OrgApacheDerbyJdbc::EmbeddedDriver', :Derby)
 require_relative 'transactions'
 require_relative '../utils/columns_limit_1'
 
@@ -10,7 +10,7 @@ module Sequel
       DATABASE_SETUP[:derby] = proc do |db|
         db.extend(Sequel::JDBC::Derby::DatabaseMethods)
         db.dataset_class = Sequel::JDBC::Derby::Dataset
-        org.apache.derby.jdbc.EmbeddedDriver
+        Java::OrgApacheDerbyJdbc::EmbeddedDriver
       end
     end
 

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

@@ -1,6 +1,6 @@
 # frozen-string-literal: true
 
-Sequel::JDBC.load_driver('org.h2.Driver', :H2)
+Sequel::JDBC.load_driver('Java::OrgH2::Driver', :H2)
 require_relative '../../extensions/auto_cast_date_and_time'
 
 module Sequel
@@ -9,7 +9,7 @@ module Sequel
       DATABASE_SETUP[:h2] = proc do |db|
         db.extend(Sequel::JDBC::H2::DatabaseMethods)
         db.dataset_class = Sequel::JDBC::H2::Dataset
-        org.h2.Driver
+        Java::OrgH2::Driver
       end
     end
 

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

@@ -1,6 +1,6 @@
 # frozen-string-literal: true
 
-Sequel::JDBC.load_driver('org.hsqldb.jdbcDriver', :HSQLDB)
+Sequel::JDBC.load_driver('Java::OrgHsqldb::jdbcDriver', :HSQLDB)
 require_relative 'transactions'
 require_relative '../../extensions/auto_cast_date_and_time'
 
@@ -10,7 +10,7 @@ module Sequel
       DATABASE_SETUP[:hsqldb] = proc do |db|
         db.extend(Sequel::JDBC::HSQLDB::DatabaseMethods)
         db.dataset_class = Sequel::JDBC::HSQLDB::Dataset
-        org.hsqldb.jdbcDriver
+        Java::OrgHsqldb::jdbcDriver
       end
     end
 

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

@@ -1,6 +1,6 @@
 # frozen-string-literal: true
 
-Sequel::JDBC.load_driver('Java::net.sourceforge.jtds.jdbc.Driver', :JTDS)
+Sequel::JDBC.load_driver('Java::NetSourceforgeJtdsJdbc::Driver', :JTDS)
 require_relative 'mssql'
 
 module Sequel
@@ -10,7 +10,7 @@ module Sequel
         db.extend(Sequel::JDBC::JTDS::DatabaseMethods)
         db.extend_datasets Sequel::MSSQL::DatasetMethods
         db.send(:set_mssql_unicode_strings)
-        Java::net.sourceforge.jtds.jdbc.Driver
+        Java::NetSourceforgeJtdsJdbc::Driver
       end
     end
 

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

@@ -2,7 +2,7 @@
 
 module Sequel
   module JDBC
-    driver = Sequel::JDBC.load_driver(%w'com.mysql.cj.jdbc.Driver com.mysql.jdbc.Driver', :MySQL)
+    driver = Sequel::JDBC.load_driver(%w'Java::ComMysqlCjJdbc::Driver Java::ComMysqlJdbc::Driver', :MySQL)
     require_relative '../shared/mysql'
 
     Sequel.synchronize do

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

@@ -1,6 +1,6 @@
 # frozen-string-literal: true
 
-Sequel::JDBC.load_driver('Java::oracle.jdbc.driver.OracleDriver')
+Sequel::JDBC.load_driver('Java::OracleJdbcDriver::OracleDriver')
 require_relative '../shared/oracle'
 require_relative 'transactions'
 
@@ -10,12 +10,12 @@ module Sequel
       DATABASE_SETUP[:oracle] = proc do |db|
         db.extend(Sequel::JDBC::Oracle::DatabaseMethods)
         db.dataset_class = Sequel::JDBC::Oracle::Dataset
-        Java::oracle.jdbc.driver.OracleDriver
+        Java::OracleJdbcDriver::OracleDriver
       end
     end
 
     module Oracle
-      JAVA_BIG_DECIMAL_CONSTRUCTOR = java.math.BigDecimal.java_class.constructor(Java::long).method(:new_instance)
+      JAVA_BIG_DECIMAL_CONSTRUCTOR = Java::JavaMath::BigDecimal.java_class.constructor(Java::long).method(:new_instance)
       ORACLE_DECIMAL = Object.new
       def ORACLE_DECIMAL.call(r, i)
         if v = r.getBigDecimal(i)
@@ -76,7 +76,7 @@ module Sequel
                 rs = log_connection_yield(sql, conn){stmt.executeQuery(sql)}
                 rs.next
                 rs.getLong(1)
-              rescue java.sql.SQLException
+              rescue Java::JavaSql::SQLException
                 nil
               end
             end
@@ -122,7 +122,7 @@ module Sequel
         NUMERIC_TYPE = Java::JavaSQL::Types::NUMERIC
         TIMESTAMP_TYPE = Java::JavaSQL::Types::TIMESTAMP
         CLOB_TYPE = Java::JavaSQL::Types::CLOB
-        TIMESTAMPTZ_TYPES = [Java::oracle.jdbc.OracleTypes::TIMESTAMPTZ, Java::oracle.jdbc.OracleTypes::TIMESTAMPLTZ].freeze
+        TIMESTAMPTZ_TYPES = [Java::OracleJdbc::OracleTypes::TIMESTAMPTZ, Java::OracleJdbc::OracleTypes::TIMESTAMPLTZ].freeze
 
         def type_convertor(map, meta, type, i)
           case type

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

@@ -1,6 +1,6 @@
 # frozen-string-literal: true
 
-Sequel::JDBC.load_driver('org.postgresql.Driver', :Postgres)
+Sequel::JDBC.load_driver('Java::OrgPostgresql::Driver', :Postgres)
 require_relative '../shared/postgres'
 
 module Sequel
@@ -9,7 +9,7 @@ module Sequel
       DATABASE_SETUP[:postgresql] = proc do |db|
         db.dataset_class = Sequel::JDBC::Postgres::Dataset
         db.extend(Sequel::JDBC::Postgres::DatabaseMethods)
-        org.postgresql.Driver
+        Java::OrgPostgresql::Driver
       end
     end
 
@@ -43,7 +43,7 @@ module Sequel
 
           synchronize(opts[:server]) do |conn|
             begin
-              copy_manager = org.postgresql.copy.CopyManager.new(conn)
+              copy_manager = Java::OrgPostgresqlCopy::CopyManager.new(conn)
               copier = copy_manager.copy_in(copy_into_sql(table, opts))
               if defined?(yield)
                 while buf = yield
@@ -74,7 +74,7 @@ module Sequel
         # See Sequel::Postgres::Adapter#copy_table
         def copy_table(table, opts=OPTS)
           synchronize(opts[:server]) do |conn|
-            copy_manager = org.postgresql.copy.CopyManager.new(conn)
+            copy_manager = Java::OrgPostgresqlCopy::CopyManager.new(conn)
             copier = copy_manager.copy_out(copy_table_sql(table, opts))
             begin
               if defined?(yield)
@@ -148,7 +148,7 @@ module Sequel
         # and set that as the prepared statement argument.
         def set_ps_arg(cps, arg, i)
           if v = bound_variable_arg(arg, nil)
-            obj = org.postgresql.util.PGobject.new
+            obj = Java::OrgPostgresqlUtil::PGobject.new
             obj.setType("unknown")
             obj.setValue(v)
             cps.setObject(i, obj)

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

@@ -6,12 +6,12 @@ require_relative 'transactions'
 module Sequel
   module JDBC
     drv = [
-      lambda{Java::sybase.jdbc4.sqlanywhere.IDriver},
-      lambda{Java::ianywhere.ml.jdbcodbc.jdbc4.IDriver},
-      lambda{Java::sybase.jdbc.sqlanywhere.IDriver},
-      lambda{Java::ianywhere.ml.jdbcodbc.jdbc.IDriver},
-      lambda{Java::com.sybase.jdbc4.jdbc.Sybdriver},
-      lambda{Java::com.sybase.jdbc3.jdbc.Sybdriver}
+      lambda{Java::SybaseJdbc4Sqlanywhere::IDriver},
+      lambda{Java::IanywhereMlJdbcodbcJdbc4::IDriver},
+      lambda{Java::SybaseJdbcSqlanywhere::IDriver},
+      lambda{Java::IanywhereMlJdbcodbcJdbc::IDriver},
+      lambda{Java::ComSybaseJdbc4Jdbc::Sybdriver},
+      lambda{Java::ComSybaseJdbc3Jdbc::Sybdriver}
     ].each do |class_proc|
       begin
         break class_proc.call

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

@@ -1,6 +1,6 @@
 # frozen-string-literal: true
 
-Sequel::JDBC.load_driver('org.sqlite.JDBC', :SQLite3)
+Sequel::JDBC.load_driver('Java::OrgSqlite::JDBC', :SQLite3)
 require_relative '../shared/sqlite'
 
 module Sequel
@@ -10,7 +10,7 @@ module Sequel
         db.extend(Sequel::JDBC::SQLite::DatabaseMethods)
         db.extend_datasets Sequel::SQLite::DatasetMethods
         db.set_integer_booleans
-        org.sqlite.JDBC
+        Java::OrgSqlite::JDBC
       end
     end
 

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

@@ -1,6 +1,6 @@
 # frozen-string-literal: true
 
-Sequel::JDBC.load_driver('com.microsoft.sqlserver.jdbc.SQLServerDriver')
+Sequel::JDBC.load_driver('Java::ComMicrosoftSqlserverJdbc::SQLServerDriver')
 require_relative 'mssql'
 
 module Sequel
@@ -10,7 +10,7 @@ module Sequel
         db.extend(Sequel::JDBC::SQLServer::DatabaseMethods)
         db.extend_datasets Sequel::MSSQL::DatasetMethods
         db.send(:set_mssql_unicode_strings)
-        com.microsoft.sqlserver.jdbc.SQLServerDriver
+        Java::ComMicrosoftSqlserverJdbc::SQLServerDriver
       end
     end
 

data/lib/sequel/adapters/jdbc.rb

@@ -20,7 +20,7 @@ module Sequel
 
     # Create custom NativeException alias for nicer access, and also so that
     # JRuby 9.2+ so it doesn't use the deprecated ::NativeException
-    NativeException = java.lang.Exception
+    NativeException = Java::JavaLang::Exception
     
     # Default database error classes
     DATABASE_ERROR_CLASSES = [NativeException]
@@ -227,7 +227,7 @@ module Sequel
             raise e unless driver
             # If the DriverManager can't get the connection - use the connect
             # method of the driver. (This happens under Tomcat for instance)
-            props = java.util.Properties.new
+            props = Java::JavaUtil::Properties.new
             if opts && opts[:user] && opts[:password]
               props.setProperty("user", opts[:user])
               props.setProperty("password", opts[:password])
@@ -506,7 +506,7 @@ module Sequel
       # Gets the connection from JNDI.
       def get_connection_from_jndi
         jndi_name = JNDI_URI_REGEXP.match(uri)[1]
-        javax.naming.InitialContext.new.lookup(jndi_name).connection
+        Java::JavaxNaming::InitialContext.new.lookup(jndi_name).connection
       end
             
       # Gets the JDBC connection uri from the JNDI resource.
@@ -530,19 +530,19 @@ module Sequel
 
       # Support Date objects used in bound variables
       def java_sql_date(date)
-        java.sql.Date.new(Time.local(date.year, date.month, date.day).to_i * 1000)
+        Java::JavaSql::Date.new(Time.local(date.year, date.month, date.day).to_i * 1000)
       end
 
       # Support DateTime objects used in bound variables
       def java_sql_datetime(datetime)
-        ts = java.sql.Timestamp.new(Time.local(datetime.year, datetime.month, datetime.day, datetime.hour, datetime.min, datetime.sec).to_i * 1000)
+        ts = Java::JavaSql::Timestamp.new(Time.local(datetime.year, datetime.month, datetime.day, datetime.hour, datetime.min, datetime.sec).to_i * 1000)
         ts.setNanos((datetime.sec_fraction * 1000000000).to_i)
         ts
       end
 
       # Support fractional seconds for Time objects used in bound variables
       def java_sql_timestamp(time)
-        ts = java.sql.Timestamp.new(time.to_i * 1000)
+        ts = Java::JavaSql::Timestamp.new(time.to_i * 1000)
         ts.setNanos(time.nsec)
         ts
       end 
@@ -636,11 +636,11 @@ module Sequel
       def schema_column_set_db_type(schema)
         case schema[:type]
         when :string
-          if schema[:db_type] =~ /\A(character( varying)?|n?(var)?char2?)\z/io && schema[:column_size] > 0
+          if schema[:db_type] =~ /\A(character( varying)?|n?(var)?char2?)\z/i && schema[:column_size] > 0
             schema[:db_type] += "(#{schema[:column_size]})"
           end
         when :decimal
-          if schema[:db_type] =~ /\A(decimal|numeric)\z/io && schema[:column_size] > 0 && schema[:scale] >= 0
+          if schema[:db_type] =~ /\A(decimal|numeric)\z/i && schema[:column_size] > 0 && schema[:scale] >= 0
             schema[:db_type] += "(#{schema[:column_size]}, #{schema[:scale]})"
           end
         end

data/lib/sequel/adapters/mysql2.rb

@@ -97,7 +97,14 @@ module Sequel
           synchronize(opts[:server]) do |conn|
             stmt, ps_sql = conn.prepared_statements[ps_name]
             unless ps_sql == sql
-              stmt.close if stmt
+              if stmt
+                begin
+                  stmt.close
+                rescue ::Mysql2::Error
+                  # probably Invalid statement handle, can happen from dropping
+                  # related table, ignore as we won't be using it again.
+                end
+              end
               stmt = log_connection_yield("Preparing #{ps_name}: #{sql}", conn){conn.prepare(sql)}
               conn.prepared_statements[ps_name] = [stmt, sql]
             end

data/lib/sequel/adapters/oracle.rb

@@ -353,6 +353,20 @@ module Sequel
           i = prepared_args.length
           LiteralString.new(":#{i}")
         end
+
+        # Avoid infinite recursion on Oracle <12 for datasets with limits
+        # (which are implemented via subqueries).  If the given dataset's
+        # prepared args are the same object as current dataset's, call the
+        # standard Sequel::Dataset#subselect_sql_append method, instead
+        # of calling super (which will call prepared_sql and result in
+        # infinite recursion).
+        def subselect_sql_append(sql, ds)
+          if !supports_fetch_next_rows? && ds.opts[:prepared_args].equal?(@opts[:prepared_args])
+            orig_subselect_sql_append(sql, ds)
+          else
+            super
+          end
+        end
       end
       
       BindArgumentMethods = prepared_statements_module(:bind, ArgumentMapper)
@@ -383,6 +397,8 @@ module Sequel
 
       private
 
+      alias orig_subselect_sql_append subselect_sql_append
+
       def literal_other_append(sql, v)
         case v
         when OraDate

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

@@ -88,6 +88,7 @@ module Sequel
   
     module DatasetMethods
       include(Module.new do
+        Sequel.set_temp_name(self){"Sequel::Access::DatasetMethods::_SQLMethods"}
         Dataset.def_sql_method(self, :select, %w'select distinct limit columns into from join where group order having compounds')
       end)
       include EmulateOffsetWithReverseAndCount

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

@@ -480,11 +480,11 @@ module Sequel
       
       def schema_column_type(db_type)
         case db_type
-        when /\A(?:bit)\z/io
+        when /\A(?:bit)\z/i
           :boolean
-        when /\A(?:(?:small)?money)\z/io
+        when /\A(?:(?:small)?money)\z/i
           :decimal
-        when /\A(timestamp|rowversion)\z/io
+        when /\A(timestamp|rowversion)\z/i
           :blob
         else
           super
@@ -574,6 +574,7 @@ module Sequel
   
     module DatasetMethods
       include(Module.new do
+        Sequel.set_temp_name(self){"Sequel::MSSQL::DatasetMethods::_SQLMethods"}
         Dataset.def_sql_method(self, :select, %w'with select distinct limit columns into from lock join where group having compounds order')
       end)
       include EmulateOffsetWithRowNumber

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

@@ -550,11 +550,11 @@ module Sequel
 
       def schema_column_type(db_type)
         case db_type
-        when /\Aset/io
+        when /\Aset/i
           :set
-        when /\Amediumint/io
+        when /\Amediumint/i
           :integer
-        when /\Amediumtext/io
+        when /\Amediumtext/i
           :string
         else
           super
@@ -567,7 +567,7 @@ module Sequel
         im = input_identifier_meth(opts[:dataset])
         table = SQL::Identifier.new(im.call(table_name))
         table = SQL::QualifiedIdentifier.new(im.call(opts[:schema]), table) if opts[:schema]
-        metadata_dataset.with_sql("DESCRIBE ?", table).map do |row|
+        metadata_dataset.with_sql("SHOW FULL COLUMNS FROM ?", table).map do |row|
           extra = row.delete(:Extra)
           if row[:primary_key] = row.delete(:Key) == 'PRI'
             row[:auto_increment] = !!(extra.to_s =~ /auto_increment/i)
@@ -577,10 +577,14 @@ module Sequel
             row[:generated] = !!(extra.to_s =~ /VIRTUAL|STORED|PERSISTENT/i)
           end
           row[:allow_null] = row.delete(:Null) == 'YES'
+          row[:comment] = row.delete(:Comment)
+          row[:comment] = nil if row[:comment] == ""
           row[:default] = row.delete(:Default)
           row[:db_type] = row.delete(:Type)
           row[:type] = schema_column_type(row[:db_type])
           row[:extra] = extra
+          row.delete(:Collation)
+          row.delete(:Privileges)
           [m.call(row.delete(:Field)), row]
         end
       end

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

@@ -333,6 +333,7 @@ module Sequel
       BITAND_PROC = lambda{|a, b| Sequel.lit(["CAST(BITAND(", ", ", ") AS INTEGER)"], a, b)}
 
       include(Module.new do
+        Sequel.set_temp_name(self){"Sequel::Oracle::DatasetMethods::_SQLMethods"}
         Dataset.def_sql_method(self, :select, %w'with select distinct columns from join where group having compounds order limit lock')
       end)