Ensure correct sql is generated while changing column data type to char.

pgadmin-org#7113
yogeshmahajan-1903 · Jan 25, 2024 · a09d610 · a09d610
1 parent 4c5324b
commit a09d610
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/...s/databases/schemas/foreign_tables/templates/foreign_table_columns/sql/default/update.sql b/...s/databases/schemas/foreign_tables/templates/foreign_table_columns/sql/default/update.sql
@@ -35,8 +35,8 @@ ALTER FOREIGN TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}}
 -- the current datatype cannot be cast to the target cltype so this conversion cannot be made automatically.
 {% endif %}
 {% if data.col_type_conversion is defined and data.col_type_conversion == False %} -- {% endif %}ALTER FOREIGN TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}}
-{% if data.col_type_conversion is defined and data.col_type_conversion == False %} -- {% endif %}    ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} TYPE {{ GET_TYPE.UPDATE_TYPE_SQL(conn, data, o_data) }}{% if data.collspcname and data.collspcname != o_data.collspcname %}
- COLLATE {{data.collspcname}}{% elif o_data.collspcname %} COLLATE {{o_data.collspcname}}{% endif %};
+{% if data.col_type_conversion is defined and data.col_type_conversion == False %} -- {% endif %}    ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} TYPE {{ GET_TYPE.UPDATE_TYPE_SQL(conn, data, o_data) }}{% if data.collspcname and data.collspcname is not none %}{%if data.collspcname != o_data.collspcname %}
+ COLLATE {{data.collspcname}}{% elif data.collspcname is not none and o_data.collspcname %} COLLATE {{o_data.collspcname}}{% endif %}{% endif %};
 
 {% endif %}
 {###  Alter column default value ###}

diff --git a/...erver_groups/servers/databases/schemas/foreign_tables/tests/foreign_tables_test_data.json b/...erver_groups/servers/databases/schemas/foreign_tables/tests/foreign_tables_test_data.json
@@ -269,7 +269,7 @@
                 }
               ],
               "name": "emp",
-              "cltype": "text",
+              "cltype": "\"char\"",
               "attlen": null,
               "attnum": 1,
               "attnotnull": false,

diff --git a/...r_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_char.msql b/...r_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_char.msql
@@ -2,7 +2,7 @@ ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#"
     RENAME "col_2_$%{}[]()&*^!@""'`\/#" TO "new_col_2_$%{}[]()&*^!@""'`\/#";
 
 ALTER TABLE testschema."table_3_$%{}[]()&*^!@""'`\/#"
-    ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" TYPE character COLLATE pg_catalog."C";
+    ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" TYPE character;
 ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#"
     ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" SET STATISTICS 5;
 

diff --git a/...er_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_char.sql b/...er_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_char.sql
@@ -3,7 +3,7 @@
 -- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_2_$%{}[]()&*^!@""'`\/#";
 
 ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#"
-    ADD COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" character(1) COLLATE pg_catalog."C";
+    ADD COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" character(1) COLLATE pg_catalog."default";
 
 COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_2_$%{}[]()&*^!@""'`\/#"
     IS 'Comment for alter';

diff --git a/...r/server_groups/servers/databases/schemas/tables/templates/columns/sql/14_plus/update.sql b/...r/server_groups/servers/databases/schemas/tables/templates/columns/sql/14_plus/update.sql
@@ -17,8 +17,8 @@ ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}}
 
 {% endif %}
 {% if data.col_type_conversion is defined and data.col_type_conversion == False %} -- {% endif %}ALTER TABLE {{conn|qtIdent(data.schema, data.table)}}
-{% if data.col_type_conversion is defined and data.col_type_conversion == False %} -- {% endif %}    ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} TYPE {{ GET_TYPE.UPDATE_TYPE_SQL(conn, data, o_data) }}{% if data.collspcname and data.collspcname != o_data.collspcname %}
- COLLATE {{data.collspcname}}{% elif o_data.collspcname %} COLLATE {{o_data.collspcname}}{% endif %};
+{% if data.col_type_conversion is defined and data.col_type_conversion == False %} -- {% endif %}    ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} TYPE {{ GET_TYPE.UPDATE_TYPE_SQL(conn, data, o_data) }}{% if data.collspcname and data.collspcname is not none and data.collspcname != o_data.collspcname %}
+ COLLATE {{data.collspcname}}{% elif data.collspcname is not none and o_data.collspcname %} COLLATE {{o_data.collspcname}}{% endif %};
 {% endif %}
 {###  Alter column default value ###}
 {% if is_view_only and data.defval is defined and data.defval is not none and data.defval != '' and data.defval != o_data.defval %}

diff --git a/...r/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/update.sql b/...r/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/update.sql
@@ -17,8 +17,8 @@ ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}}
 
 {% endif %}
 {% if data.col_type_conversion is defined and data.col_type_conversion == False %} -- {% endif %}ALTER TABLE {{conn|qtIdent(data.schema, data.table)}}
-{% if data.col_type_conversion is defined and data.col_type_conversion == False %} -- {% endif %}    ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} TYPE {{ GET_TYPE.UPDATE_TYPE_SQL(conn, data, o_data) }}{% if data.collspcname and data.collspcname != o_data.collspcname %}
- COLLATE {{data.collspcname}}{% elif o_data.collspcname %} COLLATE {{o_data.collspcname}}{% endif %};
+{% if data.col_type_conversion is defined and data.col_type_conversion == False %} -- {% endif %}    ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} TYPE {{ GET_TYPE.UPDATE_TYPE_SQL(conn, data, o_data) }}{% if data.collspcname and data.collspcname is not none %}{%if data.collspcname != o_data.collspcname %}
+ COLLATE {{data.collspcname}}{% elif data.collspcname is not none and o_data.collspcname %} COLLATE {{o_data.collspcname}}{% endif %}{% endif %};
 {% endif %}
 {###  Alter column default value ###}
 {% if is_view_only and data.defval is defined and data.defval is not none and data.defval != '' and data.defval != o_data.defval %}

diff --git a/...rvers/databases/schemas/tables/tests/pg/12_plus/alter_table_change_col_data_type_msql.sql b/...rvers/databases/schemas/tables/tests/pg/12_plus/alter_table_change_col_data_type_msql.sql
@@ -2,7 +2,7 @@ ALTER TABLE public."simple_table_$%{}[]()&*^!@""'`\/#"
     ALTER COLUMN col1 TYPE bigint;
 
 ALTER TABLE public."simple_table_$%{}[]()&*^!@""'`\/#"
-    ALTER COLUMN col2 TYPE character varying COLLATE pg_catalog."default";
+    ALTER COLUMN col2 TYPE character varying;
 
 ALTER TABLE public."simple_table_$%{}[]()&*^!@""'`\/#"
     ALTER COLUMN col6 TYPE time(5) without time zone ;