Skip to content

Commit a475175

Browse files
authored
Merge pull request rails#49775 from composerinteralia/trilogy-new-client
Build trilogy adapter with newer API
2 parents aa94960 + 571f56b commit a475175

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

activerecord/lib/active_record/connection_adapters/trilogy_adapter.rb

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,10 @@ def trilogy_connection(config)
2121
# matched rather than number of rows updated.
2222
configuration[:found_rows] = true
2323

24-
options = [
25-
configuration[:host],
26-
configuration[:port],
27-
configuration[:database],
28-
configuration[:username],
29-
configuration[:password],
30-
configuration[:socket],
31-
0
32-
]
33-
34-
trilogy_adapter_class.new nil, logger, options, configuration
24+
trilogy_adapter_class.new(configuration)
3525
end
3626
end
27+
3728
module ConnectionAdapters
3829
class TrilogyAdapter < AbstractMysqlAdapter
3930
ER_BAD_DB_ERROR = 1049

0 commit comments

Comments
 (0)