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

Distinct support for null (#4559)

Browse Source 
* distinct support for null

* better testing
This commit is contained in:
Diamond Lewis
2018-02-16 09:44:42 -06:00
committed by Florent Vilmart
parent cac14bce09
commit 848a6cf7ae
3 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Adapters/Storage/Mongo/MongoStorageAdapter.js
View File

@@ -511,13 +511,16 @@ export class MongoStorageAdapter implements StorageAdapter {
}
return this._adaptiveCollection(className)
.then(collection => collection.distinct(fieldName, transformWhere(className, query, schema)))
.then(objects => objects.map(object => {
if (isPointerField) {
const field = fieldName.substring(3);
return transformPointerString(schema, field, object);
}
return mongoObjectToParseObject(className, object, schema);
}));
.then(objects => {
objects = objects.filter((obj) => obj != null);
return objects.map(object => {
if (isPointerField) {
const field = fieldName.substring(3);
return transformPointerString(schema, field, object);
}
return mongoObjectToParseObject(className, object, schema);
});
});
}
aggregate(className: string, schema: any, pipeline: any, readPreference: ?string) {

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

@@ -1464,7 +1464,8 @@ export class PostgresStorageAdapter implements StorageAdapter {
debug('distinct', className, query);
let field = fieldName;
let column = fieldName;
if (fieldName.indexOf('.') >= 0) {
const isNested = fieldName.indexOf('.') >= 0;
if (isNested) {
field = transformDotFieldToComponents(fieldName).join('->');
column = fieldName.split('.')[0];
}
@@ -1480,7 +1481,10 @@ export class PostgresStorageAdapter implements StorageAdapter {
const wherePattern = where.pattern.length > 0 ? `WHERE ${where.pattern}` : '';
const transformer = isArrayField ? 'jsonb_array_elements' : 'ON';
const qs = `SELECT DISTINCT ${transformer}($1:raw) $2:raw FROM $3:name ${wherePattern}`;
let qs = `SELECT DISTINCT ${transformer}($1:name) $2:name FROM $3:name ${wherePattern}`;
if (isNested) {
qs = `SELECT DISTINCT ${transformer}($1:raw) $2:raw FROM $3:name ${wherePattern}`;
}
debug(qs, values);
return this._client.any(qs, values)
.catch((error) => {
@@ -1490,7 +1494,7 @@ export class PostgresStorageAdapter implements StorageAdapter {
throw error;
})
.then((results) => {
if (fieldName.indexOf('.') === -1) {
if (!isNested) {
results = results.filter((object) => object[field] !== null);
return results.map(object => {
if (!isPointerField) {