fixing method setIndexesWithSchemaFormat (#4454)

Fixing invalid database code in method `setIndexesWithSchemaFormat`:

* It must be a transaction, not a task, as it executes multiple database changes
* It should contain the initial queries inside the transaction, providing the context, not outside it;
* Replaced the code with the ES6 Generator notation
* Removing the use of batch, as the value of the result promise is irrelevant, only success/failure that matters

Author: vitaly-t

src/Adapters/Storage/Postgres/PostgresStorageAdapter.js

@@ -618,8 +618,9 @@ export class PostgresStorageAdapter implements StorageAdapter {
     });
   }
 
-  setIndexesWithSchemaFormat(className: string, submittedIndexes: any, existingIndexes: any = {}, fields: any, client: ?any): Promise<void> {
-    const conn = client || this._client;
+  setIndexesWithSchemaFormat(className: string, submittedIndexes: any, existingIndexes: any = {}, fields: any, conn: ?any): Promise<void> {
+    conn = conn || this._client;
+    const self = this;
     if (submittedIndexes === undefined) {
       return Promise.resolve();
     }
@@ -652,22 +653,15 @@ export class PostgresStorageAdapter implements StorageAdapter {
         });
       }
     });
-    let insertPromise = Promise.resolve();
-    if (insertedIndexes.length > 0) {
-      insertPromise = this.createIndexes(className, insertedIndexes, conn);
-    }
-    let deletePromise = Promise.resolve();
-    if (deletedIndexes.length > 0) {
-      deletePromise = this.dropIndexes(className, deletedIndexes, conn);
-    }
-    return conn.task(t => {
-      const values = [className, 'schema', 'indexes', JSON.stringify(existingIndexes)];
-      return t.batch([
-        deletePromise,
-        insertPromise,
-        this._ensureSchemaCollectionExists(t),
-        t.none('UPDATE "_SCHEMA" SET $2:name = json_object_set_key($2:name, $3::text, $4::jsonb) WHERE "className"=$1', values)
-      ]);
+    return conn.tx('set-indexes-with-schema-format', function * (t) {
+      if (insertedIndexes.length > 0) {
+        yield self.createIndexes(className, insertedIndexes, t);
+      }
+      if (deletedIndexes.length > 0) {
+        yield self.dropIndexes(className, deletedIndexes, t);
+      }
+      yield self._ensureSchemaCollectionExists(t);
+      yield t.none('UPDATE "_SCHEMA" SET $2:name = json_object_set_key($2:name, $3::text, $4::jsonb) WHERE "className"=$1', [className, 'schema', 'indexes', JSON.stringify(existingIndexes)]);
     });
   }