Dependencies update + pg-promise for queries.

Author: evoluteur

js/graphql-schema.js

@@ -14,11 +14,11 @@ const graphql = require('graphql'),
     dico = require('./utils/dico'),
     ft = dico.fieldTypes,
     sqls = require('./utils/sql-select'),
-    errors = require('./utils/errors')
+    errors = require('./utils/errors'),
+    query = require('./utils/query')
 
 const mIds = dico.modelIds
-const db = {}
-db.conn = pgp(config.connectionString);
+const db = query.db;
 
 const {
    GraphQLObjectType,

js/utils/query.js

@@ -1,12 +1,11 @@
-/*! *******************************************************
- *
+/*!
  * evolutility-server-node :: utils/query.js
  *
  * https://github.com/evoluteur/evolutility-server-node
  * (c) 2019 Olivier Giulieri
- ********************************************************* */
+ */
 
-const pg = require('pg'),
+const pgp = require('pg-promise')(),
     csv = require('csv-express'),
     config = require('../../config.js'),
     parseConnection = require('pg-connection-string').parse,
@@ -17,71 +16,71 @@ const dbConfig = parseConnection(config.connectionString)
 dbConfig.max = 10; // max number of clients in the pool 
 dbConfig.idleTimeoutMillis = 30000; // max client idle time before being closed
 
-const pool = new pg.Pool(dbConfig);
-
-pool.on('error', function (err, client) {
-  console.error('Unexpected error on idle client', err.message, err.stack)
-  process.exit(-1)
-})
+const db = {}
+db.conn = pgp(config.connectionString);
 
 // - run a query and return the result in request
-function runQuery(res, sql, values, singleRecord, format, header, fnPrep = null){
+function runQuery(res, sql, values, singleRecord, format, header, fnPrep){
     logger.logSQL(sql);
-
-    // Get a Postgres client from the connection pool 
-    pool.connect((err, client, done) => {
-        // SQL Query > Select Data
-        if(!client){
-            errors.badRequest(res, 'No Database connection.', 500)
-        }
-        client.query(sql, values)
-            .then(data => {
-                done();
-                var results = (data && data.rows) ? data.rows : [];
-                var nbRecords = results.length; 
-                if(format==='csv'){
-                    if(nbRecords){
-                        if(header){
-                            var headers={};
-                            for (key in results[0]) {
-                                headers[key] = header[key] || key;
-                            }
-                            results.unshift(headers);
+    // SQL Query > Select Data
+    db.conn[singleRecord ? 'one' : 'many'](sql, values)
+        .then(data => {
+            const results = data || [];
+            const nbRecords = results ? results.length : 0; 
+            if(format==='csv'){
+                if(nbRecords){
+                    if(header){
+                        var headers={};
+                        for (key in results[0]) {
+                            headers[key] = header[key] || key;
                         }
-                        logger.logCount(results.length || 0);
-                        return res.csv(results);
+                        results.unshift(headers);
                     }
-                    return null;    
+                    logger.logCount(results.length || 0);
+                    return res.csv(results);
+                }
+                return res.csv(null);
+            }else if(singleRecord){
+                logger.logCount(1);
+                if(fnPrep){
+                    return res.json(fnPrep(results));
+                }
+                return res.json(results);
+            }else{
+                res.setHeader('_count', nbRecords);
+                if(nbRecords && results[0]._full_count){
+                    res.setHeader('_full_count', results[0]._full_count);
+                    // Remove artificual "_full_count" prop (used to return the total number of records) from every record.
+                    // results.forEach(r => {delete r._full_count})
+                }
+                logger.logCount(results.length || 0);
+                if(fnPrep){
+                    return res.json(fnPrep(results));
+                }
+                return res.json(results);
+            }
+        })
+        .catch(err => {
+            if(err.code===0){
+                if(format==='csv'){
+                    // - sending something to avoid empty page in browser
+                    return res.csv(singleRecord ? {id: null} : [{id: null}]);
                 }else if(singleRecord){
-                    if(fnPrep){
-                        logger.logCount(1, true);
-                        return res.json(fnPrep(results[0]));
-                    }else{
-                        logger.logCount(1);
-                        return res.json(results.length?results[0]:null);
-                    }
+                    return res.json(null);
                 }else{
-                    res.setHeader('_count', nbRecords);
-                    if(nbRecords && results[0]._full_count){
-                        res.setHeader('_full_count', results[0]._full_count);
-                        // Remove artificual "_full_count" prop (used to return the total number of records) from every record.
-                        // results.forEach(r => {delete r._full_count})
-                    }
-                    logger.logCount(results.length || 0);
-                    return res.json(results);
+                    return res.json([]);
                 }
-            })
-            .catch(err => {
-                console.log(err.stack)
-                errors.badRequest(res, 'Database error.', 500)
-            })
-    })
+            }
+            console.log(err)
+            errors.badRequest(res, 'Database error.', 500)
+        })
 }
 
 // --------------------------------------------------------------------------------------
 
 module.exports = {
 
+    db: db,
     runQuery: runQuery,
 
 }

package.json

@@ -16,17 +16,17 @@
   },
   "dependencies": {
     "chalk": "~2.4.2",
-    "body-parser": "~1.18.3",
+    "body-parser": "~1.19.0",
     "csv-express": "~1.2.2",
     "debug": "~4.1.1",
     "express": "~4.17.1",
-    "express-graphql": "~0.8.0",
-    "graphql": "~14.4.2",
+    "express-graphql": "~0.9.0",
+    "graphql": "~14.5.4",
     "formidable": "~1.2.1",
-    "helmet": "~3.18.0",
-    "pg": "^7.11.0",
+    "helmet": "~3.20.1",
+    "pg": "^7.12.1",
     "pg-connection-string": "~2.1.0",
-    "pg-promise": "^8.7.3",
+    "pg-promise": "^9.1.2",
     "shortid": "~2.2.14",
     "supervisor": "~0.12.0",
     "underscore": "~1.9.1"