remult 3.4.0-next.9 → 3.4.0

package/remult-knex/index.js

@@ -74,43 +74,18 @@ var KnexDataProvider = /** @class */ (function () {
             throw 'the data provider is not an KnexDataProvider';
         return r.knex;
     };
+    Object.defineProperty(KnexDataProvider.prototype, "jsonColumnStorage", {
+        get: function () {
+            if (!supportsJsonLoadingAndSaving(this.knex))
+                return 'text';
+            if (this.knex.client.config.client === 'mysql2')
+                return 'textOnWrite';
+            return 'native';
+        },
+        enumerable: false,
+        configurable: true
+    });
     KnexDataProvider.prototype.getEntityDataProvider = function (entity) {
-        var e_1, _a, e_2, _b;
-        if (!supportsJsonLoadingAndSaving(this.knex))
-            try {
-                for (var _c = tslib_1.__values(entity.fields.toArray()), _d = _c.next(); !_d.done; _d = _c.next()) {
-                    var f = _d.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 (_d && !_d.done && (_a = _c.return)) _a.call(_c);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-        else if (this.knex.client.config.client === 'mysql2') {
-            try {
-                for (var _e = tslib_1.__values(entity.fields.toArray()), _f = _e.next(); !_f.done; _f = _e.next()) {
-                    var f = _f.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 });
-                    }
-                }
-            }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
-            finally {
-                try {
-                    if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
-                }
-                finally { if (e_2) throw e_2.error; }
-            }
-        }
         return new KnexEntityDataProvider(entity, this.knex, this.wrapIdentifier, this);
     };
     KnexDataProvider.prototype.transaction = function (action) {
@@ -162,7 +137,7 @@ var KnexDataProvider = /** @class */ (function () {
                         _a = FilterConsumerBridgeToKnexRequest.bind;
                         return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOfWithForceSqlExpression)(repo.metadata, wrapIdentifier)];
                     case 1:
-                        b = new (_a.apply(FilterConsumerBridgeToKnexRequest, [void 0, _b.sent(), wrapIdentifier !== null && wrapIdentifier !== void 0 ? wrapIdentifier : wrapIdentifier]))();
+                        b = new (_a.apply(FilterConsumerBridgeToKnexRequest, [void 0, _b.sent(), wrapIdentifier !== null && wrapIdentifier !== void 0 ? wrapIdentifier : wrapIdentifier, (0, sql_database_js_1.jsonColumnStorageOf)(repo)]))();
                         b._addWhere = false;
                         return [4 /*yield*/, (0, repository_internals_js_1.getRepositoryInternals)(repo)._translateWhereToFilter(condition)];
                     case 2: return [4 /*yield*/, (_b.sent()).__applyToConsumer(b)];
@@ -218,7 +193,8 @@ var KnexEntityDataProvider = /** @class */ (function () {
                                 return ((_a = _this.knex.client.config.client) === null || _a === void 0 ? void 0 : _a.includes('mssql'))
                                     ? ' offset ' + offset + ' rows fetch next ' + limit + ' rows only'
                                     : ' limit ' + limit + ' offset ' + offset;
-                            }]))];
+                            },
+                            this.dp.jsonColumnStorage]))];
                 }
             });
         });
@@ -236,7 +212,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.init()];
                     case 1:
                         e = _a.sent();
-                        br = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
+                        br = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier, this.dp.jsonColumnStorage);
                         where.__applyToConsumer(br);
                         return [4 /*yield*/, br.resolveWhere()];
                     case 2:
@@ -261,7 +237,8 @@ var KnexEntityDataProvider = /** @class */ (function () {
     KnexEntityDataProvider.prototype.find = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, cols, colKeys, _a, _b, x, name_1, query, br, r_1, r;
-            var e_3, _c;
+            var e_1, _c;
+            var _this = this;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0: return [4 /*yield*/, this.init()];
@@ -285,16 +262,16 @@ var KnexEntityDataProvider = /** @class */ (function () {
                                 }
                             }
                         }
-                        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_3) throw e_3.error; }
+                            finally { if (e_1) throw e_1.error; }
                         }
                         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);
+                        br = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier, this.dp.jsonColumnStorage);
                         options.where.__applyToConsumer(br);
                         return [4 /*yield*/, br.resolveWhere()];
                     case 2:
@@ -325,7 +302,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                                 for (var m in y) {
                                     var field = colKeys[i++];
                                     try {
-                                        result[field.key] = field.valueConverter.fromDb(y[m]);
+                                        result[field.key] = (0, valueConverters_js_1.fromDbColumn)(field, y[m], _this.dp.jsonColumnStorage);
                                     }
                                     catch (err) {
                                         throw new Error('Failed to load from db:' + field.key + '\r\n' + err);
@@ -362,14 +339,14 @@ var KnexEntityDataProvider = /** @class */ (function () {
     };
     KnexEntityDataProvider.prototype.update = function (id, data, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, f, updateObject, _a, _b, x, v, key, e_4_1, where;
-            var e_4, _c;
+            var e, f, updateObject, _a, _b, x, v, key, e_2_1, where;
+            var e_2, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0: return [4 /*yield*/, this.init()];
                     case 1:
                         e = _d.sent();
-                        f = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
+                        f = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier, this.dp.jsonColumnStorage);
                         filter_interfaces_js_1.Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
                         updateObject = {};
                         _d.label = 2;
@@ -384,7 +361,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [3 /*break*/, 6];
                     case 4:
                         if (!(data[x.key] !== undefined)) return [3 /*break*/, 6];
-                        v = translateValueAndHandleArrayAndHandleArray(x, data[x.key]);
+                        v = translateValueAndHandleArrayAndHandleArray(x, data[x.key], this.dp.jsonColumnStorage);
                         if (!(v !== undefined)) return [3 /*break*/, 6];
                         return [4 /*yield*/, e.$dbNameOf(x)];
                     case 5:
@@ -396,14 +373,14 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [3 /*break*/, 3];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_4_1 = _d.sent();
-                        e_4 = { error: e_4_1 };
+                        e_2_1 = _d.sent();
+                        e_2 = { error: e_2_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_4) throw e_4.error; }
+                        finally { if (e_2) throw e_2.error; }
                         return [7 /*endfinally*/];
                     case 10: return [4 /*yield*/, f.resolveWhere()];
                     case 11:
@@ -432,7 +409,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [4 /*yield*/, this.init()];
                     case 1:
                         e = _b.sent();
-                        f = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
+                        f = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier, this.dp.jsonColumnStorage);
                         filter_interfaces_js_1.Filter.fromEntityFilter(this.entity, (_a = this.entity.idMetadata).getIdFilter.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(ids), false))).__applyToConsumer(f);
                         return [4 /*yield*/, f.resolveWhere()];
                     case 2:
@@ -449,8 +426,8 @@ var KnexEntityDataProvider = /** @class */ (function () {
     };
     KnexEntityDataProvider.prototype.insert = function (data, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var result_1, data_1, data_1_1, row, _a, _b, e_5_1, e, batches, result, batches_1, batches_1_1, batch, _c, _d, _e, _f, e_6_1;
-            var e_5, _g, e_6, _h;
+            var result_1, data_1, data_1_1, row, _a, _b, e_3_1, e, batches, result, batches_1, batches_1_1, batch, _c, _d, _e, _f, e_4_1;
+            var e_3, _g, e_4, _h;
             var _this = this;
             return tslib_1.__generator(this, function (_j) {
                 switch (_j.label) {
@@ -479,20 +456,22 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_5_1 = _j.sent();
-                        e_5 = { error: e_5_1 };
+                        e_3_1 = _j.sent();
+                        e_3 = { error: e_3_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (data_1_1 && !data_1_1.done && (_g = data_1.return)) _g.call(data_1);
                         }
-                        finally { if (e_5) throw e_5.error; }
+                        finally { if (e_3) throw e_3.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/, result_1];
                     case 9: return [4 /*yield*/, this.init()];
                     case 10:
                         e = _j.sent();
-                        batches = splitByMaxParameters(data, function (row) { return countKnexInsertBindParameters(_this.entity, e, row); }, knexMaxParametersInOneSqlStatement(this.knex));
+                        batches = splitByMaxParameters(data, function (row) {
+                            return countKnexInsertBindParameters(_this.entity, e, row, _this.dp.jsonColumnStorage);
+                        }, knexMaxParametersInOneSqlStatement(this.knex));
                         result = [];
                         _j.label = 11;
                     case 11:
@@ -514,14 +493,14 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [3 /*break*/, 12];
                     case 15: return [3 /*break*/, 18];
                     case 16:
-                        e_6_1 = _j.sent();
-                        e_6 = { error: e_6_1 };
+                        e_4_1 = _j.sent();
+                        e_4 = { error: e_4_1 };
                         return [3 /*break*/, 18];
                     case 17:
                         try {
                             if (batches_1_1 && !batches_1_1.done && (_h = batches_1.return)) _h.call(batches_1);
                         }
-                        finally { if (e_6) throw e_6.error; }
+                        finally { if (e_4) throw e_4.error; }
                         return [7 /*endfinally*/];
                     case 18: return [2 /*return*/, result];
                 }
@@ -530,8 +509,8 @@ var KnexEntityDataProvider = /** @class */ (function () {
     };
     KnexEntityDataProvider.prototype.insertBatch = function (batch, e, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var cols, _loop_1, _a, _b, x, insertObjects, batch_1, batch_1_1, row, insertObject, cols_1, cols_1_1, x, v, key, e_7_1, e_8_1, insert, wantRows, result, ids;
-            var e_9, _c, e_8, _d, e_7, _e;
+            var cols, _loop_1, _a, _b, x, insertObjects, batch_1, batch_1_1, row, insertObject, cols_1, cols_1_1, x, v, key, e_5_1, e_6_1, insert, wantRows, result, ids;
+            var e_7, _c, e_6, _d, e_5, _e;
             var _this = this;
             return tslib_1.__generator(this, function (_f) {
                 switch (_f.label) {
@@ -541,8 +520,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                             if ((0, filter_consumer_bridge_to_sql_request_js_2.isDbReadonly)(x, e))
                                 return "continue";
                             if (batch.some(function (row) {
-                                return translateValueAndHandleArrayAndHandleArray(x, row[x.key]) !=
-                                    undefined;
+                                return translateValueAndHandleArrayAndHandleArray(x, row[x.key], _this.dp.jsonColumnStorage) != undefined;
                             }))
                                 cols.push(x);
                         };
@@ -552,12 +530,12 @@ var KnexEntityDataProvider = /** @class */ (function () {
                                 _loop_1(x);
                             }
                         }
-                        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_9) throw e_9.error; }
+                            finally { if (e_7) throw e_7.error; }
                         }
                         insertObjects = [];
                         _f.label = 1;
@@ -572,12 +550,12 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         _f.label = 3;
                     case 3:
                         _f.trys.push([3, 8, 9, 10]);
-                        cols_1 = (e_7 = void 0, tslib_1.__values(cols)), cols_1_1 = cols_1.next();
+                        cols_1 = (e_5 = void 0, tslib_1.__values(cols)), cols_1_1 = cols_1.next();
                         _f.label = 4;
                     case 4:
                         if (!!cols_1_1.done) return [3 /*break*/, 7];
                         x = cols_1_1.value;
-                        v = translateValueAndHandleArrayAndHandleArray(x, row[x.key]);
+                        v = translateValueAndHandleArrayAndHandleArray(x, row[x.key], this.dp.jsonColumnStorage);
                         return [4 /*yield*/, e.$dbNameOf(x)];
                     case 5:
                         key = _f.sent();
@@ -593,14 +571,14 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_7_1 = _f.sent();
-                        e_7 = { error: e_7_1 };
+                        e_5_1 = _f.sent();
+                        e_5 = { error: e_5_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
                             if (cols_1_1 && !cols_1_1.done && (_e = cols_1.return)) _e.call(cols_1);
                         }
-                        finally { if (e_7) throw e_7.error; }
+                        finally { if (e_5) throw e_5.error; }
                         return [7 /*endfinally*/];
                     case 10:
                         insertObjects.push(insertObject);
@@ -610,14 +588,14 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 12: return [3 /*break*/, 15];
                     case 13:
-                        e_8_1 = _f.sent();
-                        e_8 = { error: e_8_1 };
+                        e_6_1 = _f.sent();
+                        e_6 = { error: e_6_1 };
                         return [3 /*break*/, 15];
                     case 14:
                         try {
                             if (batch_1_1 && !batch_1_1.done && (_d = batch_1.return)) _d.call(batch_1);
                         }
-                        finally { if (e_8) throw e_8.error; }
+                        finally { if (e_6) throw e_6.error; }
                         return [7 /*endfinally*/];
                     case 15:
                         insert = this.getEntityFrom(e).insert(insertObjects);
@@ -627,9 +605,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 16:
                         result = _f.sent();
                         ids = result.map(function (r) {
-                            return r && typeof r === 'object'
-                                ? r[_this.entity.idMetadata.field.dbName]
-                                : r;
+                            return r && typeof r === 'object' ? r[_this.entity.idMetadata.field.dbName] : r;
                         });
                         return [2 /*return*/, this.loadRowsByIds(ids)];
                     case 17: return [4 /*yield*/, insert];
@@ -668,8 +644,8 @@ var KnexEntityDataProvider = /** @class */ (function () {
     //@internal
     KnexEntityDataProvider.prototype.insertOne = function (data, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, insertObject, _a, _b, x, v, key, e_10_1, insert, newId_1, result, result;
-            var e_10, _c;
+            var e, insertObject, _a, _b, x, v, key, e_8_1, insert, newId_1, result, result;
+            var e_8, _c;
             var _this = this;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
@@ -688,7 +664,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         if (!(0, filter_consumer_bridge_to_sql_request_js_2.isDbReadonly)(x, e)) return [3 /*break*/, 4];
                         return [3 /*break*/, 6];
                     case 4:
-                        v = translateValueAndHandleArrayAndHandleArray(x, data[x.key]);
+                        v = translateValueAndHandleArrayAndHandleArray(x, data[x.key], this.dp.jsonColumnStorage);
                         if (!(v != undefined)) return [3 /*break*/, 6];
                         return [4 /*yield*/, e.$dbNameOf(x)];
                     case 5:
@@ -700,14 +676,14 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [3 /*break*/, 3];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_10_1 = _d.sent();
-                        e_10 = { error: e_10_1 };
+                        e_8_1 = _d.sent();
+                        e_8 = { error: e_8_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_10) throw e_10.error; }
+                        finally { if (e_8) throw e_8.error; }
                         return [7 /*endfinally*/];
                     case 10:
                         insert = this.getEntityFrom(e).insert(insertObject);
@@ -748,17 +724,18 @@ var KnexEntityDataProvider = /** @class */ (function () {
     return KnexEntityDataProvider;
 }());
 var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
-    function FilterConsumerBridgeToKnexRequest(innerNameProvider, rawSqlWrapIdentifier) {
+    function FilterConsumerBridgeToKnexRequest(innerNameProvider, rawSqlWrapIdentifier, jsonColumnStorage) {
         this.innerNameProvider = innerNameProvider;
         this.rawSqlWrapIdentifier = rawSqlWrapIdentifier;
+        this.jsonColumnStorage = jsonColumnStorage;
         this._addWhere = true;
         this.promises = [];
         this.result = [];
     }
     FilterConsumerBridgeToKnexRequest.prototype.resolveWhere = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var p, p_1, p_1_1, pr, e_11_1;
-            var e_11, _a;
+            var p, p_1, p_1_1, pr, e_9_1;
+            var e_9, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -768,7 +745,7 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
                         _b.label = 1;
                     case 1:
                         _b.trys.push([1, 6, 7, 8]);
-                        p_1 = (e_11 = void 0, tslib_1.__values(p)), p_1_1 = p_1.next();
+                        p_1 = (e_9 = void 0, tslib_1.__values(p)), p_1_1 = p_1.next();
                         _b.label = 2;
                     case 2:
                         if (!!p_1_1.done) return [3 /*break*/, 5];
@@ -782,14 +759,14 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_11_1 = _b.sent();
-                        e_11 = { error: e_11_1 };
+                        e_9_1 = _b.sent();
+                        e_9 = { error: e_9_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (p_1_1 && !p_1_1.done && (_a = p_1.return)) _a.call(p_1);
                         }
-                        finally { if (e_11) throw e_11.error; }
+                        finally { if (e_9) throw e_9.error; }
                         return [7 /*endfinally*/];
                     case 8: return [3 /*break*/, 0];
                     case 9: return [2 /*return*/, this.result];
@@ -803,8 +780,8 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
     FilterConsumerBridgeToKnexRequest.prototype.or = function (orElements) {
         var _this = this;
         this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var result, _loop_2, this_1, orElements_1, orElements_1_1, element, state_1, e_12_1;
-            var e_12, _a;
+            var result, _loop_2, this_1, orElements_1, orElements_1_1, element, state_1, e_10_1;
+            var e_10, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -814,7 +791,7 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
                             return tslib_1.__generator(this, function (_c) {
                                 switch (_c.label) {
                                     case 0:
-                                        f = new FilterConsumerBridgeToKnexRequest(this_1.innerNameProvider, this_1.rawSqlWrapIdentifier);
+                                        f = new FilterConsumerBridgeToKnexRequest(this_1.innerNameProvider, this_1.rawSqlWrapIdentifier, this_1.jsonColumnStorage);
                                         f._addWhere = false;
                                         element.__applyToConsumer(f);
                                         return [4 /*yield*/, f.resolveWhere()];
@@ -853,14 +830,14 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_12_1 = _b.sent();
-                        e_12 = { error: e_12_1 };
+                        e_10_1 = _b.sent();
+                        e_10 = { error: e_10_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (orElements_1_1 && !orElements_1_1.done && (_a = orElements_1.return)) _a.call(orElements_1);
                         }
-                        finally { if (e_12) throw e_12.error; }
+                        finally { if (e_10) throw e_10.error; }
                         return [7 /*endfinally*/];
                     case 8:
                         if (result.length > 0) {
@@ -878,7 +855,7 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        f = new FilterConsumerBridgeToKnexRequest(this.innerNameProvider, this.rawSqlWrapIdentifier);
+                        f = new FilterConsumerBridgeToKnexRequest(this.innerNameProvider, this.rawSqlWrapIdentifier, this.jsonColumnStorage);
                         f._addWhere = false;
                         element.__applyToConsumer(f);
                         return [4 /*yield*/, f.resolveWhere()];
@@ -911,7 +888,9 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
     FilterConsumerBridgeToKnexRequest.prototype.isIn = function (col, val) {
         var _this = this;
         this.result.push(function (knex) {
-            return knex.whereIn(_this.innerNameProvider.$dbNameOf(col), val.map(function (x) { return translateValueAndHandleArrayAndHandleArray(col, x); }));
+            return knex.whereIn(_this.innerNameProvider.$dbNameOf(col), val.map(function (x) {
+                return translateValueAndHandleArrayAndHandleArray(col, x, _this.jsonColumnStorage);
+            }));
         });
     };
     FilterConsumerBridgeToKnexRequest.prototype.isEqualTo = function (col, val) {
@@ -933,52 +912,26 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
         this.add(col, val, '<');
     };
     FilterConsumerBridgeToKnexRequest.prototype.containsCaseInsensitive = function (col, val) {
-        var _this = this;
-        this.result.push(function (b) {
-            return b.whereRaw('lower (' +
-                b.client.ref(_this.innerNameProvider.$dbNameOf(col)) +
-                ") like lower ('%" +
-                val.replace(/'/g, "''") +
-                "%')");
-        });
-        this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
-            return [2 /*return*/];
-        }); }); })());
+        this.like(col, '%' + (0, filter_consumer_bridge_to_sql_request_js_1.escapeLike)(val) + '%');
     };
     FilterConsumerBridgeToKnexRequest.prototype.notContainsCaseInsensitive = function (col, val) {
-        var _this = this;
-        this.result.push(function (b) {
-            return b.whereRaw('not lower (' +
-                b.client.ref(_this.innerNameProvider.$dbNameOf(col)) +
-                ") like lower ('%" +
-                val.replace(/'/g, "''") +
-                "%')");
-        });
-        this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
-            return [2 /*return*/];
-        }); }); })());
+        this.like(col, '%' + (0, filter_consumer_bridge_to_sql_request_js_1.escapeLike)(val) + '%', 'not ');
     };
     FilterConsumerBridgeToKnexRequest.prototype.startsWithCaseInsensitive = function (col, val) {
-        var _this = this;
-        this.result.push(function (b) {
-            return b.whereRaw('lower (' +
-                b.client.ref(_this.innerNameProvider.$dbNameOf(col)) +
-                ") like lower ('" +
-                val.replace(/'/g, "''") +
-                "%')");
-        });
-        this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
-            return [2 /*return*/];
-        }); }); })());
+        this.like(col, (0, filter_consumer_bridge_to_sql_request_js_1.escapeLike)(val) + '%');
     };
     FilterConsumerBridgeToKnexRequest.prototype.endsWithCaseInsensitive = function (col, val) {
+        this.like(col, '%' + (0, filter_consumer_bridge_to_sql_request_js_1.escapeLike)(val));
+    };
+    FilterConsumerBridgeToKnexRequest.prototype.like = function (col, pattern, not) {
         var _this = this;
+        if (not === void 0) { not = ''; }
         this.result.push(function (b) {
-            return b.whereRaw('lower (' +
+            return b.whereRaw(not +
+                'lower (' +
                 b.client.ref(_this.innerNameProvider.$dbNameOf(col)) +
-                ") like lower ('%" +
-                val.replace(/'/g, "''") +
-                "')");
+                ') like lower (?)' +
+                filter_consumer_bridge_to_sql_request_js_1.LIKE_ESCAPE_SQL, [pattern]);
         });
         this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
             return [2 /*return*/];
@@ -987,7 +940,7 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
     FilterConsumerBridgeToKnexRequest.prototype.add = function (col, val, operator) {
         var _this = this;
         this.result.push(function (b) {
-            return b.where(_this.innerNameProvider.$dbNameOf(col), operator, translateValueAndHandleArrayAndHandleArray(col, val));
+            return b.where(_this.innerNameProvider.$dbNameOf(col), operator, translateValueAndHandleArrayAndHandleArray(col, val, _this.jsonColumnStorage));
         });
     };
     FilterConsumerBridgeToKnexRequest.prototype.databaseCustom = function (databaseCustom) {
@@ -1006,7 +959,7 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
                     case 2:
                         if (!(databaseCustom === null || databaseCustom === void 0 ? void 0 : databaseCustom.buildSql)) return [3 /*break*/, 4];
                         r_2 = new KnexCommandHelper();
-                        item = new filter_consumer_bridge_to_sql_request_js_1.CustomSqlFilterBuilder(r_2, this.rawSqlWrapIdentifier);
+                        item = new filter_consumer_bridge_to_sql_request_js_1.CustomSqlFilterBuilder(r_2, this.rawSqlWrapIdentifier, this.jsonColumnStorage);
                         return [4 /*yield*/, databaseCustom.buildSql(item)];
                     case 3:
                         sql_1 = _c.sent();
@@ -1030,8 +983,8 @@ var KnexSchemaBuilder = /** @class */ (function () {
     }
     KnexSchemaBuilder.prototype.ensureSchema = function (entities) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var entities_1, entities_1_1, entity, e, err_2, e_13_1;
-            var e_13, _a;
+            var entities_1, entities_1_1, entity, e, err_2, e_11_1;
+            var e_11, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1065,14 +1018,14 @@ var KnexSchemaBuilder = /** @class */ (function () {
                         return [3 /*break*/, 1];
                     case 9: return [3 /*break*/, 12];
                     case 10:
-                        e_13_1 = _b.sent();
-                        e_13 = { error: e_13_1 };
+                        e_11_1 = _b.sent();
+                        e_11 = { error: e_11_1 };
                         return [3 /*break*/, 12];
                     case 11:
                         try {
                             if (entities_1_1 && !entities_1_1.done && (_a = entities_1.return)) _a.call(entities_1);
                         }
-                        finally { if (e_13) throw e_13.error; }
+                        finally { if (e_11) throw e_11.error; }
                         return [7 /*endfinally*/];
                     case 12: return [2 /*return*/];
                 }
@@ -1100,7 +1053,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
         });
     };
     KnexSchemaBuilder.prototype.createTableKnexCommand = function (entity, e) {
-        var e_14, _a;
+        var e_12, _a;
         var _this = this;
         var cols = new Map();
         try {
@@ -1112,15 +1065,15 @@ var KnexSchemaBuilder = /** @class */ (function () {
                 });
             }
         }
-        catch (e_14_1) { e_14 = { error: e_14_1 }; }
+        catch (e_12_1) { e_12 = { error: e_12_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_14) throw e_14.error; }
+            finally { if (e_12) throw e_12.error; }
         }
         return this.knex.schema.createTable(e.$entityName, function (b) {
-            var e_15, _a;
+            var e_13, _a;
             try {
                 for (var _b = tslib_1.__values(entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var x = _c.value;
@@ -1133,12 +1086,12 @@ var KnexSchemaBuilder = /** @class */ (function () {
                     }
                 }
             }
-            catch (e_15_1) { e_15 = { error: e_15_1 }; }
+            catch (e_13_1) { e_13 = { error: e_13_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_15) throw e_15.error; }
+                finally { if (e_13) throw e_13.error; }
             }
             b.primary(entity.idMetadata.fields.map(function (f) { return e.$dbNameOf(f); }));
         });
@@ -1175,8 +1128,8 @@ var KnexSchemaBuilder = /** @class */ (function () {
     };
     KnexSchemaBuilder.prototype.verifyAllColumns = function (entity) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, _loop_3, this_2, _a, _b, col, e_16_1, err_3;
-            var e_16, _c;
+            var e, _loop_3, this_2, _a, _b, col, e_14_1, err_3;
+            var e_14, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_2.dbNamesOf)(entity, function (x) { return x; })];
@@ -1216,14 +1169,14 @@ var KnexSchemaBuilder = /** @class */ (function () {
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_16_1 = _d.sent();
-                        e_16 = { error: e_16_1 };
+                        e_14_1 = _d.sent();
+                        e_14 = { error: e_14_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_16) throw e_16.error; }
+                        finally { if (e_14) throw e_14.error; }
                         return [7 /*endfinally*/];
                     case 10: return [3 /*break*/, 12];
                     case 11:
@@ -1349,7 +1302,7 @@ function knexMaxParametersInOneSqlStatement(knex) {
     return defaultMaxParametersInOneSqlStatement;
 }
 function splitByMaxParameters(items, parametersInItem, maxParameters) {
-    var e_17, _a;
+    var e_15, _a;
     var batches = [];
     var batch = [];
     var params = 0;
@@ -1366,40 +1319,41 @@ function splitByMaxParameters(items, parametersInItem, maxParameters) {
             params += n;
         }
     }
-    catch (e_17_1) { e_17 = { error: e_17_1 }; }
+    catch (e_15_1) { e_15 = { error: e_15_1 }; }
     finally {
         try {
             if (items_1_1 && !items_1_1.done && (_a = items_1.return)) _a.call(items_1);
         }
-        finally { if (e_17) throw e_17.error; }
+        finally { if (e_15) throw e_15.error; }
     }
     if (batch.length)
         batches.push(batch);
     return batches;
 }
-function countKnexInsertBindParameters(entity, e, row) {
-    var e_18, _a;
+function countKnexInsertBindParameters(entity, e, row, storage) {
+    var e_16, _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_2.isDbReadonly)(x, e))
                 continue;
-            if (translateValueAndHandleArrayAndHandleArray(x, row[x.key]) != undefined)
+            if (translateValueAndHandleArrayAndHandleArray(x, row[x.key], storage) !=
+                undefined)
                 n++;
         }
     }
-    catch (e_18_1) { e_18 = { error: e_18_1 }; }
+    catch (e_16_1) { e_16 = { error: e_16_1 }; }
     finally {
         try {
             if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_18) throw e_18.error; }
+        finally { if (e_16) throw e_16.error; }
     }
     return n;
 }
-function translateValueAndHandleArrayAndHandleArray(field, val) {
-    var result = field.valueConverter.toDb(val);
+function translateValueAndHandleArrayAndHandleArray(field, val, storage) {
+    var result = (0, valueConverters_js_1.toDbColumn)(field, val, storage);
     if (Array.isArray(result))
         return JSON.stringify(result);
     return result;