Skip to content

Fix hard-coded "pkName" column in queries #347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dhmlau merged 2 commits into from
Nov 9, 2018
Merged

Fix hard-coded "pkName" column in queries #347

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
522b62c
Fix hard-coded "pkName" column in queries
ataft Oct 18, 2018
a9d1bcc
Fixed line length to pass lint
ataft Oct 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions lib/discovery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", \'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'
Expand Down Expand Up @@ -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",'
+ ' \'PK\' 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'
Expand Down