x/deb-oslo.db
Code Issues Proposed changes

Add DBDuplicateEntry detection for mysqlconnector driver

Browse Source 
Actually, adjust the mysql regex to match on the "Duplicate entry 'foo'
for key 'bar'" error string that is presumably buried deep within mysqld
itself, with less regard to specific punctuation.
Hopefully this will be portable between all mysql drivers.

Change-Id: I241c5cb61a6335857942bf79ee2301ae0c94ff6e
This commit is contained in:
Angus Lees
2014-07-02 18:23:19 +10:00
parent 9c423b43e6
commit baf30bf6c4
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
oslo/db/sqlalchemy/session.py
View File

@@ -328,12 +328,20 @@ class SqliteForeignKeysListener(PoolListener):
# N columns - (IntegrityError) duplicate key value violates unique # N columns - (IntegrityError) duplicate key value violates unique
# constraint "name_of_our_constraint" # constraint "name_of_our_constraint"
# #
# mysql: # mysql+mysqldb:
# 1 column - (IntegrityError) (1062, "Duplicate entry 'value_of_c1' for key # 1 column - (IntegrityError) (1062, "Duplicate entry 'value_of_c1' for key
# 'c1'") # 'c1'")
# N columns - (IntegrityError) (1062, "Duplicate entry 'values joined # N columns - (IntegrityError) (1062, "Duplicate entry 'values joined
# with -' for key 'name_of_our_constraint'") # with -' for key 'name_of_our_constraint'")
# #
# mysql+mysqlconnector:
# http://docs.sqlalchemy.org/en/rel_0_9/dialects/
# mysql.html#module-sqlalchemy.dialects.mysql.mysqlconnector
# 1 column - (IntegrityError) 1062 (23000): Duplicate entry 'value_of_c1' for
# key 'c1'
# N columns - (IntegrityError) 1062 (23000): Duplicate entry 'values
# joined with -' for key 'name_of_our_constraint'
#
# ibm_db_sa: # ibm_db_sa:
# N columns - (IntegrityError) SQL0803N One or more values in the INSERT # N columns - (IntegrityError) SQL0803N One or more values in the INSERT
# statement, UPDATE statement, or foreign key update caused by a # statement, UPDATE statement, or foreign key update caused by a
@@ -344,8 +352,9 @@ class SqliteForeignKeysListener(PoolListener):
_DUP_KEY_RE_DB = { _DUP_KEY_RE_DB = {
"sqlite": (re.compile(r"^.*columns?([^)]+)(is|are)\s+not\s+unique$"), "sqlite": (re.compile(r"^.*columns?([^)]+)(is|are)\s+not\s+unique$"),
re.compile(r"^.*UNIQUE\s+constraint\s+failed:\s+(.+)$")), re.compile(r"^.*UNIQUE\s+constraint\s+failed:\s+(.+)$")),
"postgresql": (re.compile(r"^.*duplicate\s+key.*\"([^\"]+)\"\s*\n.*$"),), "postgresql": (re.compile(r'^.*duplicate\s+key.*"([^"]+)"\s*\n.*$'),),
"mysql": (re.compile(r"^.*\(1062,.*'([^\']+)'\"\)$"),), "mysql": (re.compile(
r"^.*\b1062\b.*Duplicate entry '[^']+' for key '([^']+)'.*$"),),
"ibm_db_sa": (re.compile(r"^.*SQL0803N.*$"),), "ibm_db_sa": (re.compile(r"^.*SQL0803N.*$"),),
} }

9
tests/sqlalchemy/test_utils.py
View File

@@ -719,13 +719,20 @@ class TestRaiseDuplicateEntryError(test_base.BaseTestCase):
'(IntegrityError) UNIQUE constraint failed: tbl.a, tbl.b' '(IntegrityError) UNIQUE constraint failed: tbl.a, tbl.b'
) )
def test_mysql(self): def test_mysql_mysqldb(self):
self._test_impl( self._test_impl(
'mysql', 'mysql',
'(IntegrityError) (1062, "Duplicate entry ' '(IntegrityError) (1062, "Duplicate entry '
'\'2-3\' for key \'uniq_tbl0a0b\'")' '\'2-3\' for key \'uniq_tbl0a0b\'")'
) )
def test_mysql_mysqlconnector(self):
self._test_impl(
'mysql',
'(IntegrityError) 1062 (23000): Duplicate entry '
'\'2-3\' for key \'uniq_tbl0a0b\'',
)
def test_postgresql(self): def test_postgresql(self):
self._test_impl( self._test_impl(
'postgresql', 'postgresql',