From 4c19f93b3b4ff749da1f94e559910fa7bf9f389c Mon Sep 17 00:00:00 2001 From: Murtuza Zabuawala Date: Mon, 9 Jan 2017 15:05:22 +0530 Subject: [PATCH] Use the correct OID for retrieving properties of freshly created exclusion constraints. Fixes #1896 --- .../tables/constraints/exclusion_constraint/__init__.py | 2 +- .../templates/exclusion_constraint/sql/9.1_plus/get_oid.sql | 2 +- .../sql/9.1_plus/get_oid_with_transaction.sql | 6 +++--- .../templates/exclusion_constraint/sql/9.2_plus/get_oid.sql | 2 +- .../sql/9.2_plus/get_oid_with_transaction.sql | 6 +++--- .../templates/exclusion_constraint/sql/9.6_plus/get_oid.sql | 2 +- .../sql/9.6_plus/get_oid_with_transaction.sql | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py index d0995020c..6b7f52b09 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py @@ -622,7 +622,7 @@ class ExclusionConstraintView(PGChildNodeView): return make_json_response( status=400, success=0, - errormsg=e + errormsg=str(e) ) @check_precondition diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.1_plus/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.1_plus/get_oid.sql index 168e13bbe..7d4e46439 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.1_plus/get_oid.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.1_plus/get_oid.sql @@ -1,4 +1,4 @@ -SELECT ct.oid +SELECT ct.conindid AS oid FROM pg_constraint ct WHERE contype='x' AND ct.conname = {{ name|qtLiteral }}; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.1_plus/get_oid_with_transaction.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.1_plus/get_oid_with_transaction.sql index 0fc1fa8a1..13f809552 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.1_plus/get_oid_with_transaction.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.1_plus/get_oid_with_transaction.sql @@ -1,6 +1,6 @@ -SELECT ct.oid, - ct.conname as name, - NOT convalidated as convalidated +SELECT ct.conindid AS oid, + ct.conname AS name, + NOT convalidated AS convalidated FROM pg_constraint ct WHERE contype='x' AND conrelid = {{tid}}::oid LIMIT 1; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.2_plus/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.2_plus/get_oid.sql index 168e13bbe..7d4e46439 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.2_plus/get_oid.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.2_plus/get_oid.sql @@ -1,4 +1,4 @@ -SELECT ct.oid +SELECT ct.conindid AS oid FROM pg_constraint ct WHERE contype='x' AND ct.conname = {{ name|qtLiteral }}; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.2_plus/get_oid_with_transaction.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.2_plus/get_oid_with_transaction.sql index 0fc1fa8a1..13f809552 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.2_plus/get_oid_with_transaction.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.2_plus/get_oid_with_transaction.sql @@ -1,6 +1,6 @@ -SELECT ct.oid, - ct.conname as name, - NOT convalidated as convalidated +SELECT ct.conindid AS oid, + ct.conname AS name, + NOT convalidated AS convalidated FROM pg_constraint ct WHERE contype='x' AND conrelid = {{tid}}::oid LIMIT 1; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.6_plus/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.6_plus/get_oid.sql index 168e13bbe..7d4e46439 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.6_plus/get_oid.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.6_plus/get_oid.sql @@ -1,4 +1,4 @@ -SELECT ct.oid +SELECT ct.conindid AS oid FROM pg_constraint ct WHERE contype='x' AND ct.conname = {{ name|qtLiteral }}; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.6_plus/get_oid_with_transaction.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.6_plus/get_oid_with_transaction.sql index 0fc1fa8a1..13f809552 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.6_plus/get_oid_with_transaction.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/9.6_plus/get_oid_with_transaction.sql @@ -1,6 +1,6 @@ -SELECT ct.oid, - ct.conname as name, - NOT convalidated as convalidated +SELECT ct.conindid AS oid, + ct.conname AS name, + NOT convalidated AS convalidated FROM pg_constraint ct WHERE contype='x' AND conrelid = {{tid}}::oid LIMIT 1; \ No newline at end of file