test/nocobase2
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2024-11-30 11:18:36 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source 
# Conflicts:
#	packages/core/database/src/database.ts
This commit is contained in:
chenos 2024-09-26 22:24:42 +08:00
commit b4c9cd988b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,7 @@ import { referentialIntegrityCheck } from './features/referential-integrity-chec
import { ArrayFieldRepository } from './field-repository/array-field-repository'; import { ArrayFieldRepository } from './field-repository/array-field-repository';
import * as FieldTypes from './fields'; import * as FieldTypes from './fields';
import { Field, FieldContext, RelationField } from './fields'; import { Field, FieldContext, RelationField } from './fields';
import { checkDatabaseVersion } from './helpers';
import { InheritedCollection } from './inherited-collection'; import { InheritedCollection } from './inherited-collection';
import InheritanceMap from './inherited-map'; import InheritanceMap from './inherited-map';
import { InterfaceManager } from './interface-manager'; import { InterfaceManager } from './interface-manager';
@ -848,8 +849,7 @@ export class Database extends EventEmitter implements AsyncEmitter {
* @internal * @internal
*/ */
async checkVersion() { async checkVersion() {
return true; return process.env.DB_SKIP_VERSION_CHECK === 'on' || (await checkDatabaseVersion(this));
// return await checkDatabaseVersion(this);
} }
/** /**