From 082b968bbcec2abde196278e111987147ad2fa72 Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Tue, 11 Aug 2020 14:42:32 +0530 Subject: [PATCH] =?UTF-8?q?Fixed=20following=20schema=20diff=20issues:=20?= =?UTF-8?q?=20=201)=C2=A0Wrong=20SQL=20generated=20for=20the=20columns=20h?= =?UTF-8?q?aving=20different=20data=20type.=20=C2=A0=202)=20Added=20'castf?= =?UTF-8?q?unc'=20in=20the=20ignore=20list.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../browser/server_groups/servers/databases/casts/__init__.py | 2 +- .../schemas/tables/templates/columns/sql/10_plus/update.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py index ad1b78483..fa63c8c15 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py @@ -185,7 +185,7 @@ class CastView(PGChildNodeView, SchemaDiffObjectCompare): 'compare': [{'get': 'compare'}, {'get': 'compare'}] }) - keys_to_ignore = ['oid', 'id', 'oid-2'] + keys_to_ignore = ['oid', 'id', 'oid-2', 'castfunc'] def _init_(self, **kwargs): self.conn = None diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/10_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/10_plus/update.sql index 3914a1c57..259a2ca9d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/10_plus/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/10_plus/update.sql @@ -64,7 +64,7 @@ CACHE {{data.seqcache|int}} {% endif %} {% if 'attidentity' in data and data.attidentity != '' and o_data.attidentity != '' and data.attidentity != o_data.attidentity %} ALTER TABLE {{conn|qtIdent(data.schema, data.table)}} ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} SET GENERATED {% if data.attidentity == 'a' %}ALWAYS{% else%}BY DEFAULT{% endif %}{% if attidentity_params == false %};{% endif %} -{% else %} +{% elif attidentity_params %} ALTER TABLE {{conn|qtIdent(data.schema, data.table)}} ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %}{% endif %} {% if data.seqcycle %} SET CYCLE{% elif (data.seqcycle == False and o_data.seqcycle and data.seqcycle != o_data.seqcycle) %} SET NO CYCLE{% endif %}