@nocobase/database 2.1.0-alpha.15 → 2.1.0-alpha.16

package/lib/query/builder.js

@@ -166,6 +166,7 @@ function buildQuery(database, collection, options = {}) {
   let hasAgg = false;
   const attributes = [];
   const fieldMap = {};
+  const projectedFieldMap = {};
   measures.forEach((measure) => {
     const { field, aggregation, alias, distinct } = measure;
     const col = sequelize.col(field);
@@ -184,6 +185,7 @@ function buildQuery(database, collection, options = {}) {
     }
     attributes.push(attribute.length > 1 ? attribute : attribute[0]);
     fieldMap[alias || field] = measure;
+    projectedFieldMap[alias || field] = attribute[0];
   });
   const group = [];
   dimensions.forEach((dimension) => {
@@ -202,11 +204,13 @@ function buildQuery(database, collection, options = {}) {
       group.push(attribute[0]);
     }
     fieldMap[alias || field] = dimension;
+    projectedFieldMap[alias || field] = attribute[0];
   });
   const order = orders.map((item) => {
     var _a2;
     const alias = sequelize.getQueryInterface().quoteIdentifier(item.alias);
-    const name = hasAgg ? sequelize.literal(alias) : sequelize.col(item.field);
+    const projectedField = projectedFieldMap[item.alias] || projectedFieldMap[item.name] || projectedFieldMap[item.field];
+    const name = hasAgg ? projectedField || sequelize.literal(alias) : sequelize.col(item.field);
     let sort = ALLOWED_ORDER_DIRECTIONS.includes((_a2 = item.order) == null ? void 0 : _a2.toUpperCase()) ? item.order.toUpperCase() : "ASC";
     if (item.nulls === "first") {
       sort += " NULLS FIRST";

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.1.0-alpha.15",
+  "version": "2.1.0-alpha.16",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "2.1.0-alpha.15",
-    "@nocobase/utils": "2.1.0-alpha.15",
+    "@nocobase/logger": "2.1.0-alpha.16",
+    "@nocobase/utils": "2.1.0-alpha.16",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -38,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "7c86e75b0af4b9f532c8ebf5ef96a7423b0ab60e"
+  "gitHead": "14cf3dbdb9f0a9669602de4ad21a9464fa27c105"
 }