Change SQL charset for message_db to utf8mb4

This commit is contained in:
Petter Helset
2017-10-26 13:49:57 +02:00
parent 67d0f6514d
commit 3d8d3956fe
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ module Postal
# it would be undesirable as we'd just end up with lots of connections. # it would be undesirable as we'd just end up with lots of connections.
def self.new_client def self.new_client
Mysql2::Client.new(:host => Postal.config.message_db.host, :username => Postal.config.message_db.username, :password => Postal.config.message_db.password, :port => Postal.config.message_db.port, :reconnect => true) Mysql2::Client.new(:host => Postal.config.message_db.host, :username => Postal.config.message_db.username, :password => Postal.config.message_db.password, :port => Postal.config.message_db.port, :reconnect => true, :encoding => Postal.config.message_db.encoding || 'utf8mb4')
end end
@free_clients = [] @free_clients = []
+2 -2
View File
@@ -33,7 +33,7 @@ module Postal
# Creates a new empty database # Creates a new empty database
# #
def create def create
@database.query("CREATE DATABASE `#{@database.database_name}` CHARSET utf8 COLLATE UTF8_UNICODE_CI;") @database.query("CREATE DATABASE `#{@database.database_name}` CHARSET utf8mb4 COLLATE utf8mb4_bin;")
true true
rescue Mysql2::Error => e rescue Mysql2::Error => e
e.message =~ /database exists/ ? false : raise e.message =~ /database exists/ ? false : raise
@@ -185,7 +185,7 @@ module Postal
s << ", PRIMARY KEY (`id`)" s << ", PRIMARY KEY (`id`)"
end end
s << ") ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;" s << ") ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;"
end end
end end