remult 3.3.11 → 3.3.13

package/esm/src/data-api.js

@@ -113,9 +113,16 @@ export class DataApi {
         }
         try {
             let { aggregate, ...rest } = body;
+            // The aggregate summarizes the whole filtered set, so it must not inherit
+            // the items query's paging/sorting/selection.
+            const aggregateRequest = {
+                get: (key) => ['_limit', '_page', '_sort', '_order', '_select'].includes(key)
+                    ? undefined
+                    : request?.get(key),
+            };
             let [{ r }, [aggregates]] = await Promise.all([
                 this.getArrayImpl(request, rest),
-                this.groupBy(request, { ...aggregate, where: body.where }),
+                this.groupBy(aggregateRequest, { ...aggregate, where: body.where }),
             ]);
             return {
                 items: r,

package/esm/src/data-providers/array-entity-data-provider.js

@@ -329,10 +329,11 @@ export class ArrayEntityDataProvider {
         let idf = this.entity.idMetadata.field;
         if (!(idf instanceof CompoundIdField) &&
             idf.valueConverter.fieldTypeInDb === 'autoincrement') {
-            j[names.$dbNameOf(idf)] = 1;
+            const idDbName = names.$dbNameOf(idf);
+            j[idDbName] = 1;
             for (const row of this.rows()) {
-                if (row[idf.key] >= j[idf.key])
-                    j[idf.key] = row[idf.key] + 1;
+                if (row[idDbName] >= j[idDbName])
+                    j[idDbName] = row[idDbName] + 1;
             }
         }
         else {

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

@@ -545,6 +545,7 @@ export function getRowAfterUpdate(meta, dataProvider, data, id, operation) {
 export async function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
     let select = 'select count(*) as count';
     let groupBy = '';
+    const groupByCols = [];
     const processResultRow = [];
     processResultRow.push((sqlVal, theResult) => {
         theResult[GroupByCountMember] = Number(sqlVal);
@@ -562,6 +563,7 @@ export async function groupByImpl(options, e, r, orderByNullFirst, limitSyntax)
                 else
                     groupBy += ', ';
                 groupBy += e.$dbNameOf(x);
+                groupByCols.push(e.$dbNameOf(x));
             }
             processResultRow.push((sqlResult, theResult) => {
                 theResult[x.key] = x.valueConverter.fromDb(sqlResult);
@@ -625,7 +627,13 @@ export async function groupByImpl(options, e, r, orderByNullFirst, limitSyntax)
         if (orderBy)
             select += orderBy;
     }
-    if (options?.limit) {
+    // Skip paging for a pure aggregate (single row); OFFSET/FETCH without an
+    // ORDER BY is also invalid on SQL Server.
+    if (options?.limit && groupByCols.length) {
+        // SQL Server requires an ORDER BY alongside OFFSET/FETCH; default to the
+        // group columns so paging is valid and deterministic on every dialect.
+        if (!orderBy)
+            select += ' order by ' + groupByCols.join(', ');
         let page = 1;
         if (options.page)
             page = options.page;

package/package.json

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

package/src/data-api.js

@@ -187,7 +187,7 @@ var DataApi = /** @class */ (function () {
     };
     DataApi.prototype.query = function (response, request, body) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var aggregate, rest, _a, r, _b, aggregates, err_2;
+            var aggregate, rest, aggregateRequest, _a, r, _b, aggregates, err_2;
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -198,10 +198,20 @@ var DataApi = /** @class */ (function () {
                         _c.label = 1;
                     case 1:
                         _c.trys.push([1, 3, , 4]);
-                        aggregate = body.aggregate, rest = tslib_1.__rest(body, ["aggregate"]);
+                        aggregate = body.aggregate, rest = tslib_1.__rest(body
+                        // The aggregate summarizes the whole filtered set, so it must not inherit
+                        // the items query's paging/sorting/selection.
+                        , ["aggregate"]);
+                        aggregateRequest = {
+                            get: function (key) {
+                                return ['_limit', '_page', '_sort', '_order', '_select'].includes(key)
+                                    ? undefined
+                                    : request === null || request === void 0 ? void 0 : request.get(key);
+                            },
+                        };
                         return [4 /*yield*/, Promise.all([
                                 this.getArrayImpl(request, rest),
-                                this.groupBy(request, tslib_1.__assign(tslib_1.__assign({}, aggregate), { where: body.where })),
+                                this.groupBy(aggregateRequest, tslib_1.__assign(tslib_1.__assign({}, aggregate), { where: body.where })),
                             ])];
                     case 2:
                         _a = tslib_1.__read.apply(void 0, [_c.sent(), 2]), r = _a[0].r, _b = tslib_1.__read(_a[1], 1), aggregates = _b[0];

package/src/data-providers/array-entity-data-provider.js

@@ -555,7 +555,7 @@ var ArrayEntityDataProvider = /** @class */ (function () {
     };
     ArrayEntityDataProvider.prototype.insert = function (data) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var names, j, idf, _a, _b, row;
+            var names, j, idf, idDbName, _a, _b, row;
             var e_16, _c;
             var _this = this;
             return tslib_1.__generator(this, function (_d) {
@@ -567,12 +567,13 @@ var ArrayEntityDataProvider = /** @class */ (function () {
                         idf = this.entity.idMetadata.field;
                         if (!(idf instanceof CompoundIdField_js_1.CompoundIdField) &&
                             idf.valueConverter.fieldTypeInDb === 'autoincrement') {
-                            j[names.$dbNameOf(idf)] = 1;
+                            idDbName = names.$dbNameOf(idf);
+                            j[idDbName] = 1;
                             try {
                                 for (_a = tslib_1.__values(this.rows()), _b = _a.next(); !_b.done; _b = _a.next()) {
                                     row = _b.value;
-                                    if (row[idf.key] >= j[idf.key])
-                                        j[idf.key] = row[idf.key] + 1;
+                                    if (row[idDbName] >= j[idDbName])
+                                        j[idDbName] = row[idDbName] + 1;
                                 }
                             }
                             catch (e_16_1) { e_16 = { error: e_16_1 }; }

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

@@ -843,13 +843,14 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                 ? "count (distinct ".concat(dbName, ")")
                 : "".concat(operator, "( ").concat(dbName, " )");
         }
-        var select, groupBy, processResultRow, _loop_1, _a, _b, x, _loop_2, GroupByOperators_1, GroupByOperators_1_1, operator, e_8_1, where, _c, orderBy, _d, _e, x, field, _f, e_9_1, page, result;
+        var select, groupBy, groupByCols, processResultRow, _loop_1, _a, _b, x, _loop_2, GroupByOperators_1, GroupByOperators_1_1, operator, e_8_1, where, _c, orderBy, _d, _e, x, field, _f, e_9_1, page, result;
         var e_10, _g, e_8, _h, e_9, _j;
         return tslib_1.__generator(this, function (_k) {
             switch (_k.label) {
                 case 0:
                     select = 'select count(*) as count';
                     groupBy = '';
+                    groupByCols = [];
                     processResultRow = [];
                     processResultRow.push(function (sqlVal, theResult) {
                         theResult[remult3_js_1.GroupByCountMember] = Number(sqlVal);
@@ -867,6 +868,7 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                                 else
                                     groupBy += ', ';
                                 groupBy += e.$dbNameOf(x);
+                                groupByCols.push(e.$dbNameOf(x));
                             }
                             processResultRow.push(function (sqlResult, theResult) {
                                 theResult[x.key] = x.valueConverter.fromDb(sqlResult);
@@ -1049,7 +1051,13 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                         select += orderBy;
                     _k.label = 20;
                 case 20:
-                    if (options === null || options === void 0 ? void 0 : options.limit) {
+                    // Skip paging for a pure aggregate (single row); OFFSET/FETCH without an
+                    // ORDER BY is also invalid on SQL Server.
+                    if ((options === null || options === void 0 ? void 0 : options.limit) && groupByCols.length) {
+                        // SQL Server requires an ORDER BY alongside OFFSET/FETCH; default to the
+                        // group columns so paging is valid and deterministic on every dialect.
+                        if (!orderBy)
+                            select += ' order by ' + groupByCols.join(', ');
                         page = 1;
                         if (options.page)
                             page = options.page;