From 1146b969f83a217bd6a05f58695d783b874e6201 Mon Sep 17 00:00:00 2001
From: hyunnbunt <rha542@gmail.com>
Date: Mon, 28 Apr 2025 13:02:46 +0900
Subject: [PATCH 1/3] new order query added

---
 platform/wab/src/wab/server/db/DbMgr.ts | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/platform/wab/src/wab/server/db/DbMgr.ts b/platform/wab/src/wab/server/db/DbMgr.ts
index 103ab5a7b35..bc0def221c6 100644
--- a/platform/wab/src/wab/server/db/DbMgr.ts
+++ b/platform/wab/src/wab/server/db/DbMgr.ts
@@ -7402,17 +7402,23 @@ export class DbMgr implements MigrationDbMgr {
     if (query.order) {
       for (const order of query.order) {
         const field = typeof order === "string" ? order : order.field;
+        const dir =
+          typeof order === "string"
+            ? "ASC"
+            : order.dir === "asc"
+            ? "ASC"
+            : "DESC";
         if (field in fieldToMeta) {
-          const dir =
-            typeof order === "string"
-              ? "ASC"
-              : order.dir === "asc"
-              ? "ASC"
-              : "DESC";
           builder = builder.addOrderBy(
             makeTypedFieldSql(fieldToMeta[field], opts),
             dir
           );
+        } else if (
+          field === "_id" ||
+          field === "_createdAt" ||
+          field === "_updatedAt"
+        ) {
+          builder = builder.addOrderBy(`"${field.replace("_", "")}"`, dir);
         }
       }
     } else {

From 6ac216845b8bb15ad99262ac0f8b0914bd4c5df6 Mon Sep 17 00:00:00 2001
From: hyunnbunt <rha542@gmail.com>
Date: Mon, 28 Apr 2025 13:56:24 +0900
Subject: [PATCH 2/3] sql r.columnName

---
 platform/wab/src/wab/server/db/DbMgr.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/wab/src/wab/server/db/DbMgr.ts b/platform/wab/src/wab/server/db/DbMgr.ts
index bc0def221c6..b1cf3f995c5 100644
--- a/platform/wab/src/wab/server/db/DbMgr.ts
+++ b/platform/wab/src/wab/server/db/DbMgr.ts
@@ -7418,7 +7418,10 @@ export class DbMgr implements MigrationDbMgr {
           field === "_createdAt" ||
           field === "_updatedAt"
         ) {
-          builder = builder.addOrderBy(`"${field.replace("_", "")}"`, dir);
+          builder = builder.addOrderBy(
+            `Date(r.${field.replace("_", "")})`,
+            dir
+          );
         }
       }
     } else {

From ffa95781d1164d03f3f71e43269c0833894aa089 Mon Sep 17 00:00:00 2001
From: hyunnbunt <rha542@gmail.com>
Date: Mon, 28 Apr 2025 14:07:17 +0900
Subject: [PATCH 3/3] r._

---
 platform/wab/src/wab/server/db/DbMgr.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/platform/wab/src/wab/server/db/DbMgr.ts b/platform/wab/src/wab/server/db/DbMgr.ts
index b1cf3f995c5..76ad48a8b66 100644
--- a/platform/wab/src/wab/server/db/DbMgr.ts
+++ b/platform/wab/src/wab/server/db/DbMgr.ts
@@ -7418,10 +7418,7 @@ export class DbMgr implements MigrationDbMgr {
           field === "_createdAt" ||
           field === "_updatedAt"
         ) {
-          builder = builder.addOrderBy(
-            `Date(r.${field.replace("_", "")})`,
-            dir
-          );
+          builder = builder.addOrderBy(`r.${field.replace("_", "")}`, dir);
         }
       }
     } else {