@mikro-orm/mssql 7.2.0-dev.0 → 7.2.0-dev.2

package/MsSqlPlatform.js

@@ -223,18 +223,19 @@ export class MsSqlPlatform extends AbstractSqlPlatform {
         return collation;
     }
     getOrderByExpression(column, direction, collation) {
+        const dir = this.validateOrderByDirection(direction);
         const col = collation ? `${column} collate ${this.quoteCollation(collation)}` : column;
-        switch (direction.toUpperCase()) {
-            case QueryOrder.ASC_NULLS_FIRST:
+        switch (dir) {
+            case QueryOrder.asc_nulls_first:
                 return [`case when ${column} is null then 0 else 1 end, ${col} asc`];
-            case QueryOrder.ASC_NULLS_LAST:
+            case QueryOrder.asc_nulls_last:
                 return [`case when ${column} is null then 1 else 0 end, ${col} asc`];
-            case QueryOrder.DESC_NULLS_FIRST:
+            case QueryOrder.desc_nulls_first:
                 return [`case when ${column} is null then 0 else 1 end, ${col} desc`];
-            case QueryOrder.DESC_NULLS_LAST:
+            case QueryOrder.desc_nulls_last:
                 return [`case when ${column} is null then 1 else 0 end, ${col} desc`];
             default:
-                return [`${col} ${direction.toLowerCase()}`];
+                return [`${col} ${dir}`];
         }
     }
     getDefaultClientUrl() {

package/MsSqlSchemaHelper.js

@@ -400,6 +400,7 @@ export class MsSqlSchemaHelper extends SchemaHelper {
         on ep.major_id = o.object_id and ep.minor_id = 0 and ep.name = 'MS_Description'
       where o.type in ('P', 'FN', 'IF', 'TF')
         and o.is_ms_shipped = 0
+      order by s.name, o.name
     `;
         const [rows, paramsAndReturns] = await Promise.all([
             connection.execute(sql),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/mssql",
-  "version": "7.2.0-dev.0",
+  "version": "7.2.0-dev.2",
   "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.",
   "keywords": [
     "data-mapper",
@@ -47,17 +47,17 @@
     "copy": "node ../../scripts/copy.mjs"
   },
   "dependencies": {
-    "@mikro-orm/sql": "7.2.0-dev.0",
-    "kysely": "0.29.3",
+    "@mikro-orm/sql": "7.2.0-dev.2",
+    "kysely": "0.29.4",
     "tarn": "3.1.2",
     "tedious": "20.0.0",
     "tsqlstring": "1.0.1"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^7.1.6"
+    "@mikro-orm/core": "^7.1.7"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.0-dev.0"
+    "@mikro-orm/core": "7.2.0-dev.2"
   },
   "engines": {
     "node": ">= 22.17.0"