sequel 4.30.0 → 4.31.0

data/lib/sequel/adapters/postgresql.rb

@@ -1 +1,3 @@
+# frozen-string-literal: true
+
 Sequel.require 'adapters/postgres'

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

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   require 'adapters/utils/emulate_offset_with_reverse_and_count'
 

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

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel.require 'adapters/utils/split_alter_table'
 
 module Sequel

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

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel.require 'adapters/utils/emulate_offset_with_row_number'
 
 module Sequel

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

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Firebird
     module DatabaseMethods

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

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Informix
     module DatabaseMethods

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

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel.require %w'emulate_offset_with_row_number split_alter_table', 'adapters/utils'
 
 module Sequel

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

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel.require 'adapters/utils/split_alter_table'
 Sequel.require 'adapters/utils/replace'
 
@@ -187,7 +189,7 @@ module Sequel
       
       def alter_table_add_column_sql(table, op)
         if related = op.delete(:table)
-          sql = super
+          sql = super.dup
           op[:table] = related
           op[:key] ||= primary_key_from_schema(related)
           sql << ", ADD "
@@ -356,6 +358,8 @@ module Sequel
               [pk]
             elsif !(pkc = generator.constraints.select{|con| con[:type] == :primary_key}).empty?
               pkc.first[:columns]
+            elsif !(pkc = generator.columns.select{|con| con[:primary_key] == true}).empty?
+              pkc.map{|c| c[:name]}
             end
           else
             primary_key_from_schema(t)

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

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel.require %w'shared/mysql utils/stored_procedures', 'adapters'
 
 module Sequel

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

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel.require 'adapters/utils/emulate_offset_with_row_number'
 
 module Sequel
@@ -342,7 +344,7 @@ module Sequel
       def select_sql
         return super if @opts[:sql]
         if o = @opts[:offset]
-          columns = clone(:append_sql=>'', :placeholder_literal_null=>true).columns
+          columns = clone(:append_sql=>String.new, :placeholder_literal_null=>true).columns
           dsa1 = dataset_alias(1)
           rn = row_number_column
           limit = @opts[:limit]
@@ -353,7 +355,7 @@ module Sequel
             select(*columns).
             where(SQL::Identifier.new(rn) > o)
           ds = ds.where(SQL::Identifier.new(rn) <= Sequel.+(o, limit)) if limit
-          sql = @opts[:append_sql] || ''
+          sql = @opts[:append_sql] || String.new
           subselect_sql_append(sql, ds)
           sql
         elsif limit = @opts[:limit]
@@ -361,7 +363,7 @@ module Sequel
           # Lock doesn't work in subselects, so don't use a subselect when locking.
           # Don't use a subselect if custom SQL is used, as it breaks somethings.
           ds = ds.from_self unless @opts[:lock]
-          sql = @opts[:append_sql] || ''
+          sql = @opts[:append_sql] || String.new
           subselect_sql_append(sql, ds.where(SQL::ComplexExpression.new(:<=, ROW_NUMBER_EXPRESSION, limit)))
           sql
         else

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

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel.require 'adapters/utils/pg_types'
 
 module Sequel
@@ -373,7 +375,8 @@ module Sequel
       # :server :: The server to which to send the NOTIFY statement, if the sharding support
       #            is being used.
       def notify(channel, opts=OPTS)
-        sql = "NOTIFY "
+        sql = String.new
+        sql << "NOTIFY "
         dataset.send(:identifier_append, sql, channel)
         if payload = opts[:payload]
           sql << ", "
@@ -583,7 +586,7 @@ module Sequel
         s = super
         if using = op[:using]
           using = Sequel::LiteralString.new(using) if using.is_a?(String)
-          s << ' USING '
+          s += ' USING '
           s << literal(using)
         end
         s
@@ -693,7 +696,8 @@ module Sequel
         case constraint[:type]
         when :exclude
           elements = constraint[:elements].map{|c, op| "#{literal(c)} WITH #{op}"}.join(', ')
-          sql = "#{"CONSTRAINT #{quote_identifier(constraint[:name])} " if constraint[:name]}EXCLUDE USING #{constraint[:using]||'gist'} (#{elements})#{" WHERE #{filter_expr(constraint[:where])}" if constraint[:where]}"
+          sql = String.new
+          sql << "#{"CONSTRAINT #{quote_identifier(constraint[:name])} " if constraint[:name]}EXCLUDE USING #{constraint[:using]||'gist'} (#{elements})#{" WHERE #{filter_expr(constraint[:where])}" if constraint[:where]}"
           constraint_deferrable_sql_append(sql, constraint[:deferrable])
           sql
         when :foreign_key, :check
@@ -760,7 +764,8 @@ module Sequel
 
       # SQL for doing fast table insert from stdin.
       def copy_into_sql(table, opts)
-        sql = "COPY #{literal(table)}"
+        sql = String.new
+        sql << "COPY #{literal(table)}"
         if cols = opts[:columns]
           sql << literal(Array(cols))
         end
@@ -780,7 +785,8 @@ module Sequel
           table
         else
           if opts[:options] || opts[:format]
-            options = " ("
+            options = String.new
+            options << " ("
             options << "FORMAT #{opts[:format]}" if opts[:format]
             options << "#{', ' if opts[:format]}#{opts[:options]}" if opts[:options]
             options << ')'
@@ -845,17 +851,17 @@ module Sequel
         sql = super
 
         if inherits = options[:inherits]
-          sql << " INHERITS (#{Array(inherits).map{|t| quote_schema_table(t)}.join(', ')})"
+          sql += " INHERITS (#{Array(inherits).map{|t| quote_schema_table(t)}.join(', ')})"
         end
 
         if on_commit = options[:on_commit]
           raise(Error, "can't provide :on_commit without :temp to create_table") unless options[:temp]
           raise(Error, "unsupported on_commit option: #{on_commit.inspect}") unless ON_COMMIT.has_key?(on_commit)
-          sql << " ON COMMIT #{ON_COMMIT[on_commit]}"
+          sql += " ON COMMIT #{ON_COMMIT[on_commit]}"
         end
 
         if server = options[:foreign]
-          sql << " SERVER #{quote_identifier(server)}"
+          sql += " SERVER #{quote_identifier(server)}"
           if foreign_opts = options[:options]
             sql << " OPTIONS (#{foreign_opts.map{|k, v| "#{k} #{literal(v.to_s)}"}.join(', ')})"
           end
@@ -867,9 +873,9 @@ module Sequel
       def create_table_as_sql(name, sql, options)
         result = create_table_prefix_sql name, options
         if on_commit = options[:on_commit]
-          result << " ON COMMIT #{ON_COMMIT[on_commit]}"
+          result += " ON COMMIT #{ON_COMMIT[on_commit]}"
         end
-        result << " AS #{sql}"
+        result += " AS #{sql}"
       end
 
       # Use a PostgreSQL-specific create table generator
@@ -1111,7 +1117,8 @@ module Sequel
         read_only = opts[:read_only]
         deferrable = opts[:deferrable]
         if level || !read_only.nil? || !deferrable.nil?
-          sql = "SET TRANSACTION"
+          sql = String.new
+          sql << "SET TRANSACTION"
           sql << " ISOLATION LEVEL #{Sequel::Database::TRANSACTION_ISOLATION_LEVELS[level]}" if level
           sql << " READ #{read_only ? 'ONLY' : 'WRITE'}" unless read_only.nil?
           sql << " #{'NOT ' unless deferrable}DEFERRABLE" unless deferrable.nil?
@@ -1421,7 +1428,7 @@ module Sequel
         if block_given? # perform locking inside a transaction and yield to block
           @db.transaction(opts){lock(mode, opts); yield}
         else
-          sql = 'LOCK TABLE '
+          sql = 'LOCK TABLE '.dup
           source_list_append(sql, @opts[:from])
           mode = mode.to_s.upcase.strip
           unless LOCK_MODES.include?(mode)

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

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Progress
     module DatabaseMethods

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

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module SqlAnywhere
 
@@ -329,7 +331,7 @@ module Sequel
           sql << Sequel::Dataset::PAREN_OPEN
           literal_append(sql, args.at(0))
           sql << Sequel::Dataset::SPACE << (op == :LIKE ? REGEXP : NOT_REGEXP) << Sequel::Dataset::SPACE
-          pattern = ''
+          pattern = String.new
           last_c = ''
           args.at(1).each_char do |c|
             if  c == '_' and not pattern.end_with?('\\') and last_c != '\\'

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

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel.require 'adapters/utils/replace'
 
 module Sequel

data/lib/sequel/adapters/sqlanywhere.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'sqlanywhere'
 
 Sequel.require %w'shared/sqlanywhere', 'adapters'

data/lib/sequel/adapters/sqlite.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'sqlite3'
 Sequel.require 'adapters/shared/sqlite'
 
@@ -242,7 +244,8 @@ module Sequel
           cps = log_yield("PREPARE #{name}: #{sql}"){conn.prepare(sql)}
           conn.prepared_statements[name] = [cps, sql]
         end
-        log_sql = "EXECUTE #{name}"
+        log_sql = String.new
+        log_sql << "EXECUTE #{name}"
         if ps.log_sql
           log_sql << " ("
           log_sql << sql

data/lib/sequel/adapters/swift.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   # Module holding the Swift DB support for Sequel.  Swift DB is a
   # collection of drivers used in Swift ORM.

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

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'swift/db/mysql'
 Sequel.require 'adapters/shared/mysql'
 

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

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'swift/db/postgres'
 Sequel.require 'adapters/shared/postgres'
 

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

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'swift/db/sqlite3'
 Sequel.require 'adapters/shared/sqlite'
 

data/lib/sequel/adapters/tinytds.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'tiny_tds'
 Sequel.require 'adapters/shared/mssql'
 

data/lib/sequel/adapters/utils/emulate_offset_with_reverse_and_count.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module EmulateOffsetWithReverseAndCount
     # Make empty? work with an offset with an order.
@@ -27,7 +29,7 @@ module Sequel
       end
 
       ds = unlimited
-      row_count = @opts[:offset_total_count] || ds.clone(:append_sql=>'', :placeholder_literal_null=>true).count
+      row_count = @opts[:offset_total_count] || ds.clone(:append_sql=>String.new, :placeholder_literal_null=>true).count
       dsa1 = dataset_alias(1)
 
       if o.is_a?(Symbol) && @opts[:bind_vars] && (match = Sequel::Dataset::PreparedStatementMethods::PLACEHOLDER_RE.match(o.to_s))
@@ -53,7 +55,7 @@ module Sequel
         # shuld be returned, so use a condition that is always false.
         ds.where(1=>0)
       end
-      sql = @opts[:append_sql] || ''
+      sql = @opts[:append_sql] || String.new
       subselect_sql_append(sql, ds)
       sql
     end
@@ -69,7 +71,7 @@ module Sequel
     # The default order to use for datasets with offsets, if no order is defined.
     # By default, orders by all of the columns in the dataset.
     def default_offset_order
-      clone(:append_sql=>'', :offset=>nil).columns
+      clone(:append_sql=>String.new, :offset=>nil).columns
     end
   end
 end

data/lib/sequel/adapters/utils/emulate_offset_with_row_number.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module EmulateOffsetWithRowNumber
     # If the offset must be emulated with ROW_NUMBER, don't remove any ordering,
@@ -28,10 +30,10 @@ module Sequel
         end
       end
 
-      columns = clone(:append_sql=>'', :placeholder_literal_null=>true).columns
+      columns = clone(:append_sql=>String.new, :placeholder_literal_null=>true).columns
       dsa1 = dataset_alias(1)
       rn = row_number_column
-      sql = @opts[:append_sql] || ''
+      sql = @opts[:append_sql] || String.new
       subselect_sql_append(sql, unlimited.
         unordered.
         select_append{ROW_NUMBER{}.over(:order=>order).as(rn)}.
@@ -75,7 +77,7 @@ module Sequel
           end
         end
       end
-      clone(:append_sql=>'').columns
+      clone(:append_sql=>String.new).columns
     end
 
     # Whether an order is required when using offset emulation via ROW_NUMBER, true by default.

data/lib/sequel/adapters/utils/pg_types.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Postgres
     NAN             = 0.0/0.0

data/lib/sequel/adapters/utils/replace.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   class Dataset
     module Replace

data/lib/sequel/adapters/utils/split_alter_table.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel::Database::SplitAlterTable
   private
 

data/lib/sequel/adapters/utils/stored_procedures.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel 
   class Dataset
     module StoredProcedureMethods

data/lib/sequel/ast_transformer.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   # The +ASTTransformer+ class is designed to handle the abstract syntax trees
   # that Sequel uses internally and produce modified copies of them.  By itself

data/lib/sequel/connection_pool.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 # The base connection pool class, which all other connection pools are based
 # on.  This class is not instantiated directly, but subclasses should at
 # the very least implement the following API:

data/lib/sequel/connection_pool/sharded_single.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 # A ShardedSingleConnectionPool is a single threaded connection pool that
 # works with multiple shards/servers.
 class Sequel::ShardedSingleConnectionPool < Sequel::ConnectionPool

data/lib/sequel/connection_pool/sharded_threaded.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'sequel/connection_pool/threaded'
 
 # The slowest and most advanced connection, dealing with both multi-threaded

data/lib/sequel/connection_pool/single.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 # This is the fastest connection pool, since it isn't a connection pool at all.
 # It is just a wrapper around a single connection that uses the connection pool
 # API.

data/lib/sequel/connection_pool/threaded.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 # A connection pool allowing multi-threaded access to a pool of connections.
 # This is the default connection pool used by Sequel.
 class Sequel::ThreadedConnectionPool < Sequel::ConnectionPool

data/lib/sequel/core.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 %w'bigdecimal date thread time uri'.each{|f| require f}
 
 # Top level module for Sequel

data/lib/sequel/database.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   # Hash of adapters that have been used. The key is the adapter scheme
   # symbol, and the value is the Database subclass.

data/lib/sequel/database/connecting.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   class Database
     # ---------------------