sequel-rails 1.0.1 → 1.2.0

data/History.md

@@ -1,3 +1,43 @@
+1.2.0 (2022-04-15)
+==================
+
+* Migrate CI to Github actions (Jonathan Tron)
+* Add a new sequel-rails hook: `after_new_connection` which
+  sets `Sequel`'s `after_connect`, and is triggered for every
+  new connection (@kamilpavlicko)
+  [#186](https://github.com/TalentBox/sequel-rails/pull/186)
+* Database drop fix for Sequel (>= 5.38.0) (@AnotherRegularDude)
+  [#184](https://github.com/TalentBox/sequel-rails/pull/184)
+* Fix for simplified Spring integration (Janko Marohnić, Adrián Mugnolo)
+  [#181](https://github.com/TalentBox/sequel-rails/pull/181)
+* Simplify Spring integration (Janko Marohnić)
+  [#180](https://github.com/TalentBox/sequel-rails/pull/180)
+
+1.1.1 (2020-06-08)
+==================
+
+* When using SQL schema dump in MySQL, don't output the generation date in order
+  to have the same output if nothing changed. (Joseph Halter)
+* Fix readme formatting (Ben Koshy)
+  [#175](https://github.com/TalentBox/sequel-rails/pull/175)
+* Add frozen_string_literal to migration template (Semyon Pupkov)
+  [#174](https://github.com/TalentBox/sequel-rails/pull/174)
+* Add allow_missing_migration_files option (Semyon Pupkov)
+  [#172](https://github.com/TalentBox/sequel-rails/pull/172)
+  [#173](https://github.com/TalentBox/sequel-rails/pull/173)
+
+1.1.0 (2019-10-29)
+==================
+
+* Add test_connect option (p-leger)
+  [#165](https://github.com/TalentBox/sequel-rails/pull/165)
+* Silence logger for sessions store (Michael Coyne)
+  [#171](https://github.com/TalentBox/sequel-rails/pull/171)
+* Add db:sessions:clear and db:sessions:trim rake tasks (Michael Coyne)
+  [#170](https://github.com/TalentBox/sequel-rails/pull/170)
+* Allow 'servers' to propagate to Sequel connection (Dustin Byrne)
+  [#169](https://github.com/TalentBox/sequel-rails/pull/169)
+
 1.0.1 (2018-02-27)
 ==================
 

data/README.md

@@ -1,16 +1,15 @@
 # sequel-rails
 
 [![Gem Version](https://badge.fury.io/rb/sequel-rails.svg)][gem]
-[![Build Status](https://secure.travis-ci.org/TalentBox/sequel-rails.svg?branch=master)][travis]
+![Build Status](https://github.com/TalentBox/sequel-rails/actions/workflows/ci.yml/badge.svg)
 [![Code Climate](https://codeclimate.com/github/TalentBox/sequel-rails.svg)][codeclimate]
 
 [gem]: https://rubygems.org/gems/sequel-rails
-[travis]: http://travis-ci.org/TalentBox/sequel-rails
 [codeclimate]: https://codeclimate.com/github/TalentBox/sequel-rails
 
 This gem provides the railtie that allows
 [sequel](http://github.com/jeremyevans/sequel) to hook into
-[Rails (4.x and 5.x)](http://github.com/rails/rails) and thus behave like a
+[Rails (5.2.x, 6.x, 7.x)](http://github.com/rails/rails) and thus behave like a
 rails framework component. Just like activerecord does in rails,
 [sequel-rails](http://github.com/talentbox/sequel-rails) uses the railtie API to
 hook into rails. The two are actually hooked into rails almost identically.
@@ -28,7 +27,7 @@ Since January 2013, we've become the official maintainers of the gem after
 Using sequel-rails
 ==================
 
-Using sequel with Rails (4.x or 5.x) requires a couple minor changes.
+Using sequel with Rails (5.2.x, 6.x, 7.x) requires a couple minor changes.
 
 First, add the following to your Gemfile (after the `Rails` lines):
 
@@ -166,6 +165,9 @@ You can configure some options with the usual rails mechanism, in
     # Allowed options: :sql, :ruby.
     config.sequel.schema_format = :sql
 
+    # Allowed options: true, false, default false
+    config.sequel.allow_missing_migration_files = true
+
     # Whether to dump the schema after successful migrations.
     # Defaults to false in production and test, true otherwise.
     config.sequel.schema_dump = true
@@ -188,6 +190,21 @@ You can configure some options with the usual rails mechanism, in
     # This setting disabled the automatic connect after Rails init
     config.sequel.skip_connect = true
 
+    # Configure if Sequel should try to 'test' the database connection in order
+    # to fail early
+    config.sequel.test_connect = true
+
+    # Configure what should happend after SequelRails will create new connection with Sequel (applicable only for the first new connection)
+    # config.sequel.after_connect = proc do
+    #   Sequel::Model.plugin :timestamps, update_on_create: true
+    # end
+
+    # Configure what should happend after new connection in connection pool is created (applicable only for all connections)
+    # to fail early
+    # config.sequel.after_new_connection = proc do |db|
+    #   db.execute('SET statement_timeout = 30000;')
+    # end
+
     # If you want to use a specific logger
     config.sequel.logger = MyLogger.new($stdout)
 ```
@@ -246,11 +263,30 @@ Here's some examples:
 
   For in memory testing:
 
-    ```yaml
-    development:
+```yaml
+     development:
       adapter: sqlite # Also accept sqlite3
       database: ":memory:"
-    ```
+```
+
+after_connect hooks
+================
+
+There are 2 options how to set after_connect hooks in `config/application.rb`
+
+  1. `config.sequel.after_connect` will be called only on the first new connection. It can be used for enabling plugins or to set some global sequel settings.
+  ```ruby
+    config.sequel.after_connect = proc do
+      Sequel::Model.plugin :timestamps, update_on_create: true
+    end
+  ```
+
+  2. `config.sequel.after_new_connection` will be called after every new connection in connection pool is created. It can be used to run some specific `SET` commands on every new connection. It's using default `after_connect` hook in sequel. https://sequel.jeremyevans.net/rdoc/classes/Sequel/ConnectionPool.html#attribute-i-after_connect
+   ```ruby
+    config.sequel.after_new_connection = proc do |db|
+      db.execute('SET statement_timeout = 30000;')
+    end
+  ```
 
 Enabling plugins
 ================
@@ -333,6 +369,8 @@ rake db:schema:load                   # Load a schema.rb file into the database
 rake db:seed                          # Load the seed data from db/seeds.rb
 rake db:setup                         # Create the database, load the schema, and initialize with the seed data
 rake db:test:prepare                  # Prepare test database (ensure all migrations ran, drop and re-create database then load schema). This task can be run in the same invocation as other task (eg: rake db:migrate db:test:prepare).
+rake db:sessions:clear                # Delete all sessions from the database
+rake db:sessions:trim[threshold]      # Delete all sessions older than `threshold` days (default to 30 days, eg: rake db:session:trim[10])
 ```
 
 Note on Patches/Pull Requests
@@ -349,15 +387,15 @@ Note on Patches/Pull Requests
 The sequel-rails team
 =====================
 
-* Jonathan Tron (JonathanTron) - Current maintainer
-* Joseph Halter (JosephHalter) - Current maintainer
+* Jonathan Tron (@JonathanTron) - Current maintainer
+* Joseph Halter (@JosephHalter) - Current maintainer
 
 Previous maintainer
 ===================
 
 [Original project](https://github.com/brasten/sequel-rails):
 
-* Brasten Sager (brasten) - Project creator
+* Brasten Sager (@brasten) - Project creator
 
 Contributors
 ============
@@ -403,6 +441,15 @@ Improvements have been made by those awesome contributors:
 * ckoenig (@ckoenig)
 * Rolf Timmermans (@rolftimmermans)
 * Olivier Lacan (@olivierlacan)
+* Dustin Byrne (@dsbyrne)
+* Michael Coyne (@mjc-gh)
+* p-leger (@p-leger)
+* Semyon Pupkov (@artofhuman)
+* Ben Koshy (@BKSpurgeon)
+* Janko Marohnić (@janko)
+* Adrián Mugnolo (@xymbol)
+* Ivan (@AnotherRegularDude)
+* kamilpavlicko (@kamilpavlicko)
 
 Credits
 =======
@@ -412,4 +459,4 @@ The [dm-rails](http://github.com/datamapper/dm-rails) team wrote most of the ori
 Copyright
 =========
 
-Copyright (c) 2010-2013 The sequel-rails team. See [LICENSE](http://github.com/brasten/sequel-rails/blob/master/LICENSE) for details.
+Copyright (c) 2010-2022 The sequel-rails team. See [LICENSE](http://github.com/brasten/sequel-rails/blob/master/LICENSE) for details.

data/Rakefile

@@ -19,6 +19,7 @@ begin
       %w(
         TEST_ADAPTER
         TEST_DATABASE
+        TEST_DATABASE_HOST
         TEST_OWNER
         TEST_USERNAME
         TEST_PASSWORD
@@ -33,10 +34,6 @@ begin
       'sqlite3'    => { 'TEST_DATABASE' => File.join(File.expand_path('.'), 'spec/internal/db/database.sqlite3') },
     }
 
-    configs.merge!(
-      'mysql' => { 'TEST_ENCODING' => 'utf8', 'TEST_USERNAME' => 'root' }
-    ) if RUBY_VERSION < '2.4'
-
     configs.merge!(
       'mysql2' => { 'TEST_ENCODING' => 'utf8', 'TEST_USERNAME' => 'root', 'TEST_DATABASE' => 'sequel_rails_test_mysql2' }
     ) unless SequelRails.jruby?

data/ci/{rails-5.0.gemfile → rails-5.2.gemfile}

@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'railties', '~> 5.0.6'
-gem 'activemodel', '~> 5.0.6'
+gem 'railties', '~> 5.2.2'
+gem 'activemodel', '~> 5.2.2'
+gem 'actionpack', '~> 5.2.2'
 
 gemspec :path => '../'
 
@@ -9,12 +10,11 @@ gem 'sequel', "#{ENV['SEQUEL']}"
 
 gem 'fakefs', '0.11.2', :require => 'fakefs/safe'
 
+gem 'rspec-rails', '~> 5.0'
+
 # MRI/Rubinius Adapter Dependencies
 platform :ruby do
   gem 'pg'
-  if RUBY_VERSION < '2.4'
-    gem 'mysql'
-  end
   gem 'mysql2'
   gem 'sqlite3'
 end

data/ci/{rails-4.0.gemfile → rails-6.0.gemfile}

@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'railties', '~> 4.0.13'
+gem 'railties', '~> 6.0.0'
+gem 'activemodel', '~> 6.0.0'
+gem 'actionpack', '~> 6.0.0'
 
 gemspec :path => '../'
 
@@ -8,12 +10,11 @@ gem 'sequel', "#{ENV['SEQUEL']}"
 
 gem 'fakefs', '0.11.2', :require => 'fakefs/safe'
 
+gem 'rspec-rails', '~> 5.0'
+
 # MRI/Rubinius Adapter Dependencies
 platform :ruby do
   gem 'pg'
-  if RUBY_VERSION < '2.4'
-    gem 'mysql'
-  end
   gem 'mysql2'
   gem 'sqlite3'
 end

data/ci/{rails-4.1.gemfile → rails-6.1.gemfile}

@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'railties', '~> 4.1.16'
+gem 'railties', '~> 6.1.0'
+gem 'activemodel', '~> 6.1.0'
+gem 'actionpack', '~> 6.1.0'
 
 gemspec :path => '../'
 
@@ -8,12 +10,11 @@ gem 'sequel', "#{ENV['SEQUEL']}"
 
 gem 'fakefs', '0.11.2', :require => 'fakefs/safe'
 
+gem 'rspec-rails', '~> 5.0'
+
 # MRI/Rubinius Adapter Dependencies
 platform :ruby do
   gem 'pg'
-  if RUBY_VERSION < '2.4'
-    gem 'mysql'
-  end
   gem 'mysql2'
   gem 'sqlite3'
 end

data/ci/{rails-4.2.gemfile → rails-7.0.gemfile}

@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'railties', '~> 4.2.10'
+gem 'railties', '~> 7.0.0'
+gem 'activemodel', '~> 7.0.0'
+gem 'actionpack', '~> 7.0.0'
 
 gemspec :path => '../'
 
@@ -8,12 +10,11 @@ gem 'sequel', "#{ENV['SEQUEL']}"
 
 gem 'fakefs', '0.11.2', :require => 'fakefs/safe'
 
+gem 'rspec-rails', '~> 5.0'
+
 # MRI/Rubinius Adapter Dependencies
 platform :ruby do
   gem 'pg'
-  if RUBY_VERSION < '2.4'
-    gem 'mysql'
-  end
   gem 'mysql2'
   gem 'sqlite3'
 end

data/lib/action_dispatch/middleware/session/sequel_store.rb

@@ -26,13 +26,17 @@ module ActionDispatch
       end
 
       def get_session(env, sid)
-        session = load_from_store(sid)
-        env[SESSION_RECORD_KEY] = session
-        [session.session_id, session.data]
+        with_silenced_logger do
+          session = load_from_store(sid)
+          env[SESSION_RECORD_KEY] = session
+          [session.session_id, session.data]
+        end
       end
 
       def write_session(req, sid, session_data, options)
-        set_session(req.env, sid, session_data, options)
+        with_silenced_logger do
+          set_session(req.env, sid, session_data, options)
+        end
       end
 
       def set_session(env, sid, session_data, options)
@@ -42,7 +46,9 @@ module ActionDispatch
       end
 
       def delete_session(req, sid, options)
-        destroy_session(req.env, sid, options)
+        with_silenced_logger do
+          destroy_session(req.env, sid, options)
+        end
       end
 
       def destroy_session(env, sid, options)
@@ -53,10 +59,12 @@ module ActionDispatch
       end
 
       def get_session_model(env, sid)
-        if env[ENV_SESSION_OPTIONS_KEY][:id].nil?
-          env[SESSION_RECORD_KEY] = load_from_store(sid)
-        else
-          env[SESSION_RECORD_KEY] ||= load_from_store(sid)
+        with_silenced_logger do
+          if env[ENV_SESSION_OPTIONS_KEY][:id].nil?
+            env[SESSION_RECORD_KEY] = load_from_store(sid)
+          else
+            env[SESSION_RECORD_KEY] ||= load_from_store(sid)
+          end
         end
       end
 
@@ -65,6 +73,10 @@ module ActionDispatch
         klass.where(:session_id => sid).first ||
           klass.new(:session_id => generate_sid, :data => {})
       end
+
+      def with_silenced_logger
+        Rails.application.config.sequel.logger.silence { yield }
+      end
     end
   end
 end

data/lib/generators/sequel/migration/migration_generator.rb

@@ -61,7 +61,7 @@ module Sequel
       end
 
       def validate_file_name!
-        raise IllegalMigrationNameError file_name unless file_name =~ /^[_a-z0-9]+$/
+        raise IllegalMigrationNameError.new(file_name) unless file_name =~ /^[_a-z0-9]+$/
       end
     end
   end

data/lib/generators/sequel/migration/templates/migration.rb.erb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Sequel.migration do
   <%- if use_change -%>
   change do

data/lib/generators/sequel/session_migration/session_migration_generator.rb

@@ -23,7 +23,7 @@ module Sequel
       end
 
       def validate_file_name!
-        raise IllegalMigrationNameError file_name unless file_name =~ /^[_a-z0-9]+$/
+        raise IllegalMigrationNameError, file_name unless file_name =~ /^[_a-z0-9]+$/
       end
     end
   end

data/lib/sequel_rails/configuration.rb

@@ -27,7 +27,9 @@ module SequelRails
       self.schema_dump = default_schema_dump
       self.load_database_tasks = true
       self.after_connect = nil
+      self.after_new_connection = nil
       self.skip_connect = nil
+      self.test_connect = true
     end
 
     def environment_for(name)
@@ -72,6 +74,9 @@ module SequelRails
 
       config['max_connections'] = max_connections if max_connections
       config['search_path'] = search_path if search_path
+      config['servers'] = servers if servers
+      config['test'] = test_connect
+      config['after_connect'] = after_new_connection if after_new_connection
 
       url = ENV['DATABASE_URL']
       config['url'] ||= url if url

data/lib/sequel_rails/db_config.rb

@@ -73,8 +73,8 @@ module SequelRails
         return URI::Generic.build(:scheme => adapter, :opaque => database)
       end
 
-      # these four are handled separately
-      params = cfg.reject { |k, _| %w(adapter host port database).include? k }
+      # these are handled separately
+      params = cfg.reject { |k, _| non_params.include? k }
 
       if (v = params['search_path'])
         # make sure there's no whitespace
@@ -96,6 +96,10 @@ module SequelRails
         :query => q
       )
     end
+
+    def non_params
+      %w(adapter host port database servers)
+    end
   end
 end
 

data/lib/sequel_rails/migrations.rb

@@ -6,6 +6,7 @@ module SequelRails
       def migrate(version = nil)
         opts = {}
         opts[:target] = version.to_i if version
+        opts[:allow_missing_migration_files] = !!SequelRails.configuration.allow_missing_migration_files
 
         if migrations_dir.directory?
           ::Sequel::Migrator.run(::Sequel::Model.db, migrations_dir, opts)
@@ -25,12 +26,10 @@ module SequelRails
       def dump_schema_information(opts = {})
         sql = opts.fetch :sql
         adapter = SequelRails::Storage.adapter_for(Rails.env)
-        db = ::Sequel::Model.db
         res = ''
 
         if available_migrations?
-          migrator_class = ::Sequel::Migrator.send(:migrator_class, migrations_dir)
-          migrator = migrator_class.new db, migrations_dir
+          migrator = init_migrator
           res << adapter.schema_information_dump(migrator, sql)
         end
         res
@@ -43,8 +42,8 @@ module SequelRails
       def current_migration
         return unless available_migrations?
 
-        migrator_class = ::Sequel::Migrator.send(:migrator_class, migrations_dir)
-        migrator = migrator_class.new ::Sequel::Model.db, migrations_dir
+        migrator = init_migrator
+
         if migrator.respond_to?(:applied_migrations)
           migrator.applied_migrations.last
         elsif migrator.respond_to?(:current_version)
@@ -55,8 +54,8 @@ module SequelRails
       def previous_migration
         return unless available_migrations?
 
-        migrator_class = ::Sequel::Migrator.send(:migrator_class, migrations_dir)
-        migrator = migrator_class.new ::Sequel::Model.db, migrations_dir
+        migrator = init_migrator
+
         if migrator.respond_to?(:applied_migrations)
           migrator.applied_migrations[-2] || '0'
         elsif migrator.respond_to?(:current_version)
@@ -67,6 +66,16 @@ module SequelRails
       def available_migrations?
         File.exist?(migrations_dir) && Dir[File.join(migrations_dir, '*')].any?
       end
+
+      def init_migrator
+        migrator_class = ::Sequel::Migrator.send(:migrator_class, migrations_dir)
+
+        migrator_class.new(
+          ::Sequel::Model.db,
+          migrations_dir,
+          allow_missing_migration_files: !!SequelRails.configuration.allow_missing_migration_files
+        )
+      end
     end
   end
 end

data/lib/sequel_rails/railtie.rb

@@ -15,7 +15,6 @@ require 'sequel_rails/configuration'
 require 'sequel_rails/migrations'
 require 'sequel_rails/railties/log_subscriber'
 require 'sequel_rails/railties/i18n_support'
-require 'sequel_rails/railties/spring_support'
 require 'sequel_rails/railties/controller_runtime'
 require 'sequel_rails/sequel/database/active_support_notification'
 require 'action_dispatch/middleware/session/sequel_store'
@@ -76,19 +75,17 @@ module SequelRails
     end
 
     initializer 'sequel.spring' do |_app|
-      if defined?(::Spring::Application)
-        class ::Spring::Application # rubocop:disable Style/ClassAndModuleChildren
-          include ::SequelRails::SpringSupport
-          alias_method :disconnect_database_without_sequel, :disconnect_database
-          alias_method :disconnect_database, :disconnect_database_with_sequel
-        end
-      end
+      Spring.after_fork { Sequel::DATABASES.each(&:disconnect) } if defined?(Spring)
     end
 
     # Support overwriting crucial steps in subclasses
     def configure_sequel(app)
       rails_db_config = begin
         app.config.database_configuration
+      rescue RuntimeError => e
+        raise unless e.message =~ /Cannot load database configuration/
+
+        {} # will try to use DATABASE_URL
       rescue Errno::ENOENT
         {} # will try to use DATABASE_URL
       end
@@ -119,7 +116,7 @@ module SequelRails
     end
 
     def database_create_command?
-      ["db:create", "db:create:all"].any? { |c| ARGV.include?(c) }
+      ['db:create', 'db:create:all'].any? { |c| ARGV.include?(c) }
     end
   end
 end

data/lib/sequel_rails/railties/database.rake

@@ -213,6 +213,23 @@ namespace sequel_rails_namespace do
       Rails.env = previous_env
     end
   end
+
+  namespace :sessions do
+    desc 'Clear the sessions table'
+    task clear: :environment do
+      db_for_current_env.from(:sessions).truncate
+    end
+
+    desc 'Trim old sessions from the table (default: > 30 days)'
+    task :trim, [:threshold] => :environment do |_, args|
+      cutoff_period = (args.fetch(:threshold) { 30 }).to_i.days.ago
+
+      db_for_current_env
+        .from(:sessions)
+        .where { updated_at < cutoff_period }
+        .delete
+    end
+  end
 end
 
 task 'test:prepare' => "#{sequel_rails_namespace}:test:prepare"

data/lib/sequel_rails/storage/abstract.rb

@@ -15,6 +15,8 @@ module SequelRails
       end
 
       def drop
+        return if ::Sequel::DATABASES.size == 0
+
         ::Sequel::Model.db.disconnect
         res = _drop
         warn "[sequel] Dropped database '#{database}'" if res

data/lib/sequel_rails/storage/mysql.rb

@@ -13,6 +13,7 @@ module SequelRails
         commands = ['mysqldump']
         add_connection_settings commands
         add_flag commands, '--no-data'
+        add_flag commands, '--skip-dump-date'
         add_option commands, '--result-file', filename
         commands << database
         safe_exec commands

data/lib/sequel_rails/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/sequel-rails.gemspec

@@ -29,12 +29,13 @@ Gem::Specification.new do |s|
   s.add_dependency 'actionpack', '>= 4.0.0'
   s.add_dependency 'sequel', ['>= 3.28', '< 6.0']
 
-  s.add_development_dependency 'combustion'
+  s.add_development_dependency 'combustion', '~> 1.3'
   s.add_development_dependency 'generator_spec'
-  s.add_development_dependency 'rake', '>= 0.8.7', '< 12.1'
-  s.add_development_dependency 'rspec', '~> 3.7'
-  s.add_development_dependency 'rspec-rails', '~> 3.7'
-  s.add_development_dependency 'rubocop', '~> 0.52.0'
-  s.add_development_dependency 'ammeter', '1.1.4'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'rubocop', '1.27.0'
+  s.add_development_dependency 'ammeter', '1.1.5'
   s.add_development_dependency 'test-unit'
+  s.add_development_dependency 'nokogiri', '>= 1.13.4'
 end

data/spec/helpers/io.rb

@@ -4,5 +4,10 @@ module IOSpecHelper
       # if this isn't a good use for case equality I don't know what is
       pattern === a.first ? raise(Errno::ENOENT) : m.call(*a) # rubocop:disable CaseEquality
     end
+    # Rails > 6.1 uses Pathname#exists? instead of rescuing read error
+    allow(Pathname).to receive(:new).and_call_original
+    allow(Pathname).to receive(:new).with(pattern).and_return(
+      instance_double(Pathname, :exist? => false)
+    )
   end
 end

data/spec/integration/sessions_controller_spec.rb

@@ -9,7 +9,7 @@ describe SessionsController, :type => :request do
     else
       {:status => 'logged_in'}
     end
-    post '/session', opts
+    post '/session', **opts
   end
 
   describe '#create' do

data/spec/internal/config/database.yml

@@ -1,6 +1,7 @@
 test:
   adapter: "<%= ENV["TEST_ADAPTER"] || "postgresql" %>"
   database: "<%= ENV["TEST_DATABASE"] || "sequel_rails_test" %>"
+  host: "<%= ENV["TEST_DATABASE_HOST"] %>"
   <% if ENV['TEST_ADAPTER'] != 'sqlite3' %>
   owner: "<%= ENV["TEST_OWNER"] || ENV["USER"] %>"
   user: "<%= ENV["TEST_USERNAME"] || ENV["USER"] %>"
@@ -8,6 +9,8 @@ test:
   <% end %>
   <% if ENV['TEST_ADAPTER'] =~ /mysql/ %>
   encoding: "<%= ENV["TEST_ENCODING"] || "utf8" %>"
+  port: "<%= ENV["TEST_DATABASE_PORT"] || "3306" %>"
   <% elsif ENV['TEST_ADAPTER'] =~ /postgres/ %>
   encoding: "<%= ENV["TEST_ENCODING"] || "unicode" %>"
+  port: "<%= ENV["TEST_DATABASE_PORT"] || "5432" %>"
   <% end %>

data/spec/internal/db/schema.rb.init

@@ -1,10 +1,10 @@
 Sequel.migration do
   change do
-    create_table :users do
+    create_table? :users do
       primary_key :id
       String      :email
     end
-    create_table :sessions do
+    create_table? :sessions do
       primary_key :id
       String :session_id, :null => false, :unique => true, :index => true
       String :data, :text => true, :null => false