Skip to content

Commit fa48051

Browse files
committed
mysql::db sql parameter support directorynames with one or more dots
1 parent 63ba015 commit fa48051

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

manifests/db.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
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]+)+$/ {
79+
if $sqlfile !~ /^\/(?:.[.A-Za-z0-9_-]+\/?+)+(?:\.[.A-Za-z0-9]+)+$/ {
8080
$message = "The file '${sqlfile}' is invalid. A valid file path is expected."
8181
fail($message)
8282
}

spec/defines/mysql_db_spec.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@
104104
'/tmp/.test',
105105
'/foo.test',
106106
'/foo.test.txt',
107+
'/foo/test/test-1.2.3/schema/test.sql',
108+
'/foo/test/test-1.2.3/schema/foo.test.sql',
109+
'/foo/foo.t1.t2.t3/foo.test-1.2.3/test.test.schema/test..app.sql',
110+
'/foo/foo.t1.t2...t3/foo.test-1.2.3/test.test.schema/test.app.sql',
107111
].each do |path|
108112
it "succeeds when provided '#{path}' as a value to the 'sql' parameter" do
109113
params['sql'] = [path]

0 commit comments

Comments
 (0)