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

fix: create inherits with table name contains upper case (#1308)

Browse Source
This commit is contained in:
ChengLei Shao 2022-12-31 19:16:49 +08:00 committed by GitHub
parent decf91f0a9
commit d0c7a1e39b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/core/database/src/__tests__/inhertits/collection-inherits.test.ts
View File

@ -15,6 +15,30 @@ pgOnly()('collection inherits', () => {
await db.close(); await db.close();
}); });
it('should create inherits with table name contains upperCase', async () => {
db.collection({
name: 'parent',
fields: [{ name: 'field1', type: 'date' }],
});
await db.sync({
force: false,
alter: {
drop: false,
},
});
db.collection({
name: 'abcABC',
inherits: ['parent'],
fields: [{ type: 'string', name: 'name' }],
});
await db.sync({
force: false,
alter: {
drop: false,
},
});
});
it('should create inherits from empty table', async () => { it('should create inherits from empty table', async () => {
const empty = db.collection({ const empty = db.collection({
name: 'empty', name: 'empty',

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

@ -59,7 +59,7 @@ export class SyncRunner {
throw new Error(`Can't find sequence name of ${parent}`); throw new Error(`Can't find sequence name of ${parent}`);
} }
const regex = new RegExp(/nextval\('(\w+)\'.*\)/); const regex = new RegExp(/nextval\('("?\w+"?)\'.*\)/);
const match = regex.exec(columnDefault); const match = regex.exec(columnDefault);
const sequenceName = match[1]; const sequenceName = match[1];
@ -90,11 +90,13 @@ export class SyncRunner {
const sequenceTables = [...parentsDeep, tableName]; const sequenceTables = [...parentsDeep, tableName];
for (const sequenceTable of sequenceTables) { for (const sequenceTable of sequenceTables) {
const queryName = Boolean(sequenceTable.match(/[A-Z]/)) ? `"${sequenceTable}"` : sequenceTable;
const idColumnQuery = await queryInterface.sequelize.query( const idColumnQuery = await queryInterface.sequelize.query(
` `
SELECT true SELECT true
FROM pg_attribute FROM pg_attribute
WHERE attrelid = '${sequenceTable}'::regclass -- cast to a registered class (table) WHERE attrelid = '${queryName}'::regclass -- cast to a registered class (table)
AND attname = 'id' AND attname = 'id'
AND NOT attisdropped AND NOT attisdropped
`, `,