diff options
| -rw-r--r-- | oslo.db/locale/fr/LC_MESSAGES/oslo.db.po | 12 | ||||
| -rw-r--r-- | oslo_db/sqlalchemy/engines.py | 5 | ||||
| -rw-r--r-- | oslo_db/tests/sqlalchemy/test_sqlalchemy.py | 18 |
3 files changed, 26 insertions, 9 deletions
diff --git a/oslo.db/locale/fr/LC_MESSAGES/oslo.db.po b/oslo.db/locale/fr/LC_MESSAGES/oslo.db.po index 4da7424..8fa634b 100644 --- a/oslo.db/locale/fr/LC_MESSAGES/oslo.db.po +++ b/oslo.db/locale/fr/LC_MESSAGES/oslo.db.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: oslo.db\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-29 06:40+0000\n" -"PO-Revision-Date: 2015-07-28 21:03+0000\n" +"POT-Creation-Date: 2015-07-31 06:56+0000\n" +"PO-Revision-Date: 2015-07-30 21:34+0000\n" "Last-Translator: Maxime COQUEREL <max.coquerel@gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/oslodb/language/" "fr/)\n" @@ -49,6 +49,14 @@ msgstr "" "indiquer manuellement la version courante du schéma." #, python-format +msgid "" +"There is no `deleted` column in `%s` table. Project doesn't use soft-deleted " +"feature." +msgstr "" +"Il n'y a aucune colonne `deleted` dans la table `%s`. Le projet ne peut pas " +"utiliser cette fonctionnalité." + +#, python-format msgid "There is no `project_id` column in `%s` table." msgstr "Il n'y a pas de colonne `project_id` dans la table `%s`." diff --git a/oslo_db/sqlalchemy/engines.py b/oslo_db/sqlalchemy/engines.py index 6e041a2..84e4d12 100644 --- a/oslo_db/sqlalchemy/engines.py +++ b/oslo_db/sqlalchemy/engines.py @@ -211,7 +211,10 @@ def _init_connection_args(url, engine_args, **kw): # to internal usage of Python unicode objects in the driver # http://docs.sqlalchemy.org/en/rel_0_9/dialects/mysql.html if 'use_unicode' not in url.query: - engine_args['connect_args']['use_unicode'] = 0 + if six.PY3: + engine_args['connect_args']['use_unicode'] = 1 + else: + engine_args['connect_args']['use_unicode'] = 0 @utils.dispatch_for_dialect('*', multiple=True) diff --git a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py index 671cd27..49f43a1 100644 --- a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py +++ b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py @@ -23,6 +23,7 @@ import fixtures import mock from oslo_config import cfg from oslotest import base as oslo_test +import six import sqlalchemy from sqlalchemy import Column, MetaData, Table from sqlalchemy.engine import url @@ -597,17 +598,23 @@ class CreateEngineTest(oslo_test.BaseTestCase): # no need to specify this self.assertTrue('poolclass' not in self.args) + def _test_mysql_connect_args_default(self, connect_args): + if six.PY3: + self.assertEqual(connect_args, + {'charset': 'utf8', 'use_unicode': 1}) + else: + self.assertEqual(connect_args, + {'charset': 'utf8', 'use_unicode': 0}) + def test_mysql_connect_args_default(self): engines._init_connection_args( url.make_url("mysql://u:p@host/test"), self.args) - self.assertEqual(self.args['connect_args'], - {'charset': 'utf8', 'use_unicode': 0}) + self._test_mysql_connect_args_default(self.args['connect_args']) def test_mysql_oursql_connect_args_default(self): engines._init_connection_args( url.make_url("mysql+oursql://u:p@host/test"), self.args) - self.assertEqual(self.args['connect_args'], - {'charset': 'utf8', 'use_unicode': 0}) + self._test_mysql_connect_args_default(self.args['connect_args']) def test_mysql_pymysql_connect_args_default(self): engines._init_connection_args( @@ -618,8 +625,7 @@ class CreateEngineTest(oslo_test.BaseTestCase): def test_mysql_mysqldb_connect_args_default(self): engines._init_connection_args( url.make_url("mysql+mysqldb://u:p@host/test"), self.args) - self.assertEqual(self.args['connect_args'], - {'charset': 'utf8', 'use_unicode': 0}) + self._test_mysql_connect_args_default(self.args['connect_args']) def test_postgresql_connect_args_default(self): engines._init_connection_args( |