remult 3.4.0-next.7 → 3.4.0

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqlDatabase = void 0;
+exports.jsonColumnStorageOf = jsonColumnStorageOf;
 exports.getRowAfterUpdate = getRowAfterUpdate;
 exports.buildFindSql = buildFindSql;
 exports.groupByImpl = groupByImpl;
@@ -82,6 +83,13 @@ var SqlDatabase = /** @class */ (function () {
             });
         });
     };
+    Object.defineProperty(SqlDatabase.prototype, "jsonColumnStorage", {
+        get: function () {
+            return this.sql.supportsJsonColumnType ? 'native' : 'text';
+        },
+        enumerable: false,
+        configurable: true
+    });
     /* @internal*/
     SqlDatabase.prototype._getSourceSql = function () {
         return this.sql;
@@ -107,26 +115,7 @@ var SqlDatabase = /** @class */ (function () {
      * @returns The entity data provider.
      */
     SqlDatabase.prototype.getEntityDataProvider = function (entity) {
-        var e_1, _a;
         var _this = this;
-        if (!this.sql.supportsJsonColumnType) {
-            try {
-                for (var _b = tslib_1.__values(entity.fields.toArray()), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var f = _c.value;
-                    if (f.valueConverter.fieldTypeInDb === 'json') {
-                        //@ts-ignore
-                        f.valueConverter = tslib_1.__assign(tslib_1.__assign({}, f.valueConverter), { toDb: valueConverters_js_1.ValueConverters.JsonString.toDb, fromDb: valueConverters_js_1.ValueConverters.JsonString.fromDb });
-                    }
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-        }
         return new ActualSQLEntityDataProvider(entity, this, function (dbName) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
@@ -243,7 +232,7 @@ var SqlDatabase = /** @class */ (function () {
                         _c = (_d.sent());
                         _d.label = 2;
                     case 2:
-                        b = new (_a.apply(filter_consumer_bridge_to_sql_request_js_1.FilterConsumerBridgeToSqlRequest, _b.concat([_c])))();
+                        b = new (_a.apply(filter_consumer_bridge_to_sql_request_js_1.FilterConsumerBridgeToSqlRequest, _b.concat([_c, jsonColumnStorageOf(r)])))();
                         b._addWhere = false;
                         return [4 /*yield*/, (0, repository_internals_js_1.getRepositoryInternals)(r)._translateWhereToFilter(condition)];
                     case 3: return [4 /*yield*/, (_d.sent()).__applyToConsumer(b)];
@@ -279,7 +268,7 @@ var SqlDatabase = /** @class */ (function () {
                     case 3:
                         _c = (_h.sent());
                         _h.label = 4;
-                    case 4: return [4 /*yield*/, _a.apply(void 0, _b.concat([_c, (_f = sql === null || sql === void 0 ? void 0 : sql.sqlCommand) !== null && _f !== void 0 ? _f : new myDummySQLCommand(), false, (_g = sql === null || sql === void 0 ? void 0 : sql.limitSyntax) !== null && _g !== void 0 ? _g : limitSyntaxRequired]))];
+                    case 4: return [4 /*yield*/, _a.apply(void 0, _b.concat([_c, (_f = sql === null || sql === void 0 ? void 0 : sql.sqlCommand) !== null && _f !== void 0 ? _f : new myDummySQLCommand(), false, (_g = sql === null || sql === void 0 ? void 0 : sql.limitSyntax) !== null && _g !== void 0 ? _g : limitSyntaxRequired, jsonColumnStorageForRaw(r, sql === null || sql === void 0 ? void 0 : sql.jsonAsString)]))];
                     case 5:
                         built = _h.sent();
                         return [2 /*return*/, {
@@ -315,7 +304,10 @@ var SqlDatabase = /** @class */ (function () {
                     case 3:
                         _c = (_h.sent());
                         _h.label = 4;
-                    case 4: return [4 /*yield*/, _a.apply(void 0, _b.concat([_c, (_f = sql === null || sql === void 0 ? void 0 : sql.sqlCommand) !== null && _f !== void 0 ? _f : new myDummySQLCommand(), false, (_g = sql === null || sql === void 0 ? void 0 : sql.limitSyntax) !== null && _g !== void 0 ? _g : limitSyntaxRequired, { aliasColumns: true, defaultOrderBy: false }]))];
+                    case 4: return [4 /*yield*/, _a.apply(void 0, _b.concat([_c, (_f = sql === null || sql === void 0 ? void 0 : sql.sqlCommand) !== null && _f !== void 0 ? _f : new myDummySQLCommand(), false, (_g = sql === null || sql === void 0 ? void 0 : sql.limitSyntax) !== null && _g !== void 0 ? _g : limitSyntaxRequired, {
+                                aliasColumns: true,
+                                jsonColumnStorage: jsonColumnStorageForRaw(r, sql === null || sql === void 0 ? void 0 : sql.jsonAsString),
+                            }]))];
                     case 5:
                         built = _h.sent();
                         return [2 /*return*/, {
@@ -347,7 +339,7 @@ var SqlDatabase = /** @class */ (function () {
 exports.SqlDatabase = SqlDatabase;
 var defaultMaxParametersInOneSqlStatement = 2000;
 function splitByMaxParameters(items, parametersInItem, maxParameters) {
-    var e_2, _a;
+    var e_1, _a;
     var batches = [];
     var batch = [];
     var params = 0;
@@ -364,35 +356,35 @@ function splitByMaxParameters(items, parametersInItem, maxParameters) {
             params += n;
         }
     }
-    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    catch (e_1_1) { e_1 = { error: e_1_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; }
+        finally { if (e_1) throw e_1.error; }
     }
     if (batch.length)
         batches.push(batch);
     return batches;
 }
-function countInsertBindParameters(entity, e, row) {
-    var e_3, _a;
+function countInsertBindParameters(entity, e, row, storage) {
+    var e_2, _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)
+            if ((0, valueConverters_js_1.toDbColumn)(x, row[x.key], storage) != undefined)
                 n++;
         }
     }
-    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+    catch (e_2_1) { e_2 = { error: e_2_1 }; }
     finally {
         try {
             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_3) throw e_3.error; }
+        finally { if (e_2) throw e_2.error; }
     }
     return n;
 }
@@ -507,7 +499,7 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                         select = 'select count(*) count from ' + e.$entityName;
                         r = this.sql.createCommand();
                         if (!where) return [3 /*break*/, 3];
-                        wc = new filter_consumer_bridge_to_sql_request_js_1.FilterConsumerBridgeToSqlRequest(r, e);
+                        wc = new filter_consumer_bridge_to_sql_request_js_1.FilterConsumerBridgeToSqlRequest(r, e, this.sql.jsonColumnStorage);
                         where.__applyToConsumer(wc);
                         _a = select;
                         return [4 /*yield*/, wc.resolveWhere()];
@@ -532,7 +524,8 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                         return [4 /*yield*/, this.init()];
                     case 1: return [4 /*yield*/, _a.apply(void 0, _b.concat([_c.sent(), this.sql.createCommand(),
                             this.sql._getSourceSql().orderByNullsFirst,
-                            this.sql._getSourceSql().getLimitSqlSyntax]))];
+                            this.sql._getSourceSql().getLimitSqlSyntax,
+                            this.sql.jsonColumnStorage]))];
                     case 2: return [2 /*return*/, _c.sent()];
                 }
             });
@@ -548,7 +541,9 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                     case 1:
                         e = _b.sent();
                         r = this.sql.createCommand();
-                        return [4 /*yield*/, buildFindSql(this.entity, options, e, r, this.sql._getSourceSql().orderByNullsFirst, function (limit, offset) { return _this.strategy.getLimitSqlSyntax(limit, offset); })];
+                        if (options && !options.orderBy)
+                            options.orderBy = sort_js_1.Sort.createUniqueSort(this.entity, new sort_js_1.Sort());
+                        return [4 /*yield*/, buildFindSql(this.entity, options, e, r, this.sql._getSourceSql().orderByNullsFirst, function (limit, offset) { return _this.strategy.getLimitSqlSyntax(limit, offset); }, { jsonColumnStorage: this.sql.jsonColumnStorage })];
                     case 2:
                         _a = _b.sent(), select = _a.select, toResult = _a.toResult;
                         return [4 /*yield*/, r.execute(select)];
@@ -562,7 +557,7 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
         });
     };
     ActualSQLEntityDataProvider.prototype.buildResultRow = function (colKeys, y, r) {
-        return resultRow(colKeys, function (i) { return y[r.getColumnKeyInResultForIndexInSelect(i)]; });
+        return resultRow(colKeys, function (i) { return y[r.getColumnKeyInResultForIndexInSelect(i)]; }, this.sql.jsonColumnStorage);
     };
     ActualSQLEntityDataProvider.prototype.buildSelect = function (e, r, selectedFields, args) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -574,7 +569,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_4, _e;
+            var e_3, _e;
             var _this = this;
             return tslib_1.__generator(this, function (_f) {
                 switch (_f.label) {
@@ -590,7 +585,7 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                                 if ((0, filter_consumer_bridge_to_sql_request_js_1.isDbReadonly)(x, e)) {
                                 }
                                 else if (data[x.key] !== undefined) {
-                                    v = x.valueConverter.toDb(data[x.key]);
+                                    v = (0, valueConverters_js_1.toDbColumn)(x, data[x.key], this.sql.jsonColumnStorage);
                                     if (v !== undefined) {
                                         if (!added)
                                             added = true;
@@ -601,15 +596,15 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                                 }
                             }
                         }
-                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                        catch (e_3_1) { e_3 = { error: e_3_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                             }
-                            finally { if (e_4) throw e_4.error; }
+                            finally { if (e_3) throw e_3.error; }
                         }
                         idFilter = this.entity.idMetadata.getIdFilter(id);
-                        f = new filter_consumer_bridge_to_sql_request_js_1.FilterConsumerBridgeToSqlRequest(r, e);
+                        f = new filter_consumer_bridge_to_sql_request_js_1.FilterConsumerBridgeToSqlRequest(r, e, this.sql.jsonColumnStorage);
                         filter_interfaces_js_1.Filter.fromEntityFilter(this.entity, idFilter).__applyToConsumer(f);
                         _c = statement;
                         return [4 /*yield*/, f.resolveWhere()];
@@ -661,7 +656,7 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                     case 1:
                         e = _c.sent();
                         r = this.sql.createCommand();
-                        f = new filter_consumer_bridge_to_sql_request_js_1.FilterConsumerBridgeToSqlRequest(r, e);
+                        f = new filter_consumer_bridge_to_sql_request_js_1.FilterConsumerBridgeToSqlRequest(r, e, this.sql.jsonColumnStorage);
                         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);
                         statement = 'delete from ' + e.$entityName;
                         _a = statement;
@@ -678,8 +673,8 @@ 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_5_1;
-            var e_5, _e;
+            var e, maxParams, batches, result, batches_1, batches_1_1, batch, _a, _b, _c, _d, e_4_1;
+            var e_4, _e;
             var _this = this;
             var _f;
             return tslib_1.__generator(this, function (_g) {
@@ -691,7 +686,9 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                     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);
+                        batches = splitByMaxParameters(data, function (row) {
+                            return countInsertBindParameters(_this.entity, e, row, _this.sql.jsonColumnStorage);
+                        }, maxParams);
                         result = [];
                         _g.label = 2;
                     case 2:
@@ -713,14 +710,14 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                         return [3 /*break*/, 3];
                     case 6: return [3 /*break*/, 9];
                     case 7:
-                        e_5_1 = _g.sent();
-                        e_5 = { error: e_5_1 };
+                        e_4_1 = _g.sent();
+                        e_4 = { error: e_4_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_5) throw e_5.error; }
+                        finally { if (e_4) throw e_4.error; }
                         return [7 /*endfinally*/];
                     case 9: return [2 /*return*/, result];
                 }
@@ -741,7 +738,7 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
     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_6, _d;
+            var e_5, _d;
             var _this = this;
             var _e;
             return tslib_1.__generator(this, function (_f) {
@@ -752,7 +749,9 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                         _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; }))
+                            if (batch.some(function (row) {
+                                return (0, valueConverters_js_1.toDbColumn)(x, row[x.key], _this.sql.jsonColumnStorage) != undefined;
+                            }))
                                 cols.push(x);
                         };
                         try {
@@ -761,12 +760,12 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                                 _loop_1(x);
                             }
                         }
-                        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
                             }
-                            finally { if (e_6) throw e_6.error; }
+                            finally { if (e_5) throw e_5.error; }
                         }
                         colSql = '';
                         vals = '';
@@ -783,7 +782,7 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                                 if (j)
                                     vals += ', ';
                                 x = cols[j];
-                                v = x.valueConverter.toDb(batch[i][x.key]);
+                                v = (0, valueConverters_js_1.toDbColumn)(x, batch[i][x.key], this.sql.jsonColumnStorage);
                                 if (v != undefined)
                                     vals += (0, filter_consumer_bridge_to_sql_request_js_1.toDbSql)(r, x, v);
                                 else if (x.allowNull)
@@ -859,6 +858,17 @@ function wrapIdentifierOf(r) {
         return (_a = dp.wrapIdentifier) === null || _a === void 0 ? void 0 : _a.bind(dp);
     return undefined;
 }
+function jsonColumnStorageOf(r) {
+    var dp = (0, repository_internals_js_1.getRepositoryInternals)(r)._dataProvider;
+    if ((0, isOfType_js_1.isOfType)(dp, 'jsonColumnStorage'))
+        return dp.jsonColumnStorage;
+    return 'native';
+}
+function jsonColumnStorageForRaw(r, jsonAsString) {
+    if (jsonAsString === undefined)
+        return jsonColumnStorageOf(r);
+    return jsonAsString ? 'text' : 'native';
+}
 function limitSyntaxRequired() {
     throw new Error('A raw select with a limit needs limitSyntax, for example SqlDatabase.getDb()._getSourceSql().getLimitSqlSyntax');
 }
@@ -890,7 +900,7 @@ function getRowAfterUpdate(meta, dataProvider, data, id, operation) {
     return dataProvider
         .find({
         where: new filter_interfaces_js_1.Filter(function (x) {
-            var e_7, _a;
+            var e_6, _a;
             var _b;
             try {
                 for (var _c = tslib_1.__values(meta.idMetadata.fields), _d = _c.next(); !_d.done; _d = _c.next()) {
@@ -898,12 +908,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_7_1) { e_7 = { error: e_7_1 }; }
+            catch (e_6_1) { e_6 = { error: e_6_1 }; }
             finally {
                 try {
                     if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
                 }
-                finally { if (e_7) throw e_7.error; }
+                finally { if (e_6) throw e_6.error; }
             }
         }),
     })
@@ -914,11 +924,11 @@ function getRowAfterUpdate(meta, dataProvider, data, id, operation) {
     });
 }
 /** The select that `find` runs, and the mapping of one result row to field values. With `aliasColumns`, every column is aliased through `wrapIdentifier`, so a row can be read by alias as well as by position. */
-function buildFindSql(entity_1, options_1, e_8, r_1, orderByNullsFirst_1, limitSyntax_1) {
+function buildFindSql(entity_1, options_1, e_7, r_1, orderByNullsFirst_1, limitSyntax_1) {
     return tslib_1.__awaiter(this, arguments, void 0, function (entity, options, e, r, orderByNullsFirst, limitSyntax, _a) {
-        var _b, colKeys, columns, select, where, _c, first, _d, _e, c, _f, _g, e_9_1, page;
-        var e_9, _h;
-        var _j = _a === void 0 ? {} : _a, _k = _j.aliasColumns, aliasColumns = _k === void 0 ? false : _k, _l = _j.defaultOrderBy, defaultOrderBy = _l === void 0 ? true : _l;
+        var _b, colKeys, columns, select, where, _c, first, _d, _e, c, _f, _g, e_8_1, page;
+        var e_8, _h;
+        var _j = _a === void 0 ? {} : _a, _k = _j.aliasColumns, aliasColumns = _k === void 0 ? false : _k, _l = _j.jsonColumnStorage, jsonColumnStorage = _l === void 0 ? 'native' : _l;
         return tslib_1.__generator(this, function (_m) {
             switch (_m.label) {
                 case 0: return [4 /*yield*/, selectColumns(entity, e, r, options === null || options === void 0 ? void 0 : options.select, options === null || options === void 0 ? void 0 : options.args, aliasColumns)];
@@ -927,7 +937,7 @@ function buildFindSql(entity_1, options_1, e_8, r_1, orderByNullsFirst_1, limitS
                     select = 'select ' + columns + '\n from ' + e.$entityName;
                     if (!options) return [3 /*break*/, 14];
                     if (!options.where) return [3 /*break*/, 3];
-                    where = new filter_consumer_bridge_to_sql_request_js_1.FilterConsumerBridgeToSqlRequest(r, e);
+                    where = new filter_consumer_bridge_to_sql_request_js_1.FilterConsumerBridgeToSqlRequest(r, e, jsonColumnStorage);
                     options.where.__applyToConsumer(where);
                     _c = select;
                     return [4 /*yield*/, where.resolveWhere()];
@@ -938,9 +948,6 @@ function buildFindSql(entity_1, options_1, e_8, r_1, orderByNullsFirst_1, limitS
                     if (options.limit) {
                         options.orderBy = sort_js_1.Sort.createUniqueSort(entity, options.orderBy);
                     }
-                    if (!options.orderBy && defaultOrderBy) {
-                        options.orderBy = sort_js_1.Sort.createUniqueSort(entity, new sort_js_1.Sort());
-                    }
                     if (!options.orderBy) return [3 /*break*/, 13];
                     first = true;
                     _m.label = 4;
@@ -981,14 +988,14 @@ function buildFindSql(entity_1, options_1, e_8, r_1, orderByNullsFirst_1, limitS
                     return [3 /*break*/, 5];
                 case 10: return [3 /*break*/, 13];
                 case 11:
-                    e_9_1 = _m.sent();
-                    e_9 = { error: e_9_1 };
+                    e_8_1 = _m.sent();
+                    e_8 = { error: e_8_1 };
                     return [3 /*break*/, 13];
                 case 12:
                     try {
                         if (_e && !_e.done && (_h = _d.return)) _h.call(_d);
                     }
-                    finally { if (e_9) throw e_9.error; }
+                    finally { if (e_8) throw e_8.error; }
                     return [7 /*endfinally*/];
                 case 13:
                     if (options.limit) {
@@ -1005,7 +1012,7 @@ function buildFindSql(entity_1, options_1, e_8, r_1, orderByNullsFirst_1, limitS
                         colKeys: colKeys,
                         /** `valueAt` reads one column of a result row, by its position in the select or by its alias (the field key). */
                         toResult: function (valueAt) {
-                            return resultRow(colKeys, valueAt);
+                            return resultRow(colKeys, valueAt, jsonColumnStorage);
                         },
                     }];
             }
@@ -1014,8 +1021,8 @@ function buildFindSql(entity_1, options_1, e_8, r_1, orderByNullsFirst_1, limitS
 }
 function selectColumns(entity, e, r, selectedFields, args, aliasColumns) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var select, colKeys, _a, _b, x, sql, e_8_1;
-        var e_8, _c;
+        var select, colKeys, _a, _b, x, sql, e_7_1;
+        var e_7, _c;
         return tslib_1.__generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
@@ -1060,25 +1067,25 @@ function selectColumns(entity, e, r, selectedFields, args, aliasColumns) {
                     return [3 /*break*/, 2];
                 case 8: return [3 /*break*/, 11];
                 case 9:
-                    e_8_1 = _d.sent();
-                    e_8 = { error: e_8_1 };
+                    e_7_1 = _d.sent();
+                    e_7 = { error: e_7_1 };
                     return [3 /*break*/, 11];
                 case 10:
                     try {
                         if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                     }
-                    finally { if (e_8) throw e_8.error; }
+                    finally { if (e_7) throw e_7.error; }
                     return [7 /*endfinally*/];
                 case 11: return [2 /*return*/, { colKeys: colKeys, select: select }];
             }
         });
     });
 }
-function resultRow(colKeys, valueAt) {
+function resultRow(colKeys, valueAt, storage) {
     var result = {};
     colKeys.forEach(function (col, index) {
         try {
-            result[col.key] = col.valueConverter.fromDb(valueAt(index, col.key));
+            result[col.key] = (0, valueConverters_js_1.fromDbColumn)(col, valueAt(index, col.key), storage);
         }
         catch (err) {
             throw new Error('Failed to load from db:' + col.key + '\r\n' + err);
@@ -1086,12 +1093,13 @@ function resultRow(colKeys, valueAt) {
     });
     return result;
 }
-function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
-    return tslib_1.__awaiter(this, void 0, void 0, function () {
+function groupByImpl(options_1, e_9, r_1, orderByNullFirst_1, limitSyntax_1) {
+    return tslib_1.__awaiter(this, arguments, void 0, function (options, e, r, orderByNullFirst, limitSyntax, jsonColumnStorage) {
         var _a, select, toResult, result;
+        if (jsonColumnStorage === void 0) { jsonColumnStorage = 'native'; }
         return tslib_1.__generator(this, function (_b) {
             switch (_b.label) {
-                case 0: return [4 /*yield*/, buildGroupBySql(options, e, r, orderByNullFirst, limitSyntax)];
+                case 0: return [4 /*yield*/, buildGroupBySql(options, e, r, orderByNullFirst, limitSyntax, jsonColumnStorage)];
                 case 1:
                     _a = _b.sent(), select = _a.select, toResult = _a.toResult;
                     return [4 /*yield*/, r.execute(select)];
@@ -1105,8 +1113,8 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
     });
 }
 /** The select that `groupBy` runs, and the mapping of one result row back to a `GroupByResult`. Every column is aliased through `wrapIdentifier`, so a row can be read by alias as well as by position. */
-function buildGroupBySql(options, e, r, orderByNullFirst, limitSyntax) {
-    return tslib_1.__awaiter(this, void 0, void 0, function () {
+function buildGroupBySql(options_1, e_9, r_1, orderByNullFirst_1, limitSyntax_1) {
+    return tslib_1.__awaiter(this, arguments, void 0, function (options, e, r, orderByNullFirst, limitSyntax, jsonColumnStorage) {
         function alias(name) {
             aliases.push(name);
             return e.wrapIdentifier(name);
@@ -1118,6 +1126,7 @@ function buildGroupBySql(options, e, r, orderByNullFirst, limitSyntax) {
         }
         var aliases, select, groupBy, groupByCols, processResultRow, _loop_2, _a, _b, x, _loop_3, GroupByOperators_1, GroupByOperators_1_1, operator, e_10_1, where, _c, orderBy, _d, _e, x, field, _f, e_11_1, page;
         var e_12, _g, e_10, _h, e_11, _j;
+        if (jsonColumnStorage === void 0) { jsonColumnStorage = 'native'; }
         return tslib_1.__generator(this, function (_k) {
             switch (_k.label) {
                 case 0:
@@ -1143,7 +1152,7 @@ function buildGroupBySql(options, e, r, orderByNullFirst, limitSyntax) {
                                 groupByCols.push(e.$dbNameOf(x));
                             }
                             processResultRow.push(function (sqlResult, theResult) {
-                                theResult[x.key] = x.valueConverter.fromDb(sqlResult);
+                                theResult[x.key] = (0, valueConverters_js_1.fromDbColumn)(x, sqlResult, jsonColumnStorage);
                             });
                         };
                         try {
@@ -1187,7 +1196,7 @@ function buildGroupBySql(options, e, r, orderByNullFirst, limitSyntax) {
                                                         if (turnToNumber)
                                                             sqlResult = Number(sqlResult);
                                                         if (operator === 'max' || operator === 'min')
-                                                            sqlResult = x.valueConverter.fromDb(sqlResult);
+                                                            sqlResult = (0, valueConverters_js_1.fromDbColumn)(x, sqlResult, jsonColumnStorage);
                                                         theResult[x.key] = tslib_1.__assign(tslib_1.__assign({}, theResult[x.key]), (_a = {}, _a[operator] = sqlResult, _a));
                                                     });
                                                     return [2 /*return*/];
@@ -1253,7 +1262,7 @@ function buildGroupBySql(options, e, r, orderByNullFirst, limitSyntax) {
                 case 8:
                     select += '\n from ' + e.$entityName;
                     if (!(options === null || options === void 0 ? void 0 : options.where)) return [3 /*break*/, 10];
-                    where = new filter_consumer_bridge_to_sql_request_js_1.FilterConsumerBridgeToSqlRequest(r, e);
+                    where = new filter_consumer_bridge_to_sql_request_js_1.FilterConsumerBridgeToSqlRequest(r, e, jsonColumnStorage);
                     options === null || options === void 0 ? void 0 : options.where.__applyToConsumer(where);
                     _c = select;
                     return [4 /*yield*/, where.resolveWhere()];

package/src/filter/filter-consumer-bridge-to-sql-request.d.ts

@@ -1,16 +1,19 @@
 import type { FieldMetadata } from '../column-interfaces.js';
 import type { EntityMetadataOverloads, RepositoryOverloads } from '../remult3/RepositoryImplementation.js';
 import type { EntityFilter, EntityMetadata, MembersOnly } from '../remult3/remult3.js';
-import type { HasWrapIdentifier, SqlCommandWithParameters } from '../sql-command.js';
+import type { HasWrapIdentifier, JsonColumnStorage, SqlCommandWithParameters } from '../sql-command.js';
 import type { Filter, FilterConsumer } from './filter-interfaces.js';
+export declare const LIKE_ESCAPE_SQL = " escape '!'";
+export declare function escapeLike(val: string): string;
 export declare class FilterConsumerBridgeToSqlRequest implements FilterConsumer {
     private r;
     private nameProvider;
+    private jsonColumnStorage;
     private where;
     _addWhere: boolean;
     promises: Promise<void>[];
     resolveWhere(): Promise<string>;
-    constructor(r: SqlCommandWithParameters, nameProvider: EntityDbNamesBase);
+    constructor(r: SqlCommandWithParameters, nameProvider: EntityDbNamesBase, jsonColumnStorage?: JsonColumnStorage);
     custom(key: string, customItem: any): void;
     or(orElements: Filter[]): void;
     not(element: Filter): void;
@@ -27,6 +30,7 @@ export declare class FilterConsumerBridgeToSqlRequest implements FilterConsumer
     notContainsCaseInsensitive(col: FieldMetadata, val: any): void;
     startsWithCaseInsensitive(col: FieldMetadata, val: any): void;
     endsWithCaseInsensitive(col: FieldMetadata, val: any): void;
+    private like;
     private add;
     private addToWhere;
     databaseCustom(databaseCustom: CustomSqlFilterObject): void;
@@ -47,7 +51,8 @@ export type CustomSqlFilterBuilderFunction = (builder: CustomSqlFilterBuilder) =
 export declare class CustomSqlFilterBuilder implements SqlCommandWithParameters, HasWrapIdentifier {
     private r;
     wrapIdentifier: (name: string) => string;
-    constructor(r: SqlCommandWithParameters, wrapIdentifier: (name: string) => string);
+    private jsonColumnStorage;
+    constructor(r: SqlCommandWithParameters, wrapIdentifier: (name: string) => string, jsonColumnStorage?: JsonColumnStorage);
     sql: string;
     /** @deprecated  use `param` instead*/
     addParameterAndReturnSqlToken(val: any): string;