remult 0.26.17 → 0.26.18

package/esm/remult-knex/index.js

@@ -138,7 +138,10 @@ class KnexEntityDataProvider {
             if (x.isServerExpression) {
             }
             else {
-                cols.push(e.$dbNameOf(x));
+                let name = e.$dbNameOf(x);
+                if (x.options.sqlExpression)
+                    name = this.knex.raw('?? as ' + x.key, [name]);
+                cols.push(name);
                 colKeys.push(x);
             }
         }

package/esm/src/data-providers/sql-database.js

@@ -318,6 +318,8 @@ class ActualSQLServerDataProvider {
                 if (colKeys.length > 0)
                     select += ', ';
                 select += e.$dbNameOf(x);
+                if (x.options.sqlExpression)
+                    select += ' as ' + x.key;
                 colKeys.push(x);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.26.17",
+    "version": "0.26.18",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {

package/remult-knex/index.js

@@ -229,7 +229,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
     };
     KnexEntityDataProvider.prototype.find = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, cols, colKeys, _a, _b, x, query, br, r_1, r;
+            var e, cols, colKeys, _a, _b, x, name_1, query, br, r_1, r;
             var e_3, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
@@ -244,7 +244,10 @@ var KnexEntityDataProvider = /** @class */ (function () {
                                 if (x.isServerExpression) {
                                 }
                                 else {
-                                    cols.push(e.$dbNameOf(x));
+                                    name_1 = e.$dbNameOf(x);
+                                    if (x.options.sqlExpression)
+                                        name_1 = this.knex.raw('?? as ' + x.key, [name_1]);
+                                    cols.push(name_1);
                                     colKeys.push(x);
                                 }
                             }

package/src/data-providers/sql-database.js

@@ -462,6 +462,8 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
                     if (colKeys.length > 0)
                         select += ', ';
                     select += e.$dbNameOf(x);
+                    if (x.options.sqlExpression)
+                        select += ' as ' + x.key;
                     colKeys.push(x);
                 }
             }