sequel 3.11.0 → 3.12.0

data/lib/sequel/adapters/jdbc.rb

@@ -159,7 +159,8 @@ module Sequel
           args.concat([opts[:user], opts[:password]]) if opts[:user] && opts[:password]
           begin
             JavaSQL::DriverManager.getConnection(*args)
-          rescue
+          rescue => e
+            raise e unless driver
             # If the DriverManager can't get the connection - use the connect
             # method of the driver. (This happens under Tomcat for instance)
             props = java.util.Properties.new
@@ -167,7 +168,7 @@ module Sequel
               props.setProperty("user", opts[:user])
               props.setProperty("password", opts[:password])
             end
-            driver.new.connect(args[0], props)
+            driver.new.connect(args[0], props) rescue (raise e)
           end
         end
         setup_connection(conn)
@@ -184,8 +185,7 @@ module Sequel
         return call_sproc(sql, opts, &block) if opts[:sproc]
         return execute_prepared_statement(sql, opts, &block) if [Symbol, Dataset].any?{|c| sql.is_a?(c)}
         synchronize(opts[:server]) do |conn|
-          stmt = conn.createStatement
-          begin
+          statement(conn) do |stmt|
             if block_given?
               yield log_yield(sql){stmt.executeQuery(sql)}
             else
@@ -205,10 +205,6 @@ module Sequel
                 log_yield(sql){stmt.executeUpdate(sql)}
               end
             end
-          rescue NativeException, JavaSQL::SQLException => e
-            raise_error(e)
-          ensure
-            stmt.close
           end
         end
       end
@@ -226,10 +222,7 @@ module Sequel
         execute(sql, {:type=>:insert}.merge(opts))
       end
       
-      # Return a hash containing index information. Hash keys are index name symbols.
-      # Values are subhashes with two keys, :columns and :unique.  The value of :columns
-      # is an array of symbols of column names.  The value of :unique is true or false
-      # depending on if the index is unique.
+      # Use the JDBC metadata to get the index information for the table.
       def indexes(table, opts={})
         m = output_identifier_meth
         im = input_identifier_meth
@@ -272,12 +265,6 @@ module Sequel
       
       private
          
-      # JDBC uses a statement object to execute SQL on the database
-      def begin_transaction(conn)
-        conn = conn.createStatement unless supports_savepoints?
-        super
-      end
-      
       # Close given adapter connections
       def disconnect_connection(c)
         c.close
@@ -354,6 +341,12 @@ module Sequel
         ts
       end
 
+      # Log the given SQL and then execute it on the connection, used by
+      # the transaction code.
+      def log_connection_execute(conn, sql)
+        statement(conn){|s| log_yield(sql){s.execute(sql)}}
+      end
+
       # By default, there is no support for determining the last inserted
       # id, so return nil.  This method should be overridden in
       # sub adapters.
@@ -379,12 +372,6 @@ module Sequel
         super(exception, {:disconnect => cause.respond_to?(:getSQLState) && cause.getSQLState =~ /^08/}.merge(opts))
       end
 
-      # Close the given statement when removing the transaction
-      def remove_transaction(stmt)
-        stmt.close if stmt && !supports_savepoints?
-        super
-      end
-      
       # Java being java, you need to specify the type of each argument
       # for the prepared statement, and bind it individually.  This
       # guesses which JDBC method to use, and hopefully JRuby will convert
@@ -448,9 +435,14 @@ module Sequel
         ts
       end
       
-      # Create a statement object to execute transaction statements.
-      def transaction_statement_object(conn)
-        conn.createStatement
+      # Yield a new statement object, and ensure that it is closed before returning.
+      def statement(conn)
+        stmt = conn.createStatement
+        yield stmt
+      rescue NativeException, JavaSQL::SQLException => e
+        raise_error(e)
+      ensure
+        stmt.close if stmt
       end
 
       # This method determines whether or not to add

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

@@ -78,13 +78,6 @@ module Sequel
         def last_insert_id(conn, opts)
           insert_result(conn, opts[:table], opts[:values])
         end
-        
-        # Override shared postgresql adapter method to actually log,
-        # since on JDBC the first argument is a statement and not a
-        # connection, so it wouldn't be logged otherwise.
-        def log_connection_execute(stmt, sql) 
-          log_yield(sql){stmt.execute(sql)}
-        end
       end
       
       # Dataset subclass used for datasets that connect to PostgreSQL via JDBC.

data/lib/sequel/adapters/mysql.rb

@@ -99,10 +99,6 @@ module Sequel
         conn = Mysql.init
         conn.options(Mysql::READ_DEFAULT_GROUP, opts[:config_default_group] || "client")
         conn.options(Mysql::OPT_LOCAL_INFILE, opts[:config_local_infile]) if opts.has_key?(:config_local_infile)
-        if encoding = opts[:encoding] || opts[:charset]
-          # set charset _before_ the connect. using an option instead of "SET (NAMES|CHARACTER_SET_*)" works across reconnects
-          conn.options(Mysql::SET_CHARSET_NAME, encoding)
-        end
         conn.real_connect(
           opts[:host] || 'localhost',
           opts[:user],
@@ -114,6 +110,11 @@ module Sequel
           Mysql::CLIENT_MULTI_STATEMENTS +
           (opts[:compress] == false ? 0 : Mysql::CLIENT_COMPRESS)
         )
+        if encoding = opts[:encoding] || opts[:charset]
+          # Setting encoding before the connect appears not to work
+          # with READ_DEFAULT_GROUP, so set it afterwards.
+          conn.options(Mysql::SET_CHARSET_NAME, encoding)
+        end
 
         # increase timeout so mysql server doesn't disconnect us
         conn.query("set @@wait_timeout = #{opts[:timeout] || 2592000}")

data/lib/sequel/adapters/odbc.rb

@@ -7,6 +7,7 @@ module Sequel
 
       GUARDED_DRV_NAME = /^\{.+\}$/.freeze
       DRV_NAME_GUARDS = '{%s}'.freeze
+      DISCONNECT_ERRORS = /\A08S01/.freeze 
 
       def initialize(opts)
         super
@@ -50,7 +51,7 @@ module Sequel
             r = log_yield(sql){conn.run(sql)}
             yield(r) if block_given?
           rescue ::ODBC::Error, ArgumentError => e
-            raise_error(e)
+            raise_error(e, :disconnect=>DISCONNECT_ERRORS.match(e.message))
           ensure
             r.drop if r
           end
@@ -63,7 +64,7 @@ module Sequel
           begin
             log_yield(sql){conn.do(sql)}
           rescue ::ODBC::Error, ArgumentError => e
-            raise_error(e)
+            raise_error(e, :disconnect=>DISCONNECT_ERRORS.match(e.message))
           end
         end
       end

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

@@ -10,7 +10,6 @@ module Sequel
       SQL_ROLLBACK = "IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION".freeze
       SQL_ROLLBACK_TO_SAVEPOINT = 'IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION autopoint_%d'.freeze
       SQL_SAVEPOINT = 'SAVE TRANSACTION autopoint_%d'.freeze
-      TEMPORARY = "#".freeze
       
       # The types to check for 0 scale to transform :decimal types
       # to :integer.
@@ -100,6 +99,13 @@ module Sequel
       def commit_transaction_sql
         SQL_COMMIT
       end
+        
+      # MSSQL uses the name of the table to decide the difference between
+      # a regular and temporary table, with temporary table names starting with
+      # a #.
+      def create_table_sql(name, generator, options)
+        "CREATE TABLE #{quote_schema_table(options[:temp] ? "##{name}" : name)} (#{column_list_sql(generator)})"
+      end
       
       # The SQL to drop an index for the table.
       def drop_index_sql(table, op)
@@ -153,11 +159,6 @@ module Sequel
         end
       end
       
-      # SQL fragment for marking a table as temporary
-      def temporary_table_sql
-        TEMPORARY
-      end
-      
       # MSSQL has both datetime and timestamp classes, most people are going
       # to want datetime
       def type_literal_generic_datetime(column)

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

@@ -35,13 +35,8 @@ module Sequel
         :mysql
       end
 
-      # Return a hash containing index information. Hash keys are index name symbols.
-      # Values are subhashes with two keys, :columns and :unique.  The value of :columns
-      # is an array of symbols of column names.  The value of :unique is true or false
-      # depending on if the index is unique.
-      #
-      # Does not include the primary key index or indexes on partial keys.
-      def indexes(table)
+      # Use SHOW INDEX FROM to get the index information for the table.
+      def indexes(table, opts={})
         indexes = {}
         remove_indexes = []
         m = output_identifier_meth

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

@@ -253,14 +253,8 @@ module Sequel
         self << drop_trigger_sql(table, name, opts)
       end
       
-      # Return a hash containing index information. Hash keys are index name symbols.
-      # Values are subhashes with two keys, :columns and :unique.  The value of :columns
-      # is an array of symbols of column names.  The value of :unique is true or false
-      # depending on if the index is unique.
-      #
-      # This will not output any partial indexes, indexes that aren't valid or ready,
-      # or indexes that contain anything other than simple column references.
-      def indexes(table)
+      # Use the pg_* system tables to determine indexes on a table
+      def indexes(table, opts={})
         m = output_identifier_meth
         im = input_identifier_meth
         schema, table = schema_and_table(table)

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

@@ -49,11 +49,8 @@ module Sequel
         pragma_set(:foreign_keys, !!value ? 'on' : 'off') if sqlite_version >= 30619
       end
 
-      # Return a hash containing index information. Hash keys are index name symbols.
-      # Values are subhashes with two keys, :columns and :unique.  The value of :columns
-      # is an array of symbols of column names.  The value of :unique is true or false
-      # depending on if the index is unique.
-      def indexes(table)
+      # Use the index_list and index_info PRAGMAs to determine the indexes on the table.
+      def indexes(table, opts={})
         m = output_identifier_meth
         im = input_identifier_meth
         indexes = {}

data/lib/sequel/adapters/sqlite.rb

@@ -72,19 +72,19 @@ module Sequel
       
       # Run the given SQL with the given arguments and return the number of changed rows.
       def execute_dui(sql, opts={})
-        _execute(opts){|conn| log_yield(sql, opts[:arguments]){conn.execute_batch(sql, opts[:arguments])}; conn.changes}
+        _execute(opts){|conn| log_yield(sql, opts[:arguments]){conn.execute_batch(sql, opts.fetch(:arguments, []))}; conn.changes}
       end
       
       # Run the given SQL with the given arguments and return the last inserted row id.
       def execute_insert(sql, opts={})
-        _execute(opts){|conn| log_yield(sql, opts[:arguments]){conn.execute(sql, opts[:arguments])}; conn.last_insert_row_id}
+        _execute(opts){|conn| log_yield(sql, opts[:arguments]){conn.execute(sql, opts.fetch(:arguments, []))}; conn.last_insert_row_id}
       end
       
       # Run the given SQL with the given arguments and yield each row.
       def execute(sql, opts={})
         _execute(opts) do |conn|
           begin
-            yield(result = log_yield(sql, opts[:arguments]){conn.query(sql, opts[:arguments])})
+            yield(result = log_yield(sql, opts[:arguments]){conn.query(sql, opts.fetch(:arguments, []))})
           ensure
             result.close if result
           end
@@ -93,7 +93,7 @@ module Sequel
       
       # Run the given SQL with the given arguments and return the first value of the first row.
       def single_value(sql, opts={})
-        _execute(opts){|conn| log_yield(sql, opts[:arguments]){conn.get_first_value(sql, opts[:arguments])}}
+        _execute(opts){|conn| log_yield(sql, opts[:arguments]){conn.get_first_value(sql, opts.fetch(:arguments, []))}}
       end
       
       private

data/lib/sequel/core.rb

@@ -285,7 +285,6 @@ module Sequel
   private_class_method :adapter_method, :def_adapter_method
   
   require(%w"metaprogramming sql connection_pool exceptions dataset database timezones version")
-  require(%w"schema_generator schema_methods schema_sql", 'database')
   require('core_sql') if !defined?(::SEQUEL_NO_CORE_EXTENSIONS) && !ENV.has_key?('SEQUEL_NO_CORE_EXTENSIONS')
 
   # Add the database adapter class methods to Sequel via metaprogramming

data/lib/sequel/database.rb

@@ -15,1065 +15,7 @@ module Sequel
   class Database
     extend Metaprogramming
     include Metaprogramming
-
-    # Array of supported database adapters
-    ADAPTERS = %w'ado amalgalite db2 dbi do firebird informix jdbc mysql odbc openbase oracle postgres sqlite'.collect{|x| x.to_sym}
-
-    SQL_BEGIN = 'BEGIN'.freeze
-    SQL_COMMIT = 'COMMIT'.freeze
-    SQL_RELEASE_SAVEPOINT = 'RELEASE SAVEPOINT autopoint_%d'.freeze
-    SQL_ROLLBACK = 'ROLLBACK'.freeze
-    SQL_ROLLBACK_TO_SAVEPOINT = 'ROLLBACK TO SAVEPOINT autopoint_%d'.freeze
-    SQL_SAVEPOINT = 'SAVEPOINT autopoint_%d'.freeze
-    
-    TRANSACTION_BEGIN = 'Transaction.begin'.freeze
-    TRANSACTION_COMMIT = 'Transaction.commit'.freeze
-    TRANSACTION_ROLLBACK = 'Transaction.rollback'.freeze
-    
-    POSTGRES_DEFAULT_RE = /\A(?:B?('.*')::[^']+|\((-?\d+(?:\.\d+)?)\))\z/
-    MSSQL_DEFAULT_RE = /\A(?:\(N?('.*')\)|\(\((-?\d+(?:\.\d+)?)\)\))\z/
-    MYSQL_TIMESTAMP_RE = /\ACURRENT_(?:DATE|TIMESTAMP)?\z/
-    STRING_DEFAULT_RE = /\A'(.*)'\z/
-
-    # The identifier input method to use by default
-    @@identifier_input_method = nil
-
-    # The identifier output method to use by default
-    @@identifier_output_method = nil
-
-    # Whether to use the single threaded connection pool by default
-    @@single_threaded = false
-
-    # Whether to quote identifiers (columns and tables) by default
-    @@quote_identifiers = nil
-
-    # The default schema to use, generally should be nil.
-    attr_accessor :default_schema
-
-    # Numeric specifying the duration beyond which queries are logged at warn
-    # level instead of info level.
-    attr_accessor :log_warn_duration
-
-    # Array of SQL loggers to use for this database
-    attr_accessor :loggers
-    
-    # The options for this database
-    attr_reader :opts
-    
-    # The connection pool for this database
-    attr_reader :pool
-
-    # The prepared statement objects for this database, keyed by name
-    attr_reader :prepared_statements
-    
-    # Constructs a new instance of a database connection with the specified
-    # options hash.
-    #
-    # Sequel::Database is an abstract class that is not useful by itself.
-    #
-    # Takes the following options:
-    # * :default_schema : The default schema to use, should generally be nil
-    # * :disconnection_proc: A proc used to disconnect the connection.
-    # * :identifier_input_method: A string method symbol to call on identifiers going into the database
-    # * :identifier_output_method: A string method symbol to call on identifiers coming from the database
-    # * :loggers : An array of loggers to use.
-    # * :quote_identifiers : Whether to quote identifiers
-    # * :single_threaded : Whether to use a single-threaded connection pool
-    #
-    # All options given are also passed to the ConnectionPool.  If a block
-    # is given, it is used as the connection_proc for the ConnectionPool.
-    def initialize(opts = {}, &block)
-      @opts ||= opts
-      @opts = connection_pool_default_options.merge(@opts)
-      @loggers = Array(@opts[:logger]) + Array(@opts[:loggers])
-      self.log_warn_duration = @opts[:log_warn_duration]
-      @opts[:disconnection_proc] ||= proc{|conn| disconnect_connection(conn)}
-      block ||= proc{|server| connect(server)}
-      @opts[:servers] = {} if @opts[:servers].is_a?(String)
-      
-      @opts[:single_threaded] = @single_threaded = typecast_value_boolean(@opts.fetch(:single_threaded, @@single_threaded))
-      @schemas = {}
-      @default_schema = @opts.fetch(:default_schema, default_schema_default)
-      @prepared_statements = {}
-      @transactions = []
-      @identifier_input_method = nil
-      @identifier_output_method = nil
-      @quote_identifiers = nil
-      @pool = ConnectionPool.get_pool(@opts, &block)
-
-      ::Sequel::DATABASES.push(self)
-    end
-    
-    ### Class Methods ###
-
-    # The Database subclass for the given adapter scheme.
-    # Raises Sequel::AdapterNotFound if the adapter
-    # could not be loaded.
-    def self.adapter_class(scheme)
-      scheme = scheme.to_s.gsub('-', '_').to_sym
-      
-      unless klass = ADAPTER_MAP[scheme]
-        # attempt to load the adapter file
-        begin
-          Sequel.tsk_require "sequel/adapters/#{scheme}"
-        rescue LoadError => e
-          raise Sequel.convert_exception_class(e, AdapterNotFound)
-        end
-        
-        # make sure we actually loaded the adapter
-        unless klass = ADAPTER_MAP[scheme]
-          raise AdapterNotFound, "Could not load #{scheme} adapter"
-        end
-      end
-      klass
-    end
-        
-    # Returns the scheme for the Database class.
-    def self.adapter_scheme
-      @scheme
-    end
-    
-    # Connects to a database.  See Sequel.connect.
-    def self.connect(conn_string, opts = {})
-      case conn_string
-      when String
-        if match = /\A(jdbc|do):/o.match(conn_string)
-          c = adapter_class(match[1].to_sym)
-          opts = {:uri=>conn_string}.merge(opts)
-        else
-          uri = URI.parse(conn_string)
-          scheme = uri.scheme
-          scheme = :dbi if scheme =~ /\Adbi-/
-          c = adapter_class(scheme)
-          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.entries.each{|k,v| uri_options[k] = URI.unescape(v) if v.is_a?(String)}
-          opts = uri_options.merge(opts)
-        end
-      when Hash
-        opts = conn_string.merge(opts)
-        c = adapter_class(opts[:adapter] || opts['adapter'])
-      else
-        raise Error, "Sequel::Database.connect takes either a Hash or a String, given: #{conn_string.inspect}"
-      end
-      # process opts a bit
-      opts = opts.inject({}) do |m, kv| k, v = *kv
-        k = :user if k.to_s == 'username'
-        m[k.to_sym] = v
-        m
-      end
-      begin
-        db = c.new(opts)
-        db.test_connection if opts[:test] && db.send(:typecast_value_boolean, opts[:test])
-        result = yield(db) if block_given?
-      ensure
-        if block_given?
-          db.disconnect if db
-          ::Sequel::DATABASES.delete(db)
-        end
-      end
-      block_given? ? result : db
-    end
-    
-    # The method to call on identifiers going into the database
-    def self.identifier_input_method
-      @@identifier_input_method
-    end
-    
-    # Set the method to call on identifiers going into the database
-    # See Sequel.identifier_input_method=.
-    def self.identifier_input_method=(v)
-      @@identifier_input_method = v || ""
-    end
-    
-    # The method to call on identifiers coming from the database
-    def self.identifier_output_method
-      @@identifier_output_method
-    end
-    
-    # Set the method to call on identifiers coming from the database
-    # See Sequel.identifier_output_method=.
-    def self.identifier_output_method=(v)
-      @@identifier_output_method = v || ""
-    end
-
-    # Sets the default quote_identifiers mode for new databases.
-    # See Sequel.quote_identifiers=.
-    def self.quote_identifiers=(value)
-      @@quote_identifiers = value
-    end
-
-    # Sets the default single_threaded mode for new databases.
-    # See Sequel.single_threaded=.
-    def self.single_threaded=(value)
-      @@single_threaded = value
-    end
-
-    ### Private Class Methods ###
-
-    # Sets the adapter scheme for the Database class. Call this method in
-    # descendants of Database to allow connection using a URL. For example the
-    # following:
-    #
-    #   class Sequel::MyDB::Database < Sequel::Database
-    #     set_adapter_scheme :mydb
-    #     ...
-    #   end
-    #
-    # would allow connection using:
-    #
-    #   Sequel.connect('mydb://user:password@dbserver/mydb')
-    def self.set_adapter_scheme(scheme) # :nodoc:
-      @scheme = scheme
-      ADAPTER_MAP[scheme.to_sym] = self
-    end
-    
-    # Converts a uri to an options hash. These options are then passed
-    # to a newly created database object. 
-    def self.uri_to_options(uri) # :nodoc:
-      { :user => uri.user,
-        :password => uri.password,
-        :host => uri.host,
-        :port => uri.port,
-        :database => (m = /\/(.*)/.match(uri.path)) && (m[1]) }
-    end
-    
-    private_class_method :set_adapter_scheme, :uri_to_options
-    
-    ### Instance Methods ###
-
-    # Runs the supplied SQL statement string on the database server.
-    # Alias for run.
-    def <<(sql)
-      run(sql)
-    end
-    
-    # Returns a dataset from the database. If the first argument is a string,
-    # the method acts as an alias for Database#fetch, returning a dataset for
-    # arbitrary SQL:
-    #
-    #   DB['SELECT * FROM items WHERE name = ?', my_name].all
-    #
-    # Otherwise, acts as an alias for Database#from, setting the primary
-    # table for the dataset:
-    #
-    #   DB[:items].sql #=> "SELECT * FROM items"
-    def [](*args)
-      (String === args.first) ? fetch(*args) : from(*args)
-    end
-    
-    # Dynamically add new servers or modify server options at runtime. Also adds new
-    # servers to the connection pool. Intended for use with master/slave or shard
-    # configurations where it is useful to add new server hosts at runtime.
-    #
-    # servers argument should be a hash with server name symbol keys and hash or
-    # proc values.  If a servers key is already in use, it's value is overridden
-    # with the value provided.
-    #
-    #  DB.add_servers(:f=>{:host=>"hash_host_f"})
-    def add_servers(servers)
-      @opts[:servers] = @opts[:servers] ? @opts[:servers].merge(servers) : servers
-      @pool.add_servers(servers.keys)
-    end
-    
-    # Call the prepared statement with the given name with the given hash
-    # of arguments.
-    def call(ps_name, hash={})
-      prepared_statements[ps_name].call(hash)
-    end
-    
-    # Cast the given type to a literal type
-    def cast_type_literal(type)
-      type_literal(:type=>type)
-    end
-
-    # Connects to the database. This method should be overridden by descendants.
-    def connect(server)
-      raise NotImplementedError, "#connect should be overridden by adapters"
-    end
-    
-    # The database type for this database object, the same as the adapter scheme
-    # by default.  Should be overridden in adapters (especially shared adapters)
-    # to be the correct type, so that even if two separate Database objects are
-    # using different adapters you can tell that they are using the same database
-    # type.  Even better, you can tell that two Database objects that are using
-    # the same adapter are connecting to different database types (think JDBC or
-    # DataObjects).
-    def database_type
-      self.class.adapter_scheme
-    end
-    
-    # Returns a blank dataset for this database
-    def dataset
-      ds = Sequel::Dataset.new(self)
-    end
-    
-    # Disconnects all available connections from the connection pool.  Any
-    # connections currently in use will not be disconnected. Options:
-    # * :servers - Should be a symbol specifing the server to disconnect from,
-    #   or an array of symbols to specify multiple servers.
-    def disconnect(opts = {})
-      pool.disconnect(opts)
-    end
-
-    # Yield a new database object for every server in the connection pool.
-    # Intended for use in sharded environments where there is a need to make schema
-    # modifications (DDL queries) on each shard.
-    #
-    #   DB.each_server{|db| db.create_table(:users){primary_key :id; String :name}}
-    def each_server(&block)
-      servers.each{|s| self.class.connect(server_opts(s), &block)}
-    end
-
-    # Executes the given SQL on the database. This method should be overridden in descendants.
-    # This method should not be called directly by user code.
-    def execute(sql, opts={})
-      raise NotImplementedError, "#execute should be overridden by adapters"
-    end
-    
-    # Method that should be used when submitting any DDL (Data Definition
-    # Language) SQL.  By default, calls execute_dui.
-    # This method should not be called directly by user code.
-    def execute_ddl(sql, opts={}, &block)
-      execute_dui(sql, opts, &block)
-    end
-
-    # Method that should be used when issuing a DELETE, UPDATE, or INSERT
-    # statement.  By default, calls execute.
-    # This method should not be called directly by user code.
-    def execute_dui(sql, opts={}, &block)
-      execute(sql, opts, &block)
-    end
-
-    # Method that should be used when issuing a INSERT
-    # statement.  By default, calls execute_dui.
-    # This method should not be called directly by user code.
-    def execute_insert(sql, opts={}, &block)
-      execute_dui(sql, opts, &block)
-    end
-
-    # Fetches records for an arbitrary SQL statement. If a block is given,
-    # it is used to iterate over the records:
-    #
-    #   DB.fetch('SELECT * FROM items'){|r| p r}
-    #
-    # The method returns a dataset instance:
-    #
-    #   DB.fetch('SELECT * FROM items').all
-    #
-    # Fetch can also perform parameterized queries for protection against SQL
-    # injection:
-    #
-    #   DB.fetch('SELECT * FROM items WHERE name = ?', my_name).all
-    def fetch(sql, *args, &block)
-      ds = dataset.with_sql(sql, *args)
-      ds.each(&block) if block
-      ds
-    end
-    
-    # Returns a new dataset with the from method invoked. If a block is given,
-    # it is used as a filter on the dataset.
-    def from(*args, &block)
-      ds = dataset.from(*args)
-      block ? ds.filter(&block) : ds
-    end
-    
-    # Returns a single value from the database, e.g.:
-    #
-    #   # SELECT 1
-    #   DB.get(1) #=> 1 
-    #
-    #   # SELECT version()
-    #   DB.get(:version.sql_function) #=> ...
-    def get(*args, &block)
-      dataset.get(*args, &block)
-    end
-    
-    # The method to call on identifiers going into the database
-    def identifier_input_method
-      case @identifier_input_method
-      when nil
-        @identifier_input_method = @opts.fetch(:identifier_input_method, (@@identifier_input_method.nil? ? identifier_input_method_default : @@identifier_input_method))
-        @identifier_input_method == "" ? nil : @identifier_input_method
-      when ""
-        nil
-      else
-        @identifier_input_method
-      end
-    end
-    
-    # Set the method to call on identifiers going into the database
-    def identifier_input_method=(v)
-      reset_schema_utility_dataset
-      @identifier_input_method = v || ""
-    end
-    
-    # The method to call on identifiers coming from the database
-    def identifier_output_method
-      case @identifier_output_method
-      when nil
-        @identifier_output_method = @opts.fetch(:identifier_output_method, (@@identifier_output_method.nil? ? identifier_output_method_default : @@identifier_output_method))
-        @identifier_output_method == "" ? nil : @identifier_output_method
-      when ""
-        nil
-      else
-        @identifier_output_method
-      end
-    end
-    
-    # Set the method to call on identifiers coming from the database
-    def identifier_output_method=(v)
-      reset_schema_utility_dataset
-      @identifier_output_method = v || ""
-    end
-    
-    # Returns a string representation of the database object including the
-    # class name and the connection URI (or the opts if the URI
-    # cannot be constructed).
-    def inspect
-      "#<#{self.class}: #{(uri rescue opts).inspect}>" 
-    end
-
-    # Proxy the literal call to the dataset, used for default values.
-    def literal(v)
-      schema_utility_dataset.literal(v)
-    end
-
-    # Log a message at level info to all loggers.
-    def log_info(message, args=nil)
-      log_each(:info, args ? "#{message}; #{args.inspect}" : message)
-    end
-
-    # Yield to the block, logging any errors at error level to all loggers,
-    # and all other queries with the duration at warn or info level.
-    def log_yield(sql, args=nil)
-      return yield if @loggers.empty?
-      sql = "#{sql}; #{args.inspect}" if args
-      start = Time.now
-      begin
-        yield
-      rescue => e
-        log_each(:error, "#{e.class}: #{e.message.strip}: #{sql}")
-        raise
-      ensure
-        log_duration(Time.now - start, sql) unless e
-      end
-    end
-
-    # Remove any existing loggers and just use the given logger.
-    def logger=(logger)
-      @loggers = Array(logger)
-    end
-
-    # Whether to quote identifiers (columns and tables) for this database
-    def quote_identifiers=(v)
-      reset_schema_utility_dataset
-      @quote_identifiers = v
-    end
-    
-    # Returns true if the database quotes identifiers.
-    def quote_identifiers?
-      return @quote_identifiers unless @quote_identifiers.nil?
-      @quote_identifiers = @opts.fetch(:quote_identifiers, (@@quote_identifiers.nil? ? quote_identifiers_default : @@quote_identifiers))
-    end
-    
-    # Dynamically remove existing servers from the connection pool. Intended for
-    # use with master/slave or shard configurations where it is useful to remove
-    # existing server hosts at runtime.
-    #
-    # servers should be symbols or arrays of symbols.  If a nonexistent server
-    # is specified, it is ignored.  If no servers have been specified for
-    # this database, no changes are made. If you attempt to remove the :default server,
-    # an error will be raised.
-    #
-    #   DB.remove_servers(:f1, :f2)
-    def remove_servers(*servers)
-      if @opts[:servers] && !@opts[:servers].empty?
-        servs = @opts[:servers].dup
-        servers.flatten!
-        servers.each{|s| servs.delete(s)}
-        @opts[:servers] = servs
-        @pool.remove_servers(servers)
-      end
-    end
-    
-    # Runs the supplied SQL statement string on the database server. Returns nil.
-    # Options:
-    # * :server - The server to run the SQL on.
-    def run(sql, opts={})
-      execute_ddl(sql, opts)
-      nil
-    end
-    
-    # Parse the schema from the database.
-    # Returns the schema for the given table as an array with all members being arrays of length 2,
-    # the first member being the column name, and the second member being a hash of column information.
-    # Available options are:
-    #
-    # * :reload - Get fresh information from the database, instead of using
-    #   cached information.  If table_name is blank, :reload should be used
-    #   unless you are sure that schema has not been called before with a
-    #   table_name, otherwise you may only getting the schemas for tables
-    #   that have been requested explicitly.
-    # * :schema - An explicit schema to use.  It may also be implicitly provided
-    #   via the table name.
-    def schema(table, opts={})
-      raise(Error, 'schema parsing is not implemented on this database') unless respond_to?(:schema_parse_table, true)
-
-      sch, table_name = schema_and_table(table)
-      quoted_name = quote_schema_table(table)
-      opts = opts.merge(:schema=>sch) if sch && !opts.include?(:schema)
-
-      @schemas.delete(quoted_name) if opts[:reload]
-      return @schemas[quoted_name] if @schemas[quoted_name]
-
-      cols = schema_parse_table(table_name, opts)
-      raise(Error, 'schema parsing returned no columns, table probably doesn\'t exist') if cols.nil? || cols.empty?
-      cols.each{|_,c| c[:ruby_default] = column_schema_to_ruby_default(c[:default], c[:type])}
-      @schemas[quoted_name] = cols
-    end
-
-    # Returns a new dataset with the select method invoked.
-    def select(*args, &block)
-      dataset.select(*args, &block)
-    end
-
-    # An array of servers/shards for this Database object.
-    def servers
-      pool.servers
-    end
-
-    # Returns true if the database is using a single-threaded connection pool.
-    def single_threaded?
-      @single_threaded
-    end
-    
-    # Acquires a database connection, yielding it to the passed block.
-    def synchronize(server=nil, &block)
-      @pool.hold(server || :default, &block)
-    end
-    
-    # Whether the database and adapter support savepoints, false by default
-    def supports_savepoints?
-      false
-    end
-
-    # Returns true if a table with the given name exists.  This requires a query
-    # to the database.
-    def table_exists?(name)
-      begin 
-        from(name).first
-        true
-      rescue
-        false
-      end
-    end
-    
-    # Attempts to acquire a database connection.  Returns true if successful.
-    # Will probably raise an error if unsuccessful.
-    def test_connection(server=nil)
-      synchronize(server){|conn|}
-      true
-    end
-
-    # Starts a database transaction.  When a database transaction is used,
-    # either all statements are successful or none of the statements are
-    # successful.  Note that MySQL MyISAM tabels do not support transactions.
-    #
-    # The following options are respected:
-    #
-    # * :server  - The server to use for the transaction
-    # * :savepoint - Whether to create a new savepoint for this transaction,
-    #   only respected if the database adapter supports savepoints.  By
-    #   default Sequel will reuse an existing transaction, so if you want to
-    #   use a savepoint you must use this option.
-    def transaction(opts={}, &block)
-      synchronize(opts[:server]) do |conn|
-        return yield(conn) if already_in_transaction?(conn, opts)
-        _transaction(conn, &block)
-      end
-    end
-    
-    # Typecast the value to the given column_type. Calls
-    # typecast_value_#{column_type} if the method exists,
-    # otherwise returns the value.
-    # This method should raise Sequel::InvalidValue if assigned value
-    # is invalid.
-    def typecast_value(column_type, value)
-      return nil if value.nil?
-      meth = "typecast_value_#{column_type}"
-      begin
-        respond_to?(meth, true) ? send(meth, value) : value
-      rescue ArgumentError, TypeError => e
-        raise Sequel.convert_exception_class(e, InvalidValue)
-      end
-    end
-    
-    # Returns the URI identifying the database.
-    # This method can raise an error if the database used options
-    # instead of a connection string.
-    def uri
-      uri = URI::Generic.new(
-        self.class.adapter_scheme.to_s,
-        nil,
-        @opts[:host],
-        @opts[:port],
-        nil,
-        "/#{@opts[:database]}",
-        nil,
-        nil,
-        nil
-      )
-      uri.user = @opts[:user]
-      uri.password = @opts[:password] if uri.user
-      uri.to_s
-    end
-    
-    # Explicit alias of uri for easier subclassing.
-    def url
-      uri
-    end
-    
-    private
-    
-    # Internal generic transaction method.  Any exception raised by the given
-    # block will cause the transaction to be rolled back.  If the exception is
-    # not Sequel::Rollback, the error will be reraised. If no exception occurs
-    # inside the block, the transaction is commited.
-    def _transaction(conn)
-      begin
-        add_transaction
-        t = begin_transaction(conn)
-        yield(conn)
-      rescue Exception => e
-        rollback_transaction(t) if t
-        transaction_error(e)
-      ensure
-        begin
-          commit_transaction(t) unless e
-        rescue Exception => e
-          raise_error(e, :classes=>database_error_classes)
-        ensure
-          remove_transaction(t)
-        end
-      end
-    end
-    
-    # Add the current thread to the list of active transactions
-    def add_transaction
-      th = Thread.current
-      if supports_savepoints?
-        unless @transactions.include?(th)
-          th[:sequel_transaction_depth] = 0
-          @transactions << th
-        end
-      else
-        @transactions << th
-      end
-    end    
-
-    # Whether the current thread/connection is already inside a transaction
-    def already_in_transaction?(conn, opts)
-      @transactions.include?(Thread.current) && (!supports_savepoints? || !opts[:savepoint])
-    end
-    
-    # SQL to start a new savepoint
-    def begin_savepoint_sql(depth)
-      SQL_SAVEPOINT % depth
-    end
-
-    # Start a new database transaction on the given connection.
-    def begin_transaction(conn)
-      if supports_savepoints?
-        th = Thread.current
-        depth = th[:sequel_transaction_depth]
-        conn = transaction_statement_object(conn) if respond_to?(:transaction_statement_object, true)
-        log_connection_execute(conn, depth > 0 ? begin_savepoint_sql(depth) : begin_transaction_sql)
-        th[:sequel_transaction_depth] += 1
-      else
-        log_connection_execute(conn, begin_transaction_sql)
-      end
-      conn
-    end
-    
-    # SQL to BEGIN a transaction.
-    def begin_transaction_sql
-      SQL_BEGIN
-    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
-    # true to empty?
-    def blank_object?(obj)
-      return obj.blank? if obj.respond_to?(:blank?)
-      case obj
-      when NilClass, FalseClass
-        true
-      when Numeric, TrueClass
-        false
-      when String
-        obj.strip.empty?
-      else
-        obj.respond_to?(:empty?) ? obj.empty? : false
-      end
-    end
-    
-    # Convert the given default, which should be a database specific string, into
-    # a ruby object.
-    def column_schema_to_ruby_default(default, type)
-      return if default.nil?
-      orig_default = default
-      if database_type == :postgres and m = POSTGRES_DEFAULT_RE.match(default)
-        default = m[1] || m[2]
-      end
-      if database_type == :mssql and m = MSSQL_DEFAULT_RE.match(default)
-        default = m[1] || m[2]
-      end
-      if [:string, :blob, :date, :datetime, :time, :enum].include?(type)
-        if database_type == :mysql
-          return if [:date, :datetime, :time].include?(type) && MYSQL_TIMESTAMP_RE.match(default)
-          orig_default = default = "'#{default.gsub("'", "''").gsub('\\', '\\\\')}'"
-        end
-        return unless m = STRING_DEFAULT_RE.match(default)
-        default = m[1].gsub("''", "'")
-      end
-      res = begin
-        case type
-        when :boolean
-          case default 
-          when /[f0]/i
-            false
-          when /[t1]/i
-            true
-          end
-        when :string, :enum
-          default
-        when :blob
-          Sequel::SQL::Blob.new(default)
-        when :integer
-          Integer(default)
-        when :float
-          Float(default)
-        when :date
-          Sequel.string_to_date(default)
-        when :datetime
-          DateTime.parse(default)
-        when :time
-          Sequel.string_to_time(default)
-        when :decimal
-          BigDecimal.new(default)
-        end
-      rescue
-        nil
-      end
-    end
-   
-    # SQL to commit a savepoint
-    def commit_savepoint_sql(depth)
-      SQL_RELEASE_SAVEPOINT % depth
-    end
-
-    # Commit the active transaction on the connection
-    def commit_transaction(conn)
-      if supports_savepoints?
-        depth = Thread.current[:sequel_transaction_depth]
-        log_connection_execute(conn, depth > 1 ? commit_savepoint_sql(depth-1) : commit_transaction_sql)
-      else
-        log_connection_execute(conn, commit_transaction_sql)
-      end
-    end
-
-    # SQL to COMMIT a transaction.
-    def commit_transaction_sql
-      SQL_COMMIT
-    end
-    
-    # Method called on the connection object to execute SQL on the database,
-    # used by the transaction code.
-    def connection_execute_method
-      :execute
-    end
-
-    # The default options for the connection pool.
-    def connection_pool_default_options
-      {}
-    end
-    
-    # Which transaction errors to translate, blank by default.
-    def database_error_classes
-      []
-    end
-    
-    # The default value for default_schema.
-    def default_schema_default
-      nil
-    end
-
-    # The method to apply to identifiers going into the database by default.
-    # Should be overridden in subclasses for databases that fold unquoted
-    # identifiers to lower case instead of uppercase, such as
-    # MySQL, PostgreSQL, and SQLite.
-    def identifier_input_method_default
-      :upcase
-    end
-    
-    # The method to apply to identifiers coming the database by default.
-    # Should be overridden in subclasses for databases that fold unquoted
-    # identifiers to lower case instead of uppercase, such as
-    # MySQL, PostgreSQL, and SQLite.
-    def identifier_output_method_default
-      :downcase
-    end
-    
-    # Return a Method object for the dataset's output_identifier_method.
-    # Used in metadata parsing to make sure the returned information is in the
-    # correct format.
-    def input_identifier_meth
-      dataset.method(:input_identifier)
-    end
-    
-    # Log the given SQL and then execute it on the connection, used by
-    # the transaction code.
-    def log_connection_execute(conn, sql)
-      log_yield(sql){conn.send(connection_execute_method, sql)}
-    end
-
-    # Log message with message prefixed by duration at info level, or
-    # warn level if duration is greater than log_warn_duration.
-    def log_duration(duration, message)
-      log_each((lwd = log_warn_duration and duration >= lwd) ? :warn : :info, "(#{sprintf('%0.6fs', duration)}) #{message}")
-    end
-
-    # Log message at level (which should be :error, :warn, or :info)
-    # to all loggers.
-    def log_each(level, message)
-      @loggers.each{|logger| logger.send(level, message)}
-    end
-
-    # Return a dataset that uses the default identifier input and output methods
-    # for this database.  Used when parsing metadata so that column symbols are
-    # returned as expected.
-    def metadata_dataset
-      return @metadata_dataset if @metadata_dataset
-      ds = dataset
-      ds.identifier_input_method = identifier_input_method_default
-      ds.identifier_output_method = identifier_output_method_default
-      @metadata_dataset = ds
-    end
-
-    # Return a Method object for the dataset's output_identifier_method.
-    # Used in metadata parsing to make sure the returned information is in the
-    # correct format.
-    def output_identifier_meth
-      dataset.method(:output_identifier)
-    end
-
-    # Whether to quote identifiers by default for this database, true
-    # by default.
-    def quote_identifiers_default
-      true
-    end
-
-    # SQL to ROLLBACK a transaction.
-    def rollback_transaction_sql
-      SQL_ROLLBACK
-    end
-    
-    # Convert the given exception to a DatabaseError, keeping message
-    # and traceback.
-    def raise_error(exception, opts={})
-      if !opts[:classes] || Array(opts[:classes]).any?{|c| exception.is_a?(c)}
-        raise Sequel.convert_exception_class(exception, opts[:disconnect] ? DatabaseDisconnectError : DatabaseError)
-      else
-        raise exception
-      end
-    end
-    
-    # Remove the cached schema for the given schema name
-    def remove_cached_schema(table)
-      @schemas.delete(quote_schema_table(table)) if @schemas
-    end
-    
-    # Remove the current thread from the list of active transactions
-    def remove_transaction(conn)
-      th = Thread.current
-      @transactions.delete(th) if !supports_savepoints? || ((th[:sequel_transaction_depth] -= 1) <= 0)
-    end
-
-    # Remove the cached schema_utility_dataset, because the identifier
-    # quoting has changed.
-    def reset_schema_utility_dataset
-      @schema_utility_dataset = nil
-    end
-    
-    # SQL to rollback to a savepoint
-    def rollback_savepoint_sql(depth)
-      SQL_ROLLBACK_TO_SAVEPOINT % depth
-    end
-
-    # Rollback the active transaction on the connection
-    def rollback_transaction(conn)
-      if supports_savepoints?
-        depth = Thread.current[:sequel_transaction_depth]
-        log_connection_execute(conn, depth > 1 ? rollback_savepoint_sql(depth-1) : rollback_transaction_sql)
-      else
-        log_connection_execute(conn, rollback_transaction_sql)
-      end
-    end
-
-    # Split the schema information from the table
-    def schema_and_table(table_name)
-      schema_utility_dataset.schema_and_table(table_name)
-    end
-
-    # Return true if the given column schema represents an autoincrementing primary key.
-    def schema_autoincrementing_primary_key?(schema)
-      !!schema[:primary_key]
-    end
-
-    # Match the database's column type to a ruby type via a
-    # regular expression.  The following ruby types are supported:
-    # integer, string, date, datetime, boolean, and float.
-    def schema_column_type(db_type)
-      case db_type
-      when /\Ainterval\z/io
-        :interval
-      when /\A(character( varying)?|n?(var)?char|n?text)/io
-        :string
-      when /\A(int(eger)?|(big|small|tiny)int)/io
-        :integer
-      when /\Adate\z/io
-        :date
-      when /\A((small)?datetime|timestamp( with(out)? time zone)?)\z/io
-        :datetime
-      when /\Atime( with(out)? time zone)?\z/io
-        :time
-      when /\A(boolean|bit)\z/io
-        :boolean
-      when /\A(real|float|double( precision)?)\z/io
-        :float
-      when /\A(?:(?:(?:num(?:ber|eric)?|decimal)(?:\(\d+,\s*(\d+)\))?)|(?:small)?money)\z/io
-        $1 && $1 == '0' ? :integer : :decimal
-      when /bytea|blob|image|(var)?binary/io
-        :blob
-      when /\Aenum/io
-        :enum
-      end
-    end
-
-    # The dataset to use for proxying certain schema methods.
-    def schema_utility_dataset
-      @schema_utility_dataset ||= dataset
-    end
-
-    # Return the options for the given server by merging the generic
-    # options for all server with the specific options for the given
-    # server specified in the :servers option.
-    def server_opts(server)
-      opts = if @opts[:servers] && server_options = @opts[:servers][server]
-        case server_options
-        when Hash
-          @opts.merge(server_options)
-        when Proc
-          @opts.merge(server_options.call(self))
-        else
-          raise Error, 'Server opts should be a hash or proc'
-        end
-      else
-        @opts.dup
-      end
-      opts.delete(:servers)
-      opts
-    end
-    
-    # Raise a database error unless the exception is an Rollback.
-    def transaction_error(e)
-      raise_error(e, :classes=>database_error_classes) unless e.is_a?(Rollback)
-    end
-
-    # Typecast the value to an SQL::Blob
-    def typecast_value_blob(value)
-      value.is_a?(Sequel::SQL::Blob) ? value : Sequel::SQL::Blob.new(value)
-    end
-
-    # Typecast the value to true, false, or nil
-    def typecast_value_boolean(value)
-      case value
-      when false, 0, "0", /\Af(alse)?\z/i
-        false
-      else
-        blank_object?(value) ? nil : true
-      end
-    end
-
-    # Typecast the value to a Date
-    def typecast_value_date(value)
-      case value
-      when Date
-        value
-      when DateTime, Time
-        Date.new(value.year, value.month, value.day)
-      when String
-        Sequel.string_to_date(value)
-      when Hash
-        Date.new(*[:year, :month, :day].map{|x| (value[x] || value[x.to_s]).to_i})
-      else
-        raise InvalidValue, "invalid value for Date: #{value.inspect}"
-      end
-    end
-
-    # Typecast the value to a DateTime or Time depending on Sequel.datetime_class
-    def typecast_value_datetime(value)
-      raise(Sequel::InvalidValue, "invalid value for Datetime: #{value.inspect}") unless [DateTime, Date, Time, String, Hash].any?{|c| value.is_a?(c)}
-      klass = Sequel.datetime_class
-      if value.is_a?(Hash)
-        klass.send(klass == Time ? :mktime : :new, *[:year, :month, :day, :hour, :minute, :second].map{|x| (value[x] || value[x.to_s]).to_i})
-      else
-        Sequel.typecast_to_application_timestamp(value)
-      end
-    end
-
-    # Typecast the value to a BigDecimal
-    def typecast_value_decimal(value)
-      case value
-      when BigDecimal
-        value
-      when String, Numeric
-        BigDecimal.new(value.to_s)
-      else
-        raise InvalidValue, "invalid value for BigDecimal: #{value.inspect}"
-      end
-    end
-
-    # Typecast the value to a Float
-    def typecast_value_float(value)
-      Float(value)
-    end
-
-    # Typecast the value to an Integer
-    def typecast_value_integer(value)
-      Integer(value)
-    end
-
-    # Typecast the value to a String
-    def typecast_value_string(value)
-      value.to_s
-    end
-
-    # Typecast the value to a Time
-    def typecast_value_time(value)
-      case value
-      when Time
-        value
-      when String
-        Sequel.string_to_time(value)
-      when Hash
-        t = Time.now
-        Time.mktime(t.year, t.month, t.day, *[:hour, :minute, :second].map{|x| (value[x] || value[x.to_s]).to_i})
-      else
-        raise Sequel::InvalidValue, "invalid value for Time: #{value.inspect}"
-      end
-    end
   end
+
+  require(%w"connecting dataset dataset_defaults logging misc query schema_generator schema_methods", 'database')
 end