remult 2.7.33 → 2.7.34

package/esm/remult-knex/index.js

@@ -119,12 +119,17 @@ class KnexEntityDataProvider {
     async groupBy(options) {
         return groupByImpl(options, await dbNamesOf(this.entity, this.dp.wrapIdentifier), this.dp.createCommand(), false, (limit, offset) => ' limit ' + limit + ' offset ' + offset);
     }
+    getEntityFrom(e) {
+        if (this.entity.options.sqlExpression)
+            return this.knex.fromRaw(e.$entityName);
+        return this.knex(e.$entityName);
+    }
     async count(where) {
         const e = await this.init();
         const br = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
         where.__applyToConsumer(br);
         let r = await br.resolveWhere();
-        const result = await this.knex(e.$entityName)
+        const result = await this.getEntityFrom(e)
             .count()
             .where((b) => r.forEach((w) => w(b)));
         var row = result[0];
@@ -151,7 +156,7 @@ class KnexEntityDataProvider {
                 colKeys.push(x);
             }
         }
-        let query = this.knex(e.$entityName).select(cols);
+        let query = this.getEntityFrom(e).select(cols);
         if (options?.where) {
             const br = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
             options.where.__applyToConsumer(br);
@@ -218,7 +223,7 @@ class KnexEntityDataProvider {
             }
         }
         let where = await f.resolveWhere();
-        await this.knex(e.$entityName)
+        await this.getEntityFrom(e)
             .update(updateObject)
             .where((b) => where.forEach((w) => w(b)));
         return getRowAfterUpdate(this.entity, this, data, id, 'update');
@@ -228,7 +233,7 @@ class KnexEntityDataProvider {
         let f = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
         Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
         let where = await f.resolveWhere();
-        await this.knex(e.$entityName)
+        await this.getEntityFrom(e)
             .delete()
             .where((b) => where.forEach((w) => w(b)));
     }
@@ -246,7 +251,7 @@ class KnexEntityDataProvider {
                 }
             }
         }
-        let insert = this.knex(e.$entityName).insert(insertObject);
+        let insert = this.getEntityFrom(e).insert(insertObject);
         if (isAutoIncrement(this.entity.idMetadata.field)) {
             let newId;
             if (this.knex.client.config.client === 'mysql2' ||

package/package.json

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

package/remult-knex/index.js

@@ -217,6 +217,11 @@ var KnexEntityDataProvider = /** @class */ (function () {
             });
         });
     };
+    KnexEntityDataProvider.prototype.getEntityFrom = function (e) {
+        if (this.entity.options.sqlExpression)
+            return this.knex.fromRaw(e.$entityName);
+        return this.knex(e.$entityName);
+    };
     KnexEntityDataProvider.prototype.count = function (where) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, br, r, result, row, key, element;
@@ -230,7 +235,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [4 /*yield*/, br.resolveWhere()];
                     case 2:
                         r = _a.sent();
-                        return [4 /*yield*/, this.knex(e.$entityName)
+                        return [4 /*yield*/, this.getEntityFrom(e)
                                 .count()
                                 .where(function (b) { return r.forEach(function (w) { return w(b); }); })];
                     case 3:
@@ -279,7 +284,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                             }
                             finally { if (e_3) throw e_3.error; }
                         }
-                        query = this.knex(e.$entityName).select(cols);
+                        query = this.getEntityFrom(e).select(cols);
                         if (!(options === null || options === void 0 ? void 0 : options.where)) return [3 /*break*/, 3];
                         br = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
                         options.where.__applyToConsumer(br);
@@ -395,7 +400,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 10: return [4 /*yield*/, f.resolveWhere()];
                     case 11:
                         where = _d.sent();
-                        return [4 /*yield*/, this.knex(e.$entityName)
+                        return [4 /*yield*/, this.getEntityFrom(e)
                                 .update(updateObject)
                                 .where(function (b) { return where.forEach(function (w) { return w(b); }); })];
                     case 12:
@@ -418,7 +423,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [4 /*yield*/, f.resolveWhere()];
                     case 2:
                         where = _a.sent();
-                        return [4 /*yield*/, this.knex(e.$entityName)
+                        return [4 /*yield*/, this.getEntityFrom(e)
                                 .delete()
                                 .where(function (b) { return where.forEach(function (w) { return w(b); }); })];
                     case 3:
@@ -472,7 +477,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         finally { if (e_5) throw e_5.error; }
                         return [7 /*endfinally*/];
                     case 10:
-                        insert = this.knex(e.$entityName).insert(insertObject);
+                        insert = this.getEntityFrom(e).insert(insertObject);
                         if (!(0, RepositoryImplementation_js_1.isAutoIncrement)(this.entity.idMetadata.field)) return [3 /*break*/, 15];
                         if (!(this.knex.client.config.client === 'mysql2' ||
                             this.knex.client.config.client === 'mysql')) return [3 /*break*/, 12];