(MODULES-1338) Allow mysql::db to import several files #574
Conversation
| @@ -48,7 +49,7 @@ | |||
|
|
|||
| if $sql { | |||
| exec{ "${dbname}-import": | |||
| command => "/usr/bin/mysql ${dbname} < ${sql}", | |||
| command => "/bin/ls ${sql_inputs} | /usr/bin/xargs -I {} /bin/sh -c '/usr/bin/mysql ${dbname} < {} '", | |||
There was a problem hiding this comment.
for one, i'm only now notiicing /usr/bin/mysql - that's not really cool for anything that's not linux.
i'm not happy with the use of ls & xargs here.
is there a less convoluted way to do that?
command => "cat ${sql_inputs} | mysql ${dbname}"There was a problem hiding this comment.
@igalic I though I tried the cat solution and it didn't work. I tried back now and it seems to work, so yes I agree to go with that one
[root@monitor sql]# cat query1.sql
CREATE DATABASE test_1;
USE test_1;
SELECT User FROM mysql.user;
[root@monitor sql]# cat query2.sql
CREATE DATABASE test_2;
USE test_2;
SELECT User FROM mysql.user;
[root@monitor sql]# cat query1.sql query2.sql | mysql -uroot -ppassword
User
root
root
User
root
root
[root@monitor sql]# For the path to mysql how would you like to see it dealt with ?
There was a problem hiding this comment.
the only problem with cat is, if a file has no trailing \n.
generally, i'd just leave it as mysql. but i think that's for another time/pr to discuss.
at this stage we need to think how to add spec tests to cover this!
Spredzy
force-pushed
the
allow_multiple_import_at_a_time
branch
from
13efef0 to
1321e92
Compare
|
@igalic updated |
| logoutput => true, | ||
| environment => "HOME=${::root_home}", | ||
| refreshonly => $refresh, | ||
| path => '/bin:/sbin:/usr/bin:/usr/sbin', |
There was a problem hiding this comment.
i'd add '/usr/local/bin' and then we'd cover *BSD as well ;)
|
for spec tests, please take a look at our contributing doc |
Spredzy
force-pushed
the
allow_multiple_import_at_a_time
branch
from
1321e92 to
966c9c2
Compare
|
@igalic is this test enough, or something else should be covered ? |
|
let's see when travis says when it's finished. |
A user might need to import several files on database creation.
Currently the module only allows the import of a single file.
This commit allows one to, from now on, import severals.
Before :
mysql::db { 'test' :
sql => '/tmp/my_import1.sql',
}
Now :
mysql::db { 'test' :
sql => [
'/tmp/my_import1.sql',
'/tmp/my_import2.sql',
]
}
Spredzy
force-pushed
the
allow_multiple_import_at_a_time
branch
from
966c9c2 to
5e6a1c4
Compare
|
up ? |
|
whoops. sorry ._. |
(MODULES-1338) Allow mysql::db to import several files
|
and thanks, Alot! |
Remove the dependency on stdlib 4.x puppetlabs#574 introduced, add some input validation, and improve test checks.
A user might need to import several files on database creation.
Currently the module only allows the import of a single file.
This commit allows one to, from now on, import severals.
Before :
mysql::db { 'test' : sql => '/tmp/my_import1.sql', }Now :
mysql::db { 'test' : sql => [ '/tmp/my_import1.sql', '/tmp/my_import2.sql', ] }