Skip to content

Commit 9b7adbf

Browse files
author
Ashley Penney
committed
Merge pull request #291 from inkblot/fix_issue_290
Add collation with the create statement
2 parents 78ec15b + 602ec13 commit 9b7adbf

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

lib/puppet/provider/mysql_database/mysql.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def self.prefetch(resources)
4242
end
4343

4444
def create
45-
mysql([defaults_file, '-NBe', "create database `#{@resource[:name]}` character set #{@resource[:charset]}"].compact)
45+
mysql([defaults_file, '-NBe', "create database `#{@resource[:name]}` character set #{@resource[:charset]} collate #{@resource[:collate]}"].compact)
4646

4747
@property_hash[:ensure] = :present
4848
@property_hash[:charset] = @resource[:charset]

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,23 +55,23 @@
5555
end
5656

5757
describe 'create' do
58-
it 'makes a user' do
59-
provider.expects(:mysql).with([defaults_file, '-NBe', "create database `#{resource[:name]}` character set #{resource[:charset]}"])
58+
it 'makes a database' do
59+
provider.expects(:mysql).with([defaults_file, '-NBe', "create database `#{resource[:name]}` character set #{resource[:charset]} collate #{resource[:collate]}"])
6060
provider.expects(:exists?).returns(true)
6161
provider.create.should be_true
6262
end
6363
end
6464

6565
describe 'destroy' do
66-
it 'removes a user if present' do
66+
it 'removes a database if present' do
6767
provider.expects(:mysql).with([defaults_file, '-NBe', "drop database `#{resource[:name]}`"])
6868
provider.expects(:exists?).returns(false)
6969
provider.destroy.should be_true
7070
end
7171
end
7272

7373
describe 'exists?' do
74-
it 'checks if user exists' do
74+
it 'checks if database exists' do
7575
instance.exists?.should be_true
7676
end
7777
end

0 commit comments

Comments
 (0)