Merge pull request #565 from mmonaco/master

mysql_database: prevent syntax error with collate=>'binary'
xbezdick · Sep 16, 2014 · 86c7fcf · 86c7fcf
2 parents fbef97d + d986a87
commit 86c7fcf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/lib/puppet/provider/mysql_database/mysql.rb b/lib/puppet/provider/mysql_database/mysql.rb
@@ -31,7 +31,7 @@ def self.prefetch(resources)
   end
 
   def create
-    mysql([defaults_file, '-NBe', "create database if not exists `#{@resource[:name]}` character set #{@resource[:charset]} collate #{@resource[:collate]}"].compact)
+    mysql([defaults_file, '-NBe', "create database if not exists `#{@resource[:name]}` character set `#{@resource[:charset]}` collate `#{@resource[:collate]}`"].compact)
 
     @property_hash[:ensure]  = :present
     @property_hash[:charset] = @resource[:charset]

diff --git a/spec/unit/puppet/provider/mysql_database/mysql_spec.rb b/spec/unit/puppet/provider/mysql_database/mysql_spec.rb
@@ -56,7 +56,7 @@
 
   describe 'create' do
     it 'makes a database' do
-      provider.expects(:mysql).with([defaults_file, '-NBe', "create database if not exists `#{resource[:name]}` character set #{resource[:charset]} collate #{resource[:collate]}"])
+      provider.expects(:mysql).with([defaults_file, '-NBe', "create database if not exists `#{resource[:name]}` character set `#{resource[:charset]}` collate `#{resource[:collate]}`"])
       provider.expects(:exists?).returns(true)
       expect(provider.create).to be_truthy
     end

diff --git a/tests/mysql_database.pp b/tests/mysql_database.pp
@@ -10,3 +10,8 @@
   ensure  => present,
   charset => 'latin1',
 }
+database{ 'test5':
+  ensure  => present,
+  charset => 'binary',
+  collate => 'binary',
+}