@mikro-orm/knex 7.0.0-dev.75 → 7.0.0-dev.77

package/AbstractSqlDriver.js

@@ -112,7 +112,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
     }
     async findFromVirtual(entityName, where, options, type) {
         const meta = this.metadata.get(entityName);
-        /* v8 ignore next 3 */
+        /* v8 ignore next */
         if (!meta.expression) {
             return type === QueryType.SELECT ? [] : 0;
         }
@@ -132,12 +132,12 @@ export class AbstractSqlDriver extends DatabaseDriver {
             const expr = this.platform.formatQuery(res.sql, res.params);
             return this.wrapVirtualExpressionInSubquery(meta, expr, where, options, type);
         }
-        /* v8 ignore next 2 */
+        /* v8 ignore next */
         return res;
     }
     async *streamFromVirtual(entityName, where, options) {
         const meta = this.metadata.get(entityName);
-        /* v8 ignore next 3 */
+        /* v8 ignore next */
         if (!meta.expression) {
             return;
         }
@@ -161,7 +161,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
             yield* this.wrapVirtualExpressionInSubqueryStream(meta, expr, where, options, QueryType.SELECT);
             return;
         }
-        /* v8 ignore next 2 */
+        /* v8 ignore next */
         yield* res;
     }
     async wrapVirtualExpressionInSubquery(meta, expression, where, options, type) {
@@ -201,7 +201,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
     }
     mapResult(result, meta, populate = [], qb, map = {}) {
         const ret = super.mapResult(result, meta);
-        /* v8 ignore next 3 */
+        /* v8 ignore next */
         if (!ret) {
             return null;
         }
@@ -216,7 +216,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
         joinedProps.forEach(hint => {
             const [propName, ref] = hint.field.split(':', 2);
             const prop = meta.properties[propName];
-            /* v8 ignore next 3 */
+            /* v8 ignore next */
             if (!prop) {
                 return;
             }
@@ -230,7 +230,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
                 path += '[pivot]';
             }
             const relationAlias = qb.getAliasForJoinPath(path, { matchPopulateJoins: true });
-            /* v8 ignore next 3 */
+            /* v8 ignore next */
             if (!relationAlias) {
                 return;
             }
@@ -279,7 +279,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
             meta2.props
                 .filter(prop => !ref && prop.persist === false && prop.fieldNames)
                 .forEach(prop => {
-                /* v8 ignore next 3 */
+                /* v8 ignore next */
                 if (prop.fieldNames.length > 1) { // composite keys
                     relationPojo[prop.name] = prop.fieldNames.map(name => root[`${relationAlias}__${name}`]);
                 }
@@ -514,7 +514,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
         }
         const res = await this.execute(sql, params, 'run', options.ctx, options.loggerContext);
         let pk;
-        /* v8 ignore next 3 */
+        /* v8 ignore next */
         if (pks.length > 1) { // owner has composite pk
             pk = data.map(d => Utils.getPrimaryKeyCond(d, pks));
         }
@@ -768,7 +768,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
                     await this.rethrow(query.execute());
                     continue;
                 }
-                /* v8 ignore next 5 */
+                /* v8 ignore next */
                 const query = qb.update({ [coll.property.mappedBy]: pks })
                     .where({ [cols.join(Utils.PK_SEPARATOR)]: { $in: insertDiff } });
                 await this.rethrow(query.execute());

package/AbstractSqlPlatform.js

@@ -21,12 +21,12 @@ export class AbstractSqlPlatform extends Platform {
     lookupExtensions(orm) {
         SqlSchemaGenerator.register(orm);
     }
-    /* v8 ignore next 3: kept for type inference only */
+    /* v8 ignore next: kept for type inference only */
     getSchemaGenerator(driver, em) {
         return new SqlSchemaGenerator(em ?? driver);
     }
-    /* v8 ignore next 4 */
     /** @internal */
+    /* v8 ignore next */
     createNativeQueryBuilder() {
         return new NativeQueryBuilder(this);
     }

package/dialects/mssql/MsSqlNativeQueryBuilder.js

@@ -168,7 +168,7 @@ export class MsSqlNativeQueryBuilder extends NativeQueryBuilder {
             this.parts.push(`order by ${this.options.orderBy}`);
         }
         if (this.options.offset != null) {
-            /* v8 ignore next 3 */
+            /* v8 ignore next */
             if (!this.options.orderBy) {
                 throw new Error('Order by clause is required for pagination');
             }

package/dialects/mysql/MySqlExceptionConverter.js

@@ -6,7 +6,7 @@ export class MySqlExceptionConverter extends ExceptionConverter {
      * @see https://github.com/doctrine/dbal/blob/master/src/Driver/AbstractMySQLDriver.php
      */
     convertException(exception) {
-        /* v8 ignore start */
+        /* v8 ignore next */
         switch (exception.errno) {
             case 1213:
                 return new DeadlockException(exception);
@@ -75,7 +75,6 @@ export class MySqlExceptionConverter extends ExceptionConverter {
             case 1566:
                 return new NotNullConstraintViolationException(exception);
         }
-        /* v8 ignore stop */
         return super.convertException(exception);
     }
 }

package/dialects/mysql/MySqlSchemaHelper.js

@@ -78,7 +78,7 @@ export class MySqlSchemaHelper extends SchemaHelper {
         return ret;
     }
     getCreateIndexSQL(tableName, index, partialExpression = false) {
-        /* v8 ignore next 3 */
+        /* v8 ignore next */
         if (index.expression && !partialExpression) {
             return index.expression;
         }
@@ -146,7 +146,7 @@ export class MySqlSchemaHelper extends SchemaHelper {
         return ret;
     }
     async getAllChecks(connection, tables) {
-        /* v8 ignore next 3 */
+        /* v8 ignore next */
         if (!(await this.supportsCheckConstraints(connection))) {
             return {};
         }

package/dialects/sqlite/SqliteExceptionConverter.js

@@ -1,4 +1,5 @@
 import { ConnectionException, ExceptionConverter, InvalidFieldNameException, LockWaitTimeoutException, NonUniqueFieldNameException, CheckConstraintViolationException, NotNullConstraintViolationException, ReadOnlyException, SyntaxErrorException, TableExistsException, TableNotFoundException, UniqueConstraintViolationException, ForeignKeyConstraintViolationException, } from '@mikro-orm/core';
+/* v8 ignore next */
 export class SqliteExceptionConverter extends ExceptionConverter {
     /**
      * @inheritDoc
@@ -6,7 +7,6 @@ export class SqliteExceptionConverter extends ExceptionConverter {
      * @see https://github.com/doctrine/dbal/blob/master/src/Driver/AbstractSQLiteDriver.php
      */
     convertException(exception) {
-        /* v8 ignore start */
         if (exception.message.includes('database is locked')) {
             return new LockWaitTimeoutException(exception);
         }
@@ -46,7 +46,6 @@ export class SqliteExceptionConverter extends ExceptionConverter {
         if (exception.message.includes('FOREIGN KEY constraint failed')) {
             return new ForeignKeyConstraintViolationException(exception);
         }
-        /* v8 ignore stop */
         return super.convertException(exception);
     }
 }

package/dialects/sqlite/SqliteSchemaHelper.js

@@ -114,7 +114,7 @@ export class SqliteSchemaHelper extends SchemaHelper {
         }).join(';\n');
     }
     getCreateIndexSQL(tableName, index) {
-        /* v8 ignore next 3 */
+        /* v8 ignore next */
         if (index.expression) {
             return index.expression;
         }
@@ -134,7 +134,7 @@ export class SqliteSchemaHelper extends SchemaHelper {
         const constraints = [];
         // extract all columns definitions
         let columnsDef = sql.replaceAll('\n', '').match(new RegExp(`create table [\`"']?.*?[\`"']? \\((.*)\\)`, 'i'))?.[1];
-        /* v8 ignore start */
+        /* v8 ignore next */
         if (columnsDef) {
             if (columnsDef.includes(', constraint ')) {
                 constraints.push(...columnsDef.substring(columnsDef.indexOf(', constraint') + 2).split(', '));
@@ -150,7 +150,6 @@ export class SqliteSchemaHelper extends SchemaHelper {
                 }
             }
         }
-        /* v8 ignore stop */
         return { columns, constraints };
     }
     async getColumns(connection, tableName, schemaName) {
@@ -194,7 +193,7 @@ export class SqliteSchemaHelper extends SchemaHelper {
             // check constraints are defined as (note that last closing paren is missing):
             // `type` text check (`type` in ('local', 'global')
             const match = item.match(/[`["']([^`\]"']+)[`\]"'] text check \(.* \((.*)\)/i);
-            /* v8 ignore next 3 */
+            /* v8 ignore next */
             if (match) {
                 o[match[1]] = match[2].split(',').map((item) => item.trim().match(/^\(?'(.*)'/)[1]);
             }
@@ -321,7 +320,7 @@ export class SqliteSchemaHelper extends SchemaHelper {
         for (const index of Object.values(diff.changedIndexes)) {
             this.append(ret, this.dropIndex(diff.name, index));
         }
-        /* v8 ignore next 3 */
+        /* v8 ignore next */
         if (!safe && Object.values(diff.removedColumns).length > 0) {
             this.append(ret, this.getDropColumnsSQL(tableName, Object.values(diff.removedColumns), schemaName));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "7.0.0-dev.75",
+  "version": "7.0.0-dev.77",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "type": "module",
   "exports": {
@@ -57,6 +57,6 @@
     "@mikro-orm/core": "^6.6.1"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.75"
+    "@mikro-orm/core": "7.0.0-dev.77"
   }
 }

package/query/ObjectCriteriaNode.js

@@ -180,7 +180,7 @@ export class ObjectCriteriaNode extends CriteriaNode {
             o[key] = value;
             return;
         }
-        /* v8 ignore next 4 */
+        /* v8 ignore next */
         if (key === '$and') {
             o.$and.push({ [key]: value });
             return;

package/query/QueryBuilder.js

@@ -253,7 +253,7 @@ export class QueryBuilder {
      * Apply filters to the QB where condition.
      */
     async applyFilters(filterOptions = {}) {
-        /* v8 ignore next 3 */
+        /* v8 ignore next */
         if (!this.em) {
             throw new Error('Cannot apply filters, this QueryBuilder is not attached to an EntityManager');
         }
@@ -903,7 +903,7 @@ export class QueryBuilder {
             qb[prop] = properties.includes(prop) ? Utils.copy(this[prop]) : this[prop];
         }
         delete RawQueryFragment.cloneRegistry;
-        /* v8 ignore next 3 */
+        /* v8 ignore next */
         if (this._fields && !reset.includes('_fields')) {
             qb._fields = [...this._fields];
         }
@@ -1046,7 +1046,7 @@ export class QueryBuilder {
             }
             const [a, f] = this.helper.splitField(field);
             const prop = this.helper.getProperty(f, a);
-            /* v8 ignore next 3 */
+            /* v8 ignore next */
             if (prop && [ReferenceKind.ONE_TO_MANY, ReferenceKind.MANY_TO_MANY].includes(prop.kind)) {
                 return;
             }
@@ -1408,7 +1408,7 @@ export class QueryBuilder {
                     }
                     return false;
                 });
-                /* v8 ignore next 3 */
+                /* v8 ignore next */
                 if (field instanceof RawQueryFragment) {
                     innerQuery.select(field);
                 }
@@ -1517,7 +1517,7 @@ export class QueryBuilder {
         return new QueryBuilderHelper(this.mainAlias.entityName, this.mainAlias.aliasName, this._aliases, this.subQueries, this.driver);
     }
     ensureFromClause() {
-        /* v8 ignore next 3 */
+        /* v8 ignore next */
         if (!this._mainAlias) {
             throw new Error(`Cannot proceed to build a query because the main alias is not set.`);
         }
@@ -1527,8 +1527,8 @@ export class QueryBuilder {
             throw new Error('This QueryBuilder instance is already finalized, clone it first if you want to modify it.');
         }
     }
-    /* v8 ignore start */
     /** @ignore */
+    /* v8 ignore next */
     [inspect.custom](depth = 2) {
         const object = { ...this };
         const hidden = ['metadata', 'driver', 'context', 'platform', 'type'];

package/query/QueryBuilderHelper.js

@@ -26,7 +26,7 @@ export class QueryBuilderHelper {
         if (isRaw(field)) {
             return raw(field.sql, field.params);
         }
-        /* v8 ignore next 3 */
+        /* v8 ignore next */
         if (typeof field !== 'string') {
             return field;
         }
@@ -420,7 +420,7 @@ export class QueryBuilderHelper {
         }
         // operators
         const op = Object.keys(QueryOperator).find(op => op in value);
-        /* v8 ignore next 3 */
+        /* v8 ignore next */
         if (!op) {
             throw new Error(`Invalid query condition: ${inspect(cond, { depth: 5 })}`);
         }
@@ -456,7 +456,7 @@ export class QueryBuilderHelper {
         const [a, f] = this.splitField(key);
         const prop = this.getProperty(f, a);
         if (op === '$fulltext') {
-            /* v8 ignore next 3 */
+            /* v8 ignore next */
             if (!prop) {
                 throw new Error(`Cannot use $fulltext operator on ${key}, property not found`);
             }

package/schema/DatabaseTable.js

@@ -63,7 +63,7 @@ export class DatabaseTable {
             const mappedType = this.platform.getMappedType(type);
             if (mappedType instanceof DecimalType) {
                 const match = prop.columnTypes[idx].match(/\w+\((\d+), ?(\d+)\)/);
-                /* v8 ignore next 5 */
+                /* v8 ignore next */
                 if (match) {
                     prop.precision ??= +match[1];
                     prop.scale ??= +match[2];

package/schema/SchemaComparator.js

@@ -308,7 +308,7 @@ export class SchemaComparator {
             const [removedColumn, addedColumn] = candidateColumns[0];
             const removedColumnName = removedColumn.name;
             const addedColumnName = addedColumn.name;
-            /* v8 ignore next 3 */
+            /* v8 ignore next */
             if (tableDifferences.renamedColumns[removedColumnName]) {
                 continue;
             }
@@ -518,7 +518,7 @@ export class SchemaComparator {
         return simplify(expr1) !== simplify(expr2);
     }
     parseJsonDefault(defaultValue) {
-        /* v8 ignore next 3 */
+        /* v8 ignore next */
         if (!defaultValue) {
             return null;
         }

package/schema/SchemaHelper.js

@@ -74,7 +74,7 @@ export class SchemaHelper {
         return `alter table ${tableReference} rename column ${oldColumnName} to ${columnName}`;
     }
     getCreateIndexSQL(tableName, index) {
-        /* v8 ignore next 3 */
+        /* v8 ignore next */
         if (index.expression) {
             return index.expression;
         }
@@ -141,7 +141,7 @@ export class SchemaHelper {
         for (const check of Object.values(diff.changedChecks)) {
             ret.push(this.dropConstraint(diff.name, check.name));
         }
-        /* v8 ignore next 3 */
+        /* v8 ignore next */
         if (!safe && Object.values(diff.removedColumns).length > 0) {
             ret.push(this.getDropColumnsSQL(tableName, Object.values(diff.removedColumns), schemaName));
         }
@@ -224,7 +224,7 @@ export class SchemaHelper {
         const defaultName = this.platform.getDefaultPrimaryName(table.name, pkIndex.columnNames);
         return pkIndex?.keyName !== defaultName;
     }
-    /* v8 ignore next 3 */
+    /* v8 ignore next */
     castColumn(name, type) {
         return '';
     }
@@ -341,11 +341,11 @@ export class SchemaHelper {
     getDropDatabaseSQL(name) {
         return `drop database if exists ${this.quote(name)}`;
     }
-    /* v8 ignore next 3 */
+    /* v8 ignore next */
     getCreateNamespaceSQL(name) {
         return `create schema if not exists ${this.quote(name)}`;
     }
-    /* v8 ignore next 3 */
+    /* v8 ignore next */
     getDropNamespaceSQL(name) {
         return `drop schema if exists ${this.quote(name)}`;
     }
@@ -467,7 +467,7 @@ export class SchemaHelper {
     getReferencedTableName(referencedTableName, schema) {
         const [schemaName, tableName] = this.splitTableName(referencedTableName);
         schema = schemaName ?? schema ?? this.platform.getConfig().get('schema');
-        /* v8 ignore next 3 */
+        /* v8 ignore next */
         if (schema && schemaName === '*') {
             return `${schema}.${referencedTableName.replace(/^\*\./, '')}`;
         }

package/schema/SqlSchemaGenerator.js

@@ -36,7 +36,7 @@ export class SqlSchemaGenerator extends AbstractSchemaGenerator {
             }
             return true;
         }
-        /* v8 ignore next 3 */
+        /* v8 ignore next */
         if (options?.clear) {
             await this.clear({ ...options, clearIdentityMap: false });
         }
@@ -69,7 +69,7 @@ export class SqlSchemaGenerator extends AbstractSchemaGenerator {
         if (this.platform.supportsNativeEnums()) {
             const created = [];
             for (const [enumName, enumOptions] of Object.entries(toSchema.getNativeEnums())) {
-                /* v8 ignore next 3 */
+                /* v8 ignore next */
                 if (created.includes(enumName)) {
                     continue;
                 }
@@ -107,7 +107,7 @@ export class SqlSchemaGenerator extends AbstractSchemaGenerator {
     }
     async clear(options) {
         // truncate by default, so no value is considered as true
-        /* v8 ignore next 3 */
+        /* v8 ignore next */
         if (options?.truncate === false) {
             return super.clear(options);
         }