sequel 4.26.0 → 5.37.0

data/lib/sequel/connection_pool/threaded.rb

@@ -1,34 +1,28 @@
+# 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
-  # Whether or not a ConditionVariable should be used to wait for connections.
-  # True except on ruby 1.8, where ConditionVariable#wait does not support a
-  # timeout.
-  unless defined?(USE_WAITER)
-    USE_WAITER = RUBY_VERSION >= '1.9'
-  end
+  USE_WAITER = true
+  Sequel::Deprecation.deprecate_constant(self, :USE_WAITER)
 
   # The maximum number of connections this pool will create (per shard/server
   # if sharding).
   attr_reader :max_size
   
   # An array of connections that are available for use by the pool.
+  # The calling code should already have the mutex before calling this.
   attr_reader :available_connections
   
-  # A hash with thread keys and connection values for currently allocated
-  # connections.
+  # A hash with thread keys and connection values for currently allocated connections.
+  # The calling code should already have the mutex before calling this.
   attr_reader :allocated
 
   # The following additional options are respected:
-  # * :connection_handling - Set how to handle available connections.  By default,
-  #   uses a a queue for fairness.  Can be set to :stack to use a stack, which may
-  #   offer better performance.
-  # * :max_connections - The maximum number of connections the connection pool
-  #   will open (default 4)
-  # * :pool_sleep_time - The amount of time to sleep before attempting to acquire
-  #   a connection again, only used on ruby 1.8. (default 0.001)
-  # * :pool_timeout - The amount of seconds to wait to acquire a connection
-  #   before raising a PoolTimeoutError (default 5)
+  # :max_connections :: The maximum number of connections the connection pool
+  #                     will open (default 4)
+  # :pool_timeout :: The amount of seconds to wait to acquire a connection
+  #                  before raising a PoolTimeoutError (default 5)
   def initialize(db, opts = OPTS)
     super
     @max_size = Integer(opts[:max_connections] || 4)
@@ -38,14 +32,7 @@ class Sequel::ThreadedConnectionPool < Sequel::ConnectionPool
     @available_connections = []
     @allocated = {}
     @timeout = Float(opts[:pool_timeout] || 5)
-
-    if USE_WAITER
-      @waiter = ConditionVariable.new
-    else
-      # :nocov:
-      @sleep_time = Float(opts[:pool_sleep_time] || 0.001)
-      # :nocov:
-    end
+    @waiter = ConditionVariable.new
   end
   
   # Yield all of the available connections, and the one currently allocated to
@@ -68,15 +55,18 @@ class Sequel::ThreadedConnectionPool < Sequel::ConnectionPool
   # being used.  If you want to be able to disconnect connections that are
   # currently in use, use the ShardedThreadedConnectionPool, which can do that.
   # This connection pool does not, for performance reasons. To use the sharded pool,
-  # pass the <tt>:servers=>{}</tt> option when connecting to the database.
+  # pass the <tt>servers: {}</tt> option when connecting to the database.
   # 
   # Once a connection is requested using #hold, the connection pool
   # creates new connections to the database.
   def disconnect(opts=OPTS)
+    conns = nil
     sync do
-      @available_connections.each{|conn| db.disconnect_connection(conn)}
+      conns = @available_connections.dup
       @available_connections.clear
+      @waiter.signal
     end
+    conns.each{|conn| disconnect_connection(conn)}
   end
   
   # Chooses the first available connection, or if none are
@@ -91,24 +81,33 @@ class Sequel::ThreadedConnectionPool < Sequel::ConnectionPool
   # If no connection is immediately available and the pool is already using the maximum
   # number of connections, Pool#hold will block until a connection
   # is available or the timeout expires.  If the timeout expires before a
-  # connection can be acquired, a Sequel::PoolTimeout is 
-  # raised.
+  # connection can be acquired, a Sequel::PoolTimeout is raised.
   def hold(server=nil)
-    t = Thread.current
+    t = Sequel.current
     if conn = owned_connection(t)
       return yield(conn)
     end
     begin
       conn = acquire(t)
       yield conn
-    rescue Sequel::DatabaseDisconnectError
-      oconn = conn
-      conn = nil
-      db.disconnect_connection(oconn) if oconn
-      @allocated.delete(t)
+    rescue Sequel::DatabaseDisconnectError, *@error_classes => e
+      if disconnect_error?(e)
+        oconn = conn
+        conn = nil
+        disconnect_connection(oconn) if oconn
+        sync do 
+          @allocated.delete(t)
+          @waiter.signal
+        end
+      end
       raise
     ensure
-      sync{release(t)} if conn
+      if conn
+        sync{release(t)}
+        if @connection_handling == :disconnect
+          disconnect_connection(conn)
+        end
+      end
     end
   end
 
@@ -117,111 +116,115 @@ class Sequel::ThreadedConnectionPool < Sequel::ConnectionPool
   end
   
   # The total number of connections opened, either available or allocated.
-  # This may not be completely accurate as it isn't protected by the mutex.
+  # The calling code should not have the mutex before calling this.
   def size
-    @allocated.length + @available_connections.length
+    @mutex.synchronize{_size}
   end
   
   private
 
+  # The total number of connections opened, either available or allocated.
+  # The calling code should already have the mutex before calling this.
+  def _size
+    @allocated.length + @available_connections.length
+  end
+
   # Assigns a connection to the supplied thread, if one
-  # is available. The calling code should already have the mutex when
+  # is available. The calling code should NOT already have the mutex when
   # calling this.
-  def _acquire(thread)
-    if conn = available
-      @allocated[thread] = conn
+  #
+  # This should return a connection is one is available within the timeout,
+  # or nil if a connection could not be acquired within the timeout.
+  def acquire(thread)
+    if conn = assign_connection(thread)
+      return conn
     end
-  end
-  
-  if USE_WAITER
-    # Assigns a connection to the supplied thread, if one
-    # is available. The calling code should NOT already have the mutex when
-    # calling this.
-    #
-    # This should return a connection is one is available within the timeout,
-    # or nil if a connection could not be acquired within the timeout.
-    def acquire(thread)
+
+    timeout = @timeout
+    timer = Sequel.start_timer
+
+    sync do
+      @waiter.wait(@mutex, timeout)
+      if conn = next_available
+        return(@allocated[thread] = conn)
+      end
+    end
+
+    until conn = assign_connection(thread)
+      elapsed = Sequel.elapsed_seconds_since(timer)
+      # :nocov:
+      raise_pool_timeout(elapsed) if elapsed > timeout
+
+      # It's difficult to get to this point, it can only happen if there is a race condition
+      # where a connection cannot be acquired even after the thread is signalled by the condition variable
       sync do
-        if conn = _acquire(thread)
-          return conn
+        @waiter.wait(@mutex, timeout - elapsed)
+        if conn = next_available
+          return(@allocated[thread] = conn)
         end
+      end
+      # :nocov:
+    end
+
+    conn
+  end
 
-        time = Time.now
-        @waiter.wait(@mutex, @timeout)
+  # Assign a connection to the thread, or return nil if one cannot be assigned.
+  # The caller should NOT have the mutex before calling this.
+  def assign_connection(thread)
+    # Thread safe as instance variable is only assigned to local variable
+    # and not operated on outside mutex.
+    allocated = @allocated
+    do_make_new = false
+    to_disconnect = nil
 
-        # Not sure why this is helpful, but calling Thread.pass after conditional
-        # variable access dramatically increases reliability when under heavy
-        # resource contention (almost eliminating timeouts), at a small cost to
-        # runtime performance.
-        Thread.pass
+    sync do
+      if conn = next_available
+        return(allocated[thread] = conn)
+      end
 
-        until conn = _acquire(thread)
-          deadline ||= time + @timeout
-          current_time = Time.now
-          raise(::Sequel::PoolTimeout, "timeout: #{@timeout}, elapsed: #{current_time - time}") if current_time > deadline
-          # :nocov:
-          # It's difficult to get to this point, it can only happen if there is a race condition
-          # where a connection cannot be acquired even after the thread is signalled by the condition
-          @waiter.wait(@mutex, deadline - current_time)
-          Thread.pass
-          # :nocov:
+      if (n = _size) >= (max = @max_size)
+        allocated.keys.each do |t|
+          unless t.alive?
+            (to_disconnect ||= []) << allocated.delete(t)
+          end
         end
+        n = nil
+      end
 
-        conn
+      if (n || _size) < max
+        do_make_new = allocated[thread] = true
       end
     end
-  else
-    # :nocov:
-    def acquire(thread)
-      unless conn = sync{_acquire(thread)}
-        time = Time.now
-        timeout = time + @timeout
-        sleep_time = @sleep_time
-        sleep sleep_time
-        until conn = sync{_acquire(thread)}
-          raise(::Sequel::PoolTimeout, "timeout: #{@timeout}, elapsed: #{Time.now - time}") if Time.now > timeout
-          sleep sleep_time
+
+    if to_disconnect
+      to_disconnect.each{|dconn| disconnect_connection(dconn)}
+    end
+
+    # Connect to the database outside of the connection pool mutex,
+    # as that can take a long time and the connection pool mutex
+    # shouldn't be locked while the connection takes place.
+    if do_make_new
+      begin
+        conn = make_new(:default)
+        sync{allocated[thread] = conn}
+      ensure
+        unless conn
+          sync{allocated.delete(thread)}
         end
       end
-      conn
     end
-    # :nocov:
-  end
 
-  # Returns an available connection. If no connection is
-  # available, tries to create a new connection. The calling code should already
-  # have the mutex before calling this.
-  def available
-    next_available || make_new(DEFAULT_SERVER)
+    conn
   end
 
   # 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)
     @available_connections << conn
-    if USE_WAITER
-      @waiter.signal
-      Thread.pass
-    end
     conn
   end
 
-  unless method_defined?(:default_make_new)
-    # Alias the default make_new method, so subclasses can call it directly.
-    alias default_make_new make_new
-  end
-  
-  # Creates a new connection to the given server if the size of the pool for
-  # the server is less than the maximum size of the pool. The calling code
-  # should already have the mutex before calling this.
-  def make_new(server)
-    if (n = size) >= @max_size
-      @allocated.keys.each{|t| release(t) unless t.alive?}
-      n = nil
-    end
-    super if (n || size) < @max_size
-  end
-
   # Return the next available connection in the pool, or nil if there
   # is not currently an available connection.  The calling code should already
   # have the mutex before calling this.
@@ -240,9 +243,25 @@ class Sequel::ThreadedConnectionPool < Sequel::ConnectionPool
     sync{@allocated[thread]}
   end
   
-  # Create the maximum number of connections immediately.
-  def preconnect
-    (max_size - size).times{checkin_connection(make_new(nil))}
+  # Create the maximum number of connections immediately.  The calling code should
+  # NOT have the mutex before calling this.
+  def preconnect(concurrent = false)
+    enum = (max_size - _size).times
+
+    conns = if concurrent
+      enum.map{Thread.new{make_new(:default)}}.map(&:value)
+    else
+      enum.map{make_new(:default)}
+    end
+
+    sync{conns.each{|conn| checkin_connection(conn)}}
+  end
+
+  # Raise a PoolTimeout error showing the current timeout, the elapsed time, and the
+  # database's name (if any).
+  def raise_pool_timeout(elapsed)
+    name = db.opts[:name]
+    raise ::Sequel::PoolTimeout, "timeout: #{@timeout}, elapsed: #{elapsed}#{", database name: #{name}" if name}"
   end
   
   # Releases the connection assigned to the supplied thread back to the pool.
@@ -250,11 +269,12 @@ class Sequel::ThreadedConnectionPool < Sequel::ConnectionPool
   def release(thread)
     conn = @allocated.delete(thread)
 
-    if @connection_handling == :disconnect
-      db.disconnect_connection(conn)
-    else
+    unless @connection_handling == :disconnect
       checkin_connection(conn)
     end
+
+    @waiter.signal
+    nil
   end
 
   # Yield to the block while inside the mutex. The calling code should NOT
@@ -262,6 +282,4 @@ class Sequel::ThreadedConnectionPool < Sequel::ConnectionPool
   def sync
     @mutex.synchronize{yield}
   end
-  
-  CONNECTION_POOL_MAP[[false, false]] = self
 end

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
@@ -7,13 +9,16 @@
 #
 #   DB = Sequel.sqlite # Memory database
 #   DB = Sequel.sqlite('blog.db')
-#   DB = Sequel.postgres('database_name', :user=>'user', 
-#          :password=>'password', :host=>'host', :port=>5432, 
-#          :max_connections=>10)
+#   DB = Sequel.postgres('database_name',
+#          user:'user', 
+#          password: 'password',
+#          host: 'host'
+#          port: 5432, 
+#          max_connections: 10)
 #
 # If a block is given to these methods, it is passed the opened Database
 # object, which is closed (disconnected) when the block exits, just
-# like a block passed to connect.  For example:
+# like a block passed to Sequel.connect.  For example:
 #
 #   Sequel.sqlite('blog.db'){|db| puts db[:users].count} 
 #
@@ -22,11 +27,18 @@
 module Sequel
   @convert_two_digit_years = true
   @datetime_class = Time
-
-  # Whether Sequel is being run in single threaded mode
+  @split_symbols = false
   @single_threaded = false
 
-  class << self
+  # Mutex used to protect mutable data structures
+  @data_mutex = Mutex.new
+
+  # Frozen hash used as the default options hash for most options.
+  OPTS = {}.freeze
+
+  SPLIT_SYMBOL_CACHE = {}
+
+  module SequelMethods
     # Sequel converts two digit years in <tt>Date</tt>s and <tt>DateTime</tt>s by default,
     # so 01/02/03 is interpreted at January 2nd, 2003, and 12/13/99 is interpreted
     # as December 13, 1999. You can override this to treat those dates as
@@ -40,365 +52,385 @@ module Sequel
     #
     #   Sequel.datetime_class = DateTime
     #
-    # For ruby versions less than 1.9.2, +Time+ has a limited range (1901 to
-    # 2038), so if you use datetimes out of that range, you need to switch
-    # to +DateTime+.  Also, before 1.9.2, +Time+ can only handle local and UTC
-    # times, not other timezones.  Note that +Time+ and +DateTime+ objects
-    # have a different API, and in cases where they implement the same methods,
-    # they often implement them differently (e.g. + using seconds on +Time+ and
-    # days on +DateTime+).
+    # Note that +Time+ and +DateTime+ objects have a different API, and in
+    # cases where they implement the same methods, they often implement them
+    # differently (e.g. + using seconds on +Time+ and days on +DateTime+).
     attr_accessor :datetime_class
-  end
-
-  # Returns true if the passed object could be a specifier of conditions, false otherwise.
-  # Currently, Sequel considers hashes and arrays of two element arrays as
-  # condition specifiers.
-  #
-  #   Sequel.condition_specifier?({}) # => true
-  #   Sequel.condition_specifier?([[1, 2]]) # => true
-  #   Sequel.condition_specifier?([]) # => false
-  #   Sequel.condition_specifier?([1]) # => false
-  #   Sequel.condition_specifier?(1) # => false
-  def self.condition_specifier?(obj)
-    case obj
-    when Hash
-      true
-    when Array
-      !obj.empty? && !obj.is_a?(SQL::ValueList) && obj.all?{|i| i.is_a?(Array) && (i.length == 2)}
-    else
-      false
-    end
-  end
 
-  # Frozen hash used as the default options hash for most options.
-  OPTS = {}.freeze
+    # Set whether Sequel is being used in single threaded mode. By default,
+    # Sequel uses a thread-safe connection pool, which isn't as fast as the
+    # single threaded connection pool, and also has some additional thread
+    # safety checks.  If your program will only have one thread,
+    # and speed is a priority, you should set this to true:
+    #
+    #   Sequel.single_threaded = true
+    attr_accessor :single_threaded
 
-  # Creates a new database object based on the supplied connection string
-  # and optional arguments.  The specified scheme determines the database
-  # class used, and the rest of the string specifies the connection options.
-  # For example:
-  #
-  #   DB = Sequel.connect('sqlite:/') # Memory database
-  #   DB = Sequel.connect('sqlite://blog.db') # ./blog.db
-  #   DB = Sequel.connect('sqlite:///blog.db') # /blog.db
-  #   DB = Sequel.connect('postgres://user:password@host:port/database_name')
-  #   DB = Sequel.connect('sqlite:///blog.db', :max_connections=>10)
-  #
-  # You can also pass a single options hash:
-  #
-  #   DB = Sequel.connect(:adapter=>'sqlite', :database=>'./blog.db')
-  #
-  # If a block is given, it is passed the opened +Database+ object, which is
-  # closed when the block exits.  For example:
-  #
-  #   Sequel.connect('sqlite://blog.db'){|db| puts db[:users].count}  
-  #
-  # If a block is not given, a reference to this database will be held in
-  # <tt>Sequel::DATABASES</tt> until it is removed manually.  This is by
-  # design, and used by <tt>Sequel::Model</tt> to pick the default
-  # database.  It is recommended to pass a block if you do not want the
-  # resulting Database object to remain in memory until the process
-  # terminates.
-  #
-  # For details, see the {"Connecting to a Database" guide}[rdoc-ref:doc/opening_databases.rdoc].
-  # To set up a master/slave or sharded database connection, see the {"Master/Slave Databases and Sharding" guide}[rdoc-ref:doc/sharding.rdoc].
-  def self.connect(*args, &block)
-    Database.connect(*args, &block)
-  end
+    # Alias of original require method, as Sequel.require does a relative
+    # require for backwards compatibility.
+    alias orig_require require
+    private :orig_require
 
-  # Assume the core extensions are not loaded by default, if the core_extensions
-  # extension is loaded, this will be overridden.
-  def self.core_extensions?
-    false
-  end
+    # Returns true if the passed object could be a specifier of conditions, false otherwise.
+    # Currently, Sequel considers hashes and arrays of two element arrays as
+    # condition specifiers.
+    #
+    #   Sequel.condition_specifier?({}) # => true
+    #   Sequel.condition_specifier?([[1, 2]]) # => true
+    #   Sequel.condition_specifier?([]) # => false
+    #   Sequel.condition_specifier?([1]) # => false
+    #   Sequel.condition_specifier?(1) # => false
+    def condition_specifier?(obj)
+      case obj
+      when Hash
+        true
+      when Array
+        !obj.empty? && !obj.is_a?(SQL::ValueList) && obj.all?{|i| i.is_a?(Array) && (i.length == 2)}
+      else
+        false
+      end
+    end
 
-  # Convert the +exception+ to the given class.  The given class should be
-  # <tt>Sequel::Error</tt> or a subclass.  Returns an instance of +klass+ with
-  # the message and backtrace of +exception+.
-  def self.convert_exception_class(exception, klass)
-    return exception if exception.is_a?(klass)
-    e = klass.new("#{exception.class}: #{exception.message}")
-    e.wrapped_exception = exception
-    e.set_backtrace(exception.backtrace)
-    e
-  end
+    # Creates a new database object based on the supplied connection string
+    # and optional arguments.  The specified scheme determines the database
+    # class used, and the rest of the string specifies the connection options.
+    # For example:
+    #
+    #   DB = Sequel.connect('sqlite:/') # Memory database
+    #   DB = Sequel.connect('sqlite://blog.db') # ./blog.db
+    #   DB = Sequel.connect('sqlite:///blog.db') # /blog.db
+    #   DB = Sequel.connect('postgres://user:password@host:port/database_name')
+    #   DB = Sequel.connect('sqlite:///blog.db', max_connections: 10)
+    #
+    # You can also pass a single options hash:
+    #
+    #   DB = Sequel.connect(adapter: 'sqlite', database: './blog.db')
+    #
+    # If a block is given, it is passed the opened +Database+ object, which is
+    # closed when the block exits.  For example:
+    #
+    #   Sequel.connect('sqlite://blog.db'){|db| puts db[:users].count}  
+    #
+    # If a block is not given, a reference to this database will be held in
+    # <tt>Sequel::DATABASES</tt> until it is removed manually.  This is by
+    # design, and used by <tt>Sequel::Model</tt> to pick the default
+    # database.  It is recommended to pass a block if you do not want the
+    # resulting Database object to remain in memory until the process
+    # terminates, or use the <tt>keep_reference: false</tt> Database option.
+    #
+    # For details, see the {"Connecting to a Database" guide}[rdoc-ref:doc/opening_databases.rdoc].
+    # To set up a primary/replica or sharded database connection, see the {"Primary/Replica Database Configurations and Sharding" guide}[rdoc-ref:doc/sharding.rdoc].
+    def connect(*args, &block)
+      Database.connect(*args, &block)
+    end
 
-  # Load all Sequel extensions given.  Extensions are just files that exist under
-  # <tt>sequel/extensions</tt> in the load path, and are just required.  Generally,
-  # extensions modify the behavior of +Database+ and/or +Dataset+, but Sequel ships
-  # with some extensions that modify other classes that exist for backwards compatibility.
-  # In some cases, requiring an extension modifies classes directly, and in others,
-  # it just loads a module that you can extend other classes with.  Consult the documentation
-  # for each extension you plan on using for usage.
-  #
-  #   Sequel.extension(:schema_dumper)
-  #   Sequel.extension(:pagination, :query)
-  def self.extension(*extensions)
-    extensions.each{|e| Kernel.require "sequel/extensions/#{e}"}
-  end
-  
-  # Set the method to call on identifiers going into the database.  This affects
-  # the literalization of identifiers by calling this method on them before they are input.
-  # Sequel upcases identifiers in all SQL strings for most databases, so to turn that off:
-  #
-  #   Sequel.identifier_input_method = nil
-  # 
-  # to downcase instead:
-  #
-  #   Sequel.identifier_input_method = :downcase
-  #
-  # Other String instance methods work as well.
-  def self.identifier_input_method=(value)
-    Database.identifier_input_method = value
-  end
+    # Assume the core extensions are not loaded by default, if the core_extensions
+    # extension is loaded, this will be overridden.
+    def core_extensions?
+      false
+    end
 
-  # Set the method to call on identifiers coming out of the database.  This affects
-  # the literalization of identifiers by calling this method on them when they are
-  # retrieved from the database.  Sequel downcases identifiers retrieved for most
-  # databases, so to turn that off:
-  #
-  #   Sequel.identifier_output_method = nil
-  # 
-  # to upcase instead:
-  #
-  #   Sequel.identifier_output_method = :upcase
-  #
-  # Other String instance methods work as well.
-  def self.identifier_output_method=(value)
-    Database.identifier_output_method = value
-  end
+    # Convert the +exception+ to the given class.  The given class should be
+    # <tt>Sequel::Error</tt> or a subclass.  Returns an instance of +klass+ with
+    # the message and backtrace of +exception+.
+    def convert_exception_class(exception, klass)
+      return exception if exception.is_a?(klass)
+      e = klass.new("#{exception.class}: #{exception.message}")
+      e.wrapped_exception = exception
+      e.set_backtrace(exception.backtrace)
+      e
+    end
 
-  # The exception classed raised if there is an error parsing JSON.
-  # This can be overridden to use an alternative json implementation.
-  def self.json_parser_error_class
-    JSON::ParserError
-  end
+    # The current concurrency primitive, Thread.current by default.
+    def current
+      Thread.current
+    end
 
-  # Convert given object to json and return the result.
-  # This can be overridden to use an alternative json implementation.
-  def self.object_to_json(obj, *args)
-    obj.to_json(*args)
-  end
+    # Load all Sequel extensions given.  Extensions are just files that exist under
+    # <tt>sequel/extensions</tt> in the load path, and are just required.  
+    # In some cases, requiring an extension modifies classes directly, and in others,
+    # it just loads a module that you can extend other classes with.  Consult the documentation
+    # for each extension you plan on using for usage.
+    #
+    #   Sequel.extension(:blank)
+    #   Sequel.extension(:core_extensions, :named_timezones)
+    def extension(*extensions)
+      extensions.each{|e| orig_require("sequel/extensions/#{e}")}
+    end
+    
+    # The exception classed raised if there is an error parsing JSON.
+    # This can be overridden to use an alternative json implementation.
+    def json_parser_error_class
+      JSON::ParserError
+    end
 
-  # Parse the string as JSON and return the result.
-  # This can be overridden to use an alternative json implementation.
-  def self.parse_json(json)
-    JSON.parse(json, :create_additions=>false)
-  end
+    # Convert given object to json and return the result.
+    # This can be overridden to use an alternative json implementation.
+    def object_to_json(obj, *args, &block)
+      obj.to_json(*args, &block)
+    end
 
-  # Set whether to quote identifiers for all databases by default. By default,
-  # Sequel quotes identifiers in all SQL strings, so to turn that off:
-  #
-  #   Sequel.quote_identifiers = false
-  def self.quote_identifiers=(value)
-    Database.quote_identifiers = value
-  end
+    # Parse the string as JSON and return the result.
+    # This can be overridden to use an alternative json implementation.
+    def parse_json(json)
+      JSON.parse(json, :create_additions=>false)
+    end
 
-  # Convert each item in the array to the correct type, handling multi-dimensional
-  # arrays.  For each element in the array or subarrays, call the converter,
-  # unless the value is nil.
-  def self.recursive_map(array, converter)
-    array.map do |i|
-      if i.is_a?(Array)
-        recursive_map(i, converter)
-      elsif i
-        converter.call(i)
+    # Convert each item in the array to the correct type, handling multi-dimensional
+    # arrays.  For each element in the array or subarrays, call the converter,
+    # unless the value is nil.
+    def recursive_map(array, converter)
+      array.map do |i|
+        if i.is_a?(Array)
+          recursive_map(i, converter)
+        elsif !i.nil?
+          converter.call(i)
+        end
       end
     end
-  end
-
-  # Require all given +files+ which should be in the same or a subdirectory of
-  # this file.  If a +subdir+ is given, assume all +files+ are in that subdir.
-  # This is used to ensure that the files loaded are from the same version of
-  # Sequel as this file.
-  def self.require(files, subdir=nil)
-    Array(files).each{|f| super("#{File.dirname(__FILE__).untaint}/#{"#{subdir}/" if subdir}#{f}")}
-  end
 
-  # Set whether Sequel is being used in single threaded mode. By default,
-  # Sequel uses a thread-safe connection pool, which isn't as fast as the
-  # single threaded connection pool, and also has some additional thread
-  # safety checks.  If your program will only have one thread,
-  # and speed is a priority, you should set this to true:
-  #
-  #   Sequel.single_threaded = true
-  def self.single_threaded=(value)
-    @single_threaded = value
-    Database.single_threaded = value
-  end
-
-  COLUMN_REF_RE1 = /\A((?:(?!__).)+)__((?:(?!___).)+)___(.+)\z/.freeze
-  COLUMN_REF_RE2 = /\A((?:(?!___).)+)___(.+)\z/.freeze
-  COLUMN_REF_RE3 = /\A((?:(?!__).)+)__(.+)\z/.freeze
-  SPLIT_SYMBOL_CACHE = {}
+    # For backwards compatibility only.  require_relative should be used instead.
+    def require(files, subdir=nil)
+      # Use Kernel.require_relative to work around JRuby 9.0 bug
+      Array(files).each{|f| Kernel.require_relative "#{"#{subdir}/" if subdir}#{f}"}
+    end
 
-  # Splits the symbol into three parts.  Each part will
-  # either be a string or nil.
-  #
-  # For columns, these parts are the table, column, and alias.
-  # For tables, these parts are the schema, table, and alias.
-  def self.split_symbol(sym)
-    unless v = Sequel.synchronize{SPLIT_SYMBOL_CACHE[sym]}
-      v = case s = sym.to_s
-      when COLUMN_REF_RE1
-        [$1.freeze, $2.freeze, $3.freeze].freeze
-      when COLUMN_REF_RE2
-        [nil, $1.freeze, $2.freeze].freeze
-      when COLUMN_REF_RE3
-        [$1.freeze, $2.freeze, nil].freeze
-      else
-        [nil, s.freeze, nil].freeze
+    # Splits the symbol into three parts, if symbol splitting is enabled (not the default).
+    # Each part will either be a string or nil. If symbol splitting
+    # is disabled, returns an array with the first and third parts
+    # being nil, and the second part beind a string version of the symbol.
+    #
+    # For columns, these parts are the table, column, and alias.
+    # For tables, these parts are the schema, table, and alias.
+    def split_symbol(sym)
+      unless v = Sequel.synchronize{SPLIT_SYMBOL_CACHE[sym]}
+        if split_symbols?
+          v = case s = sym.to_s
+          when /\A((?:(?!__).)+)__((?:(?!___).)+)___(.+)\z/
+            [$1.freeze, $2.freeze, $3.freeze].freeze
+          when /\A((?:(?!___).)+)___(.+)\z/
+            [nil, $1.freeze, $2.freeze].freeze
+          when /\A((?:(?!__).)+)__(.+)\z/
+            [$1.freeze, $2.freeze, nil].freeze
+          else
+            [nil, s.freeze, nil].freeze
+          end
+        else
+          v = [nil,sym.to_s.freeze,nil].freeze
+        end
+        Sequel.synchronize{SPLIT_SYMBOL_CACHE[sym] = v}
       end
-      Sequel.synchronize{SPLIT_SYMBOL_CACHE[sym] = v}
+      v
+    end
+
+    # Setting this to true enables Sequel's historical behavior of splitting
+    # symbols on double or triple underscores:
+    #
+    #   :table__column         # table.column
+    #   :column___alias        # column AS alias
+    #   :table__column___alias # table.column AS alias
+    #
+    # It is only recommended to turn this on for backwards compatibility until
+    # such symbols have been converted to use newer Sequel APIs such as:
+    #
+    #   Sequel[:table][:column]            # table.column
+    #   Sequel[:column].as(:alias)         # column AS alias
+    #   Sequel[:table][:column].as(:alias) # table.column AS alias
+    #
+    # Sequel::Database instances do their own caching of literalized
+    # symbols, and changing this setting does not affect those caches.  It is
+    # recommended that if you want to change this setting, you do so directly
+    # after requiring Sequel, before creating any Sequel::Database instances.
+    #
+    # Disabling symbol splitting will also disable the handling
+    # of double underscores in virtual row methods, causing such methods to
+    # yield regular identifers instead of qualified identifiers:
+    #
+    #   # Sequel.split_symbols = true
+    #   Sequel.expr{table__column}  # table.column
+    #   Sequel.expr{table[:column]} # table.column
+    #
+    #   # Sequel.split_symbols = false
+    #   Sequel.expr{table__column}  # table__column
+    #   Sequel.expr{table[:column]} # table.column
+    def split_symbols=(v)
+      Sequel.synchronize{SPLIT_SYMBOL_CACHE.clear}
+      @split_symbols = v
     end
-    v
-  end
 
-  # Converts the given +string+ into a +Date+ object.
-  #
-  #   Sequel.string_to_date('2010-09-10') # Date.civil(2010, 09, 10)
-  def self.string_to_date(string)
-    begin
-      Date.parse(string, Sequel.convert_two_digit_years)
-    rescue => e
-      raise convert_exception_class(e, InvalidValue)
+    # Whether Sequel currently splits symbols into qualified/aliased identifiers.
+    def split_symbols?
+      @split_symbols
     end
-  end
 
-  # Converts the given +string+ into a +Time+ or +DateTime+ object, depending on the
-  # value of <tt>Sequel.datetime_class</tt>.
-  #
-  #   Sequel.string_to_datetime('2010-09-10 10:20:30') # Time.local(2010, 09, 10, 10, 20, 30)
-  def self.string_to_datetime(string)
-    begin
-      if datetime_class == DateTime
-        DateTime.parse(string, convert_two_digit_years)
-      else
-        datetime_class.parse(string)
+    # Converts the given +string+ into a +Date+ object.
+    #
+    #   Sequel.string_to_date('2010-09-10') # Date.civil(2010, 09, 10)
+    def string_to_date(string)
+      begin
+        Date.parse(string, Sequel.convert_two_digit_years)
+      rescue => e
+        raise convert_exception_class(e, InvalidValue)
       end
-    rescue => e
-      raise convert_exception_class(e, InvalidValue)
     end
-  end
 
-  # Converts the given +string+ into a <tt>Sequel::SQLTime</tt> object.
-  #
-  #   v = Sequel.string_to_time('10:20:30') # Sequel::SQLTime.parse('10:20:30')
-  #   DB.literal(v) # => '10:20:30'
-  def self.string_to_time(string)
-    begin
-      SQLTime.parse(string)
-    rescue => e
-      raise convert_exception_class(e, InvalidValue)
+    # Converts the given +string+ into a +Time+ or +DateTime+ object, depending on the
+    # value of <tt>Sequel.datetime_class</tt>.
+    #
+    #   Sequel.string_to_datetime('2010-09-10 10:20:30') # Time.local(2010, 09, 10, 10, 20, 30)
+    def string_to_datetime(string)
+      begin
+        if datetime_class == DateTime
+          DateTime.parse(string, convert_two_digit_years)
+        else
+          datetime_class.parse(string)
+        end
+      rescue => e
+        raise convert_exception_class(e, InvalidValue)
+      end
     end
-  end
 
-  if defined?(RUBY_ENGINE) && RUBY_ENGINE != 'ruby'
-  # :nocov:
-    # Mutex used to protect mutable data structures
-    @data_mutex = Mutex.new
+    # Converts the given +string+ into a <tt>Sequel::SQLTime</tt> object.
+    #
+    #   v = Sequel.string_to_time('10:20:30') # Sequel::SQLTime.parse('10:20:30')
+    #   DB.literal(v) # => '10:20:30'
+    def string_to_time(string)
+      begin
+        SQLTime.parse(string)
+      rescue => e
+        raise convert_exception_class(e, InvalidValue)
+      end
+    end
 
     # Unless in single threaded mode, protects access to any mutable
     # global data structure in Sequel.
     # Uses a non-reentrant mutex, so calling code should be careful.
-    def self.synchronize(&block)
+    # In general, this should only be used around the minimal possible code
+    # such as Hash#[], Hash#[]=, Hash#delete, Array#<<, and Array#delete.
+    def synchronize(&block)
       @single_threaded ? yield : @data_mutex.synchronize(&block)
     end
-  # :nocov:
-  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
-      yield
+
+    if RUBY_VERSION >= '2.1'
+      # A timer object that can be passed to Sequel.elapsed_seconds_since
+      # to return the number of seconds elapsed.
+      def start_timer
+        Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      end
+    else
+      # :nocov:
+      def start_timer # :nodoc:
+        Time.now
+      end
+      # :nocov:
     end
-  end
 
-  # Uses a transaction on all given databases with the given options. This:
-  #
-  #   Sequel.transaction([DB1, DB2, DB3]){...}
-  #
-  # is equivalent to:
-  #
-  #   DB1.transaction do
-  #     DB2.transaction do
-  #       DB3.transaction do
-  #         ...
-  #       end
-  #     end
-  #   end
-  #
-  # except that if Sequel::Rollback is raised by the block, the transaction is
-  # rolled back on all databases instead of just the last one.
-  #
-  # Note that this method cannot guarantee that all databases will commit or
-  # rollback.  For example, if DB3 commits but attempting to commit on DB2
-  # fails (maybe because foreign key checks are deferred), there is no way
-  # to uncommit the changes on DB3.  For that kind of support, you need to
-  # have two-phase commit/prepared transactions (which Sequel supports on
-  # some databases).
-  def self.transaction(dbs, opts=OPTS, &block)
-    unless opts[:rollback]
-      rescue_rollback = true
-      opts = Hash[opts].merge!(:rollback=>:reraise)
+    # The elapsed seconds since the given timer object was created.  The
+    # timer object should have been created via Sequel.start_timer.
+    def elapsed_seconds_since(timer)
+      start_timer - timer
     end
-    pr = dbs.reverse.inject(block){|bl, db| proc{db.transaction(opts, &bl)}}
-    if rescue_rollback
-      begin
+
+    # Uses a transaction on all given databases with the given options. This:
+    #
+    #   Sequel.transaction([DB1, DB2, DB3]){}
+    #
+    # is equivalent to:
+    #
+    #   DB1.transaction do
+    #     DB2.transaction do
+    #       DB3.transaction do
+    #       end
+    #     end
+    #   end
+    #
+    # except that if Sequel::Rollback is raised by the block, the transaction is
+    # rolled back on all databases instead of just the last one.
+    #
+    # Note that this method cannot guarantee that all databases will commit or
+    # rollback.  For example, if DB3 commits but attempting to commit on DB2
+    # fails (maybe because foreign key checks are deferred), there is no way
+    # to uncommit the changes on DB3.  For that kind of support, you need to
+    # have two-phase commit/prepared transactions (which Sequel supports on
+    # some databases).
+    def transaction(dbs, opts=OPTS, &block)
+      unless opts[:rollback]
+        rescue_rollback = true
+        opts = Hash[opts].merge!(:rollback=>:reraise)
+      end
+      pr = dbs.reverse.inject(block){|bl, db| proc{db.transaction(opts, &bl)}}
+      if rescue_rollback
+        begin
+          pr.call
+        rescue Sequel::Rollback
+          nil
+        end
+      else
         pr.call
-      rescue Sequel::Rollback
-        nil
       end
-    else
-      pr.call
     end
-  end
 
-  # If the supplied block takes a single argument,
-  # yield an <tt>SQL::VirtualRow</tt> instance to the block
-  # argument.  Otherwise, evaluate the block in the context of a
-  # <tt>SQL::VirtualRow</tt> instance.
-  #
-  #   Sequel.virtual_row{a} # Sequel::SQL::Identifier.new(:a)
-  #   Sequel.virtual_row{|o| o.a{}} # Sequel::SQL::Function.new(:a)
-  def self.virtual_row(&block)
-    vr = VIRTUAL_ROW
-    case block.arity
-    when -1, 0
-      vr.instance_exec(&block)
-    else
-      block.call(vr)
-    end  
-  end
+    # If the supplied block takes a single argument,
+    # yield an <tt>SQL::VirtualRow</tt> instance to the block
+    # argument.  Otherwise, evaluate the block in the context of a
+    # <tt>SQL::VirtualRow</tt> instance.
+    #
+    #   Sequel.virtual_row{a} # Sequel::SQL::Identifier.new(:a)
+    #   Sequel.virtual_row{|o| o.a} # Sequel::SQL::Function.new(:a)
+    def virtual_row(&block)
+      vr = VIRTUAL_ROW
+      case block.arity
+      when -1, 0
+        vr.instance_exec(&block)
+      else
+        block.call(vr)
+      end  
+    end
 
-  ### Private Class Methods ###
+    private
 
-  # Helper method that the database adapter class methods that are added to Sequel via
-  # metaprogramming use to parse arguments.
-  def self.adapter_method(adapter, *args, &block)
-    options = args.last.is_a?(Hash) ? args.pop : {}
-    opts = {:adapter => adapter.to_sym}
-    opts[:database] = args.shift if args.first.is_a?(String)
-    if args.any?
-      raise ::Sequel::Error, "Wrong format of arguments, either use (), (String), (Hash), or (String, Hash)"
-    end
+    # Helper method that the database adapter class methods that are added to Sequel via
+    # metaprogramming use to parse arguments.
+    def adapter_method(adapter, *args, &block)
+      options = args.last.is_a?(Hash) ? args.pop : OPTS
+      opts = {:adapter => adapter.to_sym}
+      opts[:database] = args.shift if args.first.is_a?(String)
+      if args.any?
+        raise ::Sequel::Error, "Wrong format of arguments, either use (), (String), (Hash), or (String, Hash)"
+      end
 
-    connect(opts.merge(options), &block)
-  end
+      connect(opts.merge(options), &block)
+    end
 
-  # 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__)
+    # Method that adds a database adapter class method to Sequel that calls
+    # Sequel.adapter_method.
+    def def_adapter_method(*adapters) # :nodoc:
+      adapters.each do |adapter|
+        define_singleton_method(adapter){|*args, &block| adapter_method(adapter, *args, &block)}
+      end
     end
   end
+  extend SequelMethods
+
+    require_relative "deprecated"
+    require_relative "sql"
+    require_relative "connection_pool"
+    require_relative "exceptions"
+    require_relative "dataset"
+    require_relative "database"
+    require_relative "timezones"
+    require_relative "ast_transformer"
+    require_relative "version"
 
-  private_class_method :adapter_method, :def_adapter_method
-
-  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)