@cheetah.js/orm 0.1.97 → 0.1.99

package/dist/query/sql-column-manager.d.ts

@@ -22,4 +22,7 @@ export declare class SqlColumnManager {
     private buildJoinMaps;
     private findNextAlias;
     private formatColumnWithAlias;
+    private getColumnNameFromProperty;
+    private getColumnNameFromPropertyForEntity;
+    private getEntityFromAlias;
 }

package/dist/query/sql-column-manager.js

@@ -65,10 +65,11 @@ class SqlColumnManager {
         return column.includes('.');
     }
     buildSimpleColumnAlias(column, alias, onlyAlias) {
+        const columnName = this.getColumnNameFromProperty(column);
         if (onlyAlias) {
-            return `${alias}."${column}"`;
+            return `${alias}."${columnName}"`;
         }
-        return `${alias}."${column}" as ${alias}_${column}`;
+        return `${alias}."${columnName}" as ${alias}_${columnName}`;
     }
     buildNestedColumnAlias(column, onlyAlias) {
         this.validateJoinsExist();
@@ -118,11 +119,39 @@ class SqlColumnManager {
         }
         return null;
     }
-    formatColumnWithAlias(alias, columnName, onlyAlias) {
+    formatColumnWithAlias(alias, propertyName, onlyAlias) {
+        const entity = this.getEntityFromAlias(alias);
+        const columnName = this.getColumnNameFromPropertyForEntity(propertyName, entity);
         if (onlyAlias) {
             return `${alias}."${columnName}"`;
         }
         return `${alias}."${columnName}" as ${alias}_${columnName}`;
     }
+    getColumnNameFromProperty(propertyName) {
+        return this.getColumnNameFromPropertyForEntity(propertyName, this.entity);
+    }
+    getColumnNameFromPropertyForEntity(propertyName, entity) {
+        if (entity.properties[propertyName]) {
+            return entity.properties[propertyName].options.columnName;
+        }
+        const relation = entity.relations?.find(rel => rel.propertyKey === propertyName);
+        if (relation) {
+            return relation.columnName;
+        }
+        return propertyName;
+    }
+    getEntityFromAlias(alias) {
+        if (alias === this.statements.alias) {
+            return this.entity;
+        }
+        const join = this.statements.join?.find(j => j.joinAlias === alias);
+        if (join?.joinEntity) {
+            const entity = this.entityStorage.get(join.joinEntity);
+            if (entity) {
+                return entity;
+            }
+        }
+        return this.entity;
+    }
 }
 exports.SqlColumnManager = SqlColumnManager;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cheetah.js/orm",
-  "version": "0.1.97",
+  "version": "0.1.99",
   "description": "A simple ORM for Cheetah.js",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -55,5 +55,5 @@
     "bun",
     "value-object"
   ],
-  "gitHead": "48d918882673a3223e28961d90d2ff54b0f80565"
+  "gitHead": "c49400c65f80efbefc86cedf0beaf1eaf5fcdc03"
 }