summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-07-29 09:35:50 +0000
committerGerrit Code Review <review@openstack.org>2014-07-29 09:35:50 +0000
commitff32fdf93f8bd1804d35b0a4efb19d7f8a103f50 (patch)
tree77bf157a4124bf521cf9d5e5e84b38345d7f7bf1
parentd1ca4073dd365e897b0c52de5e9c4f052ed6efac (diff)
parent3bf8941cca8e03e83a1f9810300f6c60f351e1ae (diff)
downloadoslo-db-ff32fdf93f8bd1804d35b0a4efb19d7f8a103f50.tar.gz
Merge "Specify raise_on_warnings=False for mysqlconnector"
-rw-r--r--oslo/db/sqlalchemy/session.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/oslo/db/sqlalchemy/session.py b/oslo/db/sqlalchemy/session.py
index ba6b8f7..442ee21 100644
--- a/oslo/db/sqlalchemy/session.py
+++ b/oslo/db/sqlalchemy/session.py
@@ -455,6 +455,11 @@ def create_engine(sql_connection, sqlite_fk=False, mysql_sql_mode=None,
engine_args['max_overflow'] = max_overflow
if pool_timeout is not None:
engine_args['pool_timeout'] = pool_timeout
+ if connection_dict.get_dialect().driver == 'mysqlconnector':
+ # mysqlconnector engine (<1.0) incorrectly defaults to
+ # raise_on_warnings=True
+ # https://bitbucket.org/zzzeek/sqlalchemy/issue/2515
+ engine_args['connect_args'] = {'raise_on_warnings': False}
engine = sqlalchemy.create_engine(sql_connection, **engine_args)