Skip to content
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

Jump to bottom

Support trilogy adapter #103

Draft
wants to merge 23 commits into
base: master
Choose a base branch
from
Draft

Support trilogy adapter #103

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e3c918b
Allow adapter change through config
xjunior Feb 8, 2024
014c35c
Remove rails < 6 case
xjunior Feb 8, 2024
f1db0e4
Move PerconaAdapter::Column spec to a separate file
xjunior Feb 8, 2024
37eeeba
Add trilogy dependencies to development and make mysql2 optional
xjunior Feb 8, 2024
39bf3c7
Add Runner specs for trilogy adapter
xjunior Feb 8, 2024
0760dde
Add PerconaAdapter specs for trilogy adapter
xjunior Feb 8, 2024
6e5cff5
Remove production require of mysql2 adapter
xjunior Feb 8, 2024
d97abd7
Validate supported adapters
xjunior Feb 8, 2024
2e2abf3
Fix some linting issues
xjunior Feb 8, 2024
5aaa263
Add warning to Departure::Migration
xjunior Feb 8, 2024
3cc5f29
Merge branch 'master' into departure-trilogy
xjunior Feb 22, 2024
2555087
Fetch adapter from database configuration
xjunior Jul 23, 2024
e07b256
Pass original adapter to percona adapter
xjunior Jul 23, 2024
f6c563c
Add details to error
xjunior Jul 23, 2024
3e8e014
Set tested adapter in specs
xjunior Jul 23, 2024
73592a8
Supported adapters as strings
xjunior Jul 23, 2024
ec6e0ea
Pass original adapter to percona adapter
xjunior Jul 23, 2024
2a965f3
Extract connection method to percona
xjunior Jul 23, 2024
443922a
Merge branch 'master' into departure-trilogy
xjunior Jul 23, 2024
c58693b
Require adapter
xjunior Jul 23, 2024
c8958f0
Set ssl_mode for trilogy
xjunior Jul 23, 2024
c2ab69a
Load trilogy adapter after rails
xjunior Jul 23, 2024
5256d40
Fix lint
xjunior Jul 23, 2024
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
1 change: 1 addition & 0 deletions .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Metrics/AbcSize:
Metrics/BlockLength:
Max: 20
Exclude:
- 'departure.gemspec'
- 'spec/*'
- 'spec/**/*'

Expand Down
12 changes: 9 additions & 3 deletions Appraisals
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,38 @@
appraise 'rails-6-0' do
gem 'rails', '6.0.6.1'
gem 'activerecord-trilogy-adapter', '>= 3.1.2'
xjunior marked this conversation as resolved.
Show resolved Hide resolved
end

appraise 'rails-6-1' do
gem 'rails', '6.1.7.6'
gem 'activerecord-trilogy-adapter', '>= 3.1.2'
end

appraise 'rails-7-0' do
gem 'rails', '7.0.8'
gem 'activerecord-trilogy-adapter', '>= 3.1.2'
end

appraise 'rails-7-1' do
gem 'rails', '7.1.3'
end

appraise 'ruby-2.7-rails-6-0' do
gem 'rails', '6.0.6.1'
gem 'activerecord-trilogy-adapter', '>= 3.1.2'
gem 'nokogiri', '< 1.16'
gem 'rails', '6.0.6.1'
end

appraise 'ruby-2.7-rails-6-1' do
gem 'rails', '6.1.7.6'
gem 'activerecord-trilogy-adapter', '>= 3.1.2'
gem 'nokogiri', '< 1.16'
gem 'rails', '6.1.7.6'
end

appraise 'ruby-2.7-rails-7-0' do
gem 'rails', '7.0.8'
gem 'activerecord-trilogy-adapter', '>= 3.1.2'
gem 'nokogiri', '< 1.16'
gem 'rails', '7.0.8'
end

appraise 'ruby-2.7-rails-7-1' do
Expand Down
4 changes: 3 additions & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ PATH
specs:
departure (6.6.0)
activerecord (>= 6.0.0, < 7.2.0, != 7.0.0)
mysql2 (>= 0.4.0, <= 0.5.5)
railties (>= 6.0.0, < 7.2.0, != 7.0.0)

GEM
Expand Down Expand Up @@ -168,6 +167,7 @@ GEM
stringio (3.1.0)
thor (1.3.0)
timeout (0.4.1)
trilogy (2.7.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
Expand All @@ -185,12 +185,14 @@ DEPENDENCIES
climate_control (~> 0.0.3)
codeclimate-test-reporter (~> 1.0.3)
departure!
mysql2 (>= 0.4.0, <= 0.5.5)
pry-byebug
rake (>= 10.0)
rspec (~> 3.4, >= 3.4.0)
rspec-its (~> 1.2)
rubocop (~> 1.60.2)
rubocop-performance (~> 1.20.2)
trilogy (>= 2.7.0)

BUNDLED WITH
2.4.22
9 changes: 5 additions & 4 deletions departure.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@ Gem::Specification.new do |spec|

spec.add_runtime_dependency 'railties', '>= 6.0.0', '!= 7.0.0', '< 7.2.0'
spec.add_runtime_dependency 'activerecord', '>= 6.0.0', '!= 7.0.0', '< 7.2.0'
spec.add_runtime_dependency 'mysql2', '>= 0.4.0', '<= 0.5.5'

spec.add_development_dependency 'appraisal', '~> 2.4.1'
spec.add_development_dependency 'climate_control', '~> 0.0.3'
spec.add_development_dependency 'mysql2', '>= 0.4.0', '<= 0.5.5'
spec.add_development_dependency 'pry-byebug'
spec.add_development_dependency 'rake', '>= 10.0'
spec.add_development_dependency 'rspec', '~> 3.4', '>= 3.4.0'
spec.add_development_dependency 'rspec-its', '~> 1.2'
spec.add_development_dependency 'pry-byebug'
spec.add_development_dependency 'climate_control', '~> 0.0.3'
spec.add_development_dependency 'rspec', '~> 3.4', '>= 3.4.0'
spec.add_development_dependency 'trilogy', '>= 2.7.0'
end
1 change: 1 addition & 0 deletions gemfiles/rails_6_0.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source 'https://rubygems.org'

gem 'activerecord-trilogy-adapter', '>= 3.1.2'
gem 'codeclimate-test-reporter', '~> 1.0.3', group: :test, require: nil
gem 'rails', '6.0.6.1'
gem 'rubocop', '~> 1.60.2', require: false
Expand Down
8 changes: 7 additions & 1 deletion gemfiles/rails_6_0.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ PATH
specs:
departure (6.6.0)
activerecord (>= 6.0.0, < 7.2.0, != 7.0.0)
mysql2 (>= 0.4.0, <= 0.5.5)
railties (>= 6.0.0, < 7.2.0, != 7.0.0)

GEM
Expand Down Expand Up @@ -53,6 +52,9 @@ GEM
activerecord (6.0.6.1)
activemodel (= 6.0.6.1)
activesupport (= 6.0.6.1)
activerecord-trilogy-adapter (3.1.2)
activerecord (>= 6.0.a, < 7.1.a)
trilogy (>= 2.4.0)
activestorage (6.0.6.1)
actionpack (= 6.0.6.1)
activejob (= 6.0.6.1)
Expand Down Expand Up @@ -209,6 +211,7 @@ GEM
thor (1.3.0)
thread_safe (0.3.6)
timeout (0.4.1)
trilogy (2.7.0)
tzinfo (1.2.11)
thread_safe (~> 0.1)
unicode-display_width (2.5.0)
Expand All @@ -222,17 +225,20 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
activerecord-trilogy-adapter (>= 3.1.2)
appraisal (~> 2.4.1)
climate_control (~> 0.0.3)
codeclimate-test-reporter (~> 1.0.3)
departure!
mysql2 (>= 0.4.0, <= 0.5.5)
pry-byebug
rails (= 6.0.6.1)
rake (>= 10.0)
rspec (~> 3.4, >= 3.4.0)
rspec-its (~> 1.2)
rubocop (~> 1.60.2)
rubocop-performance (~> 1.20.2)
trilogy (>= 2.7.0)

BUNDLED WITH
2.4.22
1 change: 1 addition & 0 deletions gemfiles/rails_6_1.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source 'https://rubygems.org'

gem 'activerecord-trilogy-adapter', '>= 3.1.2'
gem 'codeclimate-test-reporter', '~> 1.0.3', group: :test, require: nil
gem 'rails', '6.1.7.6'
gem 'rubocop', '~> 1.60.2', require: false
Expand Down
8 changes: 7 additions & 1 deletion gemfiles/rails_6_1.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ PATH
specs:
departure (6.6.0)
activerecord (>= 6.0.0, < 7.2.0, != 7.0.0)
mysql2 (>= 0.4.0, <= 0.5.5)
railties (>= 6.0.0, < 7.2.0, != 7.0.0)

GEM
Expand Down Expand Up @@ -55,6 +54,9 @@ GEM
activerecord (6.1.7.6)
activemodel (= 6.1.7.6)
activesupport (= 6.1.7.6)
activerecord-trilogy-adapter (3.1.2)
activerecord (>= 6.0.a, < 7.1.a)
trilogy (>= 2.4.0)
activestorage (6.1.7.6)
actionpack (= 6.1.7.6)
activejob (= 6.1.7.6)
Expand Down Expand Up @@ -212,6 +214,7 @@ GEM
sprockets (>= 3.0.0)
thor (1.3.0)
timeout (0.4.1)
trilogy (2.7.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
Expand All @@ -225,17 +228,20 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
activerecord-trilogy-adapter (>= 3.1.2)
appraisal (~> 2.4.1)
climate_control (~> 0.0.3)
codeclimate-test-reporter (~> 1.0.3)
departure!
mysql2 (>= 0.4.0, <= 0.5.5)
pry-byebug
rails (= 6.1.7.6)
rake (>= 10.0)
rspec (~> 3.4, >= 3.4.0)
rspec-its (~> 1.2)
rubocop (~> 1.60.2)
rubocop-performance (~> 1.20.2)
trilogy (>= 2.7.0)

BUNDLED WITH
2.4.22
1 change: 1 addition & 0 deletions gemfiles/rails_7_0.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source 'https://rubygems.org'

gem 'activerecord-trilogy-adapter', '>= 3.1.2'
gem 'codeclimate-test-reporter', '~> 1.0.3', group: :test, require: nil
gem 'rails', '7.0.8'
gem 'rubocop', '~> 1.60.2', require: false
Expand Down
8 changes: 7 additions & 1 deletion gemfiles/rails_7_0.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ PATH
specs:
departure (6.6.0)
activerecord (>= 6.0.0, < 7.2.0, != 7.0.0)
mysql2 (>= 0.4.0, <= 0.5.5)
railties (>= 6.0.0, < 7.2.0, != 7.0.0)

GEM
Expand Down Expand Up @@ -62,6 +61,9 @@ GEM
activerecord (7.0.8)
activemodel (= 7.0.8)
activesupport (= 7.0.8)
activerecord-trilogy-adapter (3.1.2)
activerecord (>= 6.0.a, < 7.1.a)
trilogy (>= 2.4.0)
activestorage (7.0.8)
actionpack (= 7.0.8)
activejob (= 7.0.8)
Expand Down Expand Up @@ -211,6 +213,7 @@ GEM
simplecov-html (0.10.2)
thor (1.3.0)
timeout (0.4.1)
trilogy (2.7.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
Expand All @@ -224,17 +227,20 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
activerecord-trilogy-adapter (>= 3.1.2)
appraisal (~> 2.4.1)
climate_control (~> 0.0.3)
codeclimate-test-reporter (~> 1.0.3)
departure!
mysql2 (>= 0.4.0, <= 0.5.5)
pry-byebug
rails (= 7.0.8)
rake (>= 10.0)
rspec (~> 3.4, >= 3.4.0)
rspec-its (~> 1.2)
rubocop (~> 1.60.2)
rubocop-performance (~> 1.20.2)
trilogy (>= 2.7.0)

BUNDLED WITH
2.4.22
4 changes: 3 additions & 1 deletion gemfiles/rails_7_1.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ PATH
specs:
departure (6.6.0)
activerecord (>= 6.0.0, < 7.2.0, != 7.0.0)
mysql2 (>= 0.4.0, <= 0.5.5)
railties (>= 6.0.0, < 7.2.0, != 7.0.0)

GEM
Expand Down Expand Up @@ -244,6 +243,7 @@ GEM
stringio (3.1.0)
thor (1.3.0)
timeout (0.4.1)
trilogy (2.7.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
Expand All @@ -262,13 +262,15 @@ DEPENDENCIES
climate_control (~> 0.0.3)
codeclimate-test-reporter (~> 1.0.3)
departure!
mysql2 (>= 0.4.0, <= 0.5.5)
pry-byebug
rails (= 7.1.3)
rake (>= 10.0)
rspec (~> 3.4, >= 3.4.0)
rspec-its (~> 1.2)
rubocop (~> 1.60.2)
rubocop-performance (~> 1.20.2)
trilogy (>= 2.7.0)

BUNDLED WITH
2.4.22
1 change: 1 addition & 0 deletions gemfiles/ruby_2.7_rails_6_0.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source 'https://rubygems.org'

gem 'activerecord-trilogy-adapter', '>= 3.1.2'
gem 'codeclimate-test-reporter', '~> 1.0.3', group: :test, require: nil
gem 'nokogiri', '< 1.16'
gem 'rails', '6.0.6.1'
Expand Down
8 changes: 7 additions & 1 deletion gemfiles/ruby_2.7_rails_6_0.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ PATH
specs:
departure (6.6.0)
activerecord (>= 6.0.0, < 7.2.0, != 7.0.0)
mysql2 (>= 0.4.0, <= 0.5.5)
railties (>= 6.0.0, < 7.2.0, != 7.0.0)

GEM
Expand Down Expand Up @@ -53,6 +52,9 @@ GEM
activerecord (6.0.6.1)
activemodel (= 6.0.6.1)
activesupport (= 6.0.6.1)
activerecord-trilogy-adapter (3.1.2)
activerecord (>= 6.0.a, < 7.1.a)
trilogy (>= 2.4.0)
activestorage (6.0.6.1)
actionpack (= 6.0.6.1)
activejob (= 6.0.6.1)
Expand Down Expand Up @@ -209,6 +211,7 @@ GEM
thor (1.3.0)
thread_safe (0.3.6)
timeout (0.4.1)
trilogy (2.7.0)
tzinfo (1.2.11)
thread_safe (~> 0.1)
unicode-display_width (2.5.0)
Expand All @@ -222,10 +225,12 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
activerecord-trilogy-adapter (>= 3.1.2)
appraisal (~> 2.4.1)
climate_control (~> 0.0.3)
codeclimate-test-reporter (~> 1.0.3)
departure!
mysql2 (>= 0.4.0, <= 0.5.5)
nokogiri (< 1.16)
pry-byebug
rails (= 6.0.6.1)
Expand All @@ -234,6 +239,7 @@ DEPENDENCIES
rspec-its (~> 1.2)
rubocop (~> 1.60.2)
rubocop-performance (~> 1.20.2)
trilogy (>= 2.7.0)

BUNDLED WITH
2.4.22
1 change: 1 addition & 0 deletions gemfiles/ruby_2.7_rails_6_1.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source 'https://rubygems.org'

gem 'activerecord-trilogy-adapter', '>= 3.1.2'
gem 'codeclimate-test-reporter', '~> 1.0.3', group: :test, require: nil
gem 'nokogiri', '< 1.16'
gem 'rails', '6.1.7.6'
Expand Down
Loading