From 522b62cb07ed2cb3cd6f3ee52530b8ab4b9bcfe8 Mon Sep 17 00:00:00 2001
From: ataft <11670864+ataft@users.noreply.github.com>
Date: Thu, 18 Oct 2018 13:32:52 -0700
Subject: [PATCH 1/2] Fix hard-coded "pkName" column in queries

---
 lib/discovery.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/discovery.js b/lib/discovery.js
index 895716eb..e3651384 100644
--- a/lib/discovery.js
+++ b/lib/discovery.js
@@ -263,7 +263,7 @@ function mixinDiscovery(PostgreSQL) {
     var sql =
       'SELECT tc.table_schema AS "fkOwner", tc.constraint_name AS "fkName", tc.table_name AS "fkTableName",'
       + ' kcu.column_name AS "fkColumnName", kcu.ordinal_position AS "keySeq",'
-      + ' ccu.table_schema AS "pkOwner", \'PK\' AS "pkName", '
+      + ' ccu.table_schema AS "pkOwner", (select constraint_name from information_schema.table_constraints tc2 where tc2.constraint_type = \'PRIMARY KEY\' and tc2.table_name=ccu.table_name limit 1) AS "pkName", '
       + ' ccu.table_name AS "pkTableName", ccu.column_name AS "pkColumnName"'
       + ' FROM information_schema.table_constraints tc'
       + ' JOIN information_schema.key_column_usage AS kcu'
@@ -297,7 +297,7 @@ function mixinDiscovery(PostgreSQL) {
   PostgreSQL.prototype.buildQueryExportedForeignKeys = function(owner, table) {
     var sql = 'SELECT kcu.constraint_name AS "fkName", kcu.table_schema AS "fkOwner", kcu.table_name AS "fkTableName",'
       + ' kcu.column_name AS "fkColumnName", kcu.ordinal_position AS "keySeq",'
-      + ' \'PK\' AS "pkName", ccu.table_schema AS "pkOwner",'
+      + ' (select constraint_name from information_schema.table_constraints tc2 where tc2.constraint_type = \'PRIMARY KEY\' and tc2.table_name=ccu.table_name limit 1) AS "pkName", ccu.table_schema AS "pkOwner",'
       + ' ccu.table_name AS "pkTableName", ccu.column_name AS "pkColumnName"'
       + ' FROM'
       + ' information_schema.constraint_column_usage ccu'

From a9d1bcce8928d7e9c288135dc78347e28d71b02d Mon Sep 17 00:00:00 2001
From: ataft <11670864+ataft@users.noreply.github.com>
Date: Mon, 22 Oct 2018 09:57:17 -0700
Subject: [PATCH 2/2] Fixed line length to pass lint

---
 lib/discovery.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/discovery.js b/lib/discovery.js
index e3651384..0eeb83d3 100644
--- a/lib/discovery.js
+++ b/lib/discovery.js
@@ -263,7 +263,10 @@ function mixinDiscovery(PostgreSQL) {
     var sql =
       'SELECT tc.table_schema AS "fkOwner", tc.constraint_name AS "fkName", tc.table_name AS "fkTableName",'
       + ' kcu.column_name AS "fkColumnName", kcu.ordinal_position AS "keySeq",'
-      + ' ccu.table_schema AS "pkOwner", (select constraint_name from information_schema.table_constraints tc2 where tc2.constraint_type = \'PRIMARY KEY\' and tc2.table_name=ccu.table_name limit 1) AS "pkName", '
+      + ' ccu.table_schema AS "pkOwner",'
+      + ' (SELECT constraint_name'
+      + ' FROM information_schema.table_constraints tc2'
+      + ' WHERE tc2.constraint_type = \'PRIMARY KEY\' and tc2.table_name=ccu.table_name limit 1) AS "pkName",'
       + ' ccu.table_name AS "pkTableName", ccu.column_name AS "pkColumnName"'
       + ' FROM information_schema.table_constraints tc'
       + ' JOIN information_schema.key_column_usage AS kcu'
@@ -297,8 +300,10 @@ function mixinDiscovery(PostgreSQL) {
   PostgreSQL.prototype.buildQueryExportedForeignKeys = function(owner, table) {
     var sql = 'SELECT kcu.constraint_name AS "fkName", kcu.table_schema AS "fkOwner", kcu.table_name AS "fkTableName",'
       + ' kcu.column_name AS "fkColumnName", kcu.ordinal_position AS "keySeq",'
-      + ' (select constraint_name from information_schema.table_constraints tc2 where tc2.constraint_type = \'PRIMARY KEY\' and tc2.table_name=ccu.table_name limit 1) AS "pkName", ccu.table_schema AS "pkOwner",'
-      + ' ccu.table_name AS "pkTableName", ccu.column_name AS "pkColumnName"'
+      + ' (SELECT constraint_name'
+      + ' FROM information_schema.table_constraints tc2'
+      + ' WHERE tc2.constraint_type = \'PRIMARY KEY\' and tc2.table_name=ccu.table_name limit 1) AS "pkName",'
+      + ' ccu.table_schema AS "pkOwner", ccu.table_name AS "pkTableName", ccu.column_name AS "pkColumnName"'
       + ' FROM'
       + ' information_schema.constraint_column_usage ccu'
       + ' JOIN information_schema.key_column_usage kcu'