Merge pull request #44 from gisce/bugfix/57394_fix_column_exist_only_…

…in_public_schema FIX metodo column_exists para casos de varios schemas
gisce · Jul 23, 2024 · 4738392 · 4738392
2 parents 7f856e4 + 18575a3
commit 4738392
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/oopgrade/oopgrade.py b/oopgrade/oopgrade.py
@@ -258,7 +258,7 @@ def add_columns(cr, column_spec, multiple=True):
             logger.info("table %s: add column %s",
                         table, column)
             if column_exists(cr, table, column):
-                logger.warn("table %s: column %s already exists",
+                logger.warning("table %s: column %s already exists",
                             table, column)
             else:
                 if multiple:
@@ -607,11 +607,13 @@ def column_exists(cr, table, column):
     :rtype: bool
     """
     cr.execute(
-        'SELECT count(attname) FROM pg_attribute '
-        'WHERE attrelid = '
-        '( SELECT oid FROM pg_class WHERE relname = %s ) '
-        'AND attname = %s',
-        (table, column));
+        'SELECT count(attname) FROM pg_attribute WHERE attrelid = ('
+            'SELECT oid FROM pg_class WHERE relname = %s AND relnamespace = ('
+                'SELECT oid FROM pg_namespace WHERE nspname = "public"'
+            ') AND relkind = "r"'
+        ') AND attname = %s',
+        (table, column)
+    )
     return cr.fetchone()[0] == 1
 
 

diff --git a/spec/data_migration_spec.py b/spec/data_migration_spec.py
@@ -207,7 +207,7 @@ def callback():
                 *expected_sql
             ))
     with description('Adding columns'):
-        with it('usign multiple at once'):
+        with it('using multiple at once'):
             cursor = Mock()
             cursor.fetchone.side_effect = [
                 [0],  # No record for random1
@@ -221,16 +221,18 @@ def callback():
             }
             add_columns(cursor, columns, multiple=True)
             expected_sql = [
-                call('SELECT count(attname) FROM pg_attribute WHERE attrelid = ( SELECT oid FROM pg_class WHERE relname = %s ) AND attname = %s', ('test_model', 'random1')),
                 call(
-                    'SELECT count(attname) FROM pg_attribute WHERE attrelid = ( SELECT oid FROM pg_class WHERE relname = %s ) AND attname = %s',
-                    ('test_model', 'random2')),
+                    'SELECT count(attname) FROM pg_attribute WHERE attrelid = (SELECT oid FROM pg_class WHERE relname = %s AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = "public") AND relkind = "r") AND attname = %s', ('test_model', 'random1')
+                ),
                 call(
-                    'ALTER TABLE "test_model" ADD COLUMN "random1" character varying(16),\nADD COLUMN "random2" character varying(16)'),
-
+                    'SELECT count(attname) FROM pg_attribute WHERE attrelid = (SELECT oid FROM pg_class WHERE relname = %s AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = "public") AND relkind = "r") AND attname = %s', ('test_model', 'random2')
+                ),
+                call(
+                    'ALTER TABLE "test_model" ADD COLUMN "random1" character varying(16),\nADD COLUMN "random2" character varying(16)'
+                ),
             ]
             expect(cursor.execute.call_args_list).to(contain_exactly(
-                 *expected_sql
+                *expected_sql
             ))
     with description('Adding columns'):
         with it('usign column by column'):
@@ -248,12 +250,12 @@ def callback():
             add_columns(cursor, columns, multiple=False)
             expected_sql = [
                 call(
-                    'SELECT count(attname) FROM pg_attribute WHERE attrelid = ( SELECT oid FROM pg_class WHERE relname = %s ) AND attname = %s',
+                    'SELECT count(attname) FROM pg_attribute WHERE attrelid = (SELECT oid FROM pg_class WHERE relname = %s AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = "public") AND relkind = "r") AND attname = %s',
                     ('test_model', 'random1')),
                 call(
                     'ALTER TABLE "test_model" ADD COLUMN "random1" character varying(16)'),
                 call(
-                    'SELECT count(attname) FROM pg_attribute WHERE attrelid = ( SELECT oid FROM pg_class WHERE relname = %s ) AND attname = %s',
+                    'SELECT count(attname) FROM pg_attribute WHERE attrelid = (SELECT oid FROM pg_class WHERE relname = %s AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = "public") AND relkind = "r") AND attname = %s',
                     ('test_model', 'random2')),
                 call(
                     'ALTER TABLE "test_model" ADD COLUMN "random2" character varying(16)'),