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

Improve update of jsonb fields. Add PG 9.5 to travis. (#2984)

Browse Source 
* Improve update of jsonb fields. Add PG 9.5 to travis.

* Replace manual escaping with pg-promise's built in
This commit is contained in:
Kulshekhar Kabra
2016-11-02 06:25:53 +05:30
committed by Florent Vilmart
parent 8f0ae7081d
commit 583887c43c
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -810,6 +810,7 @@ export class PostgresStorageAdapter {
let index = 2;
schema = toPostgresSchema(schema);
const originalUpdate = {...update};
update = handleDotFields(update);
// Resolve authData first,
// So we don't end up with multiple key updates
@@ -914,9 +915,19 @@ export class PostgresStorageAdapter {
} else if (typeof fieldValue === 'object'
&& schema.fields[fieldName]
&& schema.fields[fieldName].type === 'Object') {
updatePatterns.push(`$${index}:name = $${index + 1}`);
values.push(fieldName, fieldValue);
index += 2;
const keysToDelete = Object.keys(originalUpdate).filter(k => {
// choose top level fields that have a delete operation set
return originalUpdate[k].__op === 'Delete' && k.split('.').length === 2
}).map(k => k.split('.')[1]);
const deletePatterns = keysToDelete.reduce((p, c, i) => {
return p + ` - '$${index + 1 + i}:value'`;
}, '');
updatePatterns.push(`$${index}:name = ( COALESCE($${index}:name, '{}'::jsonb) ${deletePatterns} || $${index + 1 + keysToDelete.length}::jsonb )`);
values.push(fieldName, ...keysToDelete, JSON.stringify(fieldValue));
index += 2 + keysToDelete.length;
} else if (Array.isArray(fieldValue)
&& schema.fields[fieldName]
&& schema.fields[fieldName].type === 'Array') {