From 2d39b5fb412b896c02ccd812661d9920711f05de Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Fri, 14 Oct 2016 15:57:55 -0700 Subject: [PATCH] Identify the collation correctly when reverse engineering table SQL. Fixes #1847 --- .../templates/catalog_object_column/sql/9.1_plus/properties.sql | 2 +- .../schemas/tables/templates/column/sql/9.1_plus/properties.sql | 2 +- .../schemas/tables/templates/column/sql/9.2_plus/properties.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/templates/catalog_object_column/sql/9.1_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/templates/catalog_object_column/sql/9.1_plus/properties.sql index b2ca255b9..1bb71462e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/templates/catalog_object_column/sql/9.1_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/templates/catalog_object_column/sql/9.1_plus/properties.sql @@ -11,7 +11,7 @@ SELECT indkey, coll.collname, nspc.nspname as collnspname , attoptions, -- Start pgAdmin4, added to save time on client side parsing CASE WHEN length(coll.collname) > 0 AND length(nspc.nspname) > 0 THEN - concat(coll.collname,'."',nspc.nspname,'"') + concat(quote_ident(nspc.nspname),'.',quote_ident(coll.collname)) ELSE '' END AS collspcname, CASE WHEN strpos(format_type(ty.oid,att.atttypmod), '.') > 0 THEN split_part(format_type(ty.oid,att.atttypmod), '.', 2) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.1_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.1_plus/properties.sql index bb96cff89..fa5c3f3d8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.1_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.1_plus/properties.sql @@ -11,7 +11,7 @@ SELECT att.attname as name, att.*, def.*, pg_catalog.pg_get_expr(def.adbin, def. indkey, coll.collname, nspc.nspname as collnspname , attoptions, -- Start pgAdmin4, added to save time on client side parsing CASE WHEN length(coll.collname) > 0 AND length(nspc.nspname) > 0 THEN - concat(quote_ident(coll.collname),'.',quote_ident(nspc.nspname)) + concat(quote_ident(nspc.nspname),'.',quote_ident(coll.collname)) ELSE '' END AS collspcname, CASE WHEN strpos(format_type(ty.oid,att.atttypmod), '.') > 0 THEN split_part(format_type(ty.oid,att.atttypmod), '.', 2) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.2_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.2_plus/properties.sql index b38349689..22cef71bf 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.2_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.2_plus/properties.sql @@ -11,7 +11,7 @@ SELECT att.attname as name, att.*, def.*, pg_catalog.pg_get_expr(def.adbin, def. indkey, coll.collname, nspc.nspname as collnspname , attoptions, -- Start pgAdmin4, added to save time on client side parsing CASE WHEN length(coll.collname) > 0 AND length(nspc.nspname) > 0 THEN - concat(quote_ident(coll.collname),'.',quote_ident(nspc.nspname)) + concat(quote_ident(nspc.nspname),'.',quote_ident(coll.collname)) ELSE '' END AS collspcname, CASE WHEN strpos(format_type(ty.oid,att.atttypmod), '.') > 0 THEN split_part(format_type(ty.oid,att.atttypmod), '.', 2)