@nocobase/database 0.21.0-alpha.8 → 0.21.0-alpha.9

package/lib/sql-collection/sql-collection.js

@@ -36,6 +36,7 @@ const _SqlCollection = class _SqlCollection extends import_collection.Collection
   collectionSchema() {
     return void 0;
   }
+  /* istanbul ignore next -- @preserve */
   get filterTargetKey() {
     var _a;
     const targetKey = ((_a = this.options) == null ? void 0 : _a.filterTargetKey) || "id";

package/lib/sql-collection/sql-model.js

@@ -67,45 +67,55 @@ const _SQLModel = class _SQLModel extends import_model.Model {
     if (Array.isArray(ast)) {
       ast = ast[0];
     }
+    ast.from = ast.from || [];
+    ast.columns = ast.columns || [];
     if (ast.with) {
-      const tables = /* @__PURE__ */ new Set();
       ast.with.forEach((withItem) => {
-        const tableList = withItem.tableList;
-        tableList.forEach((table) => {
-          const name = table.split("::")[2];
-          tables.add(name);
-        });
+        const as = withItem.name;
+        const withAst = withItem.stmt.ast;
+        ast.from.push(...withAst.from.map((f) => ({ ...f, as })));
+        ast.columns.push(
+          ...withAst.columns.map((c) => ({
+            ...c,
+            expr: {
+              ...c.expr,
+              table: as
+            }
+          }))
+        );
       });
-      return Array.from(tables).map((table) => ({ table, columns: "*" }));
     }
     if (ast.columns === "*") {
-      return ast.from.map((fromItem) => ({
-        table: fromItem.table,
-        columns: "*"
-      }));
+      const tables = /* @__PURE__ */ new Set();
+      ast.from.forEach((fromItem) => {
+        tables.add(fromItem.table);
+      });
+      return Array.from(tables).map((table) => ({ table, columns: "*" }));
     }
+    const tableAliases = {};
+    ast.from.forEach((fromItem) => {
+      if (!fromItem.as) {
+        return;
+      }
+      tableAliases[fromItem.as] = fromItem.table;
+    });
     const columns = ast.columns.reduce(
       (tableMp, column) => {
         if (column.expr.type !== "column_ref") {
           return tableMp;
         }
         const table = column.expr.table;
+        const name = tableAliases[table] || table;
         const columnAttr = { name: column.expr.column, as: column.as };
-        if (!tableMp[table]) {
-          tableMp[table] = [columnAttr];
+        if (!tableMp[name]) {
+          tableMp[name] = [columnAttr];
         } else {
-          tableMp[table].push(columnAttr);
+          tableMp[name].push(columnAttr);
         }
         return tableMp;
       },
       {}
     );
-    ast.from.forEach((fromItem) => {
-      if (columns[fromItem.as]) {
-        columns[fromItem.table] = columns[fromItem.as];
-        columns[fromItem.as] = void 0;
-      }
-    });
     return Object.entries(columns).filter(([_, columns2]) => columns2).map(([table, columns2]) => ({ table, columns: columns2 }));
   }
   static getTableNameWithSchema(table) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "0.21.0-alpha.8",
+  "version": "0.21.0-alpha.9",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "0.21.0-alpha.8",
-    "@nocobase/utils": "0.21.0-alpha.8",
+    "@nocobase/logger": "0.21.0-alpha.9",
+    "@nocobase/utils": "0.21.0-alpha.9",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -36,5 +36,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "bed69485709bc8e268285b50debfc1ebfd7a30c7"
+  "gitHead": "a6fe6c4ee532c04e5a50ec777bf76436ca624cbd"
 }