sequel 5.83.0 → 5.106.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66956ac28806c0389a6c809b0aa70d2746a7aff47fd5b039d238c08f621cdbff
-  data.tar.gz: d2b8d3f88b13432c60e6164fda3577725300e18a0dfa03682871405d074d7ba0
+  metadata.gz: 93dd74cb4407d389f289342898c26327d91db1ddd733478461bd8620a3a1771b
+  data.tar.gz: b00796ca61d19f2d9aeaaa764565893e73f5dd4c0752e11bd38635fdb94b1cea
 SHA512:
-  metadata.gz: 55d45f7c3cb7154f275ddf5ea3649d78a38f147abdb49f1286358d8dbec9f607e3bf43c9ebe1dc31276d28820f455fc82dcce7b4c9808b325288380acf90edf4
-  data.tar.gz: b8301c7880dcb598ca027d225f5be791200ac1f13f4efe5351222d351b218019351a8efa1f485d499a0650cd4213ba0a148c3f10f0a67aa0b3c04f4ee611b074
+  metadata.gz: 2502a507d57a7f64dae3ddc9e736254461a3a05f15f95a4835e2ddd83cb3cf3a9f6719f97e6b05239508d4e8445cff8b502198d40eea9f2c0af9d7ea385f829f
+  data.tar.gz: 8f3e230dc402a4e9d4b2c1d60fb5bdcac580f8368a2ad79a132a29348df8bce6b78f983658c6cf1e406b53164f79f1103cdbfb8ccfd29d0ec90db48a57f348a2

data/MIT-LICENSE

@@ -1,5 +1,5 @@
 Copyright (c) 2007-2008 Sharon Rosner
-Copyright (c) 2008-2023 Jeremy Evans
+Copyright (c) 2008-2026 Jeremy Evans and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

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

@@ -281,7 +281,7 @@ module Sequel
           fetch_ado_schema(:columns, [nil,nil,table_name.to_s,nil]) do |row| 
             rows << AdoSchema::Column.new(row)
           end
-          rows.sort!{|a,b| a["ORDINAL_POSITION"] <=> b["ORDINAL_POSITION"]}
+          rows.sort_by! { |a| a["ORDINAL_POSITION"] }
         end
         
         def ado_schema_foreign_keys(table_name)
@@ -289,7 +289,7 @@ module Sequel
           fetch_ado_schema(:foreign_keys, [nil,nil,nil,nil,nil,table_name.to_s]) do |row| 
             rows << row
           end
-          rows.sort!{|a,b| a["ORDINAL"] <=> b["ORDINAL"]}
+          rows.sort_by! { |a| a["ORDINAL"] }
         end
         
         def fetch_ado_schema(type, criteria=[])

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
@@ -234,7 +234,7 @@ module Sequel
       end
 
       def disconnect_error?(e, opts)
-        super || (e.is_a?(::WIN32OLERuntimeError) && e.message =~ /Communication link failure/)
+        super || (e.is_a?(::WIN32OLERuntimeError) && e.message.include?('Communication link failure'))
       end
 
       def rollback_transaction(conn, opts=OPTS)

data/lib/sequel/adapters/amalgalite.rb

@@ -62,11 +62,26 @@ module Sequel
       
       # Mimic the file:// uri, by having 2 preceding slashes specify a relative
       # path, and 3 preceding slashes specify an absolute path.
+      # Also support no preceding slashes to specify a relative path.
       def self.uri_to_options(uri) # :nodoc:
-        { :database => (uri.host.nil? && uri.path == '/') ? nil : "#{uri.host}#{uri.path}" }
+        database = if uri.host.nil?
+          case uri.path
+          when '/'
+            nil
+          when nil
+            uri.opaque
+          else
+            uri.path
+          end
+        else
+          "#{uri.host}#{uri.path}"
+        end
+
+        { :database => database }
       end
       private_class_method :uri_to_options
       
+      
       # Connect to the database.  Since SQLite is a file based database,
       # the only options available are :database (to specify the database
       # name), and :timeout, to specify how long to wait for the database to

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
@@ -323,7 +324,7 @@ module Sequel
         when Numeric
           v.to_s
         when Date, Time
-          literal(v).gsub("'", '')
+          literal(v).delete("'")
         else
           v
         end

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,8 @@
 # frozen-string-literal: true
 
-Sequel::JDBC.load_driver('org.apache.derby.jdbc.EmbeddedDriver', :Derby)
+# SEQUEL6: Remove
+
+Sequel::JDBC.load_driver('Java::OrgApacheDerbyJdbc::EmbeddedDriver', :Derby)
 require_relative 'transactions'
 require_relative '../utils/columns_limit_1'
 
@@ -10,7 +12,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
 
@@ -18,7 +18,7 @@ module Sequel
         include AutoCastDateAndTime
 
         def commit_prepared_transaction(transaction_id, opts=OPTS)
-          run("COMMIT TRANSACTION #{transaction_id}", opts)
+          run("COMMIT TRANSACTION #{transaction_id}".freeze, opts)
         end
 
         def database_type
@@ -36,7 +36,7 @@ module Sequel
         end
 
         def rollback_prepared_transaction(transaction_id, opts=OPTS)
-          run("ROLLBACK TRANSACTION #{transaction_id}", opts)
+          run("ROLLBACK TRANSACTION #{transaction_id}".freeze, opts)
         end
 
         # H2 uses an IDENTITY type for primary keys

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
@@ -26,7 +26,7 @@ module Sequel
 
         # Raise a disconnect error if the SQL state of the cause of the exception indicates so.
         def disconnect_error?(exception, opts)
-          exception.message =~ /\ACommunications link failure/ || super
+          exception.message.start_with?("Communications link failure") || super
         end
 
         # Get the last inserted id using LAST_INSERT_ID().
@@ -64,7 +64,7 @@ module Sequel
 
         # Convert tinyint(1) type to boolean
         def schema_column_type(db_type)
-          db_type =~ /\Atinyint\(1\)/ ? :boolean : super
+          db_type.start_with?("tinyint(1)") ? :boolean : super
         end
       
         # Run the default connection setting SQL statements.

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)
@@ -55,7 +55,7 @@ module Sequel
         end
 
         def disconnect_error?(exception, opts)
-          super || exception.message =~ /\AClosed Connection/
+          super || exception.message.start_with?("Closed Connection")
         end
 
         # Default the fetch size for statements to 100, similar to the oci8-based oracle adapter.
@@ -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
 
@@ -98,7 +98,7 @@ module Sequel
 
         # Whether the given exception is due to a foreign key error.
         def foreign_key_error?(exception)
-          exception.message =~ /query does not return ResultSet/
+          exception.message.include?('query does not return ResultSet')
         end
 
         # Use getLong instead of getInt for converting integers on SQLite, since SQLite does not enforce a limit of 2**32.

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
 
@@ -84,7 +84,7 @@ module Sequel
         end
 
         def disconnect_error?(exception, opts)
-          super || (exception.message =~ /connection is closed/)
+          super || (exception.message.include?('connection is closed'))
         end
       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])
@@ -305,17 +305,31 @@ module Sequel
         m = output_identifier_meth
         schema, table = metadata_schema_and_table(table, opts)
         foreign_keys = {}
+
         metadata(:getImportedKeys, nil, schema, table) do |r|
-          if fk = foreign_keys[r[:fk_name]]
-            fk[:columns] << [r[:key_seq], m.call(r[:fkcolumn_name])]
-            fk[:key] << [r[:key_seq], m.call(r[:pkcolumn_name])]
-          elsif r[:fk_name]
-            foreign_keys[r[:fk_name]] = {:name=>m.call(r[:fk_name]), :columns=>[[r[:key_seq], m.call(r[:fkcolumn_name])]], :table=>m.call(r[:pktable_name]), :key=>[[r[:key_seq], m.call(r[:pkcolumn_name])]]}
+          next unless fk_name = r[:fk_name]
+
+          key_seq = r[:key_seq]
+          columns = [key_seq, m.call(r[:fkcolumn_name])]
+          key = [key_seq, m.call(r[:pkcolumn_name])]
+
+          if fk = foreign_keys[fk_name]
+            fk[:columns] << columns
+            fk[:key] << key
+          else
+            foreign_keys[fk_name] = {
+              :name=>m.call(fk_name),
+              :columns=>[columns],
+              :table=>m.call(r[:pktable_name]),
+              :key=>[key]
+            }
           end
         end
+
+        fk_keys = [:columns, :key]
         foreign_keys.values.each do |fk|
-          [:columns, :key].each do |k|
-            fk[k] = fk[k].sort.map{|_, v| v}
+          fk_keys.each do |k|
+            fk[k].sort!.map!{|_, v| v}
           end
         end
       end
@@ -506,7 +520,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 +544,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 +650,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/mysql.rb

@@ -290,7 +290,7 @@ module Sequel
       
       # Convert tinyint(1) type to boolean if convert_tinyint_to_bool is true
       def schema_column_type(db_type)
-        convert_tinyint_to_bool && db_type =~ /\Atinyint\(1\)/ ? :boolean : super
+        convert_tinyint_to_bool && db_type.start_with?("tinyint(1)") ? :boolean : super
       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
@@ -214,13 +221,13 @@ module Sequel
         super ||
           ((conn = opts[:conn]) && !conn.ping) ||
           (e.is_a?(::Mysql2::Error) &&
-            (e.sql_state =~ /\A08/ ||
+            ((e.sql_state && e.sql_state.start_with?("08")) ||
              MYSQL_DATABASE_DISCONNECT_ERRORS.match(e.message)))
       end
 
       # Convert tinyint(1) type to boolean if convert_tinyint_to_bool is true
       def schema_column_type(db_type)
-        convert_tinyint_to_bool && db_type =~ /\Atinyint\(1\)/ ? :boolean : super
+        convert_tinyint_to_bool && db_type.start_with?("tinyint(1)") ? :boolean : super
       end
     end
 

data/lib/sequel/adapters/odbc.rb

@@ -81,7 +81,7 @@ module Sequel
       end
 
       def disconnect_error?(e, opts)
-        super || (e.is_a?(::ODBC::Error) && /\A08S01/.match(e.message))
+        super || (e.is_a?(::ODBC::Error) && e.message.start_with?("08S01"))
       end
     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/postgres.rb

@@ -516,6 +516,7 @@ module Sequel
                 end
               ensure
                 conn.execute("UNLISTEN *")
+                true while conn.wait_for_notify(0)
               end
             end
           end
@@ -726,7 +727,7 @@ module Sequel
               prepared_args << y
               i = prepared_args.length
             end
-            LiteralString.new("#{prepared_arg_placeholder}#{i}")
+            LiteralString.new("#{prepared_arg_placeholder}#{i}".freeze)
           end
         end
 

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/db2.rb

@@ -108,7 +108,7 @@ module Sequel
         from(name).first
         true
       rescue DatabaseError => e
-        if e.to_s =~ /Operation not allowed for reason code "7" on table/ && v == false
+        if e.to_s.include?('Operation not allowed for reason code "7" on table') && v == false
           # table probably needs reorg
           reorg(name)
           v = true
@@ -175,8 +175,13 @@ module Sequel
       # Supply columns with NOT NULL if they are part of a composite
       # primary key or unique constraint
       def column_list_sql(g)
-        ks = []
-        g.constraints.each{|c| ks = c[:columns] if [:primary_key, :unique].include?(c[:type])} 
+        ks = {}
+        g.constraints.each do |c|
+          case c[:type]
+          when :primary_key, :unique
+            c[:columns].each{|c| ks[c] = true}
+          end
+        end
         g.columns.each{|c| c[:null] = false if ks.include?(c[:name]) }
         super
       end