remult 0.27.8 → 0.27.9

package/esm/remult-knex/index.js

@@ -118,7 +118,7 @@ class KnexEntityDataProvider {
         this.dp = dp;
     }
     async groupBy(options) {
-        return groupByImpl(options, await this.init(), this.dp.createCommand(), false, (limit, offset) => ' limit ' + limit + ' offset ' + offset);
+        return groupByImpl(options, await dbNamesOf(this.entity, this.dp.wrapIdentifier), this.dp.createCommand(), false, (limit, offset) => ' limit ' + limit + ' offset ' + offset);
     }
     async count(where) {
         const e = await this.init();

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

@@ -576,7 +576,10 @@ export async function groupByImpl(options, e, r, orderByNullFirst, limitSyntax)
                     const dbName = await e.$dbNameOf(x);
                     select += `, ${aggregateSqlSyntax(operator, dbName)} as ${x.key}_${operator}`;
                 }
+                const turnToNumber = x.valueType === Number || operator == 'distinctCount';
                 processResultRow.push((sqlResult, theResult) => {
+                    if (turnToNumber)
+                        sqlResult = Number(sqlResult);
                     theResult[x.key] = { ...theResult[x.key], [operator]: sqlResult };
                 });
             }

package/esm/src/remult3/RepositoryImplementation.js

@@ -195,7 +195,7 @@ export class RepositoryImplementation {
                 loaderOptions.include[key] = true;
             }
             const loader = new RelationLoader();
-            await this.populateRelationsForFields(dpOptions.group, loaderOptions, result, loader);
+            await this._populateRelationsForFields(dpOptions.group, loaderOptions, result, loader);
             await loader.resolveAll();
         }
         return result;
@@ -553,10 +553,10 @@ export class RepositoryImplementation {
         }
         let result = await promiseAll(rawRows, async (r) => await this._mapRawDataToResult(r, loadFields));
         const fields = this.metadata.fields.toArray();
-        this.populateRelationsForFields(fields, loadOptions, result, loader);
+        this._populateRelationsForFields(fields, loadOptions, result, loader);
         return result;
     }
-    populateRelationsForFields(fields, loadOptions, result, loader) {
+    _populateRelationsForFields(fields, loadOptions, result, loader) {
         for (const col of fields) {
             let rel = getRelationFieldInfo(col);
             let incl = col.options

package/package.json

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

package/remult-knex/index.js

@@ -210,7 +210,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 0:
                         _a = sql_database_js_1.groupByImpl;
                         _b = [options];
-                        return [4 /*yield*/, this.init()];
+                        return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_2.dbNamesOf)(this.entity, this.dp.wrapIdentifier)];
                     case 1: return [2 /*return*/, _a.apply(void 0, _b.concat([_c.sent(), this.dp.createCommand(),
                             false,
                             function (limit, offset) { return ' limit ' + limit + ' offset ' + offset; }]))];

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

@@ -884,7 +884,7 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                                     fields = options === null || options === void 0 ? void 0 : options[operator];
                                     if (!fields) return [3 /*break*/, 8];
                                     _loop_4 = function (x) {
-                                        var dbName;
+                                        var dbName, turnToNumber;
                                         return tslib_1.__generator(this, function (_o) {
                                             switch (_o.label) {
                                                 case 0:
@@ -896,8 +896,11 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                                                     select += ", ".concat(aggregateSqlSyntax(operator, dbName), " as ").concat(x.key, "_").concat(operator);
                                                     _o.label = 3;
                                                 case 3:
+                                                    turnToNumber = x.valueType === Number || operator == 'distinctCount';
                                                     processResultRow.push(function (sqlResult, theResult) {
                                                         var _a;
+                                                        if (turnToNumber)
+                                                            sqlResult = Number(sqlResult);
                                                         theResult[x.key] = tslib_1.__assign(tslib_1.__assign({}, theResult[x.key]), (_a = {}, _a[operator] = sqlResult, _a));
                                                     });
                                                     return [2 /*return*/];

package/src/remult3/RepositoryImplementation.d.ts

@@ -65,7 +65,7 @@ export declare class RepositoryImplementation<entityType> implements Repository<
     _buildEntityDataProviderFindOptions(options: FindOptions<entityType>): Promise<EntityDataProviderFindOptions>;
     _fromJsonArray(jsonItems: any[], loadOptions: LoadOptions<entityType>): Promise<entityType[]>;
     private _loadManyToOneForManyRows;
-    private populateRelationsForFields;
+    private _populateRelationsForFields;
     private _mapRawDataToResult;
     toJson(item: entityType | entityType[] | Promise<entityType> | Promise<entityType[]>): any;
     fromJson(x: any[], isNew?: boolean): entityType[];

package/src/remult3/RepositoryImplementation.js

@@ -276,7 +276,7 @@ var RepositoryImplementation = /** @class */ (function () {
                             finally { if (e_4) throw e_4.error; }
                         }
                         loader = new relation_loader_js_1.RelationLoader();
-                        return [4 /*yield*/, this.populateRelationsForFields(dpOptions.group, loaderOptions, result, loader)];
+                        return [4 /*yield*/, this._populateRelationsForFields(dpOptions.group, loaderOptions, result, loader)];
                     case 3:
                         _k.sent();
                         return [4 /*yield*/, loader.resolveAll()];
@@ -966,13 +966,13 @@ var RepositoryImplementation = /** @class */ (function () {
                     case 9:
                         result = _e.sent();
                         fields = this.metadata.fields.toArray();
-                        this.populateRelationsForFields(fields, loadOptions, result, loader);
+                        this._populateRelationsForFields(fields, loadOptions, result, loader);
                         return [2 /*return*/, result];
                 }
             });
         });
     };
-    RepositoryImplementation.prototype.populateRelationsForFields = function (fields, loadOptions, result, loader) {
+    RepositoryImplementation.prototype._populateRelationsForFields = function (fields, loadOptions, result, loader) {
         var e_14, _a;
         var _b;
         var _loop_1 = function (col) {