sequel-rails 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aff64f558081a4bd3fd000cdfd10d0f311f8df566191c10b9667854f3963318
-  data.tar.gz: 4893182c4f44909bacfc5addab1b7e57ad1d789e550b448ce4ef685be7630b81
+  metadata.gz: 397a879b8562aed5908b6e658f965ecb57870c0a64613cd1752e157f2604fb32
+  data.tar.gz: 9702cb1002a2b451bd7954b12e3bece2b4322795f2efe75c850ad35854ecbc10
 SHA512:
-  metadata.gz: 5857f2559c24d2f1c06d1b5f671a18f886614cae46a76c918b9a311e70c6680c0b36e740605847eef202cc8f0ada7d08670d27c64cc3fb5c5bf5b08de49b1e3a
-  data.tar.gz: 58af2a634a6d2483a686a99d7196a4250ff086b672e252409c5c15fd160a06bdaed16b47926209c6de63d6666a4c24fd24c20d255208aeb2367f4df1febc82ba
+  metadata.gz: 84addb7863682b82c8c30a8ae6ead3946b98446802ef103c88ded1ac78d78d4528e519904ec65cc92dbffbd9e904531ab5643a7e8dd134d90a520e1a899ca797
+  data.tar.gz: b3831bd1ab2e4af54cfa762269f91fbae3fd80358230fffb5e5a576e2e57ba58dc0dd6ab123cfa380e2fbd917fda800a17505323f9c80c0ac078be15d577a2ad

data/.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: ['**']
+    branches: ["**"]
 
 jobs:
   tests:
@@ -15,7 +15,7 @@ jobs:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
         ports:
-        - 5432
+          - 5432
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -27,7 +27,7 @@ jobs:
         env:
           MYSQL_ROOT_PASSWORD: root
         ports:
-        - 3306
+          - 3306
         options: >-
           --health-cmd="mysqladmin ping"
           --health-interval=10s
@@ -42,6 +42,8 @@ jobs:
           - "6.1"
           - "7.0"
           - "7.1"
+          - "7.2"
+          - "8.0"
         sequel:
           - "~> 5.0"
         ruby:
@@ -50,6 +52,7 @@ jobs:
           - "3.0"
           - "3.1"
           - "3.2"
+          - "3.3"
           # - "jruby"
         include:
           - ruby: "2.6"
@@ -66,6 +69,8 @@ jobs:
             rails: "6.1"
           - ruby: "3.2"
             rails: "6.1"
+          - ruby: "3.3"
+            rails: "6.1"
           - ruby: "2.6"
             rails: "7.0"
           - ruby: "jruby"
@@ -74,7 +79,25 @@ jobs:
             rails: "7.1"
           - ruby: "jruby"
             rails: "7.1"
-    name: Rails ${{ matrix.rails }}, Sequel ${{ matrix.sequel }}, Ruby ${{ matrix.ruby }}
+          - ruby: "2.6"
+            rails: "7.2"
+          - ruby: "2.7"
+            rails: "7.2"
+          - ruby: "3.0"
+            rails: "7.2"
+          - ruby: "jruby"
+            rails: "7.2"
+          - ruby: "2.6"
+            rails: "8.0"
+          - ruby: "2.7"
+            rails: "8.0"
+          - ruby: "3.0"
+            rails: "8.0"
+          - ruby: "3.1"
+            rails: "8.0"
+          - ruby: "jruby"
+            rails: "8.0"
+    name: Rails ${{ matrix.rails }}, Ruby ${{ matrix.ruby }}, Sequel ${{ matrix.sequel }}
 
     env:
       SEQUEL: "${{ matrix.sequel }}"

data/History.md

@@ -1,3 +1,18 @@
+1.2.4 (2025-03-06)
+==================
+
+* Disconnect database connections before attempting to drop database (@rolftimmermans)
+  [#204](https://github.com/TalentBox/sequel-rails/pull/204)
+* Configure CI to include tests for Rails ~> 8.0.0 (Jonathan Tron)
+
+1.2.3 (2024-09-15)
+==================
+
+* Allow to use commands db:test:prepare, db:setup without created DB (@artofhuman)
+  [#203](https://github.com/TalentBox/sequel-rails/pull/203)
+* Update CI to run on Ruby 3.3 (@PikachuEXE)
+  [#202](https://github.com/TalentBox/sequel-rails/pull/202)
+
 1.2.2 (2023-12-18)
 ==================
 

data/README.md

@@ -9,7 +9,7 @@
 
 This gem provides the railtie that allows
 [sequel](http://github.com/jeremyevans/sequel) to hook into
-[Rails (5.2.x, 6.x, 7.x)](http://github.com/rails/rails) and thus behave like a
+[Rails (5.2.x, 6.x, 7.x, 8.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.
@@ -27,7 +27,7 @@ Since January 2013, we've become the official maintainers of the gem after
 Using sequel-rails
 ==================
 
-Using sequel with Rails (5.2.x, 6.x, 7.x) requires a few minor changes.
+Using sequel with Rails (5.2.x, 6.x, 7.x, 8.x) requires a few minor changes.
 
 First, add the following to your Gemfile (after the `Rails` lines):
 
@@ -377,7 +377,7 @@ Once you do that, you will see the following rake tasks among others. These are
 ```bash
 rake db:create[env]                   # Create the database defined in config/database.yml for the current Rails.env
 rake db:create:all                    # Create all the local databases defined in config/database.yml
-rake db:drop[env]                     # Create the database defined in config/database.yml for the current Rails.env
+rake db:drop[env]                     # Drop the database defined in config/database.yml for the current Rails.env
 rake db:drop:all                      # Drops all the local databases defined in config/database.yml
 rake db:force_close_open_connections  # Forcibly close any open connections to the test database
 rake db:migrate                       # Migrate the database to the latest version

data/Rakefile

@@ -1,3 +1,6 @@
+# So loading rails via combustion doesn't crash on some older versions
+require 'logger'
+
 begin
   require 'bundler/setup'
 rescue LoadError

data/ci/rails-7.2.gemfile

@@ -0,0 +1,27 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 7.2.0'
+gem 'activemodel', '~> 7.2.0'
+gem 'actionpack', '~> 7.2.0'
+
+gemspec :path => '../'
+
+gem 'sequel', "#{ENV['SEQUEL']}"
+
+gem 'fakefs', '>= 1.8.0', :require => 'fakefs/safe'
+
+gem 'rspec-rails', '~> 5.0'
+
+# MRI/Rubinius Adapter Dependencies
+platform :ruby do
+  gem 'pg'
+  gem 'mysql2'
+  gem 'sqlite3'
+end
+
+# JRuby Adapter Dependencies
+platform :jruby do
+  gem 'jdbc-sqlite3'
+  gem 'jdbc-mysql'
+  gem 'jdbc-postgres'
+end

data/ci/rails-8.0.gemfile

@@ -0,0 +1,27 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 8.0.0'
+gem 'activemodel', '~> 8.0.0'
+gem 'actionpack', '~> 8.0.0'
+
+gemspec :path => '../'
+
+gem 'sequel', "#{ENV['SEQUEL']}"
+
+gem 'fakefs', '>= 1.8.0', :require => 'fakefs/safe'
+
+gem 'rspec-rails', '~> 5.0'
+
+# MRI/Rubinius Adapter Dependencies
+platform :ruby do
+  gem 'pg'
+  gem 'mysql2'
+  gem 'sqlite3'
+end
+
+# JRuby Adapter Dependencies
+platform :jruby do
+  gem 'jdbc-sqlite3'
+  gem 'jdbc-mysql'
+  gem 'jdbc-postgres'
+end

data/lib/sequel_rails/railtie.rb

@@ -108,15 +108,17 @@ module SequelRails
     end
 
     def check_skip_connect_conditions(app)
-      app.config.sequel[:skip_connect] ||= database_create_command?
+      app.config.sequel[:skip_connect] ||= skip_db_connect?
     end
 
     def database_connection_required?(app)
       !app.config.sequel[:skip_connect]
     end
 
-    def database_create_command?
-      ['db:create', 'db:create:all'].any? { |c| Rake.application.top_level_tasks.include?(c) }
+    def skip_db_connect?
+      Rake.application.top_level_tasks.any? do |task|
+        task.match?(/^db:create|db:test:prepare|^db:drop|db:setup/)
+      end
     end
   end
 end

data/lib/sequel_rails/railties/database.rake

@@ -206,6 +206,7 @@ namespace sequel_rails_namespace do
     desc "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 #{sequel_rails_namespace}:migrate #{sequel_rails_namespace}:test:prepare)."
     task :prepare => "#{sequel_rails_namespace}:abort_if_pending_migrations" do
       previous_env, Rails.env = Rails.env, 'test'
+      Sequel::DATABASES.each(&:disconnect)
       Rake::Task["#{sequel_rails_namespace}:drop"].execute
       Rake::Task["#{sequel_rails_namespace}:create"].execute
       Rake::Task["#{sequel_rails_namespace}:load"].execute

data/lib/sequel_rails/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = '1.2.2'.freeze
+  VERSION = '1.2.4'.freeze
 end

data/spec/internal/Rakefile

@@ -1,8 +1,12 @@
+# So loading rails via combustion doesn't crash on some older versions
+require 'logger'
+
 begin
   require 'bundler/setup'
 rescue LoadError
   warn 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
+
 Bundler.require :default, :development, :test
 
 Combustion.path = ''

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+# So loading rails via combustion doesn't crash on some older versions
+require 'logger'
+
 require 'rubygems'
 require 'bundler'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.4
 platform: ruby
 authors:
 - Brasten Sager (brasten)
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-18 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -224,6 +224,8 @@ files:
 - ci/rails-6.1.gemfile
 - ci/rails-7.0.gemfile
 - ci/rails-7.1.gemfile
+- ci/rails-7.2.gemfile
+- ci/rails-8.0.gemfile
 - config.ru
 - lib/action_dispatch/middleware/session/sequel_store.rb
 - lib/generators/sequel.rb
@@ -307,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Use Sequel with Rails (3.x and 4.x)