@mikro-orm/knex 7.0.0-dev.1 → 7.0.0-dev.3

package/schema/SqlSchemaGenerator.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SchemaGenerator = exports.SqlSchemaGenerator = void 0;
-const core_1 = require("@mikro-orm/core");
-const DatabaseSchema_1 = require("./DatabaseSchema");
-const SchemaComparator_1 = require("./SchemaComparator");
-class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
+import { AbstractSchemaGenerator, Utils, } from '@mikro-orm/core';
+import { DatabaseSchema } from './DatabaseSchema.js';
+import { SchemaComparator } from './SchemaComparator.js';
+export class SqlSchemaGenerator extends AbstractSchemaGenerator {
     helper = this.platform.getSchemaHelper();
     options = this.config.get('schemaGenerator');
     lastEnsuredDatabase;
@@ -48,7 +45,7 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
     getTargetSchema(schema) {
         const metadata = this.getOrderedMetadata(schema);
         const schemaName = schema ?? this.config.get('schema') ?? this.platform.getDefaultSchemaName();
-        return DatabaseSchema_1.DatabaseSchema.fromMetadata(metadata, this.platform, this.config, schemaName);
+        return DatabaseSchema.fromMetadata(metadata, this.platform, this.config, schemaName);
     }
     async getCreateSchemaSQL(options = {}) {
         const toSchema = this.getTargetSchema(options.schema);
@@ -63,7 +60,7 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
         if (this.platform.supportsNativeEnums()) {
             const created = [];
             for (const [enumName, enumOptions] of Object.entries(toSchema.getNativeEnums())) {
-                /* istanbul ignore if */
+                /* v8 ignore next 3 */
                 if (created.includes(enumName)) {
                     continue;
                 }
@@ -101,7 +98,7 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
     }
     async clearDatabase(options) {
         // truncate by default, so no value is considered as true
-        /* istanbul ignore if */
+        /* v8 ignore next 3 */
         if (options?.truncate === false) {
             return super.clearDatabase(options);
         }
@@ -109,28 +106,17 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
         for (const meta of this.getOrderedMetadata(options?.schema).reverse()) {
             await this.driver.createQueryBuilder(meta.className, this.em?.getTransactionContext(), 'write', false)
                 .withSchema(options?.schema)
-                .truncate();
+                .truncate()
+                .execute();
         }
         await this.execute(this.helper.enableForeignKeysSQL());
-        // const parts: string[] = [this.helper.disableForeignKeysSQL()];
-        //
-        // for (const meta of this.getOrderedMetadata(options?.schema).reverse()) {
-        //   const query = this.driver.createQueryBuilder(meta.className, this.em?.getTransactionContext(), 'write', false)
-        //     .withSchema(options?.schema)
-        //     .truncate()
-        //     .getFormattedQuery();
-        //   parts.push(query);
-        // }
-        //
-        // parts.push(this.helper.enableForeignKeysSQL());
-        // await this.execute(parts.join(';\n'));
         this.clearIdentityMap();
     }
     async getDropSchemaSQL(options = {}) {
         await this.ensureDatabase();
         const metadata = this.getOrderedMetadata(options.schema).reverse();
         const schemas = this.getTargetSchema(options.schema).getNamespaces();
-        const schema = await DatabaseSchema_1.DatabaseSchema.create(this.connection, this.platform, this.config, options.schema, schemas);
+        const schema = await DatabaseSchema.create(this.connection, this.platform, this.config, options.schema, schemas);
         const ret = [];
         // remove FKs explicitly if we can't use a cascading statement and we don't disable FK checks (we need this for circular relations)
         for (const meta of metadata) {
@@ -161,7 +147,7 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
     }
     getSchemaName(meta, options) {
         const schemaName = options.schema ?? this.config.get('schema');
-        /* istanbul ignore next */
+        /* v8 ignore next */
         const resolvedName = meta.schema && meta.schema === '*' ? schemaName : (meta.schema ?? schemaName);
         // skip default schema name
         if (resolvedName === this.platform.getDefaultSchemaName()) {
@@ -176,7 +162,7 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
     async getUpdateSchemaSQL(options = {}) {
         await this.ensureDatabase();
         const { fromSchema, toSchema } = await this.prepareSchemaForComparison(options);
-        const comparator = new SchemaComparator_1.SchemaComparator(this.platform);
+        const comparator = new SchemaComparator(this.platform);
         const diffUp = comparator.compare(fromSchema, toSchema);
         return this.diffToSQL(diffUp, options);
     }
@@ -185,7 +171,7 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
             await this.ensureDatabase();
         }
         const { fromSchema, toSchema } = await this.prepareSchemaForComparison(options);
-        const comparator = new SchemaComparator_1.SchemaComparator(this.platform);
+        const comparator = new SchemaComparator(this.platform);
         const diffUp = comparator.compare(fromSchema, toSchema);
         const diffDown = comparator.compare(toSchema, fromSchema, diffUp);
         return {
@@ -198,7 +184,7 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
         options.dropTables ??= true;
         const toSchema = this.getTargetSchema(options.schema);
         const schemas = toSchema.getNamespaces();
-        const fromSchema = options.fromSchema ?? await DatabaseSchema_1.DatabaseSchema.create(this.connection, this.platform, this.config, options.schema, schemas);
+        const fromSchema = options.fromSchema ?? (await DatabaseSchema.create(this.connection, this.platform, this.config, options.schema, schemas));
         const wildcardSchemaTables = Object.values(this.metadata.getAll()).filter(meta => meta.schema === '*').map(meta => meta.tableName);
         fromSchema.prune(options.schema, wildcardSchemaTables);
         toSchema.prune(options.schema, wildcardSchemaTables);
@@ -222,7 +208,7 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
         if (!options.safe && this.options.createForeignKeyConstraints) {
             for (const orphanedForeignKey of schemaDiff.orphanedForeignKeys) {
                 const [schemaName, tableName] = this.helper.splitTableName(orphanedForeignKey.localTableName, true);
-                /* istanbul ignore if */
+                /* v8 ignore next */
                 const name = (schemaName ? schemaName + '.' : '') + tableName;
                 this.append(ret, this.helper.dropForeignKey(name, orphanedForeignKey.constraintName));
             }
@@ -250,7 +236,7 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
             for (const table of Object.values(schemaDiff.removedTables)) {
                 this.append(ret, this.helper.dropTableIfExists(table.name, table.schema));
             }
-            if (core_1.Utils.hasObjectKeys(schemaDiff.removedTables)) {
+            if (Utils.hasObjectKeys(schemaDiff.removedTables)) {
                 ret.push('');
             }
         }
@@ -337,14 +323,14 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
             return;
         }
         // console.log(groups);
-        await core_1.Utils.runSerial(groups.flat(), line => this.driver.execute(line));
+        await Utils.runSerial(groups.flat(), line => this.driver.execute(line));
     }
     async dropTableIfExists(name, schema) {
         const sql = this.helper.dropTableIfExists(name, schema);
         return this.execute(sql);
     }
     wrapSchema(sql, options) {
-        const array = core_1.Utils.asArray(sql);
+        const array = Utils.asArray(sql);
         if (array.length === 0) {
             return '';
         }
@@ -363,5 +349,5 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
         return this.helper.append(array, sql, pad);
     }
 }
-exports.SqlSchemaGenerator = SqlSchemaGenerator;
-exports.SchemaGenerator = SqlSchemaGenerator;
+// for back compatibility
+export { SqlSchemaGenerator as SchemaGenerator };

package/schema/index.d.ts

@@ -1,5 +1,5 @@
-export * from './DatabaseSchema';
-export * from './DatabaseTable';
-export * from './SqlSchemaGenerator';
-export * from './SchemaHelper';
-export * from './SchemaComparator';
+export * from './DatabaseSchema.js';
+export * from './DatabaseTable.js';
+export * from './SqlSchemaGenerator.js';
+export * from './SchemaHelper.js';
+export * from './SchemaComparator.js';

package/schema/index.js

@@ -1,21 +1,5 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./DatabaseSchema"), exports);
-__exportStar(require("./DatabaseTable"), exports);
-__exportStar(require("./SqlSchemaGenerator"), exports);
-__exportStar(require("./SchemaHelper"), exports);
-__exportStar(require("./SchemaComparator"), exports);
+export * from './DatabaseSchema.js';
+export * from './DatabaseTable.js';
+export * from './SqlSchemaGenerator.js';
+export * from './SchemaHelper.js';
+export * from './SchemaComparator.js';

package/typings.d.ts

@@ -1,8 +1,9 @@
 import type { DeferMode, CheckCallback, Dictionary, EntityProperty, GroupOperator, RawQueryFragment, QBFilterQuery, QueryOrderMap, Type, QueryFlag, AnyEntity, EntityName } from '@mikro-orm/core';
-import type { JoinType, QueryType } from './query/enums';
-import type { DatabaseSchema, DatabaseTable } from './schema';
-import type { QueryBuilder } from './query/QueryBuilder';
-import type { NativeQueryBuilder } from './query/NativeQueryBuilder';
+import type { JoinType, QueryType } from './query/enums.js';
+import type { DatabaseSchema } from './schema/DatabaseSchema.js';
+import type { DatabaseTable } from './schema/DatabaseTable.js';
+import type { QueryBuilder } from './query/QueryBuilder.js';
+import type { NativeQueryBuilder } from './query/NativeQueryBuilder.js';
 export interface Table {
     table_name: string;
     schema_name?: string;

package/typings.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/index.mjs

@@ -1,232 +0,0 @@
-import mod from "./index.js";
-
-export default mod;
-export const ALIAS_REPLACEMENT = mod.ALIAS_REPLACEMENT;
-export const ALIAS_REPLACEMENT_RE = mod.ALIAS_REPLACEMENT_RE;
-export const ARRAY_OPERATORS = mod.ARRAY_OPERATORS;
-export const AbstractNamingStrategy = mod.AbstractNamingStrategy;
-export const AbstractSchemaGenerator = mod.AbstractSchemaGenerator;
-export const AbstractSqlConnection = mod.AbstractSqlConnection;
-export const AbstractSqlDriver = mod.AbstractSqlDriver;
-export const AbstractSqlPlatform = mod.AbstractSqlPlatform;
-export const AfterCreate = mod.AfterCreate;
-export const AfterDelete = mod.AfterDelete;
-export const AfterUpdate = mod.AfterUpdate;
-export const AfterUpsert = mod.AfterUpsert;
-export const ArrayCollection = mod.ArrayCollection;
-export const ArrayCriteriaNode = mod.ArrayCriteriaNode;
-export const ArrayType = mod.ArrayType;
-export const BaseEntity = mod.BaseEntity;
-export const BaseSqliteConnection = mod.BaseSqliteConnection;
-export const BaseSqlitePlatform = mod.BaseSqlitePlatform;
-export const BeforeCreate = mod.BeforeCreate;
-export const BeforeDelete = mod.BeforeDelete;
-export const BeforeUpdate = mod.BeforeUpdate;
-export const BeforeUpsert = mod.BeforeUpsert;
-export const BigIntType = mod.BigIntType;
-export const BlobType = mod.BlobType;
-export const BooleanType = mod.BooleanType;
-export const Cascade = mod.Cascade;
-export const ChangeSet = mod.ChangeSet;
-export const ChangeSetComputer = mod.ChangeSetComputer;
-export const ChangeSetPersister = mod.ChangeSetPersister;
-export const ChangeSetType = mod.ChangeSetType;
-export const CharacterType = mod.CharacterType;
-export const Check = mod.Check;
-export const CheckConstraintViolationException = mod.CheckConstraintViolationException;
-export const Collection = mod.Collection;
-export const CommitOrderCalculator = mod.CommitOrderCalculator;
-export const Config = mod.Config;
-export const Configuration = mod.Configuration;
-export const ConfigurationLoader = mod.ConfigurationLoader;
-export const Connection = mod.Connection;
-export const ConnectionException = mod.ConnectionException;
-export const ConstraintViolationException = mod.ConstraintViolationException;
-export const CreateRequestContext = mod.CreateRequestContext;
-export const CriteriaNode = mod.CriteriaNode;
-export const CriteriaNodeFactory = mod.CriteriaNodeFactory;
-export const Cursor = mod.Cursor;
-export const CursorError = mod.CursorError;
-export const DatabaseDriver = mod.DatabaseDriver;
-export const DatabaseObjectExistsException = mod.DatabaseObjectExistsException;
-export const DatabaseObjectNotFoundException = mod.DatabaseObjectNotFoundException;
-export const DatabaseSchema = mod.DatabaseSchema;
-export const DatabaseTable = mod.DatabaseTable;
-export const DataloaderType = mod.DataloaderType;
-export const DataloaderUtils = mod.DataloaderUtils;
-export const DateTimeType = mod.DateTimeType;
-export const DateType = mod.DateType;
-export const DeadlockException = mod.DeadlockException;
-export const DecimalType = mod.DecimalType;
-export const DefaultLogger = mod.DefaultLogger;
-export const DeferMode = mod.DeferMode;
-export const DoubleType = mod.DoubleType;
-export const DriverException = mod.DriverException;
-export const EagerProps = mod.EagerProps;
-export const Embeddable = mod.Embeddable;
-export const Embedded = mod.Embedded;
-export const EnsureRequestContext = mod.EnsureRequestContext;
-export const Entity = mod.Entity;
-export const EntityAssigner = mod.EntityAssigner;
-export const EntityCaseNamingStrategy = mod.EntityCaseNamingStrategy;
-export const EntityComparator = mod.EntityComparator;
-export const EntityFactory = mod.EntityFactory;
-export const EntityHelper = mod.EntityHelper;
-export const EntityIdentifier = mod.EntityIdentifier;
-export const EntityLoader = mod.EntityLoader;
-export const EntityManager = mod.EntityManager;
-export const EntityManagerType = mod.EntityManagerType;
-export const EntityMetadata = mod.EntityMetadata;
-export const EntityRepository = mod.EntityRepository;
-export const EntityRepositoryType = mod.EntityRepositoryType;
-export const EntitySchema = mod.EntitySchema;
-export const EntitySerializer = mod.EntitySerializer;
-export const EntityTransformer = mod.EntityTransformer;
-export const EntityValidator = mod.EntityValidator;
-export const Enum = mod.Enum;
-export const EnumArrayType = mod.EnumArrayType;
-export const EnumType = mod.EnumType;
-export const EventManager = mod.EventManager;
-export const EventType = mod.EventType;
-export const EventTypeMap = mod.EventTypeMap;
-export const ExceptionConverter = mod.ExceptionConverter;
-export const FileCacheAdapter = mod.FileCacheAdapter;
-export const Filter = mod.Filter;
-export const FloatType = mod.FloatType;
-export const FlushMode = mod.FlushMode;
-export const ForeignKeyConstraintViolationException = mod.ForeignKeyConstraintViolationException;
-export const Formula = mod.Formula;
-export const GeneratedCacheAdapter = mod.GeneratedCacheAdapter;
-export const GroupOperator = mod.GroupOperator;
-export const HiddenProps = mod.HiddenProps;
-export const Hydrator = mod.Hydrator;
-export const IdentityMap = mod.IdentityMap;
-export const Index = mod.Index;
-export const IntegerType = mod.IntegerType;
-export const IntervalType = mod.IntervalType;
-export const InvalidFieldNameException = mod.InvalidFieldNameException;
-export const IsolationLevel = mod.IsolationLevel;
-export const JSON_KEY_OPERATORS = mod.JSON_KEY_OPERATORS;
-export const JoinType = mod.JoinType;
-export const JsonProperty = mod.JsonProperty;
-export const JsonType = mod.JsonType;
-export const Kysely = mod.Kysely;
-export const LoadStrategy = mod.LoadStrategy;
-export const LockMode = mod.LockMode;
-export const LockWaitTimeoutException = mod.LockWaitTimeoutException;
-export const ManyToMany = mod.ManyToMany;
-export const ManyToOne = mod.ManyToOne;
-export const MediumIntType = mod.MediumIntType;
-export const MemoryCacheAdapter = mod.MemoryCacheAdapter;
-export const MetadataDiscovery = mod.MetadataDiscovery;
-export const MetadataError = mod.MetadataError;
-export const MetadataProvider = mod.MetadataProvider;
-export const MetadataStorage = mod.MetadataStorage;
-export const MetadataValidator = mod.MetadataValidator;
-export const MikroORM = mod.MikroORM;
-export const MongoNamingStrategy = mod.MongoNamingStrategy;
-export const MsSqlNativeQueryBuilder = mod.MsSqlNativeQueryBuilder;
-export const MySqlExceptionConverter = mod.MySqlExceptionConverter;
-export const MySqlNativeQueryBuilder = mod.MySqlNativeQueryBuilder;
-export const MySqlPlatform = mod.MySqlPlatform;
-export const MySqlSchemaHelper = mod.MySqlSchemaHelper;
-export const NativeQueryBuilder = mod.NativeQueryBuilder;
-export const NodeState = mod.NodeState;
-export const NonUniqueFieldNameException = mod.NonUniqueFieldNameException;
-export const NotFoundError = mod.NotFoundError;
-export const NotNullConstraintViolationException = mod.NotNullConstraintViolationException;
-export const NullCacheAdapter = mod.NullCacheAdapter;
-export const NullHighlighter = mod.NullHighlighter;
-export const ObjectBindingPattern = mod.ObjectBindingPattern;
-export const ObjectCriteriaNode = mod.ObjectCriteriaNode;
-export const ObjectHydrator = mod.ObjectHydrator;
-export const OnInit = mod.OnInit;
-export const OnLoad = mod.OnLoad;
-export const OneToMany = mod.OneToMany;
-export const OneToOne = mod.OneToOne;
-export const OptimisticLockError = mod.OptimisticLockError;
-export const OptionalProps = mod.OptionalProps;
-export const PlainObject = mod.PlainObject;
-export const Platform = mod.Platform;
-export const PopulateHint = mod.PopulateHint;
-export const PopulatePath = mod.PopulatePath;
-export const PostgreSqlNativeQueryBuilder = mod.PostgreSqlNativeQueryBuilder;
-export const PrimaryKey = mod.PrimaryKey;
-export const PrimaryKeyProp = mod.PrimaryKeyProp;
-export const Property = mod.Property;
-export const QueryBuilder = mod.QueryBuilder;
-export const QueryBuilderHelper = mod.QueryBuilderHelper;
-export const QueryFlag = mod.QueryFlag;
-export const QueryHelper = mod.QueryHelper;
-export const QueryOperator = mod.QueryOperator;
-export const QueryOrder = mod.QueryOrder;
-export const QueryOrderNumeric = mod.QueryOrderNumeric;
-export const QueryType = mod.QueryType;
-export const Raw = mod.Raw;
-export const RawQueryFragment = mod.RawQueryFragment;
-export const ReadOnlyException = mod.ReadOnlyException;
-export const Ref = mod.Ref;
-export const Reference = mod.Reference;
-export const ReferenceKind = mod.ReferenceKind;
-export const ReflectMetadataProvider = mod.ReflectMetadataProvider;
-export const RequestContext = mod.RequestContext;
-export const SCALAR_TYPES = mod.SCALAR_TYPES;
-export const ScalarCriteriaNode = mod.ScalarCriteriaNode;
-export const ScalarReference = mod.ScalarReference;
-export const SchemaComparator = mod.SchemaComparator;
-export const SchemaGenerator = mod.SchemaGenerator;
-export const SchemaHelper = mod.SchemaHelper;
-export const SerializationContext = mod.SerializationContext;
-export const SerializedPrimaryKey = mod.SerializedPrimaryKey;
-export const ServerException = mod.ServerException;
-export const SimpleLogger = mod.SimpleLogger;
-export const SmallIntType = mod.SmallIntType;
-export const SqlEntityManager = mod.SqlEntityManager;
-export const SqlEntityRepository = mod.SqlEntityRepository;
-export const SqlSchemaGenerator = mod.SqlSchemaGenerator;
-export const SqliteExceptionConverter = mod.SqliteExceptionConverter;
-export const SqliteNativeQueryBuilder = mod.SqliteNativeQueryBuilder;
-export const SqliteSchemaHelper = mod.SqliteSchemaHelper;
-export const StringType = mod.StringType;
-export const SyntaxErrorException = mod.SyntaxErrorException;
-export const TableExistsException = mod.TableExistsException;
-export const TableNotFoundException = mod.TableNotFoundException;
-export const TextType = mod.TextType;
-export const TimeType = mod.TimeType;
-export const TinyIntType = mod.TinyIntType;
-export const TransactionContext = mod.TransactionContext;
-export const TransactionEventBroadcaster = mod.TransactionEventBroadcaster;
-export const Transactional = mod.Transactional;
-export const Type = mod.Type;
-export const Uint8ArrayType = mod.Uint8ArrayType;
-export const UnderscoreNamingStrategy = mod.UnderscoreNamingStrategy;
-export const Unique = mod.Unique;
-export const UniqueConstraintViolationException = mod.UniqueConstraintViolationException;
-export const UnitOfWork = mod.UnitOfWork;
-export const UnknownType = mod.UnknownType;
-export const Utils = mod.Utils;
-export const UuidType = mod.UuidType;
-export const ValidationError = mod.ValidationError;
-export const WrappedEntity = mod.WrappedEntity;
-export const assign = mod.assign;
-export const colors = mod.colors;
-export const compareArrays = mod.compareArrays;
-export const compareBooleans = mod.compareBooleans;
-export const compareBuffers = mod.compareBuffers;
-export const compareObjects = mod.compareObjects;
-export const createSqlFunction = mod.createSqlFunction;
-export const defineConfig = mod.defineConfig;
-export const equals = mod.equals;
-export const getOnConflictFields = mod.getOnConflictFields;
-export const getOnConflictReturningFields = mod.getOnConflictReturningFields;
-export const helper = mod.helper;
-export const isRaw = mod.isRaw;
-export const parseJsonSafe = mod.parseJsonSafe;
-export const raw = mod.raw;
-export const ref = mod.ref;
-export const rel = mod.rel;
-export const serialize = mod.serialize;
-export const sql = mod.sql;
-export const t = mod.t;
-export const types = mod.types;
-export const wrap = mod.wrap;