← Back to branch summary

~zulcss/nova/ftbfs-jan1

« back to all changes in this revision

Viewing changes to debian/patches/sqlachemy-0.8.3-compat.patch

  • Committer: Chuck Short
  • Date: 2013-12-10 01:46:21 UTC
  • mfrom: (635.1.1 icehouse)
  • Revision ID: zulcss@ubuntu.com-20131210014621-ab2ozat13v8ll1wf
Refreshed sqlachemy patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/sqlachemy-0.8.3-compat.patch
20
20
Closes-Bug: #1252693
21
21
Change-Id: I52f2b5f90a2f9191767fadc7b1eacae236c30e98
22
22
---
23
 
 .../migrate_repo/versions/152_change_type_of_deleted_column.py   | 9 +++++++--
 
23
 .../migrate_repo/versions/152_change_type_of_deleted_column.py   | 9 +++++++-- 
24
24
 nova/db/sqlalchemy/utils.py                                      | 8 ++++++--
25
25
 2 files changed, 13 insertions(+), 4 deletions(-)
26
26
 
27
 
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/152_change_type_of_deleted_column.py b/nova/db/sqlalchemy/migrate_repo/versions/152_change_type_of_deleted_column.py
28
 
index 2da4487..98cfe76 100644
29
 
--- a/nova/db/sqlalchemy/migrate_repo/versions/152_change_type_of_deleted_column.py
30
 
+++ b/nova/db/sqlalchemy/migrate_repo/versions/152_change_type_of_deleted_column.py
31
 
@@ -168,8 +168,13 @@ def upgrade(migrate_engine):
32
 
             if not isinstance(constraint, CheckConstraint):
33
 
                 return False
34
 
             sqltext = str(constraint.sqltext)
35
 
-            return (sqltext.endswith("deleted in (0, 1)") or
36
 
-                    sqltext.endswith("deleted IN (:deleted_1, :deleted_2)"))
37
 
+            constraint_markers = (
38
 
+                "deleted in (0, 1)",
39
 
+                "deleted IN (:deleted_1, :deleted_2)",
40
 
+                "deleted IN (:param_1, :param_2)"
41
 
+            )
42
 
+            return any(
43
 
+                    sqltext.endswith(marker) for marker in constraint_markers)
44
 
 
45
 
         constraints = []
46
 
         for constraint in table.constraints:
47
 
diff --git a/nova/db/sqlalchemy/utils.py b/nova/db/sqlalchemy/utils.py
48
 
index b07058c..d65d03d 100644
49
 
--- a/nova/db/sqlalchemy/utils.py
50
 
+++ b/nova/db/sqlalchemy/utils.py
51
 
@@ -514,8 +514,12 @@ def _change_deleted_column_type_to_id_type_sqlite(migrate_engine, table_name,
 
27
diff -Naurp nova-2014.1.dev100.ga27cf10.orig/nova/db/sqlalchemy/utils.py nova-2014.1.dev100.ga27cf10/nova/db/sqlalchemy/utils.py
 
28
--- nova-2014.1.dev100.ga27cf10.orig/nova/db/sqlalchemy/utils.py        2013-12-09 09:49:18.000000000 -0500
 
29
+++ nova-2014.1.dev100.ga27cf10/nova/db/sqlalchemy/utils.py     2013-12-09 09:56:34.058389265 -0500
 
30
@@ -514,8 +514,12 @@ def _change_deleted_column_type_to_id_ty
52
31
         if not isinstance(constraint, CheckConstraint):
53
32
             return False
54
33
         sqltext = str(constraint.sqltext)
63
42
 
64
43
     constraints = []
65
44
     for constraint in table.constraints:
66
 
1.8.5
67