sequel 3.21.0 → 3.29.0

data/lib/sequel/adapters/mock.rb

@@ -0,0 +1,315 @@
+module Sequel
+  module Mock
+    # Connection class for Sequel's mock adapter.
+    class Connection
+      # Sequel::Mock::Database object that created this connection
+      attr_reader :db
+
+      # Shard this connection operates on, when using Sequel's
+      # sharding support (always :default for databases not using
+      # sharding).
+      attr_reader :server
+
+      # The specific database options for this connection.
+      attr_reader :opts
+
+      # Store the db, server, and opts.
+      def initialize(db, server, opts)
+        @db = db
+        @server = server
+        @opts = opts
+      end
+
+      # Delegate to the db's #_execute method.
+      def execute(sql)
+        @db.send(:_execute, self, sql) 
+      end
+    end
+
+    # Database class for Sequel's mock adapter.
+    class Database < Sequel::Database
+      set_adapter_scheme :mock
+
+      # Set the autogenerated primary key integer
+      # to be returned when running an insert query.
+      # Argument types supported:
+      #
+      # nil :: Return nil for all inserts
+      # Integer :: Starting integer for next insert, with
+      #            futher inserts getting an incremented
+      #            value
+      # Array :: First insert gets the first value in the
+      #          array, second gets the second value, etc.
+      # Proc :: Called with the insert SQL query, uses
+      #         the value returned
+      # Class :: Should be an Exception subclass, will create a new
+      #          instance an raise it wrapped in a DatabaseError.
+      attr_writer :autoid
+
+      # Set the columns to set in the dataset when the dataset fetches
+      # rows.  Argument types supported:
+      # nil :: Set no columns
+      # Array of Symbols: Used for all datasets
+      # Array (otherwise): First retrieval gets the first value in the
+      #                    array, second gets the second value, etc.
+      # Proc :: Called with the select SQL query, uses the value
+      #         returned, which should be an array of symbols
+      attr_writer :columns
+
+      # Set the hashes to yield by execute when retrieving rows.
+      # Argument types supported:
+      #
+      # nil :: Yield no rows
+      # Hash :: Always yield a single row with this hash
+      # Array of Hashes :: Yield separately for each hash in this array
+      # Array (otherwise) :: First retrieval gets the first value
+      #          in the array, second gets the second value, etc.
+      # Proc :: Called with the select SQL query, uses
+      #         the value returned, which should be a hash or
+      #         array of hashes.
+      # Class :: Should be an Exception subclass, will create a new
+      #          instance an raise it wrapped in a DatabaseError.
+      attr_writer :fetch
+
+      # Set the number of rows to return from update or delete.
+      # Argument types supported:
+      #
+      # nil :: Return 0 for all updates and deletes
+      # Integer :: Used for all updates and deletes
+      # Array :: First update/delete gets the first value in the
+      #          array, second gets the second value, etc.
+      # Proc :: Called with the update/delete SQL query, uses
+      #         the value returned.
+      # Class :: Should be an Exception subclass, will create a new
+      #          instance an raise it wrapped in a DatabaseError.
+      attr_writer :numrows
+
+      # Additional options supported:
+      #
+      # :autoid :: Call #autoid= with the value
+      # :columns :: Call #columns= with the value
+      # :fetch ::  Call #fetch= with the value
+      # :numrows :: Call #numrows= with the value
+      # :extend :: A module the object is extended with.
+      # :sqls :: The array to store the SQL queries in.
+      def initialize(opts=nil)
+        super
+        self.autoid = opts[:autoid]
+        self.columns = opts[:columns]
+        self.fetch = opts[:fetch]
+        self.numrows = opts[:numrows]
+        extend(opts[:extend]) if opts[:extend]
+        @sqls = opts[:sqls] || []
+      end
+
+      # Return a related Connection option connecting to the given shard.
+      def connect(server)
+        Connection.new(self, server, server_opts(server))
+      end
+
+      # Store the sql used for later retrieval with #sqls, and return
+      # the appropriate value using either the #autoid, #fetch, or
+      # #numrows methods.
+      def execute(sql, opts={}, &block)
+        synchronize(opts[:server]){|c| _execute(c, sql, opts, &block)} 
+      end
+      alias execute_ddl execute
+
+      # Store the sql used, and return the value of the #numrows method.
+      def execute_dui(sql, opts={})
+        execute(sql, opts.merge(:meth=>:numrows))
+      end
+
+      # Store the sql used, and return the value of the #autoid method.
+      def execute_insert(sql, opts={})
+        execute(sql, opts.merge(:meth=>:autoid))
+      end
+
+      # Return all stored SQL queries, and clear the cache
+      # of SQL queries.
+      def sqls
+        s = @sqls.dup
+        @sqls.clear
+        s
+      end
+
+      # Enable use of savepoints.
+      def supports_savepoints?
+        true
+      end
+
+      private
+
+      def _autoid(sql, v, ds=nil)
+        case v
+        when Integer
+          if ds
+            ds.autoid += 1 if ds.autoid.is_a?(Integer)
+          else
+            @autoid += 1
+          end
+          v
+        else
+          _nextres(v, sql, nil)
+        end
+      end
+
+      def _execute(c, sql, opts={}, &block)
+        sql += " -- args: #{opts[:arguments].inspect}" if opts[:arguments]
+        sql += " -- #{@opts[:append]}" if @opts[:append]
+        sql += " -- #{c.server}" if c.server != :default
+        log_info(sql)
+        @sqls << sql 
+
+        ds = opts[:dataset]
+        begin
+          if block
+            columns(ds, sql) if ds
+            _fetch(sql, ds._fetch || @fetch, &block)
+          elsif meth = opts[:meth]
+            if meth == :numrows
+              _numrows(sql, ds.numrows || @numrows)
+            else
+              v = ds.autoid
+              _autoid(sql, v || @autoid, (ds if v))
+            end
+          end
+        rescue => e
+          raise_error(e)
+        end
+      end
+
+      def _fetch(sql, f, &block)
+        case f
+        when Hash
+          yield f.dup
+        when Array
+          if f.all?{|h| h.is_a?(Hash)}
+            f.each{|h| yield h.dup}
+          else
+            _fetch(sql, f.shift, &block)
+          end
+        when Proc
+          h = f.call(sql)
+          if h.is_a?(Hash)
+            yield h.dup
+          elsif h
+            h.each{|h1| yield h1.dup}
+          end
+        when Class
+          if f < Exception
+            raise f
+          else
+            raise Error, "Invalid @autoid/@numrows attribute: #{v.inspect}"
+          end
+        when nil
+          # nothing
+        else
+          raise Error, "Invalid @fetch attribute: #{f.inspect}"
+        end
+      end
+
+      def _nextres(v, sql, default)
+        case v
+        when Integer
+          v
+        when Array
+          v.empty? ? default : _nextres(v.shift, sql, default)
+        when Proc
+          v.call(sql)
+        when Class
+          if v < Exception
+            raise v
+          else
+            raise Error, "Invalid @autoid/@numrows attribute: #{v.inspect}"
+          end
+        when nil
+          default
+        else
+          raise Error, "Invalid @autoid/@numrows attribute: #{v.inspect}"
+        end
+      end
+
+      def _numrows(sql, v)
+        _nextres(v, sql, 0)
+      end
+
+      def columns(ds, sql, cs=@columns)
+        case cs
+        when Array
+          unless cs.empty?
+            if cs.all?{|c| c.is_a?(Symbol)}
+              ds.columns(*cs)
+            else
+              columns(ds, sql, cs.shift)
+            end
+          end
+        when Proc
+          ds.columns(*cs.call(sql))
+        when nil
+          # nothing
+        else
+          raise Error, "Invalid @columns attribute: #{cs.inspect}"
+        end
+      end
+
+      def disconnect_connection(c)
+      end
+
+      def quote_identifiers_default
+        false
+      end
+
+      def identifier_input_method_default
+        nil
+      end
+
+      def identifier_input_method_default
+        nil
+      end
+    end
+
+    class Dataset < Sequel::Dataset
+      Database::DatasetClass = self
+
+      # Override the databases's autoid setting for this dataset
+      attr_accessor :autoid
+
+      # Override the databases's fetch setting for this dataset
+      attr_accessor :_fetch
+
+      # Override the databases's numrows setting for this dataset
+      attr_accessor :numrows
+
+      # If arguments are provided, use them to set the columns
+      # for this dataset and return self.  Otherwise, use the
+      # default Sequel behavior and return the columns.
+      def columns(*cs)
+        if cs.empty?
+          super
+        else
+          @columns = cs
+          self
+        end
+      end
+
+      def fetch_rows(sql, &block)
+        execute(sql, &block)
+      end
+
+      private
+
+      def execute(sql, opts={}, &block)
+        super(sql, opts.merge(:dataset=>self), &block)
+      end
+
+      def execute_dui(sql, opts={}, &block)
+        super(sql, opts.merge(:dataset=>self), &block)
+      end
+
+      def execute_insert(sql, opts={}, &block)
+        super(sql, opts.merge(:dataset=>self), &block)
+      end
+    end
+  end
+end

data/lib/sequel/adapters/mysql.rb

@@ -5,97 +5,63 @@ rescue LoadError
 end
 raise(LoadError, "require 'mysql' did not define Mysql::CLIENT_MULTI_RESULTS!\n  You are probably using the pure ruby mysql.rb driver,\n  which Sequel does not support. You need to install\n  the C based adapter, and make sure that the mysql.so\n  file is loaded instead of the mysql.rb file.\n") unless defined?(Mysql::CLIENT_MULTI_RESULTS)
 
-Sequel.require %w'shared/mysql utils/stored_procedures', 'adapters'
+Sequel.require %w'shared/mysql_prepared_statements', 'adapters'
 
 module Sequel
   # Module for holding all MySQL-related classes and modules for Sequel.
   module MySQL
     TYPE_TRANSLATOR = tt = Class.new do
       def boolean(s) s.to_i != 0 end
-      def blob(s) ::Sequel::SQL::Blob.new(s) end
       def integer(s) s.to_i end
       def float(s) s.to_f end
-      def decimal(s) ::BigDecimal.new(s) end
-      def date(s) ::Sequel.string_to_date(s) end
-      def time(s) ::Sequel.string_to_time(s) end
-      def timestamp(s) ::Sequel.database_to_application_timestamp(s) end
-      def date_conv(s) ::Sequel::MySQL.convert_date_time(:string_to_date, s) end
-      def time_conv(s) ::Sequel::MySQL.convert_date_time(:string_to_time, s) end
-      def timestamp_conv(s) ::Sequel::MySQL.convert_date_time(:database_to_application_timestamp, s) end
     end.new
 
     # Hash with integer keys and callable values for converting MySQL types.
     MYSQL_TYPES = {}
     {
-      [0, 246]  => tt.method(:decimal),
-      [2, 3, 8, 9, 13, 247, 248]  => tt.method(:integer),
-      [4, 5]  => tt.method(:float),
-      [249, 250, 251, 252]  => tt.method(:blob)
+      [0, 246] => ::BigDecimal.method(:new),
+      [2, 3, 8, 9, 13, 247, 248] => tt.method(:integer),
+      [4, 5] => tt.method(:float),
+      [249, 250, 251, 252] => ::Sequel::SQL::Blob.method(:new)
     }.each do |k,v|
       k.each{|n| MYSQL_TYPES[n] = v}
     end
 
-    # Modify the type translator used for the tinyint type based
-    # on the value given.
-    def self.convert_tinyint_to_bool=(v)
-      MYSQL_TYPES[1] = TYPE_TRANSLATOR.method(v ? :boolean : :integer)
-      @convert_tinyint_to_bool = v
-    end
-    self.convert_tinyint_to_bool = convert_tinyint_to_bool
-
     class << self
-      # By default, Sequel raises an exception if in invalid date or time is used.
-      # However, if this is set to nil or :nil, the adapter treats dates
-      # like 0000-00-00 and times like 838:00:00 as nil values.  If set to :string,
-      # it returns the strings as is.  
-      attr_reader :convert_invalid_date_time
-    end
-
-    # Modify the type translators for the date, time, and timestamp types
-    # depending on the value given.
-    def self.convert_invalid_date_time=(v)
-      MYSQL_TYPES[11] = TYPE_TRANSLATOR.method(v == false ? :time : :time_conv)
-      m = TYPE_TRANSLATOR.method(v == false ? :date : :date_conv)
-      [10, 14].each{|i| MYSQL_TYPES[i] = m}
-      m = TYPE_TRANSLATOR.method(v == false ? :timestamp : :timestamp_conv)
-      [7, 12].each{|i| MYSQL_TYPES[i] = m}
-      @convert_invalid_date_time = v
+      # Whether to convert invalid date time values by default.
+      attr_accessor :convert_invalid_date_time
     end
     self.convert_invalid_date_time = false
 
-    # If convert_invalid_date_time is nil, :nil, or :string and
-    # the conversion raises an InvalidValue exception, return v
-    # if :string and nil otherwise.
-    def self.convert_date_time(meth, v)
-      begin
-        Sequel.send(meth, v)
-      rescue InvalidValue
-        case @convert_invalid_date_time
-        when nil, :nil
-          nil
-        when :string
-          v
-        else 
-          raise
-        end
-      end
-    end
-  
     # Database class for MySQL databases used with Sequel.
     class Database < Sequel::Database
       include Sequel::MySQL::DatabaseMethods
+      include Sequel::MySQL::PreparedStatements::DatabaseMethods
       
       # Mysql::Error messages that indicate the current connection should be disconnected
       MYSQL_DATABASE_DISCONNECT_ERRORS = /\A(Commands out of sync; you can't run this command now|Can't connect to local MySQL server through socket|MySQL server has gone away|Lost connection to MySQL server during query)/
       
       set_adapter_scheme :mysql
+
+      # Hash of conversion procs for the current database
+      attr_reader :conversion_procs
+      #
+      # Whether to convert tinyint columns to bool for the current database
+      attr_reader :convert_tinyint_to_bool
+
+      # By default, Sequel raises an exception if in invalid date or time is used.
+      # However, if this is set to nil or :nil, the adapter treats dates
+      # like 0000-00-00 and times like 838:00:00 as nil values.  If set to :string,
+      # it returns the strings as is.
+      attr_reader :convert_invalid_date_time
       
-      # Support stored procedures on MySQL
-      def call_sproc(name, opts={}, &block)
-        args = opts[:args] || [] 
-        execute("CALL #{name}#{args.empty? ? '()' : literal(args)}", opts.merge(:sproc=>false), &block)
+      def initialize(opts={})
+        super
+        @conversion_procs = MYSQL_TYPES.dup
+        self.convert_tinyint_to_bool = Sequel::MySQL.convert_tinyint_to_bool
+        self.convert_invalid_date_time = Sequel::MySQL.convert_invalid_date_time
       end
-      
+
       # Connect to the database.  In addition to the usual database options,
       # the following options have effect:
       #
@@ -139,7 +105,7 @@ module Sequel
           opts[:user],
           opts[:password],
           opts[:database],
-          opts[:port],
+          (opts[:port].to_i if opts[:port]),
           opts[:socket],
           Mysql::CLIENT_MULTI_RESULTS +
           Mysql::CLIENT_MULTI_STATEMENTS +
@@ -161,30 +127,31 @@ module Sequel
 
         sqls.each{|sql| log_yield(sql){conn.query(sql)}}
 
-        class << conn
-          attr_accessor :prepared_statements
-        end
-        conn.prepared_statements = {}
+        add_prepared_statements_cache(conn)
         conn
       end
       
-      # Returns instance of Sequel::MySQL::Dataset with the given options.
-      def dataset(opts = nil)
-        MySQL::Dataset.new(self, opts)
+      # Modify the type translators for the date, time, and timestamp types
+      # depending on the value given.
+      def convert_invalid_date_time=(v)
+        m0 = ::Sequel.method(:string_to_time)
+        @conversion_procs[11] = (v != false) ?  lambda{|v| convert_date_time(v, &m0)} : m0
+        m1 = ::Sequel.method(:string_to_date) 
+        m = (v != false) ? lambda{|v| convert_date_time(v, &m1)} : m1
+        [10, 14].each{|i| @conversion_procs[i] = m}
+        m2 = method(:to_application_timestamp)
+        m = (v != false) ? lambda{|v| convert_date_time(v, &m2)} : m2
+        [7, 12].each{|i| @conversion_procs[i] = m}
+        @convert_invalid_date_time = v
       end
-      
-      # Executes the given SQL using an available connection, yielding the
-      # connection if the block is given.
-      def execute(sql, opts={}, &block)
-        if opts[:sproc]
-          call_sproc(sql, opts, &block)
-        elsif sql.is_a?(Symbol)
-          execute_prepared_statement(sql, opts, &block)
-        else
-          synchronize(opts[:server]){|conn| _execute(conn, sql, opts, &block)}
-        end
+
+      # Modify the type translator used for the tinyint type based
+      # on the value given.
+      def convert_tinyint_to_bool=(v)
+        @conversion_procs[1] = TYPE_TRANSLATOR.method(v ? :boolean : :integer)
+        @convert_tinyint_to_bool = v
       end
-      
+
       # Return the version of the MySQL server two which we are connecting.
       def server_version(server=nil)
         @server_version ||= (synchronize(server){|conn| conn.server_version if conn.respond_to?(:server_version)} || super)
@@ -220,7 +187,7 @@ module Sequel
             end
           end
         rescue Mysql::Error => e
-          raise_error(e, :disconnect=>MYSQL_DATABASE_DISCONNECT_ERRORS.match(e.message))
+          raise_error(e)
         ensure
           r.free if r
           # Use up all results to avoid a commands out of sync message.
@@ -244,10 +211,34 @@ module Sequel
         :query
       end
       
+      # If convert_invalid_date_time is nil, :nil, or :string and
+      # the conversion raises an InvalidValue exception, return v
+      # if :string and nil otherwise.
+      def convert_date_time(v)
+        begin
+          yield v
+        rescue InvalidValue
+          case @convert_invalid_date_time
+          when nil, :nil
+            nil
+          when :string
+            v
+          else 
+            raise
+          end
+        end
+      end
+    
       # The MySQL adapter main error class is Mysql::Error
       def database_error_classes
         [Mysql::Error]
       end
+
+      # Raise a disconnect error if the exception message matches the list
+      # of recognized exceptions.
+      def disconnect_error?(e, opts)
+        super || (e.is_a?(::Mysql::Error) && MYSQL_DATABASE_DISCONNECT_ERRORS.match(e.message))
+      end
       
       # The database name when using the native adapter is always stored in
       # the :database option.
@@ -262,97 +253,18 @@ module Sequel
         nil
       end
       
-      # Executes a prepared statement on an available connection.  If the
-      # prepared statement already exists for the connection and has the same
-      # SQL, reuse it, otherwise, prepare the new statement.  Because of the
-      # usual MySQL stupidity, we are forced to name arguments via separate
-      # SET queries.  Use @sequel_arg_N (for N starting at 1) for these
-      # arguments.
-      def execute_prepared_statement(ps_name, opts, &block)
-        args = opts[:arguments]
-        ps = prepared_statements[ps_name]
-        sql = ps.prepared_sql
-        synchronize(opts[:server]) do |conn|
-          unless conn.prepared_statements[ps_name] == sql
-            conn.prepared_statements[ps_name] = sql
-            _execute(conn, "PREPARE #{ps_name} FROM '#{::Mysql.quote(sql)}'", opts)
-          end
-          i = 0
-          _execute(conn, "SET " + args.map {|arg| "@sequel_arg_#{i+=1} = #{literal(arg)}"}.join(", "), opts) unless args.empty?
-          _execute(conn, "EXECUTE #{ps_name}#{" USING #{(1..i).map{|j| "@sequel_arg_#{j}"}.join(', ')}" unless i == 0}", opts, &block)
-        end
-      end
-      
       # Convert tinyint(1) type to boolean if convert_tinyint_to_bool is true
       def schema_column_type(db_type)
-        Sequel::MySQL.convert_tinyint_to_bool && db_type == 'tinyint(1)' ? :boolean : super
+        convert_tinyint_to_bool && db_type == 'tinyint(1)' ? :boolean : super
       end
     end
     
     # Dataset class for MySQL datasets accessed via the native driver.
     class Dataset < Sequel::Dataset
       include Sequel::MySQL::DatasetMethods
-      include StoredProcedures
-      
-      # Methods to add to MySQL prepared statement calls without using a
-      # real database prepared statement and bound variables.
-      module CallableStatementMethods
-        # Extend given dataset with this module so subselects inside subselects in
-        # prepared statements work.
-        def subselect_sql(ds)
-          ps = ds.to_prepared_statement(:select)
-          ps.extend(CallableStatementMethods)
-          ps = ps.bind(@opts[:bind_vars]) if @opts[:bind_vars]
-          ps.prepared_args = prepared_args
-          ps.prepared_sql
-        end
-      end
-      
-      # Methods for MySQL prepared statements using the native driver.
-      module PreparedStatementMethods
-        include Sequel::Dataset::UnnumberedArgumentMapper
-        
-        private
-        
-        # Execute the prepared statement with the bind arguments instead of
-        # the given SQL.
-        def execute(sql, opts={}, &block)
-          super(prepared_statement_name, {:arguments=>bind_arguments}.merge(opts), &block)
-        end
-        
-        # Same as execute, explicit due to intricacies of alias and super.
-        def execute_dui(sql, opts={}, &block)
-          super(prepared_statement_name, {:arguments=>bind_arguments}.merge(opts), &block)
-        end
-      end
-      
-      # Methods for MySQL stored procedures using the native driver.
-      module StoredProcedureMethods
-        include Sequel::Dataset::StoredProcedureMethods
-        
-        private
-        
-        # Execute the database stored procedure with the stored arguments.
-        def execute(sql, opts={}, &block)
-          super(@sproc_name, {:args=>@sproc_args, :sproc=>true}.merge(opts), &block)
-        end
-        
-        # Same as execute, explicit due to intricacies of alias and super.
-        def execute_dui(sql, opts={}, &block)
-          super(@sproc_name, {:args=>@sproc_args, :sproc=>true}.merge(opts), &block)
-        end
-      end
-      
-      # MySQL is different in that it supports prepared statements but not bound
-      # variables outside of prepared statements.  The default implementation
-      # breaks the use of subselects in prepared statements, so extend the
-      # temporary prepared statement that this creates with a module that
-      # fixes it.
-      def call(type, bind_arguments={}, *values, &block)
-        ps = to_prepared_statement(type, values)
-        ps.extend(CallableStatementMethods)
-        ps.call(bind_arguments, &block)
-      end
+      include Sequel::MySQL::PreparedStatements::DatasetMethods
+
+      Database::DatasetClass = self
       
       # Delete rows matching this dataset
       def delete
@@ -365,11 +277,12 @@ module Sequel
       def fetch_rows(sql, &block)
         execute(sql) do |r|
           i = -1
+          cps = db.conversion_procs
           cols = r.fetch_fields.map do |f| 
             # Pretend tinyint is another integer type if its length is not 1, to
             # avoid casting to boolean if Sequel::MySQL.convert_tinyint_to_bool
             # is set.
-            type_proc = f.type == 1 && f.length != 1 ? MYSQL_TYPES[2] : MYSQL_TYPES[f.type]
+            type_proc = f.type == 1 && f.length != 1 ? cps[2] : cps[f.type]
             [output_identifier(f.name), type_proc, i+=1]
           end
           @columns = cols.map{|c| c.first}
@@ -395,18 +308,6 @@ module Sequel
         execute_dui(insert_sql(*values)){|c| return c.insert_id}
       end
       
-      # Store the given type of prepared statement in the associated database
-      # with the given name.
-      def prepare(type, name=nil, *values)
-        ps = to_prepared_statement(type, values)
-        ps.extend(PreparedStatementMethods)
-        if name
-          ps.prepared_statement_name = name
-          db.prepared_statements[name] = ps
-        end
-        ps
-      end
-      
       # Replace (update or insert) the matching row.
       def replace(*args)
         execute_dui(replace_sql(*args)){|c| return c.insert_id}
@@ -450,11 +351,6 @@ module Sequel
         "'#{::Mysql.quote(v)}'"
       end
       
-      # Extend the dataset with the MySQL stored procedure methods.
-      def prepare_extend_sproc(ds)
-        ds.extend(StoredProcedureMethods)
-      end
-      
       # Yield each row of the given result set r with columns cols
       # as a hash with symbol keys
       def yield_rows(r, cols)