Skip to content
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

Jump to bottom

feat: Allow creating of unique indexes #8671

Open
wants to merge 4 commits into
base: alpha
Choose a base branch
from
Open

feat: Allow creating of unique indexes #8671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad62422
feat: allow creating of unique indexes
dblythy Jun 27, 2023
29c9878
Update MongoStorageAdapter.js
dblythy Jun 27, 2023
a561edd
Update MongoStorageAdapter.js
dblythy Jun 28, 2023
35591c4
Merge branch 'alpha' into create-indexes
mtrezza Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
100 changes: 100 additions & 0 deletions spec/schemas.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3051,6 +3051,42 @@ describe('schemas', () => {
});
});

it('allows add unique index when you create a class', async () => {
await reconfigureServer({ silent: false });
const response = await request({
url: 'http://localhost:8378/1/schemas',
method: 'POST',
headers: masterKeyHeaders,
json: true,
body: {
className: 'NewClass',
fields: {
aString: { type: 'String' },
},
indexes: {
name1: { aString: 1, _options: { unique: true } },
},
},
});
expect(response.data).toEqual({
className: 'NewClass',
fields: {
ACL: { type: 'ACL' },
createdAt: { type: 'Date' },
updatedAt: { type: 'Date' },
objectId: { type: 'String' },
aString: { type: 'String' },
},
classLevelPermissions: defaultClassLevelPermissions,
indexes: {
name1: { aString: 1, _options: { unique: true } },
},
});
const indexes = await config.database.adapter.getIndexes('NewClass');
expect(indexes.length).toBe(2);
expect(indexes.filter(row => row.unique).length).toEqual(1);
});

it('empty index returns nothing', done => {
request({
url: 'http://localhost:8378/1/schemas',
Expand Down Expand Up @@ -3148,6 +3184,70 @@ describe('schemas', () => {
});
});

it('lets you add unique indexes', async () => {
await request({
url: 'http://localhost:8378/1/schemas/NewClass',
method: 'POST',
headers: masterKeyHeaders,
json: true,
body: {},
});
let response = await request({
url: 'http://localhost:8378/1/schemas/NewClass',
method: 'PUT',
headers: masterKeyHeaders,
json: true,
body: {
fields: {
aString: { type: 'String' },
},
indexes: {
name1: { aString: 1, _options: { unique: true } },
},
},
});
expect(
dd(response.data, {
className: 'NewClass',
fields: {
ACL: { type: 'ACL' },
createdAt: { type: 'Date' },
updatedAt: { type: 'Date' },
objectId: { type: 'String' },
aString: { type: 'String' },
},
classLevelPermissions: defaultClassLevelPermissions,
indexes: {
_id_: { _id: 1 },
name1: { aString: 1, _options: { unique: true } },
},
})
).toEqual(undefined);
response = await request({
url: 'http://localhost:8378/1/schemas/NewClass',
headers: masterKeyHeaders,
json: true,
});
expect(response.data).toEqual({
className: 'NewClass',
fields: {
ACL: { type: 'ACL' },
createdAt: { type: 'Date' },
updatedAt: { type: 'Date' },
objectId: { type: 'String' },
aString: { type: 'String' },
},
classLevelPermissions: defaultClassLevelPermissions,
indexes: {
_id_: { _id: 1 },
name1: { aString: 1, _options: { unique: true } },
},
});
const indexes = await config.database.adapter.getIndexes('NewClass');
expect(indexes.length).toEqual(2);
expect(indexes.filter(row => row.unique).length).toEqual(1);
});

it_only_db('mongo')('lets you add index with with pointer like structure', done => {
request({
url: 'http://localhost:8378/1/schemas/NewClass',
Expand Down
15 changes: 13 additions & 2 deletions src/Adapters/Storage/Mongo/MongoStorageAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import MongoCollection from './MongoCollection';
import MongoSchemaCollection from './MongoSchemaCollection';
import { StorageAdapter } from '../StorageAdapter';
import deepcopy from 'deepcopy';
import type { SchemaType, QueryType, StorageClass, QueryOptions } from '../StorageAdapter';
import { parse as parseUrl, format as formatUrl } from '../../../vendor/mongodbUrl';
import {
Expand Down Expand Up @@ -274,7 +275,12 @@ export class MongoStorageAdapter implements StorageAdapter {
const deletePromises = [];
const insertedIndexes = [];
Object.keys(submittedIndexes).forEach(name => {
const field = submittedIndexes[name];
const field = deepcopy(submittedIndexes[name]);
let indexOptions = {};
if (field._options) {
indexOptions = field._options;
delete field._options;
}
if (existingIndexes[name] && field.__op !== 'Delete') {
throw new Parse.Error(Parse.Error.INVALID_QUERY, `Index ${name} exists, cannot update.`);
}
Expand Down Expand Up @@ -302,11 +308,16 @@ export class MongoStorageAdapter implements StorageAdapter {
);
}
});
existingIndexes[name] = field;
insertedIndexes.push({
key: field,
name,
...indexOptions,
});
const fieldCopy = deepcopy(field);
if (Object.keys(indexOptions).length) {
fieldCopy._options = indexOptions;
}
existingIndexes[name] = fieldCopy;
}
});
let insertPromise = Promise.resolve();
Expand Down