Skip to content

Commit 63ba015

Browse files
committed
mysql::db sql parameter support filenames with multiple dots
1 parent 45a6e5c commit 63ba015

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

manifests/db.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
# Ensure that the sql files passed are valid file paths.
7777
if $sql {
7878
$sql.each | $sqlfile | {
79-
if $sqlfile !~ /^\/(?:[A-Za-z0-9_-]+\/?+)+(?:.[A-Za-z0-9]+)$/ {
80-
$message = "The file '${sqlfile}' is invalid. A a valid file path is expected."
79+
if $sqlfile !~ /^\/(?:[A-Za-z0-9_-]+\/?+)+(?:\.[A-Za-z0-9]+)+$/ {
80+
$message = "The file '${sqlfile}' is invalid. A valid file path is expected."
8181
fail($message)
8282
}
8383
}

spec/defines/mysql_db_spec.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
].each do |path|
9595
it "fails when provided '#{path}' as a value to the 'sql' parameter" do
9696
params['sql'] = [path]
97-
is_expected.to raise_error(Puppet::PreformattedError, %r{The file '#{Regexp.escape(path)}' is invalid. A a valid file path is expected.})
97+
is_expected.to raise_error(Puppet::PreformattedError, %r{The file '#{Regexp.escape(path)}' is invalid. A valid file path is expected.})
9898
end
9999
end
100100

@@ -103,6 +103,7 @@
103103
'/tmp/test.txt',
104104
'/tmp/.test',
105105
'/foo.test',
106+
'/foo.test.txt',
106107
].each do |path|
107108
it "succeeds when provided '#{path}' as a value to the 'sql' parameter" do
108109
params['sql'] = [path]

0 commit comments

Comments
 (0)