Skip to content

Commit a04f809

Browse files
urkleurkle
committed
add in AR 6.1 and 7.0 support, also Ruby 3.1
1 parent abe9bba commit a04f809

File tree

9 files changed

+178
-4
lines changed

9 files changed

+178
-4
lines changed

‎.github/workflows/prs.yml

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,23 @@ jobs:
2222
- '2.5'
2323
- '2.7'
2424
- '3.0'
25+
- '3.1'
2526
activerecord:
2627
- '5.2'
2728
- '6.0'
29+
- '6.1'
30+
- '7.0'
2831
db:
2932
- skip
3033
dbversion:
3134
- skip
3235
exclude:
3336
- ruby: '3.0'
3437
activerecord: '5.2'
38+
- ruby: '3.1'
39+
activerecord: '5.2'
40+
- ruby: '2.5'
41+
activerecord: '7.0'
3542
- db: skip
3643
dbversion: skip
3744
include:
@@ -67,6 +74,22 @@ jobs:
6774
activerecord: '6.0'
6875
db: postgresql
6976
dbversion: '12'
77+
- ruby: '2.5'
78+
activerecord: '6.1'
79+
db: postgresql
80+
dbversion: '9.6'
81+
- ruby: '2.5'
82+
activerecord: '6.1'
83+
db: postgresql
84+
dbversion: '10'
85+
- ruby: '2.5'
86+
activerecord: '6.1'
87+
db: postgresql
88+
dbversion: '11'
89+
- ruby: '2.5'
90+
activerecord: '6.1'
91+
db: postgresql
92+
dbversion: '12'
7093
- ruby: '2.7'
7194
activerecord: '5.2'
7295
db: postgresql
@@ -99,6 +122,38 @@ jobs:
99122
activerecord: '6.0'
100123
db: postgresql
101124
dbversion: '12'
125+
- ruby: '2.7'
126+
activerecord: '6.1'
127+
db: postgresql
128+
dbversion: '9.6'
129+
- ruby: '2.7'
130+
activerecord: '6.1'
131+
db: postgresql
132+
dbversion: '10'
133+
- ruby: '2.7'
134+
activerecord: '6.1'
135+
db: postgresql
136+
dbversion: '11'
137+
- ruby: '2.7'
138+
activerecord: '6.1'
139+
db: postgresql
140+
dbversion: '12'
141+
- ruby: '2.7'
142+
activerecord: '7.0'
143+
db: postgresql
144+
dbversion: '9.6'
145+
- ruby: '2.7'
146+
activerecord: '7.0'
147+
db: postgresql
148+
dbversion: '10'
149+
- ruby: '2.7'
150+
activerecord: '7.0'
151+
db: postgresql
152+
dbversion: '11'
153+
- ruby: '2.7'
154+
activerecord: '7.0'
155+
db: postgresql
156+
dbversion: '12'
102157
- ruby: '3.0'
103158
activerecord: '6.0'
104159
db: postgresql
@@ -115,6 +170,86 @@ jobs:
115170
activerecord: '6.0'
116171
db: postgresql
117172
dbversion: '12'
173+
- ruby: '3.0'
174+
activerecord: '6.1'
175+
db: postgresql
176+
dbversion: '9.6'
177+
- ruby: '3.0'
178+
activerecord: '6.1'
179+
db: postgresql
180+
dbversion: '10'
181+
- ruby: '3.0'
182+
activerecord: '6.1'
183+
db: postgresql
184+
dbversion: '11'
185+
- ruby: '3.0'
186+
activerecord: '6.1'
187+
db: postgresql
188+
dbversion: '12'
189+
- ruby: '3.0'
190+
activerecord: '7.0'
191+
db: postgresql
192+
dbversion: '9.6'
193+
- ruby: '3.0'
194+
activerecord: '7.0'
195+
db: postgresql
196+
dbversion: '10'
197+
- ruby: '3.0'
198+
activerecord: '7.0'
199+
db: postgresql
200+
dbversion: '11'
201+
- ruby: '3.0'
202+
activerecord: '7.0'
203+
db: postgresql
204+
dbversion: '12'
205+
- ruby: '3.1'
206+
activerecord: '6.0'
207+
db: postgresql
208+
dbversion: '9.6'
209+
- ruby: '3.1'
210+
activerecord: '6.0'
211+
db: postgresql
212+
dbversion: '10'
213+
- ruby: '3.1'
214+
activerecord: '6.0'
215+
db: postgresql
216+
dbversion: '11'
217+
- ruby: '3.1'
218+
activerecord: '6.0'
219+
db: postgresql
220+
dbversion: '12'
221+
- ruby: '3.1'
222+
activerecord: '6.1'
223+
db: postgresql
224+
dbversion: '9.6'
225+
- ruby: '3.1'
226+
activerecord: '6.1'
227+
db: postgresql
228+
dbversion: '10'
229+
- ruby: '3.1'
230+
activerecord: '6.1'
231+
db: postgresql
232+
dbversion: '11'
233+
- ruby: '3.1'
234+
activerecord: '6.1'
235+
db: postgresql
236+
dbversion: '12'
237+
- ruby: '3.1'
238+
activerecord: '7.0'
239+
db: postgresql
240+
dbversion: '9.6'
241+
- ruby: '3.1'
242+
activerecord: '7.0'
243+
db: postgresql
244+
dbversion: '10'
245+
- ruby: '3.1'
246+
activerecord: '7.0'
247+
db: postgresql
248+
dbversion: '11'
249+
- ruby: '3.1'
250+
activerecord: '7.0'
251+
db: postgresql
252+
dbversion: '12'
118253
env:
119254
BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/activerecord-${{ matrix.activerecord }}/Gemfile.${{ matrix.db }}"
120255
POSTGRESQL_DB_HOST: 127.0.0.1

‎README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,17 @@ SchemaPlus::Functions is tested on:
8686
<!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
8787
* ruby **2.5** with activerecord **5.2**, using **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
8888
* ruby **2.5** with activerecord **6.0**, using **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
89+
* ruby **2.5** with activerecord **6.1**, using **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
8990
* ruby **2.7** with activerecord **5.2**, using **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
9091
* ruby **2.7** with activerecord **6.0**, using **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
92+
* ruby **2.7** with activerecord **6.1**, using **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
93+
* ruby **2.7** with activerecord **7.0**, using **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
9194
* ruby **3.0** with activerecord **6.0**, using **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
95+
* ruby **3.0** with activerecord **6.1**, using **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
96+
* ruby **3.0** with activerecord **7.0**, using **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
97+
* ruby **3.1** with activerecord **6.0**, using **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
98+
* ruby **3.1** with activerecord **6.1**, using **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
99+
* ruby **3.1** with activerecord **7.0**, using **postgresql:9.6**, **postgresql:10**, **postgresql:11** or **postgresql:12**
92100

93101
<!-- SCHEMA_DEV: MATRIX - end -->
94102

‎gemfiles/activerecord-6.1/Gemfile.base

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
2+
eval File.read(base_gemfile)
3+
4+
gem "activerecord", ">= 6.1", "< 6.2"

‎gemfiles/activerecord-6.1/Gemfile.postgresql

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
2+
eval File.read(base_gemfile), binding, base_gemfile
3+
4+
platform :ruby do
5+
gem "pg"
6+
end
7+
8+
platform :jruby do
9+
gem 'activerecord-jdbcpostgresql-adapter'
10+
end

‎gemfiles/activerecord-7.0/Gemfile.base

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
2+
eval File.read(base_gemfile)
3+
4+
gem "activerecord", ">= 7.0", "< 7.1"

‎gemfiles/activerecord-7.0/Gemfile.postgresql

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
2+
eval File.read(base_gemfile), binding, base_gemfile
3+
4+
platform :ruby do
5+
gem "pg"
6+
end
7+
8+
platform :jruby do
9+
gem 'activerecord-jdbcpostgresql-adapter'
10+
end

‎schema_dev.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@ ruby:
22
- 2.5
33
- 2.7
44
- 3.0
5+
- 3.1
56
activerecord:
67
- 5.2
78
- 6.0
9+
- 6.1
10+
- 7.0
811
db:
912
- postgresql
1013
dbversions:

‎schema_plus_functions.gemspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ Gem::Specification.new do |gem|
2121

2222
gem.required_ruby_version = ">= 2.5.0"
2323

24-
gem.add_dependency "activerecord", ">= 5.2", "< 6.1"
25-
gem.add_dependency "schema_plus_core", "~> 3.0"
24+
gem.add_dependency "activerecord", ">= 5.2", "< 7.1"
25+
gem.add_dependency "schema_plus_core", "~> 3.1.0"
2626

2727
gem.add_development_dependency "bundler"
2828
gem.add_development_dependency "rake", "~> 13.0"
2929
gem.add_development_dependency "rspec", "~> 3.0"
30-
gem.add_development_dependency "schema_dev", "~> 4.1"
30+
gem.add_development_dependency "schema_dev", "~> 4.2.0"
3131
end

‎spec/spec_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22

33
require 'simplecov'
4-
SimpleCov.start
4+
SimpleCov.start unless SimpleCov.running
55

66
$LOAD_PATH.unshift(File.dirname(__FILE__))
77
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

0 commit comments

Comments
 (0)