remult 3.2.3 → 3.3.0

package/src/data-providers/rest-data-provider.d.ts

@@ -2,7 +2,7 @@ import type { DataProvider, EntityDataProvider, EntityDataProviderGroupByOptions
 import { UrlBuilder } from '../../urlBuilder.js';
 import type { ApiClient } from '../context.js';
 import { Filter } from '../filter/filter-interfaces.js';
-import type { EntityMetadata } from '../remult3/remult3.js';
+import type { EntityMetadata, InsertOrUpdateOptions } from '../remult3/remult3.js';
 export declare class RestDataProvider implements DataProvider {
     private apiProvider;
     private entityRequested?;
@@ -33,11 +33,11 @@ export declare class RestEntityDataProvider implements EntityDataProvider, Proxy
         set: any;
     }[]): Promise<any[]>;
     find(options?: EntityDataProviderFindOptions): Promise<Array<any>>;
-    update(id: any, data: any): Promise<any>;
+    update(id: any, data: any, options?: InsertOrUpdateOptions): Promise<any>;
     private toJsonOfIncludedKeys;
     delete(id: any): Promise<void>;
-    insert(data: any): Promise<any>;
-    insertMany(data: any[]): Promise<any[]>;
+    insert(data: any, options?: InsertOrUpdateOptions): Promise<any>;
+    insertMany(data: any[], options?: InsertOrUpdateOptions): Promise<any[]>;
 }
 export declare function addFilterToUrlAndReturnTrueIfSuccessful(filter: any, url: UrlBuilder): boolean;
 export declare const liveQueryAction = "liveQuery-";

package/src/data-providers/rest-data-provider.js

@@ -82,6 +82,7 @@ function findOptionsFromJson(json, meta) {
             'orderBy',
             'include',
             'select',
+            'args',
         ]), _c = _b.next(); !_c.done; _c = _b.next()) {
             var key = _c.value;
             if (json[key] !== undefined) {
@@ -286,36 +287,42 @@ var RestEntityDataProvider = /** @class */ (function () {
         var url = new urlBuilder_js_1.UrlBuilder(this.url());
         var filterObject;
         if (options) {
-            if (options.where) {
-                filterObject = options.where.toJson(); //        options.where.__applyToConsumer(new FilterConsumnerBridgeToUrlBuilder(url));
-                if (addFilterToUrlAndReturnTrueIfSuccessful(filterObject, url))
-                    filterObject = undefined;
+            if (options.where === 'all') {
+                filterObject = 'all';
             }
-            if (options.orderBy && options.orderBy.Segments) {
-                var sort_1 = '';
-                var order_1 = '';
-                var hasDescending_1 = false;
-                options.orderBy.Segments.forEach(function (c) {
-                    if (sort_1.length > 0) {
-                        sort_1 += ',';
-                        order_1 += ',';
-                    }
-                    sort_1 += c.field.key;
-                    order_1 += c.isDescending ? 'desc' : 'asc';
-                    if (c.isDescending)
-                        hasDescending_1 = true;
-                });
-                if (sort_1)
-                    url.add('_sort', sort_1);
-                if (hasDescending_1)
-                    url.add('_order', order_1);
-            }
-            if (options.limit)
-                url.add('_limit', options.limit);
-            if (options.page)
-                url.add('_page', options.page);
-            if (options.select) {
-                url.add('_select', options.select.join(','));
+            else {
+                if (options.where) {
+                    filterObject = options.where.toJson();
+                    if (options.args === undefined)
+                        if (addFilterToUrlAndReturnTrueIfSuccessful(filterObject, url))
+                            filterObject = undefined;
+                }
+                if (options.orderBy && options.orderBy.Segments) {
+                    var sort_1 = '';
+                    var order_1 = '';
+                    var hasDescending_1 = false;
+                    options.orderBy.Segments.forEach(function (c) {
+                        if (sort_1.length > 0) {
+                            sort_1 += ',';
+                            order_1 += ',';
+                        }
+                        sort_1 += c.field.key;
+                        order_1 += c.isDescending ? 'desc' : 'asc';
+                        if (c.isDescending)
+                            hasDescending_1 = true;
+                    });
+                    if (sort_1)
+                        url.add('_sort', sort_1);
+                    if (hasDescending_1)
+                        url.add('_order', order_1);
+                }
+                if (options.limit)
+                    url.add('_limit', options.limit);
+                if (options.page)
+                    url.add('_page', options.page);
+                if (options.select) {
+                    url.add('_select', options.select.join(','));
+                }
             }
         }
         var run = function (action, body) {
@@ -332,6 +339,8 @@ var RestEntityDataProvider = /** @class */ (function () {
                 else
                     body = tslib_1.__assign(tslib_1.__assign({}, body), { where: filterObject });
             }
+            if (options && 'args' in options)
+                body.args = options.args;
             if (body && method != 'put')
                 return _this.http().post(u.url, body);
             else
@@ -366,11 +375,17 @@ var RestEntityDataProvider = /** @class */ (function () {
             }); },
         };
     };
-    RestEntityDataProvider.prototype.update = function (id, data) {
+    RestEntityDataProvider.prototype.update = function (id, data, options) {
         var _this = this;
+        var urlArgs = [];
+        if (id == '')
+            urlArgs.push('__action=emptyId');
+        if ((options === null || options === void 0 ? void 0 : options.select) === 'none')
+            urlArgs.push('_select=$none');
         return this.http()
             .put(this.url() +
-            (id != '' ? '/' + encodeURIComponent(id) : '?__action=emptyId'), this.toJsonOfIncludedKeys(data))
+            (id != '' ? '/' + encodeURIComponent(id) : '') +
+            (urlArgs.length > 0 ? '?' + urlArgs.join('&') : ''), this.toJsonOfIncludedKeys(data))
             .then(function (y) { return _this.translateFromJson(y); });
     };
     RestEntityDataProvider.prototype.toJsonOfIncludedKeys = function (data) {
@@ -409,16 +424,16 @@ var RestEntityDataProvider = /** @class */ (function () {
             });
         });
     };
-    RestEntityDataProvider.prototype.insert = function (data) {
+    RestEntityDataProvider.prototype.insert = function (data, options) {
         var _this = this;
         return this.http()
-            .post(this.url(), this.translateToJson(data))
+            .post(this.url() + ((options === null || options === void 0 ? void 0 : options.select) === 'none' ? '?_select=$none' : ''), this.translateToJson(data))
             .then(function (y) { return _this.translateFromJson(y); });
     };
-    RestEntityDataProvider.prototype.insertMany = function (data) {
+    RestEntityDataProvider.prototype.insertMany = function (data, options) {
         var _this = this;
         return this.http()
-            .post(this.url(), data.map(function (data) { return _this.translateToJson(data); }))
+            .post(this.url() + ((options === null || options === void 0 ? void 0 : options.select) === 'none' ? '?_select=$none' : ''), data.map(function (data) { return _this.translateToJson(data); }))
             .then(function (y) { return y.map(function (y) { return _this.translateFromJson(y); }); });
     };
     return RestEntityDataProvider;

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

@@ -13,6 +13,7 @@ var sort_js_1 = require("../sort.js");
 var valueConverters_js_1 = require("../valueConverters.js");
 var repository_internals_js_1 = require("../remult3/repository-internals.js");
 var isOfType_js_1 = require("../isOfType.js");
+var fieldDbName_js_1 = require("../filter/fieldDbName.js");
 /**
  * A DataProvider for Sql Databases
  * @example
@@ -413,78 +414,100 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
     };
     ActualSQLEntityDataProvider.prototype.find = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, _a, colKeys, select, r, where, _b, first, segs, _c, _d, s, segs_1, segs_1_1, c, page;
-            var e_2, _e, e_3, _f;
+            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 (_g) {
-                switch (_g.label) {
+            return tslib_1.__generator(this, function (_j) {
+                switch (_j.label) {
                     case 0: return [4 /*yield*/, this.init()];
                     case 1:
-                        e = _g.sent();
-                        _a = this.buildSelect(e, options === null || options === void 0 ? void 0 : options.select), colKeys = _a.colKeys, select = _a.select;
+                        e = _j.sent();
+                        r = this.sql.createCommand();
+                        return [4 /*yield*/, this.buildSelect(e, r, options === null || options === void 0 ? void 0 : options.select, options === null || options === void 0 ? void 0 : options.args)];
+                    case 2:
+                        _a = _j.sent(), colKeys = _a.colKeys, select = _a.select;
                         select = 'select ' + select;
                         select += '\n from ' + e.$entityName;
-                        r = this.sql.createCommand();
-                        if (!options) return [3 /*break*/, 4];
-                        if (!options.where) return [3 /*break*/, 3];
+                        if (!options) return [3 /*break*/, 15];
+                        if (!options.where) return [3 /*break*/, 4];
                         where = new filter_consumer_bridge_to_sql_request_js_1.FilterConsumerBridgeToSqlRequest(r, e);
                         options.where.__applyToConsumer(where);
                         _b = select;
                         return [4 /*yield*/, where.resolveWhere()];
-                    case 2:
-                        select = _b + _g.sent();
-                        _g.label = 3;
                     case 3:
+                        select = _b + _j.sent();
+                        _j.label = 4;
+                    case 4:
                         if (options.limit) {
                             options.orderBy = sort_js_1.Sort.createUniqueSort(this.entity, options.orderBy);
                         }
                         if (!options.orderBy) {
                             options.orderBy = sort_js_1.Sort.createUniqueSort(this.entity, new sort_js_1.Sort());
                         }
-                        if (options.orderBy) {
-                            first = true;
-                            segs = [];
-                            try {
-                                for (_c = tslib_1.__values(options.orderBy.Segments), _d = _c.next(); !_d.done; _d = _c.next()) {
-                                    s = _d.value;
-                                    segs.push(s);
-                                }
-                            }
-                            catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                            finally {
-                                try {
-                                    if (_d && !_d.done && (_e = _c.return)) _e.call(_c);
-                                }
-                                finally { if (e_2) throw e_2.error; }
+                        if (!options.orderBy) return [3 /*break*/, 14];
+                        first = true;
+                        segs = [];
+                        try {
+                            for (_c = tslib_1.__values(options.orderBy.Segments), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                s = _d.value;
+                                segs.push(s);
                             }
+                        }
+                        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                        finally {
                             try {
-                                for (segs_1 = tslib_1.__values(segs), segs_1_1 = segs_1.next(); !segs_1_1.done; segs_1_1 = segs_1.next()) {
-                                    c = segs_1_1.value;
-                                    if (first) {
-                                        select += ' Order By ';
-                                        first = false;
-                                    }
-                                    else
-                                        select += ', ';
-                                    select += e.$dbNameOf(c.field);
-                                    if (c.isDescending)
-                                        select += ' desc';
-                                    if (this.sql._getSourceSql().orderByNullsFirst) {
-                                        if (c.isDescending)
-                                            select += ' nulls last';
-                                        else
-                                            select += ' nulls first';
-                                    }
-                                }
-                            }
-                            catch (e_3_1) { e_3 = { error: e_3_1 }; }
-                            finally {
-                                try {
-                                    if (segs_1_1 && !segs_1_1.done && (_f = segs_1.return)) _f.call(segs_1);
-                                }
-                                finally { if (e_3) throw e_3.error; }
+                                if (_d && !_d.done && (_g = _c.return)) _g.call(_c);
                             }
+                            finally { if (e_3) throw e_3.error; }
                         }
+                        _j.label = 5;
+                    case 5:
+                        _j.trys.push([5, 12, 13, 14]);
+                        segs_1 = tslib_1.__values(segs), segs_1_1 = segs_1.next();
+                        _j.label = 6;
+                    case 6:
+                        if (!!segs_1_1.done) return [3 /*break*/, 11];
+                        c = segs_1_1.value;
+                        if (first) {
+                            select += ' Order By ';
+                            first = false;
+                        }
+                        else
+                            select += ', ';
+                        _e = select;
+                        if (!c.field.options.sqlExpression) return [3 /*break*/, 7];
+                        _f = c.field.options.key;
+                        return [3 /*break*/, 9];
+                    case 7: return [4 /*yield*/, e.$dbNameOf(c.field)];
+                    case 8:
+                        _f = _j.sent();
+                        _j.label = 9;
+                    case 9:
+                        select = _e + _f;
+                        if (c.isDescending)
+                            select += ' desc';
+                        if (this.sql._getSourceSql().orderByNullsFirst) {
+                            if (c.isDescending)
+                                select += ' nulls last';
+                            else
+                                select += ' nulls first';
+                        }
+                        _j.label = 10;
+                    case 10:
+                        segs_1_1 = segs_1.next();
+                        return [3 /*break*/, 6];
+                    case 11: return [3 /*break*/, 14];
+                    case 12:
+                        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_2) throw e_2.error; }
+                        return [7 /*endfinally*/];
+                    case 14:
                         if (options.limit) {
                             page = 1;
                             if (options.page)
@@ -495,8 +518,8 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                                 ' ' +
                                     this.strategy.getLimitSqlSyntax(options.limit, (page - 1) * options.limit);
                         }
-                        _g.label = 4;
-                    case 4: return [2 /*return*/, r.execute(select).then(function (r) {
+                        _j.label = 15;
+                    case 15: return [2 /*return*/, r.execute(select).then(function (r) {
                             return r.rows.map(function (y) {
                                 return _this.buildResultRow(colKeys, y, r);
                             });
@@ -518,37 +541,67 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
         }
         return result;
     };
-    ActualSQLEntityDataProvider.prototype.buildSelect = function (e, selectedFields) {
-        var e_4, _a;
-        var select = '';
-        var colKeys = [];
-        try {
-            for (var _b = tslib_1.__values(this.entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var x = _c.value;
-                if (selectedFields && !selectedFields.includes(x.key))
-                    continue;
-                if (x.isServerExpression) {
-                }
-                else {
-                    if (colKeys.length > 0)
-                        select += ', ';
-                    select += e.$dbNameOf(x);
-                    if (x.options.sqlExpression)
-                        select += ' as ' + x.key;
-                    colKeys.push(x);
+    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_4_1;
+            var e_4, _c;
+            return tslib_1.__generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        select = '';
+                        colKeys = [];
+                        _d.label = 1;
+                    case 1:
+                        _d.trys.push([1, 9, 10, 11]);
+                        _a = tslib_1.__values(this.entity.fields), _b = _a.next();
+                        _d.label = 2;
+                    case 2:
+                        if (!!_b.done) return [3 /*break*/, 8];
+                        x = _b.value;
+                        if (selectedFields && !selectedFields.includes(x.key))
+                            return [3 /*break*/, 7];
+                        if (!x.isServerExpression) return [3 /*break*/, 3];
+                        return [3 /*break*/, 7];
+                    case 3:
+                        if (colKeys.length > 0)
+                            select += ', ';
+                        if (!(typeof x.options.sqlExpression === 'function')) return [3 /*break*/, 5];
+                        return [4 /*yield*/, x[fieldDbName_js_1.originalSqlExpressionKey](this.entity, args, r)];
+                    case 4:
+                        sql = _d.sent();
+                        if (sql.includes(' '))
+                            select += '(' + sql + ')';
+                        else
+                            select += sql;
+                        return [3 /*break*/, 6];
+                    case 5:
+                        select += e.$dbNameOf(x);
+                        _d.label = 6;
+                    case 6:
+                        if (x.options.sqlExpression)
+                            select += ' as ' + x.key;
+                        colKeys.push(x);
+                        _d.label = 7;
+                    case 7:
+                        _b = _a.next();
+                        return [3 /*break*/, 2];
+                    case 8: return [3 /*break*/, 11];
+                    case 9:
+                        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_4) throw e_4.error; }
+                        return [7 /*endfinally*/];
+                    case 11: return [2 /*return*/, { colKeys: colKeys, select: select }];
                 }
-            }
-        }
-        catch (e_4_1) { e_4 = { error: e_4_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_4) throw e_4.error; }
-        }
-        return { colKeys: colKeys, select: select };
+            });
+        });
     };
-    ActualSQLEntityDataProvider.prototype.update = function (id, data) {
+    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_5, _e;
@@ -573,7 +626,7 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                                             added = true;
                                         else
                                             statement += ', ';
-                                        statement += e.$dbNameOf(x) + ' = ' + r.param(v);
+                                        statement += e.$dbNameOf(x) + ' = ' + (0, filter_consumer_bridge_to_sql_request_js_1.toDbSql)(r, x, v);
                                     }
                                 }
                             }
@@ -592,10 +645,14 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                         return [4 /*yield*/, f.resolveWhere()];
                     case 2:
                         statement = _c + _f.sent();
-                        _d = this.buildSelect(e), colKeys = _d.colKeys, select = _d.select;
+                        return [4 /*yield*/, this.buildSelect(e, r, undefined, undefined)];
+                    case 3:
+                        _d = _f.sent(), colKeys = _d.colKeys, select = _d.select;
                         returning = true;
                         if (this.sql._getSourceSql().doesNotSupportReturningSyntax)
                             returning = false;
+                        if ((options === null || options === void 0 ? void 0 : options.select) === 'none')
+                            returning = false;
                         if (returning &&
                             this.sql._getSourceSql().doesNotSupportReturningSyntaxOnlyForUpdate)
                             returning = false;
@@ -605,6 +662,8 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                                 var _a, _b;
                                 (_b = (_a = _this.sql._getSourceSql()).afterMutation) === null || _b === void 0 ? void 0 : _b.call(_a);
                                 if (!returning) {
+                                    if ((options === null || options === void 0 ? void 0 : options.select) === 'none')
+                                        return undefined;
                                     return getRowAfterUpdate(_this.entity, _this, data, id, 'update');
                                 }
                                 if (sqlResult.rows.length != 1)
@@ -643,7 +702,7 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
             });
         });
     };
-    ActualSQLEntityDataProvider.prototype.insert = function (data) {
+    ActualSQLEntityDataProvider.prototype.insert = function (data, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, r, cols, vals, added, _a, _b, x, v, statement, _c, colKeys, select;
             var e_6, _d;
@@ -672,7 +731,7 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                                             vals += ', ';
                                         }
                                         cols += e.$dbNameOf(x);
-                                        vals += r.param(v);
+                                        vals += (0, filter_consumer_bridge_to_sql_request_js_1.toDbSql)(r, x, v);
                                     }
                                 }
                             }
@@ -685,8 +744,11 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                             finally { if (e_6) throw e_6.error; }
                         }
                         statement = "insert into ".concat(e.$entityName, " (").concat(cols, ") values (").concat(vals, ")");
-                        _c = this.buildSelect(e), colKeys = _c.colKeys, select = _c.select;
-                        if (!this.sql._getSourceSql().doesNotSupportReturningSyntax)
+                        return [4 /*yield*/, this.buildSelect(e, r, undefined, undefined)];
+                    case 2:
+                        _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;
@@ -697,6 +759,8 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                                         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);
@@ -704,12 +768,16 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                                         }).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 2: return [2 /*return*/, _e.sent()];
+                    case 3: return [2 /*return*/, _e.sent()];
                 }
             });
         });

package/src/filter/fieldDbName.d.ts

@@ -1,3 +1,4 @@
-import type { EntityMetadata } from "../remult3/remult3.js";
+import type { EntityMetadata } from '../remult3/remult3.js';
 import type { FieldMetadata } from '../column-interfaces.js';
+export declare const originalSqlExpressionKey: unique symbol;
 export declare function fieldDbName(f: FieldMetadata, meta: EntityMetadata, wrapIdentifier?: (name: string) => string, forceSqlExpression?: boolean): Promise<string>;

package/src/filter/fieldDbName.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.originalSqlExpressionKey = void 0;
 exports.fieldDbName = fieldDbName;
 var tslib_1 = require("tslib");
 var relationInfoMember_js_1 = require("../remult3/relationInfoMember.js");
 var sqlExpressionInProgressKey = Symbol.for("sqlExpressionInProgressKey");
+exports.originalSqlExpressionKey = Symbol.for("originalSqlExpressionKey");
 function fieldDbName(f_1, meta_1) {
     return tslib_1.__awaiter(this, arguments, void 0, function (f, meta, wrapIdentifier, forceSqlExpression) {
         var result_1, rel, field, fInfo;
@@ -23,7 +25,9 @@ function fieldDbName(f_1, meta_1) {
                     _a.trys.push([1, , 3, 4]);
                     ;
                     f[sqlExpressionInProgressKey] = true;
-                    return [4 /*yield*/, f.options.sqlExpression(meta)];
+                    if (!f[exports.originalSqlExpressionKey])
+                        f[exports.originalSqlExpressionKey] = f.options.sqlExpression;
+                    return [4 /*yield*/, f.options.sqlExpression(meta, undefined, undefined)];
                 case 2:
                     result_1 = _a.sent();
                     if (!result_1.includes('\0'))

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

@@ -84,3 +84,4 @@ export interface dbNamesOfOptions {
 }
 export declare function dbNamesOf<entityType>(repo: EntityMetadataOverloads<entityType>, wrapIdentifierOrOptions?: ((name: string) => string) | dbNamesOfOptions): Promise<EntityDbNames<entityType>>;
 export declare function dbNamesOfWithForceSqlExpression<entityType>(repo: EntityMetadataOverloads<entityType>, wrapIdentifierOrOptions?: ((name: string) => string) | dbNamesOfOptions): Promise<EntityDbNames<entityType>>;
+export declare function toDbSql(r: SqlCommandWithParameters, field: FieldMetadata, val: any): string;

package/src/filter/filter-consumer-bridge-to-sql-request.js

@@ -6,6 +6,7 @@ exports.shouldNotCreateField = shouldNotCreateField;
 exports.shouldCreateEntity = shouldCreateEntity;
 exports.dbNamesOf = dbNamesOf;
 exports.dbNamesOfWithForceSqlExpression = dbNamesOfWithForceSqlExpression;
+exports.toDbSql = toDbSql;
 var tslib_1 = require("tslib");
 var sql_database_js_1 = require("../data-providers/sql-database.js");
 var remult_proxy_js_1 = require("../remult-proxy.js");
@@ -162,7 +163,7 @@ var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
                     this.addToWhere(this.nameProvider.$dbNameOf(col) +
                         ' in (' +
                         val
-                            .map(function (x) { return _this.r.param(col.valueConverter.toDb(x)); })
+                            .map(function (x) { return toDbSql(_this.r, col, col.valueConverter.toDb(x)); })
                             .join(',') +
                         ')');
                 else
@@ -250,7 +251,7 @@ var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
                     ' ' +
                     operator +
                     ' ' +
-                    this.r.param(col.valueConverter.toDb(val));
+                    toDbSql(this.r, col, col.valueConverter.toDb(val));
                 this.addToWhere(x);
                 return [2 /*return*/];
             });
@@ -431,3 +432,7 @@ function internalDbNamesOf(repo_1, wrapIdentifierOrOptions_1) {
         });
     });
 }
+function toDbSql(r, field, val) {
+    var _a;
+    return ((_a = field.valueConverter.toDbSql) !== null && _a !== void 0 ? _a : (function (x) { return x; }))(r.param(val));
+}

package/src/remult-proxy.js

@@ -195,11 +195,11 @@ var RemultProxy = /** @class */ (function () {
                         .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
                         .getEntityRef.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
                 },
-                _a.insert = function (args2) {
+                _a.insert = function (args2, args3) {
                     var _a;
                     return (_a = self
                         .remultFactory())
-                        .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).insert(args2);
+                        .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).insert(args2, args3);
                 },
                 _a.liveQuery = function () {
                     var _a, _b;
@@ -238,11 +238,11 @@ var RemultProxy = /** @class */ (function () {
                         .remultFactory())
                         .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).upsert(args2);
                 },
-                _a.update = function (a, b) {
+                _a.update = function (a, b, c) {
                     var _a;
                     return (_a = self
                         .remultFactory())
-                        .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).update(a, b);
+                        .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).update(a, b, c);
                 },
                 _a);
             entityCache.set(args[1], result);