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

refactoring database code (#4448)

Browse Source 
* refactoring database code

Starting to refactor the database code for better use of promises + ES6 generators, to prepare for ES7 await/async.

* Update PostgresStorageAdapter.js

* Update PostgresStorageAdapter.js

naming the transaction.
This commit is contained in:
Vitaly Tomilov
2017-12-24 15:58:20 +00:00
committed by GitHub
parent 33de770709
commit 08ba738227
1 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -836,8 +836,6 @@ export class PostgresStorageAdapter {
// Returns a Promise. // Returns a Promise.
deleteFields(className, schema, fieldNames) { deleteFields(className, schema, fieldNames) {
debug('deleteFields', className, fieldNames); debug('deleteFields', className, fieldNames);
return Promise.resolve()
.then(() => {
fieldNames = fieldNames.reduce((list, fieldName) => { fieldNames = fieldNames.reduce((list, fieldName) => {
const field = schema.fields[fieldName] const field = schema.fields[fieldName]
if (field.type !== 'Relation') { if (field.type !== 'Relation') {
@@ -852,18 +850,11 @@ export class PostgresStorageAdapter {
return `$${idx + 2}:name`; return `$${idx + 2}:name`;
}).join(', DROP COLUMN'); }).join(', DROP COLUMN');
const doBatch = (t) => { return this._client.tx('delete-fields', function * (t) {
const batch = [ yield t.none('UPDATE "_SCHEMA" SET "schema"=$<schema> WHERE "className"=$<className>', {schema, className});
t.none('UPDATE "_SCHEMA" SET "schema"=$<schema> WHERE "className"=$<className>', {schema, className})
];
if (values.length > 1) { if (values.length > 1) {
batch.push(t.none(`ALTER TABLE $1:name DROP COLUMN ${columns}`, values)); yield t.none(`ALTER TABLE $1:name DROP COLUMN ${columns}`, values);
} }
return batch;
}
return this._client.tx((t) => {
return t.batch(doBatch(t));
});
}); });
} }