sequel 4.38.0 → 4.39.0

data/doc/transactions.rdoc

@@ -168,4 +168,4 @@ behavior to execute multiple times.  For example, with the following code:
 
 The logger.info method will be called multiple times if there is a serialization failure.
 
-The :num_retries option can be used to set the maxmimum number of times to retry.  It is set to 5 times by default.
+The :num_retries option can be used to set the maximum number of times to retry.  It is set to 5 times by default.

data/doc/virtual_rows.rdoc

@@ -23,7 +23,7 @@ SQL function expression.
 It's possible to use Sequel's DSL to represent such expressions, but it is a
 little verbose:
 
-  dataset.where(Sequel.expr(:a) > Sequel.function(:b, :c))
+  dataset.where(Sequel[:a] > Sequel.function(:b, :c))
   # WHERE a > b(c)
 
 The virtual row DSL makes such code more concise:

data/lib/sequel/adapters/mock.rb

@@ -32,63 +32,6 @@ module Sequel
     class Database < Sequel::Database
       set_adapter_scheme :mock
 
-      # Map of database type names to module names, used for handling
-      # mock adapters for specific database types.
-      SHARED_ADAPTERS = {
-        'access'=>'Access',
-        'cubrid'=>'Cubrid',
-        'db2'=>'DB2',
-        'firebird'=>'Firebird',
-        'informix'=>'Informix',
-        'mssql'=>'MSSQL',
-        'mysql'=>'MySQL',
-        'oracle'=>'Oracle',
-        'postgres'=>'Postgres',
-        'sqlanywhere'=>'SqlAnywhere',
-        'sqlite'=>'SQLite'
-      }
-
-      # Procs to run for specific database types to get the mock adapter
-      # to work with the shared adapter
-      SHARED_ADAPTER_SETUP = {
-        'postgres' => lambda do |db|
-          db.instance_eval do
-            @server_version = 90500
-            initialize_postgres_adapter
-          end
-          db.extend(Module.new do
-            def bound_variable_arg(arg, conn)
-              arg
-            end
-
-            def primary_key(table)
-              :id
-            end
-          end)
-        end,
-        'oracle' => lambda do |db|
-          db.instance_eval do
-            @server_version = 11000000
-            @primary_key_sequences = {}
-          end
-        end,
-        'mysql' => lambda do |db|
-          db.instance_eval do
-            @server_version = 50617
-          end
-        end,
-        'mssql' => lambda do |db|
-          db.instance_eval do
-            @server_version = 11000000
-          end
-        end,
-        'sqlite' => lambda do |db|
-          db.instance_eval do
-            @sqlite_version = 30903
-          end
-        end
-      }
-
       # Set the autogenerated primary key integer
       # to be returned when running an insert query.
       # Argument types supported:
@@ -292,17 +235,30 @@ module Sequel
       def adapter_initialize
         opts = @opts
         @sqls = opts[:sqls] || []
-        if mod_name = SHARED_ADAPTERS[opts[:host]]
-          @shared_adapter = true
-          require "sequel/adapters/shared/#{opts[:host]}"
-          extend Sequel.const_get(mod_name)::DatabaseMethods
-          extend_datasets Sequel.const_get(mod_name)::DatasetMethods
-          if pr = SHARED_ADAPTER_SETUP[opts[:host]]
-            pr.call(self)
+        @shared_adapter = false
+
+        case db_type = opts[:host] 
+        when String, Symbol
+          db_type = db_type.to_sym
+          unless mod = Sequel.synchronize{SHARED_ADAPTER_MAP[db_type]}
+            begin
+              require "sequel/adapters/shared/#{db_type}"
+            rescue LoadError
+            else
+              mod = Sequel.synchronize{SHARED_ADAPTER_MAP[db_type]}
+            end
+          end
+
+          if mod
+            @shared_adapter = true
+            extend(mod::DatabaseMethods)
+            extend_datasets(mod::DatasetMethods)
+            if mod.respond_to?(:mock_adapter_setup)
+              mod.mock_adapter_setup(self)
+            end
           end
-        else
-          @shared_adapter = false
         end
+
         self.autoid = opts[:autoid]
         self.columns = opts[:columns]
         self.fetch = opts[:fetch]

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

@@ -4,6 +4,8 @@ module Sequel
   require 'adapters/utils/emulate_offset_with_reverse_and_count'
 
   module Access
+    Sequel::Database.set_shared_adapter_scheme(:access, self)
+
     module DatabaseMethods
       extend Sequel::Database::ResetIdentifierMangling
 

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

@@ -4,6 +4,8 @@ Sequel.require 'adapters/utils/split_alter_table'
 
 module Sequel
   module Cubrid
+    Sequel::Database.set_shared_adapter_scheme(:cubrid, self)
+
     module DatabaseMethods
       extend Sequel::Database::ResetIdentifierMangling
 

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

@@ -4,6 +4,8 @@ Sequel.require 'adapters/utils/emulate_offset_with_row_number'
 
 module Sequel
   module DB2
+    Sequel::Database.set_shared_adapter_scheme(:db2, self)
+
     @use_clob_as_blob = false
 
     class << self

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

@@ -2,6 +2,8 @@
 
 module Sequel
   module Firebird
+    Sequel::Database.set_shared_adapter_scheme(:firebird, self)
+
     module DatabaseMethods
       extend Sequel::Database::ResetIdentifierMangling
 

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

@@ -2,6 +2,8 @@
 
 module Sequel
   module Informix
+    Sequel::Database.set_shared_adapter_scheme(:informix, self)
+
     module DatabaseMethods
       extend Sequel::Database::ResetIdentifierMangling
 

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

@@ -5,6 +5,14 @@ Sequel.require %w'emulate_offset_with_row_number split_alter_table', 'adapters/u
 module Sequel
   Dataset::NON_SQL_OPTIONS << :disable_insert_output
   module MSSQL
+    Sequel::Database.set_shared_adapter_scheme(:mssql, self)
+
+    def self.mock_adapter_setup(db)
+      db.instance_eval do
+        @server_version = 11000000
+      end
+    end
+
     module DatabaseMethods
       extend Sequel::Database::ResetIdentifierMangling
 
@@ -433,8 +441,8 @@ module Sequel
         tn = m2.call(table_name.to_s)
         table_id = get(Sequel.function(:object_id, tn))
         info_sch_sch = opts[:information_schema_schema]
-        inf_sch_qual = lambda{|s| info_sch_sch ? Sequel.qualify(info_sch_sch, s) : Sequel.expr(s)}
-        sys_qual = lambda{|s| info_sch_sch ? Sequel.qualify(info_sch_sch, Sequel.qualify(Sequel.lit(''), s)) : Sequel.expr(s)}
+        inf_sch_qual = lambda{|s| info_sch_sch ? Sequel.qualify(info_sch_sch, s) : Sequel[s]}
+        sys_qual = lambda{|s| info_sch_sch ? Sequel.qualify(info_sch_sch, Sequel.qualify(Sequel.lit(''), s)) : Sequel[s]}
 
         identity_cols = metadata_dataset.from(Sequel.lit('[sys].[columns]')).
           where(:object_id=>table_id, :is_identity=>true).

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

@@ -9,6 +9,14 @@ module Sequel
   Dataset::NON_SQL_OPTIONS << :on_duplicate_key_update
 
   module MySQL
+    Sequel::Database.set_shared_adapter_scheme(:mysql, self)
+
+    def self.mock_adapter_setup(db)
+      db.instance_eval do
+        @server_version = 50617
+      end
+    end
+
     @convert_tinyint_to_bool = true
 
     class << self
@@ -188,17 +196,22 @@ module Sequel
       private
       
       def alter_table_add_column_sql(table, op)
-        if related = op.delete(:table)
-          sql = super.dup
+        pos = if after_col = op[:after]
+          " AFTER #{quote_identifier(after_col)}"
+        elsif op[:first]
+          " FIRST"
+        end
+
+        sql = if related = op.delete(:table)
+          sql = super + "#{pos}, ADD "
           op[:table] = related
           op[:key] ||= primary_key_from_schema(related)
-          sql << ", ADD "
           if constraint_name = op.delete(:foreign_key_constraint_name)
             sql << "CONSTRAINT #{quote_identifier(constraint_name)} "
           end
           sql << "FOREIGN KEY (#{quote_identifier(op[:name])})#{column_references_sql(op)}"
         else
-          super
+          "#{super}#{pos}"
         end
       end
 

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

@@ -4,6 +4,15 @@ Sequel.require 'adapters/utils/emulate_offset_with_row_number'
 
 module Sequel
   module Oracle
+    Sequel::Database.set_shared_adapter_scheme(:oracle, self)
+    
+    def self.mock_adapter_setup(db)
+      db.instance_eval do
+        @server_version = 11000000
+        @primary_key_sequences = {}
+      end
+    end
+
     module DatabaseMethods
       extend Sequel::Database::ResetIdentifierMangling
 

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

@@ -25,6 +25,26 @@ module Sequel
   #                 qualification, and in which order to check the schemas when
   #                 an unqualified object is referenced.
   module Postgres
+    Sequel::Database.set_shared_adapter_scheme(:postgres, self)
+
+    module MockAdapterDatabaseMethods
+      def bound_variable_arg(arg, conn)
+        arg
+      end
+
+      def primary_key(table)
+        :id
+      end
+    end
+
+    def self.mock_adapter_setup(db)
+      db.instance_eval do
+        @server_version = 90500
+        initialize_postgres_adapter
+        extend(MockAdapterDatabaseMethods)
+      end
+    end
+
     # Array of exceptions that need to be converted.  JDBC
     # uses NativeExceptions, the native adapter uses PGError.
     CONVERTED_EXCEPTIONS = []
@@ -577,6 +597,10 @@ module Sequel
         end
       end
 
+      def alter_table_add_column_sql(table, op)
+        "ADD COLUMN#{' IF NOT EXISTS' if op[:if_not_exists]} #{column_definition_sql(op)}"
+      end
+
       # Use a PostgreSQL-specific alter table generator
       def alter_table_generator_class
         Postgres::AlterTableGenerator
@@ -1315,6 +1339,8 @@ module Sequel
       # :phrase :: Similar to :plain, but also adding an ILIKE filter to ensure that
       #            returned rows also include the exact phrase used.
       # :rank :: Set to true to order by the rank, so that closer matches are returned first.
+      # :to_tsquery :: Can be set to :plain or :phrase to specify the function to use to
+      #                convert the terms to a ts_query.
       # :tsquery :: Specifies the terms argument is already a valid SQL expression returning a
       #             tsquery, and can be used directly in the query.
       # :tsvector :: Specifies the cols argument is already a valid SQL expression returning a
@@ -1329,7 +1355,14 @@ module Sequel
 
         unless opts[:tsquery]
           phrase_terms = terms.is_a?(Array) ? terms.join(' | ') : terms
-          query_func = (opts[:phrase] || opts[:plain]) ? :plainto_tsquery : :to_tsquery
+
+          query_func = case to_tsquery = opts[:to_tsquery]
+          when :phrase, :plain
+            :"#{to_tsquery}to_tsquery"
+          else
+            (opts[:phrase] || opts[:plain]) ? :plainto_tsquery : :to_tsquery
+          end
+
           terms = Sequel.function(query_func, lang, phrase_terms)
         end
 

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

@@ -2,6 +2,7 @@
 
 module Sequel
   module SqlAnywhere
+    Sequel::Database.set_shared_adapter_scheme(:sqlanywhere, self)
 
     @convert_smallint_to_bool = true
 

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

@@ -4,6 +4,14 @@ Sequel.require 'adapters/utils/replace'
 
 module Sequel
   module SQLite
+    Sequel::Database.set_shared_adapter_scheme(:sqlite, self)
+
+    def self.mock_adapter_setup(db)
+      db.instance_eval do
+        @sqlite_version = 30903
+      end
+    end
+    
     # No matter how you connect to SQLite, the following Database options
     # can be used to set PRAGMAs on connections in a thread-safe manner:
     # :auto_vacuum, :foreign_keys, :synchronous, and :temp_store.

data/lib/sequel/core.rb

@@ -392,6 +392,16 @@ module Sequel
 
   require(%w"deprecated sql connection_pool exceptions dataset database timezones ast_transformer version")
 
+  class << self
+    # Allow nicer syntax for creating Sequel expressions:
+    #
+    #   Sequel[1]     # => Sequel::SQL::NumericExpression: 1
+    #   Sequel["a"]   # => Sequel::SQL::StringExpression: 'a'
+    #   Sequel[:a]    # => Sequel::SQL::Identifier: "a"
+    #   Sequel[:a=>1] # => Sequel::SQL::BooleanExpression: ("a" = 1)
+    alias_method :[], :expr
+  end
+
   # Add the database adapter class methods to Sequel via metaprogramming
   def_adapter_method(*Database::ADAPTERS)
 end

data/lib/sequel/database.rb

@@ -5,6 +5,11 @@ module Sequel
   # symbol, and the value is the Database subclass.
   ADAPTER_MAP = {}
     
+  # Hash of shared adapters that have been registered.  The key is the
+  # adapter scheme symbol, and the value is the Sequel module containing
+  # the shared adapter.
+  SHARED_ADAPTER_MAP = {}
+
   # Array of all databases to which Sequel has connected.  If you are
   # developing an application that can connect to an arbitrary number of 
   # databases, delete the database objects from this or they will not get

data/lib/sequel/database/connecting.rb

@@ -129,6 +129,34 @@ module Sequel
       Sequel.synchronize{ADAPTER_MAP[scheme] = self}
     end
     private_class_method :set_adapter_scheme
+
+    # Sets the given module as the shared adapter module for the given scheme.
+    # Used to register shared adapters for use by the mock adapter. Example:
+    #
+    #   # in file sequel/adapters/shared/mydb.rb
+    #   module Sequel::MyDB
+    #     Sequel::Database.set_shared_adapter_scheme :mydb, :self
+    #
+    #     def self.mock_adapter_setup(db)
+    #       # ...
+    #     end
+    #
+    #     module DatabaseMethods
+    #       # ...
+    #     end
+    #
+    #     module DatasetMethods
+    #       # ...
+    #     end
+    #   end
+    #
+    # would allow the mock adapter to return a Database instance that supports
+    # the MyDB syntax via:
+    #
+    #   Sequel.connect('mock://mydb')
+    def self.set_shared_adapter_scheme(scheme, mod)
+      Sequel.synchronize{SHARED_ADAPTER_MAP[scheme] = mod}
+    end
     
     # The connection pool for this Database instance.  All Database instances have
     # their own connection pools.

data/lib/sequel/database/misc.rb

@@ -160,38 +160,6 @@ module Sequel
       end
     end
 
-    # If a transaction is not currently in process, yield to the block immediately.
-    # Otherwise, add the block to the list of blocks to call after the currently
-    # in progress transaction commits (and only if it commits).
-    # Options:
-    # :server :: The server/shard to use.
-    def after_commit(opts=OPTS, &block)
-      raise Error, "must provide block to after_commit" unless block
-      synchronize(opts[:server]) do |conn|
-        if h = _trans(conn)
-          raise Error, "cannot call after_commit in a prepared transaction" if h[:prepare]
-          add_transaction_hook(conn, :after_commit, block)
-        else
-          yield
-        end
-      end
-    end
-    
-    # If a transaction is not currently in progress, ignore the block.
-    # Otherwise, add the block to the list of the blocks to call after the currently
-    # in progress transaction rolls back (and only if it rolls back).
-    # Options:
-    # :server :: The server/shard to use.
-    def after_rollback(opts=OPTS, &block)
-      raise Error, "must provide block to after_rollback" unless block
-      synchronize(opts[:server]) do |conn|
-        if h = _trans(conn)
-          raise Error, "cannot call after_rollback in a prepared transaction" if h[:prepare]
-          add_transaction_hook(conn, :after_rollback, block)
-        end
-      end
-    end
-    
     # Cast the given type to a literal type
     #
     #   DB.cast_type_literal(Float) # double precision
@@ -224,13 +192,6 @@ module Sequel
       Sequel.convert_output_timestamp(v, timezone)
     end
 
-    # Return true if already in a transaction given the options,
-    # false otherwise.  Respects the :server option for selecting
-    # a shard.
-    def in_transaction?(opts=OPTS)
-      synchronize(opts[:server]){|conn| !!_trans(conn)}
-    end
-
     # Returns a string representation of the database object including the
     # class name and connection URI and options used when connecting (if any).
     def inspect
@@ -341,13 +302,6 @@ module Sequel
     def adapter_initialize
     end
 
-    # Set the given callable as a hook to be called. Type should be either
-    # :after_commit or :after_rollback.
-    def add_transaction_hook(conn, type, block)
-      hooks = _trans(conn)[type] ||= []
-      hooks << block
-    end
-
     # Returns true when the object is considered blank.
     # The only objects that are blank are nil, false,
     # strings with all whitespace, and ones that respond
@@ -366,11 +320,6 @@ module Sequel
       end
     end
 
-    # Which transaction errors to translate, blank by default.
-    def database_error_classes
-      []
-    end
-
     # An enumerable yielding pairs of regexps and exception classes, used
     # to match against underlying driver exception messages in
     # order to raise a more specific Sequel::DatabaseError subclass.