Skip to content

fix: await PK on create before updating relationships #737

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

Open
nickschot wants to merge 2 commits into
base: stable
Choose a base branch
from
Open

fix: await PK on create before updating relationships #737

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b77eea
fix: don't update belongsTo relationships for new records
nickschot Dec 5, 2018
c39cdd7
- restructure model create method to make sure we have a valid PK bef…
nickschot Jan 23, 2019
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
32 changes: 17 additions & 15 deletions src/packages/database/model/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1166,20 +1166,6 @@ class Model {
const run = async (trx: Object) => {
const { hooks, logger, primaryKey } = this;
const instance = Reflect.construct(this, [props, false]);
let statements = [];

const associations = Object
.keys(props)
.filter(key => (
Boolean(this.relationshipFor(key))
));

if (associations.length) {
statements = associations.reduce((arr, key) => [
...arr,
...updateRelationship(instance, key, trx)
], []);
}

await runHooks(instance, trx, hooks.beforeValidation);

Expand All @@ -1191,12 +1177,28 @@ class Model {
hooks.beforeSave
);

const runner = createRunner(logger, statements);
const runner = createRunner(logger, []);
const [[primaryKeyValue]] = await runner(await create(instance, trx));

Reflect.set(instance, primaryKey, primaryKeyValue);
Reflect.set(instance.rawColumnData, primaryKey, primaryKeyValue);

let statements = [];
const associations = Object
.keys(props)
.filter(key => (
Boolean(this.relationshipFor(key))
));

if (associations.length) {
statements = associations.reduce((arr, key) => [
...arr,
...updateRelationship(instance, key, trx)
], []);
}

await Promise.all(statements);

Reflect.defineProperty(instance, 'initialized', {
value: true,
writable: false,
Expand Down