Merge branch 'master' into fixSelectExclude

Author: cbaker6

package-lock.json

@@ -49,7 +49,7 @@
     "mustache": "4.2.0",
     "parse": "3.1.0",
     "pg-monitor": "1.4.1",
-    "pg-promise": "10.9.2",
+    "pg-promise": "10.10.1",
     "pluralize": "8.0.0",
     "redis": "3.1.1",
     "semver": "7.3.4",

package.json

@@ -1056,28 +1056,25 @@ export class PostgresStorageAdapter implements StorageAdapter {
     conn = conn || this._client;
     const self = this;
 
-    await conn.tx('schema-upgrade', async t => {
+    await conn.task('schema-upgrade', async t => {
       const columns = await t.map(
         'SELECT column_name FROM information_schema.columns WHERE table_name = $<className>',
         { className },
         a => a.column_name
       );
       const newColumns = Object.keys(schema.fields)
         .filter(item => columns.indexOf(item) === -1)
-        .map(fieldName =>
-          self.addFieldIfNotExists(className, fieldName, schema.fields[fieldName], t)
-        );
+        .map(fieldName => self.addFieldIfNotExists(className, fieldName, schema.fields[fieldName]));
 
       await t.batch(newColumns);
     });
   }
 
-  async addFieldIfNotExists(className: string, fieldName: string, type: any, conn: any) {
+  async addFieldIfNotExists(className: string, fieldName: string, type: any) {
     // TODO: Must be revised for invalid logic...
     debug('addFieldIfNotExists');
-    conn = conn || this._client;
     const self = this;
-    await conn.tx('add-field-if-not-exists', async t => {
+    await this._client.tx('add-field-if-not-exists', async t => {
       if (type.type !== 'Relation') {
         try {
           await t.none(