sequel 3.45.0 → 3.46.0

data/doc/transactions.rdoc

@@ -8,7 +8,7 @@ Sequel uses autocommit mode by default for all of its database adapters, so in g
 * Migrations if the database supports transactional schema
 * A few model plugins
 
-Everywhere else, it is up to use to use a database transaction if you want to.
+Everywhere else, it is up to you to use a database transaction if you want to.
 
 == Basic Transaction Usage
 

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

@@ -1,4 +1,5 @@
 Sequel.require 'adapters/jdbc/transactions'
+Sequel.require 'adapters/utils/emulate_offset_with_row_number'
 
 module Sequel
   module JDBC

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

@@ -85,6 +85,12 @@ module Sequel
             sql = "ALTER TABLE #{quote_schema_table(table)} ALTER COLUMN #{quote_identifier(op[:name])} #{type_literal(op)}"
             column_definition_order.each{|m| send(:"column_definition_#{m}_sql", sql, op)}
             sql
+          when :drop_constraint
+            if op[:type] == :primary_key
+              "ALTER TABLE #{quote_schema_table(table)} DROP PRIMARY KEY"
+            else
+              super(table, op)
+            end
           else
             super(table, op)
           end
@@ -121,6 +127,11 @@ module Sequel
           PRIMARY_KEY_INDEX_RE
         end
 
+        # H2 does not support named column constraints.
+        def supports_named_column_constraints?
+          false
+        end
+
         # Use BIGINT IDENTITY for identity columns that use bigint, fixes
         # the case where primary_key :column, :type=>Bignum is used.
         def type_literal_generic_bignum(column)

data/lib/sequel/adapters/mysql2.rb

@@ -27,17 +27,11 @@ module Sequel
       #   a filter for an autoincrement column equals NULL to return the last
       #   inserted row.
       # * :charset - Same as :encoding (:encoding takes precendence)
-      # * :config_default_group - The default group to read from the in
-      #   the MySQL config file.
-      # * :config_local_infile - If provided, sets the Mysql::OPT_LOCAL_INFILE
-      #   option on the connection with the given value.
-      # * :connect_timeout - Set the timeout in seconds before a connection
-      #   attempt is abandoned.
       # * :encoding - Set all the related character sets for this
       #   connection (connection, client, database, server, and results).
-      # * :socket - Use a unix socket file instead of connecting via TCP/IP.
-      # * :timeout - Set the timeout in seconds before the server will
-      #   disconnect this connection (a.k.a. @@wait_timeout).
+      #
+      # The options hash is also passed to mysql2, and can include mysql2
+      # options such as :local_infile.
       def connect(server)
         opts = server_opts(server)
         opts[:host] ||= 'localhost'

data/lib/sequel/adapters/postgres.rb

@@ -164,7 +164,7 @@ module Sequel
       # conversion is done, so an error is raised if you attempt to retrieve an infinite
       # timestamp.  You can set this to :nil to convert to nil, :string to leave
       # as a string, or :float to convert to an infinite float.
-      attr_accessor :convert_infinite_timestamps
+      attr_reader :convert_infinite_timestamps
       
       # Add the primary_keys and primary_key_sequences instance variables,
       # so we can get the correct return values for inserted rows.
@@ -233,6 +233,22 @@ module Sequel
         conn
       end
       
+      def convert_infinite_timestamps=(v)
+        @convert_infinite_timestamps = v
+        pr = old_pr = Postgres.use_iso_date_format ? TYPE_TRANSLATOR.method(:date) : Sequel.method(:string_to_date)
+        if v
+          pr = lambda do |v|
+            case v
+            when *INFINITE_TIMESTAMP_STRINGS
+              infinite_timestamp_value(v)
+            else
+              old_pr.call(v)
+            end
+          end
+        end
+        conversion_procs[1082] = pr
+      end
+
       # Disconnect given connection
       def disconnect_connection(conn)
         begin
@@ -396,7 +412,7 @@ module Sequel
       # If convert_infinite_timestamps is true and the value is infinite, return an appropriate
       # value based on the convert_infinite_timestamps setting.
       def to_application_timestamp(value)
-        if c = convert_infinite_timestamps
+        if convert_infinite_timestamps
           case value
           when *INFINITE_TIMESTAMP_STRINGS
             infinite_timestamp_value(value)
@@ -504,6 +520,22 @@ module Sequel
         conn.execute(sql)
       end
 
+      # If the value is an infinite value (either an infinite float or a string returned by
+      # by PostgreSQL for an infinite timestamp), return it without converting it if
+      # convert_infinite_timestamps is set.
+      def typecast_value_date(value)
+        if convert_infinite_timestamps
+          case value
+          when *INFINITE_DATETIME_VALUES
+            value
+          else
+            super
+          end
+        else
+          super
+        end
+      end
+
       # If the value is an infinite value (either an infinite float or a string returned by
       # by PostgreSQL for an infinite timestamp), return it without converting it if
       # convert_infinite_timestamps is set.

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

@@ -146,6 +146,11 @@ module Sequel
         nil
       end
 
+      # CUBRID does not support named column constraints.
+      def supports_named_column_constraints?
+        false
+      end
+
       # CUBRID doesn't support booleans, it recommends using smallint.
       def type_literal_generic_trueclass(column)
         :smallint

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

@@ -414,6 +414,7 @@ module Sequel
       APOS_RE = Dataset::APOS_RE
       DOUBLE_APOS = Dataset::DOUBLE_APOS
       INTO = Dataset::INTO
+      DOUBLE_BRACKET_CLOSE = ']]'.freeze
       DATEPART_SECOND_OPEN = "CAST((datepart(".freeze
       DATEPART_SECOND_MIDDLE = ') + datepart(ns, '.freeze
       DATEPART_SECOND_CLOSE = ")/1000000000.0) AS double precision)".freeze
@@ -434,6 +435,8 @@ module Sequel
       CASE_INSENSITIVE_COLLATION = 'Latin1_General_CI_AS'.freeze
       DEFAULT_TIMESTAMP_FORMAT = "'%Y-%m-%dT%H:%M:%S%N%z'".freeze
       FORMAT_DATE = "'%Y%m%d'".freeze
+      CROSS_APPLY = 'CROSS APPLY'.freeze
+      OUTER_APPLY = 'OUTER APPLY'.freeze
 
       Sequel::Dataset.def_mutation_method(:disable_insert_output, :output, :module=>self)
 
@@ -484,6 +487,11 @@ module Sequel
         end
       end
       
+      # Uses CROSS APPLY to join the given table into the current dataset.
+      def cross_apply(table)
+        join_table(:cross_apply, table)
+      end
+
       # Disable the use of INSERT OUTPUT
       def disable_insert_output
         clone(:disable_insert_output=>true)
@@ -545,6 +553,11 @@ module Sequel
         lock_style(:dirty)
       end
 
+      # Uses OUTER APPLY to join the given table into the current dataset.
+      def outer_apply(table)
+        join_table(:outer_apply, table)
+      end
+
       # Include an OUTPUT clause in the eventual INSERT, UPDATE, or DELETE query.
       #
       # The first argument is the table to output into, and the second argument
@@ -570,10 +583,9 @@ module Sequel
         clone({:output => output})
       end
 
-      # MSSQL uses [] to quote identifiers.  MSSQL does not support
-      # escaping of ], so you cannot use that character in an identifier.
+      # MSSQL uses [] to quote identifiers.
       def quoted_identifier_append(sql, name)
-        sql << BRACKET_OPEN << name.to_s << BRACKET_CLOSE
+        sql << BRACKET_OPEN << name.to_s.gsub(/\]/, DOUBLE_BRACKET_CLOSE) << BRACKET_CLOSE
       end
       
       # The version of the database server.
@@ -729,6 +741,18 @@ module Sequel
         end
       end
 
+      # Handle CROSS APPLY and OUTER APPLY JOIN types
+      def join_type_sql(join_type)
+        case join_type
+        when :cross_apply
+          CROSS_APPLY
+        when :outer_apply
+          OUTER_APPLY
+        else
+          super
+        end
+      end
+
       # MSSQL uses a literal hexidecimal number for blob strings
       def literal_blob_append(sql, v)
         sql << HEX_START << v.unpack(HSTAR).first

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

@@ -199,13 +199,16 @@ module Sequel
           unless op[:type] || opts[:type]
             raise Error, "cannot determine database type to use for CHANGE COLUMN operation"
           end
-          "CHANGE COLUMN #{quote_identifier(op[:name])} #{column_definition_sql(op.merge(opts))}"
+          opts = op.merge(opts)
+          opts.delete(:auto_increment) if op[:auto_increment] == false
+          "CHANGE COLUMN #{quote_identifier(op[:name])} #{column_definition_sql(opts)}"
         when :drop_constraint
           type = case op[:type]
           when :primary_key
             "DROP PRIMARY KEY"
           when :foreign_key
-            "DROP FOREIGN KEY #{quote_identifier(op[:name])}"
+            name = op[:name] || foreign_key_name(table, op[:columns])
+            "DROP FOREIGN KEY #{quote_identifier(name)}"
           when :unique
             "DROP INDEX #{quote_identifier(op[:name])}"
           end
@@ -224,6 +227,13 @@ module Sequel
         case op[:op]
         when :drop_index
           "#{drop_index_sql(table, op)} ON #{quote_schema_table(table)}"
+        when :drop_constraint
+          if op[:type] == :primary_key
+            if (pk = primary_key_from_schema(table)).length == 1
+              return [alter_table_sql(table, {:op=>:rename_column, :name=>pk.first, :new_name=>pk.first, :auto_increment=>false}), super]
+            end
+          end
+          super
         else
           super
         end
@@ -242,7 +252,7 @@ module Sequel
       # operations, since in some cases adding a foreign key constraint in
       # the same query as other operations results in MySQL error 150.
       def combinable_alter_table_op?(op)
-        super && !(op[:op] == :add_constraint && op[:type] == :foreign_key)
+        super && !(op[:op] == :add_constraint && op[:type] == :foreign_key) && !(op[:op] == :drop_constraint && op[:type] == :primary_key)
       end
 
       # The SQL queries to execute on initial connection
@@ -317,6 +327,7 @@ module Sequel
         collate = options.fetch(:collate, Sequel::MySQL.default_collate)
         generator.constraints.sort_by{|c| (c[:type] == :primary_key) ? -1 : 1}
 
+        # Proc for figuring out the primary key for a given table.
         key_proc = lambda do |t|
           if t == name 
             if pk = generator.primary_key_name
@@ -329,12 +340,17 @@ module Sequel
           end
         end
 
+        # Manually set the keys, since MySQL requires one, it doesn't use the primary
+        # key if none are specified.
         generator.constraints.each do |c|
           if c[:type] == :foreign_key
             c[:key] ||= key_proc.call(c[:table])
           end
         end
 
+        # Split column constraints into table constraints in some cases:
+        # * foreign key - Always
+        # * unique, primary_key - Only if constraint has a name
         generator.columns.each do |c|
           if t = c.delete(:table)
             same_table = t == name
@@ -346,7 +362,7 @@ module Sequel
               generator.constraints.unshift(:type=>:unique, :columns=>Array(k))
             end
 
-            generator.foreign_key([c[:name]], t, c.merge(:name=>nil, :type=>:foreign_key, :key=>key))
+            generator.foreign_key([c[:name]], t, c.merge(:name=>c[:foreign_key_constraint_name], :type=>:foreign_key, :key=>key))
           end
         end
 
@@ -448,6 +464,11 @@ module Sequel
         true
       end
 
+      # MySQL does not support named column constraints.
+      def supports_named_column_constraints?
+        false
+      end
+
       # Respect the :size option if given to produce
       # tinyblob, mediumblob, and longblob if :tiny,
       # :medium, or :long is given.

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

@@ -221,6 +221,7 @@ module Sequel
             ops.each{|op| alter_table_sql_list(table, [op]).flatten.each{|sql| execute_ddl(sql)}}
           end
         end
+      ensure
         self.foreign_keys = true if fks
       end
 
@@ -255,7 +256,11 @@ module Sequel
           when :primary_key
             duplicate_table(table){|columns| columns.each{|s| s[:primary_key] = nil}}
           when :foreign_key
-            duplicate_table(table, :no_foreign_keys=>true)
+            if op[:columns]
+              duplicate_table(table, :skip_foreign_key_columns=>op[:columns])
+            else
+              duplicate_table(table, :no_foreign_keys=>true)
+            end
           else
             duplicate_table(table)
           end
@@ -366,6 +371,12 @@ module Sequel
           if ocp = opts[:old_columns_proc]
             fks.delete_if{|c| ocp.call(c[:columns].dup) != c[:columns]}
           end
+          
+          # Skip any foreign key columns where a constraint for those
+          # foreign keys is being dropped.
+          if sfkc = opts[:skip_foreign_key_columns]
+            fks.delete_if{|c| c[:columns] == sfkc}
+          end
 
           constraints.concat(fks.each{|h| h[:type] = :foreign_key})
         end

data/lib/sequel/connection_pool.rb

@@ -18,8 +18,8 @@
 #
 # add_servers(Array of Symbols) :: start recognizing all shards/servers specified
 #                                  by the array of symbols.
-# * remove_servers(Array of Symbols) :: no longer recognize all shards/servers
-#                                       specified by the array of symbols.
+# remove_servers(Array of Symbols) :: no longer recognize all shards/servers
+#                                     specified by the array of symbols.
 class Sequel::ConnectionPool
   # The default server to use
   DEFAULT_SERVER = :default
@@ -42,7 +42,7 @@ class Sequel::ConnectionPool
       when Class
         v.new(db, opts)
       when Symbol
-        Sequel.ts_require("connection_pool/#{v}")
+        Sequel.tsk_require("sequel/connection_pool/#{v}")
         connection_pool_class(opts).new(db, opts) || raise(Sequel::Error, "No connection pool class found")
       end
     end

data/lib/sequel/connection_pool/sharded_threaded.rb

@@ -185,13 +185,7 @@ class Sequel::ShardedThreadedConnectionPool < Sequel::ThreadedConnectionPool
   # returns the connection. The calling code should already have the mutex
   # before calling this.
   def checkin_connection(server, conn)
-    case @connection_handling
-    when :queue
-      available_connections(server).unshift(conn)
-    else
-      available_connections(server) << conn
-    end
-
+    available_connections(server) << conn
     conn
   end
 
@@ -222,7 +216,12 @@ class Sequel::ShardedThreadedConnectionPool < Sequel::ThreadedConnectionPool
   # if there is not currently an available connection for the server.
   # The calling code should already have the mutex before calling this.
   def next_available(server)
-    available_connections(server).pop
+    case @connection_handling
+    when :queue
+      available_connections(server).shift
+    else
+      available_connections(server).pop
+    end
   end
   
   # Returns the connection owned by the supplied thread for the given server,

data/lib/sequel/connection_pool/threaded.rb

@@ -140,13 +140,7 @@ class Sequel::ThreadedConnectionPool < Sequel::ConnectionPool
   # Return a connection to the pool of available connections, returns the connection.
   # The calling code should already have the mutex before calling this.
   def checkin_connection(conn)
-    case @connection_handling
-    when :queue
-      @available_connections.unshift(conn)
-    else
-      @available_connections << conn
-    end
-
+    @available_connections << conn
     conn
   end
 
@@ -168,7 +162,12 @@ class Sequel::ThreadedConnectionPool < Sequel::ConnectionPool
   # is not currently an available connection.  The calling code should already
   # have the mutex before calling this.
   def next_available
-    @available_connections.pop
+    case @connection_handling
+    when :queue
+      @available_connections.shift
+    else
+      @available_connections.pop
+    end
   end
 
   # Returns the connection owned by the supplied thread,

data/lib/sequel/core.rb

@@ -20,7 +20,7 @@
 # Sequel currently adds methods to the Array, Hash, String and Symbol classes by
 # default.  You can either require 'sequel/no_core_ext' or set the
 # +SEQUEL_NO_CORE_EXTENSIONS+ constant or environment variable before requiring
-# sequel to have # Sequel not add methods to those classes.
+# sequel to have Sequel not add methods to those classes.
 #
 # For a more expanded introduction, see the {README}[link:files/README_rdoc.html].
 # For a quicker introduction, see the {cheat sheet}[link:files/doc/cheat_sheet_rdoc.html].
@@ -332,7 +332,7 @@ module Sequel
   else
     # Yield directly to the block.  You don't need to synchronize
     # access on MRI because the GVL makes certain methods atomic.
-    def self.synchronize(&block)
+    def self.synchronize
       yield
     end
   end
@@ -422,6 +422,9 @@ module Sequel
 
   # Method that adds a database adapter class method to Sequel that calls
   # Sequel.adapter_method.
+  #
+  # Do not call this method with untrusted input, as that can result in
+  # arbitrary code execution.
   def self.def_adapter_method(*adapters) # :nodoc:
     adapters.each do |adapter|
       instance_eval("def #{adapter}(*args, &block); adapter_method('#{adapter}', *args, &block) end", __FILE__, __LINE__)

data/lib/sequel/database.rb

@@ -15,5 +15,5 @@ module Sequel
   class Database
   end
 
-  require(%w"connecting dataset dataset_defaults logging misc query schema_generator schema_methods", 'database')
+  require(%w"connecting dataset dataset_defaults logging features misc query transactions schema_generator schema_methods", 'database')
 end

data/lib/sequel/database/connecting.rb

@@ -56,10 +56,7 @@ module Sequel
           uri_options = c.send(:uri_to_options, uri)
           uri.query.split('&').collect{|s| s.split('=')}.each{|k,v| uri_options[k.to_sym] = v if k && !k.empty?} unless uri.query.to_s.strip.empty?
           uri_options.to_a.each{|k,v| uri_options[k] = URI.unescape(v) if v.is_a?(String)}
-          opts = opts.merge(:orig_opts=>opts.dup)
-          opts[:uri] = conn_string
-          opts = uri_options.merge(opts)
-          opts[:adapter] = scheme
+          opts = uri_options.merge(opts).merge!(:orig_opts=>opts.dup, :uri=>conn_string, :adapter=>scheme)
         end
       when Hash
         opts = conn_string.merge(opts)
@@ -77,14 +74,16 @@ module Sequel
       begin
         db = c.new(opts)
         db.test_connection if opts[:test] && db.send(:typecast_value_boolean, opts[:test])
-        result = yield(db) if block_given?
+        if block_given?
+          return yield(db)
+        end
       ensure
         if block_given?
           db.disconnect if db
           Sequel.synchronize{::Sequel::DATABASES.delete(db)}
         end
       end
-      block_given? ? result : db
+      db
     end
     
     # Sets the default single_threaded mode for new databases.
@@ -107,7 +106,7 @@ module Sequel
     #   Sequel.connect('mydb://user:password@dbserver/mydb')
     def self.set_adapter_scheme(scheme) # :nodoc:
       @scheme = scheme
-      ADAPTER_MAP[scheme.to_sym] = self
+      ADAPTER_MAP[scheme] = self
     end
     private_class_method :set_adapter_scheme
     
@@ -186,6 +185,7 @@ module Sequel
     #
     #   DB.each_server{|db| db.create_table(:users){primary_key :id; String :name}}
     def each_server(&block)
+      raise(Error, "Database#each_server must be passed a block") unless block
       servers.each{|s| self.class.connect(server_opts(s), &block)}
     end