@mikro-orm/mssql 7.0.0-dev.2 → 7.0.0-dev.20

package/MsSqlPlatform.d.ts

@@ -1,4 +1,4 @@
-import { AbstractSqlPlatform, type EntityMetadata, type IDatabaseDriver, type EntityManager, type MikroORM, Type, type Primary, type IPrimaryKey, MsSqlNativeQueryBuilder } from '@mikro-orm/knex';
+import { AbstractSqlPlatform, type EntityMetadata, type IDatabaseDriver, type EntityManager, type MikroORM, Type, type Primary, type IPrimaryKey, QueryOrder, MsSqlNativeQueryBuilder } from '@mikro-orm/knex';
 import { MsSqlSchemaHelper } from './MsSqlSchemaHelper.js';
 import { MsSqlExceptionConverter } from './MsSqlExceptionConverter.js';
 import { MsSqlSchemaGenerator } from './MsSqlSchemaGenerator.js';
@@ -59,5 +59,6 @@ export declare class MsSqlPlatform extends AbstractSqlPlatform {
     escape(value: any): string;
     getSchemaGenerator(driver: IDatabaseDriver, em?: EntityManager): MsSqlSchemaGenerator;
     allowsComparingTuples(): boolean;
+    getOrderByExpression(column: string, direction: QueryOrder): string[];
     getDefaultClientUrl(): string;
 }

package/MsSqlPlatform.js

@@ -1,4 +1,4 @@
-import { AbstractSqlPlatform, raw, Type, Utils, ALIAS_REPLACEMENT, DoubleType, FloatType, RawQueryFragment, MsSqlNativeQueryBuilder, } from '@mikro-orm/knex';
+import { AbstractSqlPlatform, raw, Type, Utils, ALIAS_REPLACEMENT, DoubleType, FloatType, QueryOrder, RawQueryFragment, MsSqlNativeQueryBuilder, } from '@mikro-orm/knex';
 // @ts-expect-error no types available
 import SqlString from 'tsqlstring';
 import { MsSqlSchemaHelper } from './MsSqlSchemaHelper.js';
@@ -196,6 +196,20 @@ export class MsSqlPlatform extends AbstractSqlPlatform {
     allowsComparingTuples() {
         return false;
     }
+    getOrderByExpression(column, direction) {
+        switch (direction.toUpperCase()) {
+            case QueryOrder.ASC_NULLS_FIRST:
+                return [`case when ${column} is null then 0 else 1 end, ${column} asc`];
+            case QueryOrder.ASC_NULLS_LAST:
+                return [`case when ${column} is null then 1 else 0 end, ${column} asc`];
+            case QueryOrder.DESC_NULLS_FIRST:
+                return [`case when ${column} is null then 0 else 1 end, ${column} desc`];
+            case QueryOrder.DESC_NULLS_LAST:
+                return [`case when ${column} is null then 1 else 0 end, ${column} desc`];
+            default:
+                return [`${column} ${direction.toLowerCase()}`];
+        }
+    }
     getDefaultClientUrl() {
         return 'mssql://sa@localhost:1433';
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/mssql",
   "type": "module",
-  "version": "7.0.0-dev.2",
+  "version": "7.0.0-dev.20",
   "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",
@@ -50,17 +50,17 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "7.0.0-dev.2",
+    "@mikro-orm/knex": "7.0.0-dev.20",
     "tarn": "3.0.2",
     "tedious": "19.0.0",
     "tsqlstring": "1.0.1"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.4.5",
-    "kysely": "https://pkg.pr.new/kysely-org/kysely/kysely@2b7007e"
+    "@mikro-orm/core": "^6.4.15",
+    "kysely": "0.28.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.2",
+    "@mikro-orm/core": "7.0.0-dev.20",
     "kysely": "*"
   }
 }