Merge ec90ee5 into f58da6b

acarl · Apr 25, 2019 · d8ad90f · d8ad90f
2 parents f58da6b + ec90ee5
commit d8ad90f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -489,13 +489,15 @@ PgRestify.prototype.refreshDatabaseSchema = function(next) {
 
     sqlGetDatabaseMetadata += ' and table_name not in (';
 
-    for (let i = 0; i < this.ignoredTableNames.length; i++) {
-      sqlGetDatabaseMetadata += '$'+(i + 2);
-      queryParams.push(this.ignoredTableNames[i]);
-    }
+    sqlGetDatabaseMetadata += this.ignoredTableNames.map(function(ignoredTableName, index) {
+      return '$'+(index + 2);
+    }).join(', ');
 
-    sqlGetDatabaseMetadata += ')';
+    this.ignoredTableNames.forEach(function(ignoredTableName) {
+      queryParams.push(ignoredTableName);
+    });
 
+    sqlGetDatabaseMetadata += ')';
   }
 
   this.runQuery(sqlGetDatabaseMetadata, queryParams, function(err, result) {

diff --git a/test/initialization.js b/test/initialization.js
@@ -3,6 +3,7 @@ var restify = require('restify');
 var { Client } = require('pg');
 var bunyan = require('bunyan');
 var helper = require('./helper');
+var async = require('async');
 var request = helper.request;
 
 describe('initialize method', function() {
@@ -113,7 +114,14 @@ describe('initialize method', function() {
 
     // drop the id column from the test table
 
-    client.query('alter table user_alert_messages drop column if exists id;', [], function(err) {
+    async.series([
+      function (next) {
+        client.query('alter table user_alert_messages_bad_id drop column if exists id;', [], next);
+      },
+      function (next) {
+        client.query('alter table user_alert_messages drop column if exists id;', [], next);
+      }
+    ], function(err) {
 
       client.end();
 
@@ -129,7 +137,7 @@ describe('initialize method', function() {
       pgRestify.initialize({
           server:server,
           pgConfig:helper.pgConfig,
-          ignoredTableNames: ['user_alert_messages']
+          ignoredTableNames: ['user_alert_messages', 'user_alert_messages_bad_id']
         },
         postInit);