diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-07 15:33:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-07 15:33:30 +0000 |
| commit | 106376d59f9a25fef94baf413316b22c7d4218d2 (patch) | |
| tree | 208a31407d3f04837cabab40e8da41f6f6b4c314 | |
| parent | 2f013887c20310c522f9494ed854554e6f8c7aa4 (diff) | |
| parent | 30cb47ee205400787af8f7fb739e8b67edc16dd0 (diff) | |
| download | oslo-106376d59f9a25fef94baf413316b22c7d4218d2.tar.gz oslo-106376d59f9a25fef94baf413316b22c7d4218d2.tar.xz oslo-106376d59f9a25fef94baf413316b22c7d4218d2.zip | |
Merge "Changed processing unique constraint name."
| -rw-r--r-- | openstack/common/db/sqlalchemy/session.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openstack/common/db/sqlalchemy/session.py b/openstack/common/db/sqlalchemy/session.py index dbc0bc8..4394846 100644 --- a/openstack/common/db/sqlalchemy/session.py +++ b/openstack/common/db/sqlalchemy/session.py @@ -436,7 +436,7 @@ def _raise_if_duplicate_entry_error(integrity_error, engine_name): """ def get_columns_from_uniq_cons_or_name(columns): - # note(vsergeyev): UniqueConstraint name convention: "uniq_t$c1$c2" + # note(vsergeyev): UniqueConstraint name convention: "uniq_t0c10c2" # where `t` it is table name and columns `c1`, `c2` # are in UniqueConstraint. uniqbase = "uniq_" @@ -444,7 +444,7 @@ def _raise_if_duplicate_entry_error(integrity_error, engine_name): if engine_name == "postgresql": return [columns[columns.index("_") + 1:columns.rindex("_")]] return [columns] - return columns[len(uniqbase):].split("$")[1:] + return columns[len(uniqbase):].split("0")[1:] if engine_name not in ["mysql", "sqlite", "postgresql"]: return |