Skip to content

Commit c747ea7

Browse files
committed
Merge pull request #422 from stevesaliman/master
fixed a quoting problem with the mysql_database provider
2 parents 3f9f0f6 + 80b97d2 commit c747ea7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lib/puppet/provider/mysql_database/mysql.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
def self.instances
88
mysql([defaults_file, '-NBe', 'show databases'].compact).split("\n").collect do |name|
99
attributes = {}
10-
mysql([defaults_file, '-NBe', 'show variables like "%_database"', name].compact).split("\n").each do |line|
10+
mysql([defaults_file, '-NBe', "show variables like '%_database'"].compact).split("\n").each do |line|
1111
k,v = line.split(/\s/)
1212
attributes[k] = v
1313
end

spec/unit/puppet/provider/mysql_database/mysql_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
Puppet::Util.stubs(:which).with('mysql').returns('/usr/bin/mysql')
3232
File.stubs(:file?).with('/root/.my.cnf').returns(true)
3333
provider.class.stubs(:mysql).with([defaults_file, '-NBe', 'show databases']).returns('new_database')
34-
provider.class.stubs(:mysql).with([defaults_file, '-NBe', 'show variables like "%_database"', 'new_database']).returns("character_set_database latin1\ncollation_database latin1_swedish_ci\nskip_show_database OFF")
34+
provider.class.stubs(:mysql).with([defaults_file, '-NBe', "show variables like '%_database'"]).returns("character_set_database latin1\ncollation_database latin1_swedish_ci\nskip_show_database OFF")
3535
end
3636

3737
let(:instance) { provider.class.instances.first }
@@ -40,7 +40,7 @@
4040
it 'returns an array of databases' do
4141
provider.class.stubs(:mysql).with([defaults_file, '-NBe', 'show databases']).returns(raw_databases)
4242
raw_databases.each_line do |db|
43-
provider.class.stubs(:mysql).with([defaults_file, '-NBe', 'show variables like "%_database"', db.chomp]).returns("character_set_database latin1\ncollation_database latin1_swedish_ci\nskip_show_database OFF")
43+
provider.class.stubs(:mysql).with([defaults_file, '-NBe', "show variables like '%_database'"]).returns("character_set_database latin1\ncollation_database latin1_swedish_ci\nskip_show_database OFF")
4444
end
4545
databases = provider.class.instances.collect {|x| x.name }
4646
parsed_databases.should match_array(databases)

0 commit comments

Comments
 (0)