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

pg-promise refactoring (#4401)

Browse Source 
initial refactoring of `pg-promise` code.
This commit is contained in:
Vitaly Tomilov
2017-11-30 08:30:15 +07:00
committed by GitHub
parent 9eed81e636
commit 9d1d8515fc
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -601,9 +601,7 @@ export class PostgresStorageAdapter {
} }
classExists(name) { classExists(name) {
return this._client.one(`SELECT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = $1)`, [name]).then((res) => { return this._client.one('SELECT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = $1)', [name], a => a.exists);
return res.exists;
});
} }
setClassLevelPermissions(className, CLPs) { setClassLevelPermissions(className, CLPs) {
@@ -655,17 +653,19 @@ export class PostgresStorageAdapter {
if (deletedIndexes.length > 0) { if (deletedIndexes.length > 0) {
deletePromise = this.dropIndexes(className, deletedIndexes, conn); deletePromise = this.dropIndexes(className, deletedIndexes, conn);
} }
return deletePromise return conn.task(t => {
.then(() => insertPromise) const values = [className, 'schema', 'indexes', JSON.stringify(existingIndexes)];
.then(() => this._ensureSchemaCollectionExists()) return t.batch([
.then(() => { deletePromise,
const values = [className, 'schema', 'indexes', JSON.stringify(existingIndexes)] insertPromise,
return conn.none(`UPDATE "_SCHEMA" SET $2:name = json_object_set_key($2:name, $3::text, $4::jsonb) WHERE "className"=$1 `, values); this._ensureSchemaCollectionExists(t),
t.none('UPDATE "_SCHEMA" SET $2:name = json_object_set_key($2:name, $3::text, $4::jsonb) WHERE "className"=$1', values)
]);
}); });
} }
createClass(className, schema) { createClass(className, schema) {
return this._client.tx(t => { return this._client.tx('create-class', t => {
const q1 = this.createTable(className, schema, t); const q1 = this.createTable(className, schema, t);
const q2 = t.none('INSERT INTO "_SCHEMA" ("className", "schema", "isParseClass") VALUES ($<className>, $<schema>, true)', { className, schema }); const q2 = t.none('INSERT INTO "_SCHEMA" ("className", "schema", "isParseClass") VALUES ($<className>, $<schema>, true)', { className, schema });
const q3 = this.setIndexesWithSchemaFormat(className, schema.indexes, {}, schema.fields, t); const q3 = this.setIndexesWithSchemaFormat(className, schema.indexes, {}, schema.fields, t);
@@ -727,15 +727,17 @@ export class PostgresStorageAdapter {
}); });
const qs = `CREATE TABLE IF NOT EXISTS $1:name (${patternsArray.join(',')})`; const qs = `CREATE TABLE IF NOT EXISTS $1:name (${patternsArray.join(',')})`;
const values = [className, ...valuesArray]; const values = [className, ...valuesArray];
return this._ensureSchemaCollectionExists(conn) return conn.task(t => {
return this._ensureSchemaCollectionExists(t)
.then(() => conn.none(qs, values)) .then(() => conn.none(qs, values))
.catch(error => { .catch(error => {
if (error.code === PostgresDuplicateRelationError) { if (error.code === PostgresDuplicateRelationError) {
// Table already exists, must have been created by a different request. Ignore error. // Table already exists, must have been created by a different request. Ignore error.
} else { } else {
throw error; throw error;
} }})
}).then(() => { })
.then(() => {
return conn.tx('create-relation-tables', t => { return conn.tx('create-relation-tables', t => {
const queries = relations.map((fieldName) => { const queries = relations.map((fieldName) => {
return t.none('CREATE TABLE IF NOT EXISTS $<joinTable:name> ("relatedId" varChar(120), "owningId" varChar(120), PRIMARY KEY("relatedId", "owningId") )', {joinTable: `_Join:${fieldName}:${className}`}); return t.none('CREATE TABLE IF NOT EXISTS $<joinTable:name> ("relatedId" varChar(120), "owningId" varChar(120), PRIMARY KEY("relatedId", "owningId") )', {joinTable: `_Join:${fieldName}:${className}`});
@@ -748,7 +750,7 @@ export class PostgresStorageAdapter {
addFieldIfNotExists(className, fieldName, type) { addFieldIfNotExists(className, fieldName, type) {
// TODO: Must be revised for invalid logic... // TODO: Must be revised for invalid logic...
debug('addFieldIfNotExists', {className, fieldName, type}); debug('addFieldIfNotExists', {className, fieldName, type});
return this._client.tx("addFieldIfNotExists", t=> { return this._client.tx('add-field-if-not-exists', t => {
let promise = Promise.resolve(); let promise = Promise.resolve();
if (type.type !== 'Relation') { if (type.type !== 'Relation') {
promise = t.none('ALTER TABLE $<className:name> ADD COLUMN $<fieldName:name> $<postgresType:raw>', { promise = t.none('ALTER TABLE $<className:name> ADD COLUMN $<fieldName:name> $<postgresType:raw>', {