sequel-rails 1.1.1 → 1.2.1

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):
 
@@ -195,6 +194,19 @@ You can configure some options with the usual rails mechanism, in
     # 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
+    #   Sequel::Model.db.extension :pg_array, :pg_hstore # database specific extension
+    #   Sequel.extension :pg_hstore_ops # sequel specific extension
+    # 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)
 ```
@@ -259,6 +271,27 @@ Here's some examples:
       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
+      Sequel::Model.db.extension :pg_array, :pg_hstore # database specific extension
+      Sequel.extension :pg_hstore_ops # sequel specific extension
+    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
 ================
 
@@ -358,15 +391,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
 ============
@@ -417,6 +450,14 @@ Improvements have been made by those awesome contributors:
 * p-leger (@p-leger)
 * Semyon Pupkov (@artofhuman)
 * Ben Koshy (@BKSpurgeon)
+* Janko Marohnić (@janko)
+* Adrián Mugnolo (@xymbol)
+* Ivan (@AnotherRegularDude)
+* kamilpavlicko (@kamilpavlicko)
+* Stefan Vermaas (@stefanvermaas)
+* Yuri Smirnov (@tycooon)
+* Mickael Kurmann (@elbouillon)
+* Radoslaw Wojnarowski (@rwojnarowski)
 
 Credits
 =======
@@ -426,4 +467,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/TalentBox/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.2.gemfile

@@ -10,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-6.0.gemfile

@@ -10,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-5.0.gemfile → rails-6.1.gemfile}

@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'railties', '~> 5.0.7'
-gem 'activemodel', '~> 5.0.7'
+gem 'railties', '~> 6.1.0'
+gem 'activemodel', '~> 6.1.0'
+gem 'actionpack', '~> 6.1.0'
 
 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-7.0.gemfile}

@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'railties', '~> 4.0.13'
+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/sequel_rails/configuration.rb

@@ -27,6 +27,7 @@ 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
@@ -75,6 +76,7 @@ module SequelRails
       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/migrations.rb

@@ -26,7 +26,6 @@ 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?

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| Rake.application.top_level_tasks.include?(c) }
     end
   end
 end

data/lib/sequel_rails/railties/log_subscriber.rb

@@ -47,10 +47,10 @@ module SequelRails
         end
 
         if odd?
-          name = color(name, :cyan, true)
-          sql  = color(sql, nil, true)
+          name = color(name, :cyan, :bold => true)
+          sql  = color(sql, nil, :bold => true)
         else
-          name = color(name, :magenta, true)
+          name = color(name, :magenta, :bold => true)
         end
 
         debug "  #{name}  #{sql}#{binds}"

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/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.2.1'.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

data/spec/lib/sequel_rails/configuration_spec.rb

@@ -113,23 +113,33 @@ describe SequelRails::Configuration do
   end
 
   describe '#connect' do
+    let(:adapter) { ENV['TEST_ADAPTER'] || 'postgres' }
     let(:environments) do
       {
         'development' => {
-          'adapter' => 'postgres',
+          'adapter' => adapter,
           'owner' => (ENV['TEST_OWNER'] || ENV['USER']),
-          'username' => (ENV['TEST_OWNER'] || ENV['USER']),
+          'username' => (ENV['TEST_USERNAME'] || ENV['TEST_OWNER'] || ENV['USER']),
           'database' => 'sequel_rails_test_storage_dev',
-          'host' => '127.0.0.1',
+          'password' => ENV['TEST_PASSWORD'],
+          'host' => ENV['TEST_DATABASE_HOST'],
+          'port' => ENV['TEST_DATABASE_PORT'],
         },
         'test' => {
-          'adapter' => 'postgres',
+          'adapter' => adapter,
           'owner' => (ENV['TEST_OWNER'] || ENV['USER']),
-          'username' => (ENV['TEST_OWNER'] || ENV['USER']),
+          'username' => (ENV['TEST_USERNAME'] || ENV['TEST_OWNER'] || ENV['USER']),
           'database' => 'sequel_rails_test_storage_test',
-          'host' => '127.0.0.1',
+          'password' => ENV['TEST_PASSWORD'],
+          'host' => ENV['TEST_DATABASE_HOST'],
+          'port' => ENV['TEST_DATABASE_PORT'],
         },
-        'remote' => {
+        'remote_pg' => {
+          'adapter' => 'postgres',
+          'host' => '10.0.0.1',
+          'database' => 'sequel_rails_test_storage_dev',
+        },
+        'remote_mysql' => {
           'adapter' => 'mysql',
           'host' => '10.0.0.1',
           'database' => 'sequel_rails_test_storage_remote',
@@ -315,7 +325,7 @@ describe SequelRails::Configuration do
           end
         end
 
-        let(:environment) { 'development' }
+        let(:environment) { 'remote_pg' }
 
         context 'in C-Ruby' do
           include_examples 'test_connect'
@@ -347,7 +357,7 @@ describe SequelRails::Configuration do
             expect(::Sequel).to receive(:connect) do |url, hash|
               expect(url).to start_with('jdbc:postgresql://')
               expect(hash[:adapter]).to eq('jdbc:postgresql')
-              expect(hash[:host]).to eq('127.0.0.1')
+              expect(hash[:host]).to eq('10.0.0.1')
             end
             subject.connect environment
           end
@@ -367,7 +377,7 @@ describe SequelRails::Configuration do
       end
 
       context 'for a mysql connection' do
-        let(:environment) { 'remote' }
+        let(:environment) { 'remote_mysql' }
 
         context 'in C-Ruby' do
           include_examples 'test_connect'
@@ -427,5 +437,16 @@ describe SequelRails::Configuration do
         subject.connect environment
       end
     end
+
+    describe 'after each connection hook' do
+      let(:environment) { 'development' }
+
+      it 'runs hook if provided' do
+        called = 0
+        subject.after_new_connection = ->(_conn){ called += 1 }
+        subject.connect environment
+        expect(called).to eq(1)
+      end
+    end
   end
 end

data/spec/lib/sequel_rails/migrations_spec.rb

@@ -10,7 +10,9 @@ describe SequelRails::Migrations do
       context 'with no version specified' do
         it 'runs migrations using Sequel::Migrator' do
           expect(::Sequel::Migrator).to receive(:run).with(
-            db, Rails.root.join('db/migrate'), allow_missing_migration_files: false
+            db,
+            Rails.root.join('db/migrate'),
+            { :allow_missing_migration_files => false }
           ).and_return result
           expect(described_class.send(migration_method)).to be(result)
         end
@@ -18,7 +20,9 @@ describe SequelRails::Migrations do
       context 'with version specified' do
         it 'runs migrations using Sequel::Migrator' do
           expect(::Sequel::Migrator).to receive(:run).with(
-            db, Rails.root.join('db/migrate'), allow_missing_migration_files: false, target: 1
+            db,
+            Rails.root.join('db/migrate'),
+            { :allow_missing_migration_files => false, :target => 1 }
           ).and_return result
           expect(described_class.send(migration_method, 1)).to be(result)
         end
@@ -36,7 +40,9 @@ describe SequelRails::Migrations do
 
         it 'runs migrations using Sequel::Migrator' do
           expect(::Sequel::Migrator).to receive(:run).with(
-            db, Rails.root.join('db/migrate'), allow_missing_migration_files: true
+            db,
+            Rails.root.join('db/migrate'),
+            { :allow_missing_migration_files => true }
           ).and_return result
 
           described_class.send(migration_method)

data/spec/lib/sequel_rails/railtie_spec.rb

@@ -93,8 +93,12 @@ describe SequelRails::Railtie do
 
     context 'and DATABASE_URL is defined' do
       let :database_url do
-        cfg = Combustion::Application.config.database_configuration['test']
-        SequelRails::DbConfig.new(cfg).url
+        if ENV['TEST_ADAPTER']=~/sqlite/
+          'sqlite:/' # in-memory db
+        else
+          cfg = Combustion::Application.config.database_configuration['test']
+          SequelRails::DbConfig.new(cfg).url
+        end
       end
 
       around do |ex|

data/spec/lib/sequel_rails/storage/postgres_spec.rb

@@ -83,6 +83,17 @@ describe SequelRails::Storage::Postgres, :postgres do
     end
   end
 
+  describe '#drop' do
+    before do
+      stub_const('Sequel::DATABASES', [])
+    end
+
+    it 'properly executes without active sequel connections' do
+      expect(Sequel::Model).not_to receive(:db)
+      subject.drop
+    end
+  end
+
   describe '#_dump' do
     let(:dump_file_name) { 'dump.sql' }
     it 'uses the pg_dump command' do

data/spec/lib/sequel_rails/storage/sqlite_spec.rb

@@ -17,7 +17,10 @@ describe SequelRails::Storage::Sqlite, :sqlite do
       it 'defer to Sequel' do
         path = double(:path)
         allow(subject).to receive(:path).and_return path
-        expect(::Sequel).to receive(:connect).with('adapter' => 'sqlite3', 'database' => path)
+        expect(::Sequel).to receive(:connect).with({
+          'adapter' => 'sqlite3',
+          'database' => path
+        })
         subject._create
       end
     end

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ require 'ammeter/init'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 rspec_exclusions = {}
-rspec_exclusions[:skip_jdbc] = SequelRails.jruby?
+rspec_exclusions[:skip_jdbc] = !SequelRails.jruby?
 rspec_exclusions[:postgres] = ENV['TEST_ADAPTER'] != 'postgresql'
 rspec_exclusions[:mysql] = !%w(mysql mysql2).include?(ENV['TEST_ADAPTER'])
 rspec_exclusions[:sqlite] = ENV['TEST_ADAPTER'] != 'sqlite3'