Skip to content

Rails 7.1 & 7.2 support #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fb-naymspace wants to merge 2 commits into from
Closed

Rails 7.1 & 7.2 support #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d09c3ec
Add gemfiles for activerecord 7.1 and 7.2, add ruby 3.2 and 3.2
fb-naymspace May 14, 2025
7345d4d
Fix nil error from schema dumper with activerecord 7.2
fb-naymspace May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 76 additions & 0 deletions .github/workflows/prs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,15 @@ jobs:
- '2.7'
- '3.0'
- '3.1'
- '3.2'
- '3.3'
activerecord:
- '5.2'
- '6.0'
- '6.1'
- '7.0'
- '7.1'
- '7.2'
db:
- mysql2
- sqlite3
Expand All @@ -39,8 +43,16 @@ jobs:
activerecord: '5.2'
- ruby: '3.1'
activerecord: '5.2'
- ruby: '3.2'
activerecord: '5.2'
- ruby: '3.3'
activerecord: '5.2'
- ruby: '2.5'
activerecord: '7.0'
- ruby: '2.5'
activerecord: '7.1'
- ruby: '2.5'
activerecord: '7.2'
- db: skip
dbversion: skip
include:
Expand Down Expand Up @@ -72,6 +84,14 @@ jobs:
activerecord: '7.0'
db: postgresql
dbversion: '9.6'
- ruby: '2.7'
activerecord: '7.1'
db: postgresql
dbversion: '9.6'
- ruby: '2.7'
activerecord: '7.2'
db: postgresql
dbversion: '9.6'
- ruby: '3.0'
activerecord: '6.0'
db: postgresql
Expand All @@ -84,6 +104,14 @@ jobs:
activerecord: '7.0'
db: postgresql
dbversion: '9.6'
- ruby: '3.0'
activerecord: '7.1'
db: postgresql
dbversion: '9.6'
- ruby: '3.0'
activerecord: '7.2'
db: postgresql
dbversion: '9.6'
- ruby: '3.1'
activerecord: '6.0'
db: postgresql
Expand All @@ -96,6 +124,54 @@ jobs:
activerecord: '7.0'
db: postgresql
dbversion: '9.6'
- ruby: '3.1'
activerecord: '7.1'
db: postgresql
dbversion: '9.6'
- ruby: '3.1'
activerecord: '7.2'
db: postgresql
dbversion: '9.6'
- ruby: '3.2'
activerecord: '6.0'
db: postgresql
dbversion: '9.6'
- ruby: '3.2'
activerecord: '6.1'
db: postgresql
dbversion: '9.6'
- ruby: '3.2'
activerecord: '7.0'
db: postgresql
dbversion: '9.6'
- ruby: '3.2'
activerecord: '7.1'
db: postgresql
dbversion: '9.6'
- ruby: '3.2'
activerecord: '7.2'
db: postgresql
dbversion: '9.6'
- ruby: '3.3'
activerecord: '6.0'
db: postgresql
dbversion: '9.6'
- ruby: '3.3'
activerecord: '6.1'
db: postgresql
dbversion: '9.6'
- ruby: '3.3'
activerecord: '7.0'
db: postgresql
dbversion: '9.6'
- ruby: '3.3'
activerecord: '7.1'
db: postgresql
dbversion: '9.6'
- ruby: '3.3'
activerecord: '7.2'
db: postgresql
dbversion: '9.6'
env:
BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/activerecord-${{ matrix.activerecord }}/Gemfile.${{ matrix.db }}"
POSTGRESQL_DB_HOST: 127.0.0.1
Expand Down
4 changes: 4 additions & 0 deletions gemfiles/activerecord-7.1/Gemfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
eval File.read(base_gemfile)

gem "activerecord", ">= 7.1", "< 7.2"
10 changes: 10 additions & 0 deletions gemfiles/activerecord-7.1/Gemfile.mysql2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
eval File.read(base_gemfile), binding, base_gemfile

platform :ruby do
gem "mysql2"
end

platform :jruby do
gem 'activerecord-jdbcmysql-adapter'
end
10 changes: 10 additions & 0 deletions gemfiles/activerecord-7.1/Gemfile.postgresql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
eval File.read(base_gemfile), binding, base_gemfile

platform :ruby do
gem "pg"
end

platform :jruby do
gem 'activerecord-jdbcpostgresql-adapter'
end
10 changes: 10 additions & 0 deletions gemfiles/activerecord-7.1/Gemfile.sqlite3
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
eval File.read(base_gemfile), binding, base_gemfile

platform :ruby do
gem "sqlite3"
end

platform :jruby do
gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
end
4 changes: 4 additions & 0 deletions gemfiles/activerecord-7.2/Gemfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
eval File.read(base_gemfile)

gem "activerecord", ">= 7.2", "< 7.3"
10 changes: 10 additions & 0 deletions gemfiles/activerecord-7.2/Gemfile.mysql2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
eval File.read(base_gemfile), binding, base_gemfile

platform :ruby do
gem "mysql2"
end

platform :jruby do
gem 'activerecord-jdbcmysql-adapter'
end
10 changes: 10 additions & 0 deletions gemfiles/activerecord-7.2/Gemfile.postgresql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
eval File.read(base_gemfile), binding, base_gemfile

platform :ruby do
gem "pg"
end

platform :jruby do
gem 'activerecord-jdbcpostgresql-adapter'
end
10 changes: 10 additions & 0 deletions gemfiles/activerecord-7.2/Gemfile.sqlite3
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
eval File.read(base_gemfile), binding, base_gemfile

platform :ruby do
gem "sqlite3"
end

platform :jruby do
gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
end
4 changes: 3 additions & 1 deletion lib/schema_plus/core/active_record/schema_dumper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ def types(_)

def tables(_)
SchemaMonkey::Middleware::Dumper::Tables.start(dumper: self, connection: @connection, dump: @dump) do |env|
super nil
stream = StringIO.new
super stream
@dump.tables << stream.string unless stream.string.blank?
end
end

Expand Down
2 changes: 1 addition & 1 deletion lib/schema_plus/core/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

module SchemaPlus
module Core
VERSION = "3.1.0"
VERSION = "3.1.1"
end
end
4 changes: 4 additions & 0 deletions schema_dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@ ruby:
- 2.7
- 3.0
- 3.1
- 3.2
- 3.3
activerecord:
- 5.2
- 6.0
- 6.1
- 7.0
- 7.1
- 7.2
db:
- postgresql
- mysql2
Expand Down
4 changes: 2 additions & 2 deletions schema_plus_core.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ Gem::Specification.new do |gem|

gem.required_ruby_version = ">= 2.5.0"

gem.add_dependency "activerecord", ">= 5.2", "< 7.1"
gem.add_dependency "activerecord", ">= 5.2", "< 7.3"
gem.add_dependency "schema_monkey", "~> 3.0.2"

gem.add_development_dependency "bundler"
gem.add_development_dependency "rake", "~> 13.0.0"
gem.add_development_dependency "rspec", "~> 3.0"
gem.add_development_dependency "rspec-given"
gem.add_development_dependency "schema_dev", "~> 4.2.0"
gem.add_development_dependency "schema_dev", "~> 4.2.1"
end
Loading