joe/kami-parse-server
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update PostgresStorageAdapter.js (#6989)

Browse Source 
* Update PostgresStorageAdapter.js

Improve `createClass` transaction:

* `await` makes it a more consistent sequence of queries
* `batch` is not needed there
* No need for an extra `.then` section

* Update PostgresStorageAdapter.js

Remove batch-dependent error code check, as it should happen automatically without batch result.

* Update PostgresStorageAdapter.js

Removing unused variable.
This commit is contained in:
Vitaly Tomilov
2020-11-03 16:01:04 +00:00
committed by GitHub
parent c9832023c4
commit bbae55d518
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Adapters/Storage/Postgres/PostgresStorageAdapter.js
View File

@@ -12,7 +12,6 @@ const PostgresDuplicateColumnError = '42701';
const PostgresMissingColumnError = '42703'; const PostgresMissingColumnError = '42703';
const PostgresDuplicateObjectError = '42710'; const PostgresDuplicateObjectError = '42710';
const PostgresUniqueIndexViolationError = '23505'; const PostgresUniqueIndexViolationError = '23505';
const PostgresTransactionAbortedError = '25P02';
const logger = require('../../../logger'); const logger = require('../../../logger');
const debug = function (...args: any) { const debug = function (...args: any) {
@@ -986,29 +985,21 @@ export class PostgresStorageAdapter implements StorageAdapter {
conn = conn || this._client; conn = conn || this._client;
return conn return conn
.tx('create-class', async t => { .tx('create-class', async t => {
const q1 = this.createTable(className, schema, t); await this.createTable(className, schema, t);
const q2 = t.none( await t.none(
'INSERT INTO "_SCHEMA" ("className", "schema", "isParseClass") VALUES ($<className>, $<schema>, true)', 'INSERT INTO "_SCHEMA" ("className", "schema", "isParseClass") VALUES ($<className>, $<schema>, true)',
{ className, schema } { className, schema }
); );
const q3 = this.setIndexesWithSchemaFormat( await this.setIndexesWithSchemaFormat(
className, className,
schema.indexes, schema.indexes,
{}, {},
schema.fields, schema.fields,
t t
); );
// TODO: The test should not verify the returned value, and then
// the method can be simplified, to avoid returning useless stuff.
return t.batch([q1, q2, q3]);
})
.then(() => {
return toParseSchema(schema); return toParseSchema(schema);
}) })
.catch(err => { .catch(err => {
if (err.data[0].result.code === PostgresTransactionAbortedError) {
err = err.data[1].result;
}
if ( if (
err.code === PostgresUniqueIndexViolationError && err.code === PostgresUniqueIndexViolationError &&
err.detail.includes(className) err.detail.includes(className)