Skip to content

Commit 2555087

Browse files
committed
Fetch adapter from database configuration
1 parent 3cc5f29 commit 2555087

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

lib/active_record/connection_adapters/percona_adapter.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ def percona_connection(config)
1313
config = config.dup if config.frozen?
1414
config[:username] = 'root'
1515
end
16-
connection = send("#{Departure.configuration.adapter}_connection", config)
16+
adapter = config[:adapter]
17+
connection = if Departure::SUPPORTED_ADAPTERS.include?(adapter)
18+
send("#{adapter}_connection", config)
19+
else
20+
raise ArgumentError, "Supported Departure adapters are #{Departure::SUPPORTED_ADAPTERS.inspect}"
21+
end
1722

1823
connection_details = Departure::ConnectionDetails.new(config)
1924
verbose = ActiveRecord::Migration.verbose

lib/departure.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
end
2929

3030
module Departure
31+
SUPPORTED_ADAPTERS = %i[trilogy mysql2].freeze
32+
3133
class << self
3234
attr_accessor :configuration
3335
end

lib/departure/configuration.rb

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,19 @@
11
module Departure
22
class Configuration
3-
SUPPORTED_ADAPTERS = %i[trilogy mysql2].freeze
4-
53
attr_accessor :tmp_path, :global_percona_args, :enabled_by_default, :redirect_stderr
6-
attr_reader :adapter
74

85
def initialize
96
@tmp_path = '.'.freeze
107
@error_log_filename = 'departure_error.log'.freeze
118
@global_percona_args = nil
129
@enabled_by_default = true
1310
@redirect_stderr = true
14-
@adapter = :mysql2
1511
end
1612

1713
def error_log_path
1814
File.join(tmp_path, error_log_filename)
1915
end
2016

21-
def adapter=(name)
22-
unless SUPPORTED_ADAPTERS.include?(name)
23-
raise ArgumentError, "Supported Departure adapters are #{SUPPORTED_ADAPTERS.inspect}"
24-
end
25-
26-
@adapter = name
27-
end
28-
2917
private
3018

3119
attr_reader :error_log_filename

0 commit comments

Comments
 (0)