mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 09:17:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: transaction error (#1162)

Browse Source
This commit is contained in:
ChengLei Shao 2022-11-30 11:37:59 +08:00 committed by GitHub
parent 7cfa939f63
commit dea9655573
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
packages/core/database/src/sync-runner.ts
View File

@ -90,20 +90,29 @@ export class SyncRunner {
const sequenceTables = [...parentsDeep, tableName];
for (const sequenceTable of sequenceTables) {
try {
await queryInterface.sequelize.query(
`alter table "${sequenceTable}" alter column id set default nextval('${maxSequenceName}')`,
{
transaction,
},
);
} catch (err) {
if (err.message.match(/column "id" of relation "\w+" does not exist/)) {
continue;
}
const idColumnQuery = await queryInterface.sequelize.query(
`
SELECT true
FROM pg_attribute
WHERE attrelid = '${sequenceTable}'::regclass -- cast to a registered class (table)
AND attname = 'id'
AND NOT attisdropped
`,
{
transaction,
},
);
throw err;
if (idColumnQuery[0].length == 0) {
continue;
}
await queryInterface.sequelize.query(
`alter table "${sequenceTable}" alter column id set default nextval('${maxSequenceName}')`,
{
transaction,
},
);
}
}

2
packages/pro-plugins

@ -1 +1 @@
Subproject commit cf44c47ff9b5ef41e8becde3f1c8b5b1c2af6cda
Subproject commit 5a5fba41ae1cecaf3b073fcb610e9dc68dad0b85