Skip to content

(GH-1761) Fix locale-dependent prefetch failure in mysql_database provider #1769

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

Open
jst-cyr wants to merge 3 commits into
base: main
Choose a base branch
from
Open

(GH-1761) Fix locale-dependent prefetch failure in mysql_database provider #1769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f2d277
(GH-1761) Match MySQL unknown-database error by code, not locale text
jst-cyr Nov 10, 2026
b92bb98
Fix RuboCop Performance/StringInclude offense
jst-cyr Nov 10, 2026
32b6375
Trimming down comments inserted by Claude
jst-cyr Nov 10, 2026
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
3 changes: 2 additions & 1 deletion lib/puppet/provider/mysql_database/mysql.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ def self.instances(managed_databases = nil)
attributes[k] = v
end
rescue Puppet::ExecutionFailure => e
raise unless e.message.include?('Unknown database')
# MySQL/MariaDB error 1049 is ER_BAD_DB_ERROR ("Unknown database"). Match on the numeric error code to handle localized error text.
raise unless e.message.include?('ERROR 1049 ')

next
end
Expand Down
10 changes: 10 additions & 0 deletions spec/unit/puppet/provider/mysql_database/mysql_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,16 @@
expect(databases).to eq(['managed_existing'])
end

it 'skips managed databases that no longer exist under a non-English locale' do
allow(provider.class).to receive(:mysql_caller).with(["show variables like '%_database'", 'managed_existing'], 'regular').and_return("character_set_database latin1\ncollation_database latin1_swedish_ci\nskip_show_database OFF") # rubocop:disable Layout/LineLength
allow(provider.class).to receive(:mysql_caller)
.with(["show variables like '%_database'", 'managed_missing'], 'regular')
.and_raise(Puppet::ExecutionFailure, "Execution of '/usr/bin/mariadb -NBe show variables like '%_database' managed_missing' returned 1: ERROR 1049 (42000): Unbekannte Datenbank 'managed_missing'") # rubocop:disable Layout/LineLength

databases = provider.class.instances(['managed_existing', 'managed_missing']).map(&:name)
expect(databases).to eq(['managed_existing'])
end

it 're-raises unexpected database lookup failures' do
allow(provider.class).to receive(:mysql_caller).with(["show variables like '%_database'", 'managed_broken'], 'regular').and_raise(Puppet::ExecutionFailure, 'ERROR 1044 (42000): Access denied')

Expand Down
Loading