Skip to content

Distinct support for null #4559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 16, 2018
Merged

Distinct support for null #4559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5e7b39
distinct support for null
dplewis Feb 9, 2018
f9e7d9e
better testing
dplewis Feb 9, 2018
fc8d478
Merge branch 'master' into null-distinct
dplewis Feb 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions spec/ParseQuery.Aggregate.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,30 @@ describe('Parse.Query Aggregate testing', () => {
}).catch(done.fail);
});

it('distinct null field', (done) => {
const options = Object.assign({}, masterKeyOptions, {
body: { distinct: 'distinctField' }
});
const user1 = new Parse.User();
user1.setUsername('distinct_1');
user1.setPassword('password');
user1.set('distinctField', 'one');

const user2 = new Parse.User();
user2.setUsername('distinct_2');
user2.setPassword('password');
user2.set('distinctField', null);
user1.signUp().then(() => {
return user2.signUp();
}).then(() => {
return rp.get(Parse.serverURL + '/aggregate/_User', options);
}).then((resp) => {
expect(resp.results.length).toEqual(1);
expect(resp.results).toEqual(['one']);
done();
}).catch(done.fail);
});

it('does not return sensitive hidden properties', (done) => {
const options = Object.assign({}, masterKeyOptions, {
body: {
Expand Down
17 changes: 10 additions & 7 deletions src/Adapters/Storage/Mongo/MongoStorageAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 7 additions & 3 deletions src/Adapters/Storage/Postgres/PostgresStorageAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}
Expand All @@ -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) => {
Expand All @@ -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) {
Expand Down