ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: find inherit collection warn (#1663)

Browse Source
This commit is contained in:
ChengLei Shao 2023-04-07 19:44:44 +08:00 committed by GitHub
parent 59326dbf90
commit c3a91e9758
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/core/database/src/database.ts
View File

@ -390,20 +390,24 @@ export class Database extends EventEmitter implements AsyncEmitter {
this.on('afterRepositoryFind', ({ findOptions, dataCollection, data }) => { this.on('afterRepositoryFind', ({ findOptions, dataCollection, data }) => {
if (dataCollection.isParent()) { if (dataCollection.isParent()) {
for (const row of data) { for (const row of data) {
const rowCollectionName = this.tableNameCollectionMap.get( const rowCollection = this.tableNameCollectionMap.get(
findOptions.raw findOptions.raw
? `${row['__schemaName']}.${row['__tableName']}` ? `${row['__schemaName']}.${row['__tableName']}`
: `${row.get('__schemaName')}.${row.get('__tableName')}`, : `${row.get('__schemaName')}.${row.get('__tableName')}`,
).name; );
if (!rowCollectionName) { if (!rowCollection) {
throw new Error( this.logger.warn(
`Can not find collection by table name ${rowCollectionName}, current collections: ${Array.from( `Can not find collection by table name ${JSON.stringify(row)}, current collections: ${Array.from(
this.tableNameCollectionMap.keys(), this.tableNameCollectionMap.keys(),
).join(', ')}`, ).join(', ')}`,
); );
return;
} }
const rowCollectionName = rowCollection.name;
findOptions.raw findOptions.raw
? (row['__collection'] = rowCollectionName) ? (row['__collection'] = rowCollectionName)
: row.set('__collection', rowCollectionName, { : row.set('__collection', rowCollectionName, {