Changeset 2954

Timestamp:

06/21/06 09:37:16 (17 years ago)

Author:

jerome

Message:

Ensures that the databases are created with UTF-8 encoding, and that the
client tells that we will always use UTF-8 when sending datas to the server
or retrieving them.

Location:

pykota/trunk

Files:

• initscripts/mysql/pykota-mysql.sql (modified) (1 diff)
• initscripts/postgresql/pykota-postgresql.sql (modified) (1 diff)
• pykota/storages/mysqlstorage.py (modified) (1 diff)
• pykota/storages/pgstorage.py (modified) (1 diff)

pykota/trunk/initscripts/mysql/pykota-mysql.sql

@@ -31 +31 @@
 -- Create the print quota database
 --
-CREATE DATABASE pykota;
+CREATE DATABASE pykota DEFAULT CHARACTER SET 'utf8';
 
 --

pykota/trunk/initscripts/postgresql/pykota-postgresql.sql

@@ -31 +31 @@
 -- Create the print quota database
 --
-CREATE DATABASE pykota;
+CREATE DATABASE pykota WITH ENCODING='UTF-8';
 
 --

pykota/trunk/pykota/storages/mysqlstorage.py

@@ -50 +50 @@
         self.database.autocommit(1)
         self.cursor = self.database.cursor()
+        self.cursor.execute("SET NAMES 'utf8';")
         self.cursor.execute("SET TRANSACTION ISOLATION LEVEL READ COMMITTED;") # Same as PostgreSQL and Oracle's default
         self.closed = 0

pykota/trunk/pykota/storages/pgstorage.py

@@ -54 +54 @@
         self.database = pg.connect(host=host, port=port, dbname=dbname, user=user, passwd=passwd)
         self.closed = 0
+        self.database.query("SET CLIENT_ENCODING TO 'UTF-8';")
         self.tool.logdebug("Database opened (host=%s, port=%s, dbname=%s, user=%s)" % (host, port, dbname, user))