Skip to content
This repository was archived by the owner on Sep 2, 2025. It is now read-only.

Batch insert support #127

Merged
dekelev merged 5 commits into from
Nov 10, 2020
Merged

Batch insert support #127

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
72c8ff7
Batch insert support. Closes https://github.com/feathersjs-ecosystem/…
mdmitry01 Oct 23, 2020
74d9241
Merge branch 'master' of https://github.com/feathersjs-ecosystem/feat…
mdmitry01 Nov 8, 2020
c175add
don't use .returning() with redshift dialect
mdmitry01 Nov 9, 2020
4895434
add a test case: create with $noSelect and without allowedInsert
mdmitry01 Nov 9, 2020
931e810
fix: Objection.js hooks don't work with '.toKnexQuery()' method
mdmitry01 Nov 9, 2020
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
135 changes: 92 additions & 43 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,58 +616,107 @@ class Service extends AdapterService {
});
}

/**
* `create` service function for Objection.
* @param {object} data
* @param {object} params
*/
async _create (data, params) {
const transaction = await this._createTransaction(params);
const create = (data, params) => {
const q = this._createQuery(params);
const allowedUpsert = this.mergeRelations(this.allowedUpsert, params.mergeAllowUpsert);
const allowedInsert = this.mergeRelations(this.allowedInsert, params.mergeAllowInsert);

if (this.createUseUpsertGraph) {
if (allowedUpsert) {
q.allowGraph(allowedUpsert);
}
q.upsertGraphAndFetch(data, this.upsertGraphOptions);
} else if (allowedInsert) {
q.allowGraph(allowedInsert);
q.insertGraph(data, this.insertGraphOptions);
} else {
q.insert(data, this.id);
}

return q
.then(row => {
if (params.query && params.query.$noSelect) { return data; }

let id;
_getCreatedRecords (insertResults, inputData, params) {
if (params.query && params.query.$noSelect) {
return inputData;
}
if (!Array.isArray(insertResults)) {
insertResults = [insertResults];
}

if (Array.isArray(this.id)) {
id = [];
const findQuery = Object.assign({ $and: [] }, params.query);
const idsQueries = [];

for (const idKey of this.id) {
id.push(row && row[idKey] ? row[idKey] : data[idKey]);
}
if (Array.isArray(this.id)) {
for (const insertResult of insertResults) {
const ids = [];
for (const idKey of this.id) {
if (idKey in insertResult) {
ids.push(insertResult[idKey]);
} else {
id = row && row[this.id] ? row[this.id] : data[this.id];
return inputData;
}
}
idsQueries.push(this.getIdsQuery(ids));
}
} else {
const ids = [];
for (const insertResult of insertResults) {
if (this.id in insertResult) {
ids.push(insertResult[this.id]);
} else {
return inputData;
}
}
idsQueries.push(this.getIdsQuery(null, ids));
}

if (!id || (Array.isArray(id) && !id.length)) { return data; }
if (idsQueries.length > 1) {
findQuery.$and.push({ $or: idsQueries });
} else {
findQuery.$and = findQuery.$and.concat(idsQueries);
}

return this._get(id, params);
})
.catch(errorHandler);
};
return this._find(Object.assign({}, params, { query: findQuery }))
.then(page => {
const records = page.data || page;
if (Array.isArray(inputData)) {
return records;
}
return records[0];
});
}

if (Array.isArray(data)) {
return Promise.all(data.map(current => create(current, params))).then(this._commitTransaction(transaction), this._rollbackTransaction(transaction));
/**
* @param data
* @param params
* @returns {Promise<Object|Object[]>}
* @private
*/
_batchInsert (data, params) {
const { dialect } = this.Model.knex().client;
// batch insert only works with Postgresql and SQL Server
if (dialect === 'postgresql' || dialect === 'mssql') {
return this._createQuery(params)
.insert(data)
.returning(this.id);
}
if (!Array.isArray(data)) {
return this._createQuery(params).insert(data);
}
const promises = data.map(dataItem => {
return this._createQuery(params).insert(dataItem);
});
return Promise.all(promises);
}

return create(data, params).then(this._commitTransaction(transaction), this._rollbackTransaction(transaction));
/**
* `create` service function for Objection.
* @param {object} data
* @param {object} params
*/
async _create (data, params) {
const transaction = await this._createTransaction(params);
const q = this._createQuery(params);
let promise = q;
const allowedUpsert = this.mergeRelations(this.allowedUpsert, params.mergeAllowUpsert);
const allowedInsert = this.mergeRelations(this.allowedInsert, params.mergeAllowInsert);

if (this.createUseUpsertGraph) {
if (allowedUpsert) {
q.allowGraph(allowedUpsert);
}
q.upsertGraph(data, this.upsertGraphOptions);
} else if (allowedInsert) {
q.allowGraph(allowedInsert);
q.insertGraph(data, this.insertGraphOptions);
} else {
promise = this._batchInsert(data, params);
}
return promise
.then(insertResults => this._getCreatedRecords(insertResults, data, params))
.then(this._commitTransaction(transaction), this._rollbackTransaction(transaction))
.catch(errorHandler);
}

/**
Expand Down