github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-25 19:58:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use cross-platform insert

Browse Source
This commit is contained in:
rijkvanzanten
2020-08-04 17:15:17 -04:00
parent 33192e4ab3
commit 2de91c7db2
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
api/src/services/items.ts
View File

@@ -82,12 +82,17 @@ export default class ItemsService implements AbstractService {
// string / uuid primary
let primaryKey = payloadWithoutAlias[primaryKeyField];
const result = await trx
.insert(payloadWithoutAlias, primaryKeyField)
.into(this.collection);
await trx.insert(payloadWithoutAlias).into(this.collection);
// Auto-incremented id
if (!primaryKey) primaryKey = result[0];
if (!primaryKey) {
const result = await trx
.select(primaryKeyField)
.from(this.collection)
.orderBy(primaryKeyField, 'desc')
.first();
primaryKey = result[primaryKeyField];
}
primaryKeys.push(primaryKey);
}
@@ -112,8 +117,15 @@ export default class ItemsService implements AbstractService {
const activityPrimaryKeys: PrimaryKey[] = [];
for (const activityRecord of activityRecords) {
const result = await trx.insert(activityRecord, 'id').into('directus_activity');
activityPrimaryKeys.push(result[0]);
await trx.insert(activityRecord).into('directus_activity');
let primaryKey;
const result = await trx
.select('id')
.from('directus_activity')
.orderBy(primaryKeyField, 'desc')
.first();
primaryKey = result[primaryKeyField];
activityPrimaryKeys.push(primaryKey);
}
const revisionRecords = activityPrimaryKeys.map((key, index) => ({
@@ -248,10 +260,15 @@ export default class ItemsService implements AbstractService {
const activityPrimaryKeys: PrimaryKey[] = [];
for (const activityRecord of activityRecords) {
await trx.insert(activityRecord).into('directus_activity');
let primaryKey;
const result = await trx
.insert(activityRecord, 'id')
.into('directus_activity');
activityPrimaryKeys.push(result[0]);
.select('id')
.from('directus_activity')
.orderBy(primaryKeyField, 'desc')
.first();
primaryKey = result[primaryKeyField];
activityPrimaryKeys.push(primaryKey);
}
const itemsService = new ItemsService(this.collection, { knex: trx });