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

Print warning when unknown options are passed to Trilogy#initialize #155

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Print warning when unknown options are passed to Trilogy#initialize #155

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1677d51
Print warning when unknown options are passed to Trilogy#initialize
bensheldon Jan 30, 2024
6e2f348
Don't transform the options
bensheldon Jan 30, 2024
9802567
Fix variable name
bensheldon Jan 30, 2024
76701e5
Fix variable
bensheldon Jan 30, 2024
bdb0aa3
Use #inspect
bensheldon Jan 30, 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
11 changes: 5 additions & 6 deletions contrib/ruby/lib/trilogy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,15 @@
class Trilogy
VALID_OPTIONS = %i[
host port path database username password encoding
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the distinction between socket and path options?

I see this:

trilogy/contrib/ruby/script/benchmark

Lines 15 to 16 in 362ee58

path: DEFAULT_SOCK, # for trilogy
socket: DEFAULT_SOCK, # for mysql2

..but also this:

trilogy/contrib/ruby/test/test_helper.rb

Line 61 in 362ee58

socket: socket,

Copy link
Contributor

@composerinteralia composerinteralia Jan 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think path is a valid option for either trilogy or mysql2. Maybe it used to be called path?

ssl ssl_mode tls_min_version read_timeout write_timeout connect_timeout
ssl ssl_mode ssl_cipher ssl_ca ssl_capath ssl_key ssl_cert
tls_min_version tls_max_version tls_ciphersuites
read_timeout write_timeout connect_timeout
multi_statement
].freeze

def initialize(options = {})
original_options = options.dup
options = VALID_OPTIONS.each_with_object({}) do |key, hash|
hash[key] = original_options.delete(key) if original_options.key?(key)
end
$stderr.puts "WARNING: Unknown Trilogy options: #{original_options.keys.join(", ")}" unless original_options.empty?
invalid_keys = options.keys - VALID_OPTIONS
$stderr.puts "WARNING: Unknown Trilogy options: #{invalid_keys.keys.join(", ")}" unless original_options.empty?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think Rails might pass through the whole db config, which includes keys that wouldn't be valid here. We should check that before merging this.


options[:port] = options[:port].to_i if options[:port]
mysql_encoding = options[:encoding] || "utf8mb4"
Expand Down
Loading