Merge "Support unicode in the keystone database."

openstack · Feb 27, 2012 · 9075d25 · 9075d25
2 parents 746cd92 + cdac09e
commit 9075d25
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -4,6 +4,7 @@ Akira YOSHIYAMA <akirayoshiyama@gmail.com>
 Alan Pevec <apevec@redhat.com>
 Alex Silva <alex.silva@M1BPAGY.(none)>
 Alvaro Lopez Garcia <aloga@ifca.unican.es>
+Andrew Bogott <abogott@wikimedia.org>
 Andy Smith <github@anarkystic.com>
 Anne Gentle <anne.gentle@rackspace.com>
 annegentle <anne@openstack.org>

diff --git a/keystone/common/sql/core.py b/keystone/common/sql/core.py
@@ -105,6 +105,7 @@ def get_engine(self):
 
         engine_args = {'pool_recycle': CONF.sql.idle_timeout,
                        'echo': False,
+                       'convert_unicode': True
                        }
 
         if 'sqlite' in connection_dict.drivername: