Merge branch 'main' into next

# Conflicts:
#	packages/core/database/src/database.ts
This commit is contained in:
chenos 2024-09-26 22:24:42 +08:00
commit b4c9cd988b

View File

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