remult 3.3.19-next.2 → 3.4.0-next.2

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

@@ -185,8 +185,6 @@ var SqlDatabase = /** @class */ (function () {
                                 doesNotSupportReturningSyntax: this.sql.doesNotSupportReturningSyntax,
                                 doesNotSupportReturningSyntaxOnlyForUpdate: this.sql.doesNotSupportReturningSyntaxOnlyForUpdate,
                                 orderByNullsFirst: this.sql.orderByNullsFirst,
-                                afterMutation: this.sql.afterMutation,
-                                maxParametersInOneSqlStatement: this.sql.maxParametersInOneSqlStatement,
                             }))];
                     case 2:
                         _a.sent();
@@ -272,57 +270,6 @@ var SqlDatabase = /** @class */ (function () {
     return SqlDatabase;
 }());
 exports.SqlDatabase = SqlDatabase;
-var defaultMaxParametersInOneSqlStatement = 2000;
-function splitByMaxParameters(items, parametersInItem, maxParameters) {
-    var e_2, _a;
-    var batches = [];
-    var batch = [];
-    var params = 0;
-    try {
-        for (var items_1 = tslib_1.__values(items), items_1_1 = items_1.next(); !items_1_1.done; items_1_1 = items_1.next()) {
-            var item = items_1_1.value;
-            var n = parametersInItem(item);
-            if (batch.length > 0 && params + n > maxParameters) {
-                batches.push(batch);
-                batch = [];
-                params = 0;
-            }
-            batch.push(item);
-            params += n;
-        }
-    }
-    catch (e_2_1) { e_2 = { error: e_2_1 }; }
-    finally {
-        try {
-            if (items_1_1 && !items_1_1.done && (_a = items_1.return)) _a.call(items_1);
-        }
-        finally { if (e_2) throw e_2.error; }
-    }
-    if (batch.length)
-        batches.push(batch);
-    return batches;
-}
-function countInsertBindParameters(entity, e, row) {
-    var e_3, _a;
-    var n = 0;
-    try {
-        for (var _b = tslib_1.__values(entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
-            var x = _c.value;
-            if ((0, filter_consumer_bridge_to_sql_request_js_1.isDbReadonly)(x, e))
-                continue;
-            if (x.valueConverter.toDb(row[x.key]) != undefined)
-                n++;
-        }
-    }
-    catch (e_3_1) { e_3 = { error: e_3_1 }; }
-    finally {
-        try {
-            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-        }
-        finally { if (e_3) throw e_3.error; }
-    }
-    return n;
-}
 var icons = new Map([
     // CRUD
     ['INSERT', '⚪'], // Used to insert new data into a database.
@@ -467,8 +414,8 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
     };
     ActualSQLEntityDataProvider.prototype.find = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, r, _a, colKeys, select, where, _b, first, segs, _c, _d, s, segs_1, segs_1_1, c, _e, _f, e_4_1, page;
-            var e_5, _g, e_4, _h;
+            var e, r, _a, colKeys, select, where, _b, first, segs, _c, _d, s, segs_1, segs_1_1, c, _e, _f, e_2_1, page;
+            var e_3, _g, e_2, _h;
             var _this = this;
             return tslib_1.__generator(this, function (_j) {
                 switch (_j.label) {
@@ -506,12 +453,12 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                                 segs.push(s);
                             }
                         }
-                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                        catch (e_3_1) { e_3 = { error: e_3_1 }; }
                         finally {
                             try {
                                 if (_d && !_d.done && (_g = _c.return)) _g.call(_c);
                             }
-                            finally { if (e_5) throw e_5.error; }
+                            finally { if (e_3) throw e_3.error; }
                         }
                         _j.label = 5;
                     case 5:
@@ -551,14 +498,14 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                         return [3 /*break*/, 6];
                     case 11: return [3 /*break*/, 14];
                     case 12:
-                        e_4_1 = _j.sent();
-                        e_4 = { error: e_4_1 };
+                        e_2_1 = _j.sent();
+                        e_2 = { error: e_2_1 };
                         return [3 /*break*/, 14];
                     case 13:
                         try {
                             if (segs_1_1 && !segs_1_1.done && (_h = segs_1.return)) _h.call(segs_1);
                         }
-                        finally { if (e_4) throw e_4.error; }
+                        finally { if (e_2) throw e_2.error; }
                         return [7 /*endfinally*/];
                     case 14:
                         if (options.limit) {
@@ -596,8 +543,8 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
     };
     ActualSQLEntityDataProvider.prototype.buildSelect = function (e, r, selectedFields, args) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var select, colKeys, _a, _b, x, sql, e_6_1;
-            var e_6, _c;
+            var select, colKeys, _a, _b, x, sql, e_4_1;
+            var e_4, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -640,14 +587,14 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 8: return [3 /*break*/, 11];
                     case 9:
-                        e_6_1 = _d.sent();
-                        e_6 = { error: e_6_1 };
+                        e_4_1 = _d.sent();
+                        e_4 = { error: e_4_1 };
                         return [3 /*break*/, 11];
                     case 10:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_6) throw e_6.error; }
+                        finally { if (e_4) throw e_4.error; }
                         return [7 /*endfinally*/];
                     case 11: return [2 /*return*/, { colKeys: colKeys, select: select }];
                 }
@@ -657,7 +604,7 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
     ActualSQLEntityDataProvider.prototype.update = function (id, data, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, r, statement, added, _a, _b, x, v, idFilter, f, _c, _d, colKeys, select, returning;
-            var e_7, _e;
+            var e_5, _e;
             var _this = this;
             return tslib_1.__generator(this, function (_f) {
                 switch (_f.label) {
@@ -684,12 +631,12 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                                 }
                             }
                         }
-                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                             }
-                            finally { if (e_7) throw e_7.error; }
+                            finally { if (e_5) throw e_5.error; }
                         }
                         idFilter = this.entity.idMetadata.getIdFilter(id);
                         f = new filter_consumer_bridge_to_sql_request_js_1.FilterConsumerBridgeToSqlRequest(r, e);
@@ -730,27 +677,23 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
             });
         });
     };
-    ActualSQLEntityDataProvider.prototype.delete = function (ids) {
+    ActualSQLEntityDataProvider.prototype.delete = function (id) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, r, f, statement, _a;
-            var _b;
             var _this = this;
-            return tslib_1.__generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        if (ids.length === 0)
-                            return [2 /*return*/];
-                        return [4 /*yield*/, this.init()];
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, this.init()];
                     case 1:
-                        e = _c.sent();
+                        e = _b.sent();
                         r = this.sql.createCommand();
                         f = new filter_consumer_bridge_to_sql_request_js_1.FilterConsumerBridgeToSqlRequest(r, e);
-                        filter_interfaces_js_1.Filter.fromEntityFilter(this.entity, (_b = this.entity.idMetadata).getIdFilter.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(ids), false))).__applyToConsumer(f);
+                        filter_interfaces_js_1.Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
                         statement = 'delete from ' + e.$entityName;
                         _a = statement;
                         return [4 /*yield*/, f.resolveWhere()];
                     case 2:
-                        statement = _a + _c.sent();
+                        statement = _a + _b.sent();
                         return [2 /*return*/, r.execute(statement).then(function () {
                                 var _a, _b;
                                 (_b = (_a = _this.sql._getSourceSql()).afterMutation) === null || _b === void 0 ? void 0 : _b.call(_a);
@@ -761,172 +704,80 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
     };
     ActualSQLEntityDataProvider.prototype.insert = function (data, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, maxParams, batches, result, batches_1, batches_1_1, batch, _a, _b, _c, _d, e_8_1;
-            var e_8, _e;
+            var e, r, cols, vals, added, _a, _b, x, v, statement, _c, colKeys, select;
+            var e_6, _d;
             var _this = this;
-            var _f;
-            return tslib_1.__generator(this, function (_g) {
-                switch (_g.label) {
-                    case 0:
-                        if (data.length === 0)
-                            return [2 /*return*/, []];
-                        return [4 /*yield*/, this.init()];
+            return tslib_1.__generator(this, function (_e) {
+                switch (_e.label) {
+                    case 0: return [4 /*yield*/, this.init()];
                     case 1:
-                        e = _g.sent();
-                        maxParams = (_f = this.strategy.maxParametersInOneSqlStatement) !== null && _f !== void 0 ? _f : defaultMaxParametersInOneSqlStatement;
-                        batches = splitByMaxParameters(data, function (row) { return countInsertBindParameters(_this.entity, e, row); }, maxParams);
-                        result = [];
-                        _g.label = 2;
-                    case 2:
-                        _g.trys.push([2, 7, 8, 9]);
-                        batches_1 = tslib_1.__values(batches), batches_1_1 = batches_1.next();
-                        _g.label = 3;
-                    case 3:
-                        if (!!batches_1_1.done) return [3 /*break*/, 6];
-                        batch = batches_1_1.value;
-                        _b = (_a = result.push).apply;
-                        _c = [result];
-                        _d = [[]];
-                        return [4 /*yield*/, this.insertBatch(batch, e, options)];
-                    case 4:
-                        _b.apply(_a, _c.concat([tslib_1.__spreadArray.apply(void 0, _d.concat([tslib_1.__read.apply(void 0, [(_g.sent())]), false]))]));
-                        _g.label = 5;
-                    case 5:
-                        batches_1_1 = batches_1.next();
-                        return [3 /*break*/, 3];
-                    case 6: return [3 /*break*/, 9];
-                    case 7:
-                        e_8_1 = _g.sent();
-                        e_8 = { error: e_8_1 };
-                        return [3 /*break*/, 9];
-                    case 8:
-                        try {
-                            if (batches_1_1 && !batches_1_1.done && (_e = batches_1.return)) _e.call(batches_1);
-                        }
-                        finally { if (e_8) throw e_8.error; }
-                        return [7 /*endfinally*/];
-                    case 9: return [2 /*return*/, result];
-                }
-            });
-        });
-    };
-    //@internal
-    ActualSQLEntityDataProvider.prototype.insertOne = function (data, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.insert([data], options)];
-                    case 1: return [2 /*return*/, (_a.sent())[0]];
-                }
-            });
-        });
-    };
-    ActualSQLEntityDataProvider.prototype.insertBatch = function (batch, e, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var r, cols, _loop_1, _a, _b, x, colSql, vals, i, i, j, x, v, statement, _c, colKeys, select, source, wantRows, sql, lastId, ids, id;
-            var e_9, _d;
-            var _this = this;
-            var _e;
-            return tslib_1.__generator(this, function (_f) {
-                switch (_f.label) {
-                    case 0:
+                        e = _e.sent();
                         r = this.sql.createCommand();
-                        cols = [];
-                        _loop_1 = function (x) {
-                            if ((0, filter_consumer_bridge_to_sql_request_js_1.isDbReadonly)(x, e))
-                                return "continue";
-                            if (batch.some(function (row) { return x.valueConverter.toDb(row[x.key]) != undefined; }))
-                                cols.push(x);
-                        };
+                        cols = '';
+                        vals = '';
+                        added = false;
                         try {
                             for (_a = tslib_1.__values(this.entity.fields), _b = _a.next(); !_b.done; _b = _a.next()) {
                                 x = _b.value;
-                                _loop_1(x);
+                                if ((0, filter_consumer_bridge_to_sql_request_js_1.isDbReadonly)(x, e)) {
+                                }
+                                else {
+                                    v = x.valueConverter.toDb(data[x.key]);
+                                    if (v != undefined) {
+                                        if (!added)
+                                            added = true;
+                                        else {
+                                            cols += ', ';
+                                            vals += ', ';
+                                        }
+                                        cols += e.$dbNameOf(x);
+                                        vals += (0, filter_consumer_bridge_to_sql_request_js_1.toDbSql)(r, x, v);
+                                    }
+                                }
                             }
                         }
-                        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+                        catch (e_6_1) { e_6 = { error: e_6_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
                             }
-                            finally { if (e_9) throw e_9.error; }
-                        }
-                        colSql = '';
-                        vals = '';
-                        for (i = 0; i < cols.length; i++) {
-                            if (i)
-                                colSql += ', ';
-                            colSql += e.$dbNameOf(cols[i]);
-                        }
-                        for (i = 0; i < batch.length; i++) {
-                            if (i)
-                                vals += ',';
-                            vals += '(';
-                            for (j = 0; j < cols.length; j++) {
-                                if (j)
-                                    vals += ', ';
-                                x = cols[j];
-                                v = x.valueConverter.toDb(batch[i][x.key]);
-                                if (v != undefined)
-                                    vals += (0, filter_consumer_bridge_to_sql_request_js_1.toDbSql)(r, x, v);
-                                else if (x.allowNull)
-                                    vals += 'null';
-                                else
-                                    vals += 'DEFAULT';
-                            }
-                            vals += ')';
+                            finally { if (e_6) throw e_6.error; }
                         }
-                        statement = "insert into ".concat(e.$entityName, " (").concat(colSql, ") values ").concat(vals);
+                        statement = "insert into ".concat(e.$entityName, " (").concat(cols, ") values (").concat(vals, ")");
                         return [4 /*yield*/, this.buildSelect(e, r, undefined, undefined)];
-                    case 1:
-                        _c = _f.sent(), colKeys = _c.colKeys, select = _c.select;
-                        source = this.sql._getSourceSql();
-                        wantRows = (options === null || options === void 0 ? void 0 : options.select) !== 'none';
-                        if (!source.doesNotSupportReturningSyntax && wantRows)
-                            statement += ' returning ' + select;
-                        return [4 /*yield*/, r.execute(statement)];
                     case 2:
-                        sql = _f.sent();
-                        (_e = source.afterMutation) === null || _e === void 0 ? void 0 : _e.call(source);
-                        if (!wantRows)
-                            return [2 /*return*/, batch.map(function () { return undefined; })];
-                        if (source.doesNotSupportReturningSyntax) {
-                            if ((0, RepositoryImplementation_js_1.isAutoIncrement)(this.entity.idMetadata.field)) {
-                                lastId = sql.rows[0];
-                                if (typeof lastId !== 'number')
-                                    throw new Error('Auto increment, for a database that is does not support returning syntax, should return an array with the single last added id. Instead it returned: ' +
-                                        JSON.stringify(lastId));
-                                ids = [];
-                                for (id = lastId - batch.length + 1; id <= lastId; id++)
-                                    ids.push(id);
-                                return [2 /*return*/, this.loadRowsByIds(ids)];
-                            }
-                            return [2 /*return*/, this.loadRowsByIds(batch.map(function (row) { return _this.entity.idMetadata.getId(row); }))];
-                        }
-                        return [2 /*return*/, sql.rows.map(function (row) { return _this.buildResultRow(colKeys, row, sql); })];
-                }
-            });
-        });
-    };
-    ActualSQLEntityDataProvider.prototype.loadRowsByIds = function (ids) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var found, byId;
-            var _a;
-            var _this = this;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, this.find({
-                            where: filter_interfaces_js_1.Filter.fromEntityFilter(this.entity, (_a = this.entity.idMetadata).getIdFilter.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(ids), false))),
-                        })];
-                    case 1:
-                        found = _b.sent();
-                        byId = new Map(found.map(function (row) { return [_this.entity.idMetadata.getId(row) + '', row]; }));
-                        return [2 /*return*/, ids.map(function (id) {
-                                var row = byId.get(id + '');
-                                if (!row)
-                                    throw new Error("Failed to insert row - result contained ".concat(found.length, " rows"));
-                                return row;
+                        _c = _e.sent(), colKeys = _c.colKeys, select = _c.select;
+                        if (!this.sql._getSourceSql().doesNotSupportReturningSyntax &&
+                            !((options === null || options === void 0 ? void 0 : options.select) === 'none'))
+                            statement += ' returning ' + select;
+                        return [4 /*yield*/, r.execute(statement).then(function (sql) {
+                                var _a, _b;
+                                (_b = (_a = _this.sql._getSourceSql()).afterMutation) === null || _b === void 0 ? void 0 : _b.call(_a);
+                                if (_this.sql._getSourceSql().doesNotSupportReturningSyntax) {
+                                    if ((0, RepositoryImplementation_js_1.isAutoIncrement)(_this.entity.idMetadata.field)) {
+                                        var id_1 = sql.rows[0];
+                                        if (typeof id_1 !== 'number')
+                                            throw new Error('Auto increment, for a database that is does not support returning syntax, should return an array with the single last added id. Instead it returned: ' +
+                                                JSON.stringify(id_1));
+                                        if ((options === null || options === void 0 ? void 0 : options.select) === 'none')
+                                            return undefined;
+                                        return _this.find({
+                                            where: new filter_interfaces_js_1.Filter(function (x) {
+                                                return x.isEqualTo(_this.entity.idMetadata.field, id_1);
+                                            }),
+                                        }).then(function (r) { return r[0]; });
+                                    }
+                                    else {
+                                        if ((options === null || options === void 0 ? void 0 : options.select) === 'none')
+                                            return undefined;
+                                        return getRowAfterUpdate(_this.entity, _this, data, undefined, 'insert');
+                                    }
+                                }
+                                if ((options === null || options === void 0 ? void 0 : options.select) === 'none')
+                                    return undefined;
+                                return _this.buildResultRow(colKeys, sql.rows[0], sql);
                             })];
+                    case 3: return [2 /*return*/, _e.sent()];
                 }
             });
         });
@@ -962,7 +813,7 @@ function getRowAfterUpdate(meta, dataProvider, data, id, operation) {
     return dataProvider
         .find({
         where: new filter_interfaces_js_1.Filter(function (x) {
-            var e_10, _a;
+            var e_7, _a;
             var _b;
             try {
                 for (var _c = tslib_1.__values(meta.idMetadata.fields), _d = _c.next(); !_d.done; _d = _c.next()) {
@@ -970,12 +821,12 @@ function getRowAfterUpdate(meta, dataProvider, data, id, operation) {
                     x.isEqualTo(field, (_b = data[field.key]) !== null && _b !== void 0 ? _b : idFilter[field.key]);
                 }
             }
-            catch (e_10_1) { e_10 = { error: e_10_1 }; }
+            catch (e_7_1) { e_7 = { error: e_7_1 }; }
             finally {
                 try {
                     if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
                 }
-                finally { if (e_10) throw e_10.error; }
+                finally { if (e_7) throw e_7.error; }
             }
         }),
     })
@@ -992,8 +843,8 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                 ? "count (distinct ".concat(dbName, ")")
                 : "".concat(operator, "( ").concat(dbName, " )");
         }
-        var select, groupBy, groupByCols, processResultRow, _loop_2, _a, _b, x, _loop_3, GroupByOperators_1, GroupByOperators_1_1, operator, e_11_1, where, _c, orderBy, _d, _e, x, field, _f, e_12_1, page, result;
-        var e_13, _g, e_11, _h, e_12, _j;
+        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:
@@ -1005,7 +856,7 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                         theResult[remult3_js_1.GroupByCountMember] = Number(sqlVal);
                     });
                     if (options === null || options === void 0 ? void 0 : options.group) {
-                        _loop_2 = function (x) {
+                        _loop_1 = function (x) {
                             if (x.isServerExpression) {
                             }
                             else {
@@ -1026,26 +877,26 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                         try {
                             for (_a = tslib_1.__values(options === null || options === void 0 ? void 0 : options.group), _b = _a.next(); !_b.done; _b = _a.next()) {
                                 x = _b.value;
-                                _loop_2(x);
+                                _loop_1(x);
                             }
                         }
-                        catch (e_13_1) { e_13 = { error: e_13_1 }; }
+                        catch (e_10_1) { e_10 = { error: e_10_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_g = _a.return)) _g.call(_a);
                             }
-                            finally { if (e_13) throw e_13.error; }
+                            finally { if (e_10) throw e_10.error; }
                         }
                     }
-                    _loop_3 = function (operator) {
-                        var fields, _loop_4, fields_1, fields_1_1, x, e_14_1;
-                        var e_14, _l;
+                    _loop_2 = function (operator) {
+                        var fields, _loop_3, fields_1, fields_1_1, x, e_11_1;
+                        var e_11, _l;
                         return tslib_1.__generator(this, function (_m) {
                             switch (_m.label) {
                                 case 0:
                                     fields = options === null || options === void 0 ? void 0 : options[operator];
                                     if (!fields) return [3 /*break*/, 8];
-                                    _loop_4 = function (x) {
+                                    _loop_3 = function (x) {
                                         var dbName, turnToNumber;
                                         return tslib_1.__generator(this, function (_o) {
                                             switch (_o.label) {
@@ -1074,12 +925,12 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                                     _m.label = 1;
                                 case 1:
                                     _m.trys.push([1, 6, 7, 8]);
-                                    fields_1 = (e_14 = void 0, tslib_1.__values(fields)), fields_1_1 = fields_1.next();
+                                    fields_1 = (e_11 = void 0, tslib_1.__values(fields)), fields_1_1 = fields_1.next();
                                     _m.label = 2;
                                 case 2:
                                     if (!!fields_1_1.done) return [3 /*break*/, 5];
                                     x = fields_1_1.value;
-                                    return [5 /*yield**/, _loop_4(x)];
+                                    return [5 /*yield**/, _loop_3(x)];
                                 case 3:
                                     _m.sent();
                                     _m.label = 4;
@@ -1088,14 +939,14 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                                     return [3 /*break*/, 2];
                                 case 5: return [3 /*break*/, 8];
                                 case 6:
-                                    e_14_1 = _m.sent();
-                                    e_14 = { error: e_14_1 };
+                                    e_11_1 = _m.sent();
+                                    e_11 = { error: e_11_1 };
                                     return [3 /*break*/, 8];
                                 case 7:
                                     try {
                                         if (fields_1_1 && !fields_1_1.done && (_l = fields_1.return)) _l.call(fields_1);
                                     }
-                                    finally { if (e_14) throw e_14.error; }
+                                    finally { if (e_11) throw e_11.error; }
                                     return [7 /*endfinally*/];
                                 case 8: return [2 /*return*/];
                             }
@@ -1109,7 +960,7 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                 case 2:
                     if (!!GroupByOperators_1_1.done) return [3 /*break*/, 5];
                     operator = GroupByOperators_1_1.value;
-                    return [5 /*yield**/, _loop_3(operator)];
+                    return [5 /*yield**/, _loop_2(operator)];
                 case 3:
                     _k.sent();
                     _k.label = 4;
@@ -1118,14 +969,14 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                     return [3 /*break*/, 2];
                 case 5: return [3 /*break*/, 8];
                 case 6:
-                    e_11_1 = _k.sent();
-                    e_11 = { error: e_11_1 };
+                    e_8_1 = _k.sent();
+                    e_8 = { error: e_8_1 };
                     return [3 /*break*/, 8];
                 case 7:
                     try {
                         if (GroupByOperators_1_1 && !GroupByOperators_1_1.done && (_h = GroupByOperators_1.return)) _h.call(GroupByOperators_1);
                     }
-                    finally { if (e_11) throw e_11.error; }
+                    finally { if (e_8) throw e_8.error; }
                     return [7 /*endfinally*/];
                 case 8:
                     select += '\n from ' + e.$entityName;
@@ -1186,14 +1037,14 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                     return [3 /*break*/, 12];
                 case 16: return [3 /*break*/, 19];
                 case 17:
-                    e_12_1 = _k.sent();
-                    e_12 = { error: e_12_1 };
+                    e_9_1 = _k.sent();
+                    e_9 = { error: e_9_1 };
                     return [3 /*break*/, 19];
                 case 18:
                     try {
                         if (_e && !_e.done && (_j = _d.return)) _j.call(_d);
                     }
-                    finally { if (e_12) throw e_12.error; }
+                    finally { if (e_9) throw e_9.error; }
                     return [7 /*endfinally*/];
                 case 19:
                     if (orderBy)