@mikro-orm/mssql 7.0.0-rc.2 → 7.0.0-rc.3

package/MsSqlConnection.js

@@ -1,4 +1,4 @@
-import { AbstractSqlConnection, Utils, } from '@mikro-orm/sql';
+import { AbstractSqlConnection, Utils } from '@mikro-orm/sql';
 import { MssqlDialect } from 'kysely';
 import * as Tedious from 'tedious';
 import * as Tarn from 'tarn';
@@ -68,7 +68,7 @@ export class MsSqlConnection extends AbstractSqlConnection {
             return res.rows;
         }
         const rowCount = res.rows.length;
-        const hasEmptyCount = (rowCount === 1) && ('' in res.rows[0]);
+        const hasEmptyCount = rowCount === 1 && '' in res.rows[0];
         const emptyRow = hasEmptyCount && Number(res.rows[0]['']);
         return {
             affectedRows: hasEmptyCount ? emptyRow : Number(res.numAffectedRows),

package/MsSqlDriver.js

@@ -22,7 +22,9 @@ export class MsSqlDriver extends AbstractSqlDriver {
             const returningFields = Utils.flatten(returningProps.map(prop => prop.fieldNames));
             const using2 = `select * from (values ${data.map((x, i) => `(${i})`).join(',')}) v (id) where 1 = 1`;
             /* v8 ignore next */
-            const output = returningFields.length > 0 ? `output ${returningFields.map(field => 'inserted.' + this.platform.quoteIdentifier(field)).join(', ')}` : '';
+            const output = returningFields.length > 0
+                ? `output ${returningFields.map(field => 'inserted.' + this.platform.quoteIdentifier(field)).join(', ')}`
+                : '';
             const sql = `merge into ${tableName} using (${using2}) s on 1 = 0 when not matched then insert default values ${output};`;
             const res = await this.execute(sql, [], 'run', options.ctx);
             const pks = this.getPrimaryKeyFields(meta);
@@ -43,7 +45,9 @@ export class MsSqlDriver extends AbstractSqlDriver {
     }
     createQueryBuilder(entityName, ctx, preferredConnectionType, convertCustomTypes, loggerContext, alias, em) {
         // do not compute the connectionType if EM is provided as it will be computed from it in the QB later on
-        const connectionType = em ? preferredConnectionType : this.resolveConnectionType({ ctx, connectionType: preferredConnectionType });
+        const connectionType = em
+            ? preferredConnectionType
+            : this.resolveConnectionType({ ctx, connectionType: preferredConnectionType });
         const qb = new MsSqlQueryBuilder(entityName, this.metadata, this, ctx, alias, connectionType, em, loggerContext);
         if (!convertCustomTypes) {
             qb.unsetFlag(QueryFlag.CONVERT_CUSTOM_TYPES);
@@ -53,7 +57,7 @@ export class MsSqlDriver extends AbstractSqlDriver {
     appendOutputTable(entityName, data, sql) {
         const meta = this.metadata.get(entityName);
         const returningProps = meta.props
-            .filter(prop => prop.persist !== false && prop.defaultRaw || prop.autoincrement || prop.generated)
+            .filter(prop => (prop.persist !== false && prop.defaultRaw) || prop.autoincrement || prop.generated)
             .filter(prop => !(prop.name in data[0]) || isRaw(data[0][prop.name]));
         const returningFields = Utils.flatten(returningProps.map(prop => prop.fieldNames));
         /* v8 ignore next */
@@ -61,9 +65,7 @@ export class MsSqlDriver extends AbstractSqlDriver {
             return sql;
         }
         const tableName = this.getTableName(meta, {}, true);
-        const selections = returningFields
-            .map((field) => `[t].${this.platform.quoteIdentifier(field)}`)
-            .join(',');
+        const selections = returningFields.map((field) => `[t].${this.platform.quoteIdentifier(field)}`).join(',');
         const position = sql.indexOf(' values ');
         const sqlBeforeValues = sql.substring(0, position);
         const sqlAfterValues = sql.substring(position + 1);

package/MsSqlExceptionConverter.js

@@ -7,7 +7,10 @@ export class MsSqlExceptionConverter extends ExceptionConverter {
     convertException(exception) {
         let errno = exception.number;
         /* v8 ignore next */
-        if ('errors' in exception && Array.isArray(exception.errors) && typeof exception.errors[0] === 'object' && 'message' in exception.errors[0]) {
+        if ('errors' in exception &&
+            Array.isArray(exception.errors) &&
+            typeof exception.errors[0] === 'object' &&
+            'message' in exception.errors[0]) {
             exception.message += '\n' + exception.errors.map(e => e.message).join('\n');
             errno ??= exception.errors[0].number;
             exception.lineNumber ??= exception.errors[0].lineNumber;

package/MsSqlPlatform.js

@@ -130,9 +130,9 @@ export class MsSqlPlatform extends AbstractSqlPlatform {
     }
     validateMetadata(meta) {
         for (const prop of meta.props) {
-            if ((prop.runtimeType === 'string' || ['string', 'nvarchar'].includes(prop.type))
-                && !['uuid'].includes(prop.type)
-                && !prop.columnTypes[0].startsWith('varchar')) {
+            if ((prop.runtimeType === 'string' || ['string', 'nvarchar'].includes(prop.type)) &&
+                !['uuid'].includes(prop.type) &&
+                !prop.columnTypes[0].startsWith('varchar')) {
                 prop.customType ??= new UnicodeStringType();
                 prop.customType.prop = prop;
                 prop.customType.platform = this;
@@ -148,7 +148,7 @@ export class MsSqlPlatform extends AbstractSqlPlatform {
             boolean: 'bit',
         };
         const cast = (key) => raw(type in types ? `cast(${key} as ${types[type]})` : key);
-        const quoteKey = (key) => key.match(/^[a-z]\w*$/i) ? key : `"${key}"`;
+        const quoteKey = (key) => (key.match(/^[a-z]\w*$/i) ? key : `"${key}"`);
         /* v8 ignore next */
         if (path.length === 0) {
             return cast(`json_value(${root}, '$.${b.map(quoteKey).join('.')}')`);

package/MsSqlSchemaHelper.js

@@ -2,8 +2,8 @@ import { EnumType, SchemaHelper, StringType, TextType, Utils, } from '@mikro-orm
 import { UnicodeStringType } from './UnicodeStringType.js';
 export class MsSqlSchemaHelper extends SchemaHelper {
     static DEFAULT_VALUES = {
-        'true': ['1'],
-        'false': ['0'],
+        true: ['1'],
+        false: ['0'],
         'getdate()': ['current_timestamp'],
     };
     getManagementDbName() {
@@ -87,7 +87,7 @@ export class MsSqlSchemaHelper extends SchemaHelper {
       where (${[...tablesBySchemas.entries()].map(([schema, tables]) => `(ic.table_name in (${tables.map(t => this.platform.quoteValue(t.table_name)).join(',')}) and ic.table_schema = '${schema}')`).join(' OR ')})
       order by ordinal_position`;
         const allColumns = await connection.execute(sql);
-        const str = (val) => val != null ? '' + val : val;
+        const str = (val) => (val != null ? '' + val : val);
         const ret = {};
         for (const col of allColumns) {
             const mappedType = this.platform.getMappedType(col.data_type);
@@ -95,7 +95,9 @@ export class MsSqlSchemaHelper extends SchemaHelper {
             const increments = col.is_identity === 1 && connection.getPlatform().isNumericColumn(mappedType);
             const key = this.getTableKey(col);
             /* v8 ignore next */
-            const generated = col.generation_expression ? `${col.generation_expression}${col.is_persisted ? ' persisted' : ''}` : undefined;
+            const generated = col.generation_expression
+                ? `${col.generation_expression}${col.is_persisted ? ' persisted' : ''}`
+                : undefined;
             let type = col.data_type;
             if (['varchar', 'nvarchar', 'char', 'nchar', 'varbinary'].includes(col.data_type)) {
                 col.length = col.character_maximum_length;
@@ -115,7 +117,9 @@ export class MsSqlSchemaHelper extends SchemaHelper {
             ret[key] ??= [];
             ret[key].push({
                 name: col.column_name,
-                type: this.platform.isNumericColumn(mappedType) ? col.data_type.replace(/ unsigned$/, '').replace(/\(\d+\)$/, '') : type,
+                type: this.platform.isNumericColumn(mappedType)
+                    ? col.data_type.replace(/ unsigned$/, '').replace(/\(\d+\)$/, '')
+                    : type,
                 mappedType,
                 unsigned: col.data_type.endsWith(' unsigned'),
                 length: col.length,
@@ -237,7 +241,12 @@ export class MsSqlSchemaHelper extends SchemaHelper {
             /* v8 ignore next */
             const hasItems = (items?.length ?? 0) > 0;
             if (item.columnName && hasItems) {
-                items = items.map(val => val.trim().replace(`[${item.columnName}]=`, '').match(/^\(?'(.*)'/)?.[1]).filter(Boolean);
+                items = items
+                    .map(val => val
+                    .trim()
+                    .replace(`[${item.columnName}]=`, '')
+                    .match(/^\(?'(.*)'/)?.[1])
+                    .filter(Boolean);
                 if (items.length > 0) {
                     o[item.columnName] = items.reverse();
                 }
@@ -310,7 +319,7 @@ export class MsSqlSchemaHelper extends SchemaHelper {
             }
             // convert to string first if it's not already a string or has a smaller length
             const type = this.platform.extractSimpleType(col.fromColumn.type);
-            if (!['varchar', 'nvarchar', 'varbinary'].includes(type) || (col.fromColumn.length < col.column.length)) {
+            if (!['varchar', 'nvarchar', 'varbinary'].includes(type) || col.fromColumn.length < col.column.length) {
                 ret.push(`alter table ${quotedName} alter column [${col.oldColumnName}] nvarchar(max)`);
             }
         }
@@ -372,18 +381,21 @@ export class MsSqlSchemaHelper extends SchemaHelper {
             }
             const i = globalThis.idx;
             globalThis.idx++;
-            constraints.push(`declare @constraint${i} varchar(100) = (select default_constraints.name from sys.all_columns`
-                + ' join sys.tables on all_columns.object_id = tables.object_id'
-                + ' join sys.schemas on tables.schema_id = schemas.schema_id'
-                + ' join sys.default_constraints on all_columns.default_object_id = default_constraints.object_id'
-                + ` where schemas.name = '${schemaName}' and tables.name = '${tableName}' and all_columns.name = '${column.name}')`
-                + ` if @constraint${i} is not null exec('alter table ${tableNameRaw} drop constraint ' + @constraint${i})`);
+            constraints.push(`declare @constraint${i} varchar(100) = (select default_constraints.name from sys.all_columns` +
+                ' join sys.tables on all_columns.object_id = tables.object_id' +
+                ' join sys.schemas on tables.schema_id = schemas.schema_id' +
+                ' join sys.default_constraints on all_columns.default_object_id = default_constraints.object_id' +
+                ` where schemas.name = '${schemaName}' and tables.name = '${tableName}' and all_columns.name = '${column.name}')` +
+                ` if @constraint${i} is not null exec('alter table ${tableNameRaw} drop constraint ' + @constraint${i})`);
         }
         return constraints;
     }
     getRenameColumnSQL(tableName, oldColumnName, to, schemaName) {
         /* v8 ignore next */
-        const oldName = (schemaName && schemaName !== this.platform.getDefaultSchemaName() ? schemaName + '.' : '') + tableName + '.' + oldColumnName;
+        const oldName = (schemaName && schemaName !== this.platform.getDefaultSchemaName() ? schemaName + '.' : '') +
+            tableName +
+            '.' +
+            oldColumnName;
         const columnName = this.platform.quoteValue(to.name);
         return `exec sp_rename ${this.platform.quoteValue(oldName)}, ${columnName}, 'COLUMN'`;
     }
@@ -392,7 +404,10 @@ export class MsSqlSchemaHelper extends SchemaHelper {
         const primaryKey = !changedProperties && !this.hasNonDefaultPrimaryKeyName(table);
         const columnType = column.generated ? `as ${column.generated}` : column.type;
         const col = [this.quote(column.name)];
-        if (column.autoincrement && !column.generated && !compositePK && (!changedProperties || changedProperties.has('autoincrement') || changedProperties.has('type'))) {
+        if (column.autoincrement &&
+            !column.generated &&
+            !compositePK &&
+            (!changedProperties || changedProperties.has('autoincrement') || changedProperties.has('type'))) {
             col.push(column.mappedType.getColumnType({ autoincrement: true }, this.platform));
         }
         else {
@@ -401,10 +416,15 @@ export class MsSqlSchemaHelper extends SchemaHelper {
         Utils.runIfNotEmpty(() => col.push('identity(1,1)'), column.autoincrement);
         Utils.runIfNotEmpty(() => col.push('null'), column.nullable);
         Utils.runIfNotEmpty(() => col.push('not null'), !column.nullable && !column.generated);
-        if (column.autoincrement && !column.generated && !compositePK && (!changedProperties || changedProperties.has('autoincrement') || changedProperties.has('type'))) {
+        if (column.autoincrement &&
+            !column.generated &&
+            !compositePK &&
+            (!changedProperties || changedProperties.has('autoincrement') || changedProperties.has('type'))) {
             Utils.runIfNotEmpty(() => col.push('primary key'), primaryKey && column.primary);
         }
-        const useDefault = changedProperties ? false : column.default != null && column.default !== 'null' && !column.autoincrement;
+        const useDefault = changedProperties
+            ? false
+            : column.default != null && column.default !== 'null' && !column.autoincrement;
         const defaultName = this.platform.getConfig().getNamingStrategy().indexName(table.name, [column.name], 'default');
         Utils.runIfNotEmpty(() => col.push(`constraint ${this.quote(defaultName)} default ${column.default}`), useDefault);
         return col.join(' ');
@@ -459,14 +479,16 @@ export class MsSqlSchemaHelper extends SchemaHelper {
      */
     getIndexColumns(index) {
         if (index.columns?.length) {
-            return index.columns.map(col => {
+            return index.columns
+                .map(col => {
                 let colDef = this.quote(col.name);
                 // MSSQL supports sort order
                 if (col.sort) {
                     colDef += ` ${col.sort}`;
                 }
                 return colDef;
-            }).join(', ');
+            })
+                .join(', ');
         }
         return index.columnNames.map(c => this.quote(c)).join(', ');
     }
@@ -490,8 +512,7 @@ export class MsSqlSchemaHelper extends SchemaHelper {
         if (index.expression) {
             return index.expression;
         }
-        const needsWhereClause = index.unique
-            && index.columnNames.some(column => table.getColumn(column)?.nullable);
+        const needsWhereClause = index.unique && index.columnNames.some(column => table.getColumn(column)?.nullable);
         if (!needsWhereClause) {
             return this.getCreateIndexSQL(table.getShortestName(), index);
         }
@@ -517,9 +538,11 @@ export class MsSqlSchemaHelper extends SchemaHelper {
         return `if object_id('${viewName}', 'V') is not null drop view ${viewName}`;
     }
     getAddColumnsSQL(table, columns) {
-        const adds = columns.map(column => {
+        const adds = columns
+            .map(column => {
             return `${this.createTableColumn(column, table)}`;
-        }).join(', ');
+        })
+            .join(', ');
         return [`alter table ${table.getQuotedName()} add ${adds}`];
     }
     appendComments(table) {
@@ -556,7 +579,10 @@ else
         return +match[2];
     }
     wrap(val, type) {
-        const stringType = type instanceof StringType || type instanceof TextType || type instanceof EnumType || type instanceof UnicodeStringType;
+        const stringType = type instanceof StringType ||
+            type instanceof TextType ||
+            type instanceof EnumType ||
+            type instanceof UnicodeStringType;
         return typeof val === 'string' && val.length > 0 && stringType ? this.platform.quoteValue(val) : val;
     }
 }

package/package.json

@@ -1,44 +1,44 @@
 {
   "name": "@mikro-orm/mssql",
-  "type": "module",
-  "version": "7.0.0-rc.2",
+  "version": "7.0.0-rc.3",
   "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.",
-  "exports": {
-    "./package.json": "./package.json",
-    ".": "./index.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/mikro-orm/mikro-orm.git"
-  },
   "keywords": [
-    "orm",
+    "data-mapper",
+    "ddd",
+    "entity",
+    "identity-map",
+    "javascript",
+    "js",
+    "mariadb",
+    "mikro-orm",
     "mongo",
     "mongodb",
     "mysql",
-    "mariadb",
+    "orm",
     "postgresql",
     "sqlite",
     "sqlite3",
     "ts",
     "typescript",
-    "js",
-    "javascript",
-    "entity",
-    "ddd",
-    "mikro-orm",
-    "unit-of-work",
-    "data-mapper",
-    "identity-map"
+    "unit-of-work"
   ],
-  "author": "Martin Adámek",
-  "license": "MIT",
+  "homepage": "https://mikro-orm.io",
   "bugs": {
     "url": "https://github.com/mikro-orm/mikro-orm/issues"
   },
-  "homepage": "https://mikro-orm.io",
-  "engines": {
-    "node": ">= 22.17.0"
+  "license": "MIT",
+  "author": "Martin Adámek",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/mikro-orm/mikro-orm.git"
+  },
+  "type": "module",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": "./index.js"
+  },
+  "publishConfig": {
+    "access": "public"
   },
   "scripts": {
     "build": "yarn compile && yarn copy",
@@ -46,20 +46,20 @@
     "compile": "yarn run -T tsc -p tsconfig.build.json",
     "copy": "node ../../scripts/copy.mjs"
   },
-  "publishConfig": {
-    "access": "public"
-  },
   "dependencies": {
-    "@mikro-orm/sql": "7.0.0-rc.2",
+    "@mikro-orm/sql": "7.0.0-rc.3",
     "kysely": "0.28.11",
     "tarn": "3.0.2",
     "tedious": "19.2.1",
     "tsqlstring": "1.0.1"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.6.4"
+    "@mikro-orm/core": "^6.6.8"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-rc.2"
+    "@mikro-orm/core": "7.0.0-rc.3"
+  },
+  "engines": {
+    "node": ">= 22.17.0"
   }
 }