From 1ccdf7f07ef46c7902b29b691df64d202c3c36da Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Thu, 27 May 2021 14:25:20 +0200
Subject: [PATCH] #122

---
 .vscode/settings.json                                  |  3 +++
 plugins/dbgate-plugin-postgres/src/backend/Analyser.js |  4 ++--
 .../dbgate-plugin-postgres/src/backend/sql/routines.js | 10 +++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..bae22e49c
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "jestrunner.jestCommand": "node_modules/.bin/cross-env DEVMODE=1 LOCALTEST=1 node_modules/.bin/jest"
+}
\ No newline at end of file
diff --git a/plugins/dbgate-plugin-postgres/src/backend/Analyser.js b/plugins/dbgate-plugin-postgres/src/backend/Analyser.js
index 02c04adba..76c600703 100644
--- a/plugins/dbgate-plugin-postgres/src/backend/Analyser.js
+++ b/plugins/dbgate-plugin-postgres/src/backend/Analyser.js
@@ -109,7 +109,7 @@ class Analyser extends DatabaseAnalyser {
           .map(getColumnInfo),
       })),
       procedures: routines.rows
-        .filter(x => x.objectType == 'PROCEDURE')
+        .filter(x => x.object_type == 'PROCEDURE')
         .map(proc => ({
           objectId: `procedures:${proc.schema_name}.${proc.pure_name}`,
           pureName: proc.pure_name,
@@ -117,7 +117,7 @@ class Analyser extends DatabaseAnalyser {
           contentHash: proc.hash_code,
         })),
       functions: routines.rows
-        .filter(x => x.objectType == 'FUNCTION')
+        .filter(x => x.object_type == 'FUNCTION')
         .map(func => ({
           objectId: `functions:${func.schema_name}.${func.pure_name}`,
           pureName: func.pure_name,
diff --git a/plugins/dbgate-plugin-postgres/src/backend/sql/routines.js b/plugins/dbgate-plugin-postgres/src/backend/sql/routines.js
index 56ce1f12d..b4c1a830a 100644
--- a/plugins/dbgate-plugin-postgres/src/backend/sql/routines.js
+++ b/plugins/dbgate-plugin-postgres/src/backend/sql/routines.js
@@ -1,10 +1,10 @@
 module.exports = `
 select 
-  routine_name as "pureName",
-  routine_schema as "schemaName",
-  routine_definition as "createSql",
-  md5(routine_definition) as "hashCode",
-  routine_type as "objectType"
+  routine_name as "pure_name",
+  routine_schema as "schema_name",
+  routine_definition as "create_sql",
+  md5(routine_definition) as "hash_code",
+  routine_type as "object_type"
 from
   information_schema.routines where routine_schema != 'information_schema' and routine_schema != 'pg_catalog' 
   and (