remult 0.25.8 → 0.26.0

package/remult-knex/index.d.ts

@@ -1,19 +1,24 @@
 import type { Knex } from 'knex';
 import type { Remult } from '../src/context.js';
+import { type EntityDbNamesBase } from '../src/filter/filter-consumer-bridge-to-sql-request.js';
 import type { FieldMetadata } from '../src/column-interfaces.js';
 import type { DataProvider, EntityDataProvider } from '../src/data-interfaces.js';
 import type { EntityFilter, EntityMetadata } from '../src/remult3/remult3.js';
 import type { RepositoryOverloads } from '../src/remult3/RepositoryImplementation.js';
-import type { HasWrapIdentifier } from '../src/sql-command.js';
-export declare class KnexDataProvider implements DataProvider, HasWrapIdentifier {
+import type { HasWrapIdentifier, SqlCommand, SqlCommandFactory, SqlResult } from '../src/sql-command.js';
+import type { CanBuildMigrations } from '../migrations/migration-types.js';
+export declare class KnexDataProvider implements DataProvider, HasWrapIdentifier, SqlCommandFactory, CanBuildMigrations {
     knex: Knex;
     constructor(knex: Knex);
-    static getDb(remult?: Remult): Knex<any, any[]>;
+    end(): Promise<void>;
+    createCommand(): SqlCommand;
+    execute(sql: string): Promise<SqlResult>;
+    static getDb(dataProvider?: DataProvider): Knex<any, any[]>;
     wrapIdentifier: (name: string) => string;
     getEntityDataProvider(entity: EntityMetadata<any>): EntityDataProvider;
     transaction(action: (dataProvider: DataProvider) => Promise<void>): Promise<void>;
     static rawFilter(build: CustomKnexFilterBuilderFunction): EntityFilter<any>;
-    static filterToRaw<entityType>(entity: RepositoryOverloads<entityType>, condition: EntityFilter<entityType>): Promise<(knex: any) => void>;
+    static filterToRaw<entityType>(entity: RepositoryOverloads<entityType>, condition: EntityFilter<entityType>, wrapIdentifier?: (name: string) => string): Promise<(knex: any) => void>;
     isProxy?: boolean;
     ensureSchema(entities: EntityMetadata<any>[]): Promise<void>;
 }
@@ -23,7 +28,9 @@ export declare class KnexSchemaBuilder {
     verifyStructureOfAllEntities(remult?: Remult): Promise<void>;
     ensureSchema(entities: EntityMetadata<any>[]): Promise<void>;
     createIfNotExist(entity: EntityMetadata): Promise<void>;
-    addColumnIfNotExist<T extends EntityMetadata>(entity: T, c: (e: T) => FieldMetadata): Promise<void>;
+    createTableKnexCommand(entity: EntityMetadata<any>, e: EntityDbNamesBase): Knex.SchemaBuilder;
+    addColumnIfNotExist(entity: EntityMetadata, c: (e: EntityMetadata) => FieldMetadata): Promise<void>;
+    createColumnKnexCommand(e: EntityDbNamesBase, col: FieldMetadata<any, any>, colName: string): Knex.SchemaBuilder;
     verifyAllColumns<T extends EntityMetadata>(entity: T): Promise<void>;
     additionalWhere: string;
     constructor(knex: Knex);

package/remult-knex/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createKnexDataProvider = exports.buildColumn = exports.KnexSchemaBuilder = exports.KnexDataProvider = void 0;
 var tslib_1 = require("tslib");
 var filter_consumer_bridge_to_sql_request_js_1 = require("../src/filter/filter-consumer-bridge-to-sql-request.js");
+var filter_consumer_bridge_to_sql_request_js_2 = require("../src/filter/filter-consumer-bridge-to-sql-request.js");
 var filter_interfaces_js_1 = require("../src/filter/filter-interfaces.js");
 var CompoundIdField_js_1 = require("../src/CompoundIdField.js");
 var remult_proxy_js_1 = require("../src/remult-proxy.js");
@@ -18,8 +19,58 @@ var KnexDataProvider = /** @class */ (function () {
         this.knex = knex;
         this.wrapIdentifier = function (x) { return _this.knex.ref(x) + ''; };
     }
-    KnexDataProvider.getDb = function (remult) {
-        var r = (remult || remult_proxy_js_1.remult).dataProvider;
+    KnexDataProvider.prototype.end = function () {
+        return this.knex.destroy();
+    };
+    /* @internal */
+    KnexDataProvider.prototype.provideMigrationBuilder = function (builder) {
+        var sb = new KnexSchemaBuilder(this.knex);
+        return {
+            createTable: function (entity) {
+                return tslib_1.__awaiter(this, void 0, void 0, function () {
+                    var e;
+                    return tslib_1.__generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_2.dbNamesOf)(entity, function (x) { return x; })];
+                            case 1:
+                                e = _a.sent();
+                                sb.createTableKnexCommand(entity, e)
+                                    .toSQL()
+                                    .forEach(function (sql) { return builder.addSql(sql.sql); });
+                                return [2 /*return*/];
+                        }
+                    });
+                });
+            },
+            addColumn: function (entity, field) {
+                return tslib_1.__awaiter(this, void 0, void 0, function () {
+                    var e;
+                    return tslib_1.__generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_2.dbNamesOf)(entity, function (x) { return x; })];
+                            case 1:
+                                e = _a.sent();
+                                return [4 /*yield*/, sb
+                                        .createColumnKnexCommand(e, field, e.$dbNameOf(field))
+                                        .toSQL()
+                                        .forEach(function (sql) { return builder.addSql(sql.sql); })];
+                            case 2:
+                                _a.sent();
+                                return [2 /*return*/];
+                        }
+                    });
+                });
+            },
+        };
+    };
+    KnexDataProvider.prototype.createCommand = function () {
+        return new KnexBridgeToSQLCommand(this.knex);
+    };
+    KnexDataProvider.prototype.execute = function (sql) {
+        return this.createCommand().execute(sql);
+    };
+    KnexDataProvider.getDb = function (dataProvider) {
+        var r = (dataProvider || remult_proxy_js_1.remult.dataProvider);
         if (!r.knex)
             throw 'the data provider is not an KnexDataProvider';
         return r.knex;
@@ -61,7 +112,7 @@ var KnexDataProvider = /** @class */ (function () {
                 finally { if (e_2) throw e_2.error; }
             }
         }
-        return new KnexEntityDataProvider(entity, this.knex);
+        return new KnexEntityDataProvider(entity, this.knex, this.wrapIdentifier);
     };
     KnexDataProvider.prototype.transaction = function (action) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -100,7 +151,7 @@ var KnexDataProvider = /** @class */ (function () {
             },
             _a;
     };
-    KnexDataProvider.filterToRaw = function (entity, condition) {
+    KnexDataProvider.filterToRaw = function (entity, condition, wrapIdentifier) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var repo, b, _a, r;
             return tslib_1.__generator(this, function (_b) {
@@ -108,9 +159,9 @@ var KnexDataProvider = /** @class */ (function () {
                     case 0:
                         repo = (0, RepositoryImplementation_js_1.getRepository)(entity);
                         _a = FilterConsumerBridgeToKnexRequest.bind;
-                        return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(repo.metadata, function (x) { return x; })];
+                        return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_2.dbNamesOf)(repo.metadata, function (x) { return x; })];
                     case 1:
-                        b = new (_a.apply(FilterConsumerBridgeToKnexRequest, [void 0, _b.sent()]))();
+                        b = new (_a.apply(FilterConsumerBridgeToKnexRequest, [void 0, _b.sent(), wrapIdentifier]))();
                         b._addWhere = false;
                         return [4 /*yield*/, (0, repository_internals_js_1.getRepositoryInternals)(repo)._translateWhereToFilter(condition)];
                     case 2: return [4 /*yield*/, (_b.sent()).__applyToConsumer(b)];
@@ -143,9 +194,10 @@ var KnexDataProvider = /** @class */ (function () {
 }());
 exports.KnexDataProvider = KnexDataProvider;
 var KnexEntityDataProvider = /** @class */ (function () {
-    function KnexEntityDataProvider(entity, knex) {
+    function KnexEntityDataProvider(entity, knex, rawSqlWrapIdentifier) {
         this.entity = entity;
         this.knex = knex;
+        this.rawSqlWrapIdentifier = rawSqlWrapIdentifier;
     }
     KnexEntityDataProvider.prototype.count = function (where) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -155,7 +207,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.init()];
                     case 1:
                         e = _a.sent();
-                        br = new FilterConsumerBridgeToKnexRequest(e);
+                        br = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
                         where.__applyToConsumer(br);
                         return [4 /*yield*/, br.resolveWhere()];
                     case 2:
@@ -208,7 +260,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         }
                         query = this.knex(e.$entityName).select(cols);
                         if (!(options === null || options === void 0 ? void 0 : options.where)) return [3 /*break*/, 3];
-                        br = new FilterConsumerBridgeToKnexRequest(e);
+                        br = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
                         options.where.__applyToConsumer(br);
                         return [4 /*yield*/, br.resolveWhere()];
                     case 2:
@@ -257,7 +309,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(this.entity, function (x) { return x; })];
+                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_2.dbNamesOf)(this.entity, function (x) { return x; })];
                     case 1:
                         r = (_a.sent());
                         return [2 /*return*/, {
@@ -268,6 +320,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                                     return r.$dbNameOf(f);
                                 },
                                 $entityName: r.$entityName,
+                                wrapIdentifier: r.wrapIdentifier,
                             }];
                 }
             });
@@ -282,7 +335,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.init()];
                     case 1:
                         e = _d.sent();
-                        f = new FilterConsumerBridgeToKnexRequest(e);
+                        f = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
                         filter_interfaces_js_1.Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
                         resultFilter = this.entity.idMetadata.getIdFilter(id);
                         if (data.id != undefined)
@@ -296,7 +349,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 3:
                         if (!!_b.done) return [3 /*break*/, 7];
                         x = _b.value;
-                        if (!(0, filter_consumer_bridge_to_sql_request_js_1.isDbReadonly)(x, e)) return [3 /*break*/, 4];
+                        if (!(0, filter_consumer_bridge_to_sql_request_js_2.isDbReadonly)(x, e)) return [3 /*break*/, 4];
                         return [3 /*break*/, 6];
                     case 4:
                         if (!(data[x.key] !== undefined)) return [3 /*break*/, 6];
@@ -344,7 +397,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.init()];
                     case 1:
                         e = _a.sent();
-                        f = new FilterConsumerBridgeToKnexRequest(e);
+                        f = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
                         filter_interfaces_js_1.Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
                         return [4 /*yield*/, f.resolveWhere()];
                     case 2:
@@ -382,7 +435,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 3:
                         if (!!_b.done) return [3 /*break*/, 7];
                         x = _b.value;
-                        if (!(0, filter_consumer_bridge_to_sql_request_js_1.isDbReadonly)(x, e)) return [3 /*break*/, 4];
+                        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]);
@@ -440,8 +493,9 @@ var KnexEntityDataProvider = /** @class */ (function () {
     return KnexEntityDataProvider;
 }());
 var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
-    function FilterConsumerBridgeToKnexRequest(nameProvider) {
-        this.nameProvider = nameProvider;
+    function FilterConsumerBridgeToKnexRequest(innerNameProvider, rawSqlWrapIdentifier) {
+        this.innerNameProvider = innerNameProvider;
+        this.rawSqlWrapIdentifier = rawSqlWrapIdentifier;
         this._addWhere = true;
         this.promises = [];
         this.result = [];
@@ -505,7 +559,7 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
                             return tslib_1.__generator(this, function (_c) {
                                 switch (_c.label) {
                                     case 0:
-                                        f = new FilterConsumerBridgeToKnexRequest(this_1.nameProvider);
+                                        f = new FilterConsumerBridgeToKnexRequest(this_1.innerNameProvider, this_1.rawSqlWrapIdentifier);
                                         f._addWhere = false;
                                         element.__applyToConsumer(f);
                                         return [4 /*yield*/, f.resolveWhere()];
@@ -564,16 +618,18 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
     };
     FilterConsumerBridgeToKnexRequest.prototype.isNull = function (col) {
         var _this = this;
-        this.result.push(function (b) { return b.whereNull(_this.nameProvider.$dbNameOf(col)); });
+        this.result.push(function (b) { return b.whereNull(_this.innerNameProvider.$dbNameOf(col)); });
     };
     FilterConsumerBridgeToKnexRequest.prototype.isNotNull = function (col) {
         var _this = this;
-        this.result.push(function (b) { return b.whereNotNull(_this.nameProvider.$dbNameOf(col)); });
+        this.result.push(function (b) {
+            return b.whereNotNull(_this.innerNameProvider.$dbNameOf(col));
+        });
     };
     FilterConsumerBridgeToKnexRequest.prototype.isIn = function (col, val) {
         var _this = this;
         this.result.push(function (knex) {
-            return knex.whereIn(_this.nameProvider.$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); }));
         });
     };
     FilterConsumerBridgeToKnexRequest.prototype.isEqualTo = function (col, val) {
@@ -598,7 +654,7 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
         var _this = this;
         this.result.push(function (b) {
             return b.whereRaw('lower (' +
-                b.client.ref(_this.nameProvider.$dbNameOf(col)) +
+                b.client.ref(_this.innerNameProvider.$dbNameOf(col)) +
                 ") like lower ('%" +
                 val.replace(/'/g, "''") +
                 "%')");
@@ -611,7 +667,7 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
         var _this = this;
         this.result.push(function (b) {
             return b.whereRaw('not lower (' +
-                b.client.ref(_this.nameProvider.$dbNameOf(col)) +
+                b.client.ref(_this.innerNameProvider.$dbNameOf(col)) +
                 ") like lower ('%" +
                 val.replace(/'/g, "''") +
                 "%')");
@@ -623,13 +679,13 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
     FilterConsumerBridgeToKnexRequest.prototype.add = function (col, val, operator) {
         var _this = this;
         this.result.push(function (b) {
-            return b.where(_this.nameProvider.$dbNameOf(col), operator, translateValueAndHandleArrayAndHandleArray(col, val));
+            return b.where(_this.innerNameProvider.$dbNameOf(col), operator, translateValueAndHandleArrayAndHandleArray(col, val));
         });
     };
     FilterConsumerBridgeToKnexRequest.prototype.databaseCustom = function (databaseCustom) {
         var _this = this;
         this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var _a, _b;
+            var _a, _b, r_2, item, sql_1;
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -639,7 +695,20 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
                     case 1:
                         _b.apply(_a, [_c.sent()]);
                         _c.label = 2;
-                    case 2: return [2 /*return*/];
+                    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);
+                        return [4 /*yield*/, databaseCustom.buildSql(item)];
+                    case 3:
+                        sql_1 = _c.sent();
+                        if (typeof sql_1 !== 'string')
+                            sql_1 = item.sql;
+                        if (sql_1) {
+                            this.result.push(function (b) { return b.whereRaw(sql_1, r_2.values); });
+                        }
+                        _c.label = 4;
+                    case 4: return [2 /*return*/];
                 }
             });
         }); })());
@@ -681,14 +750,13 @@ var KnexSchemaBuilder = /** @class */ (function () {
                     case 1:
                         if (!!entities_1_1.done) return [3 /*break*/, 9];
                         entity = entities_1_1.value;
-                        return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(entity, function (x) { return x; })];
+                        return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_2.dbNamesOf)(entity, function (x) { return x; })];
                     case 2:
                         e = _b.sent();
                         _b.label = 3;
                     case 3:
                         _b.trys.push([3, 7, , 8]);
-                        if (!!entity.options.sqlExpression) return [3 /*break*/, 6];
-                        if (!(e.$entityName.toLowerCase().indexOf('from ') < 0)) return [3 /*break*/, 6];
+                        if (!(0, filter_consumer_bridge_to_sql_request_js_2.shouldCreateEntity)(entity, e)) return [3 /*break*/, 6];
                         return [4 /*yield*/, this.createIfNotExist(entity)];
                     case 4:
                         _b.sent();
@@ -722,85 +790,85 @@ var KnexSchemaBuilder = /** @class */ (function () {
     };
     KnexSchemaBuilder.prototype.createIfNotExist = function (entity) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, cols_1, _a, _b, f;
-            var e_9, _c;
-            var _this = this;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(entity, function (x) { return x; })];
+            var e;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_2.dbNamesOf)(entity, function (x) { return x; })];
                     case 1:
-                        e = _d.sent();
+                        e = _a.sent();
                         return [4 /*yield*/, this.knex.schema.hasTable(e.$entityName)];
                     case 2:
-                        if (!!(_d.sent())) return [3 /*break*/, 4];
-                        cols_1 = new Map();
-                        try {
-                            for (_a = tslib_1.__values(entity.fields), _b = _a.next(); !_b.done; _b = _a.next()) {
-                                f = _b.value;
-                                cols_1.set(f, {
-                                    name: e.$dbNameOf(f),
-                                    readonly: (0, filter_consumer_bridge_to_sql_request_js_1.shouldNotCreateField)(f, e),
-                                });
-                            }
-                        }
-                        catch (e_9_1) { e_9 = { error: e_9_1 }; }
-                        finally {
-                            try {
-                                if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
-                            }
-                            finally { if (e_9) throw e_9.error; }
-                        }
-                        return [4 /*yield*/, logSql(this.knex.schema.createTable(e.$entityName, function (b) {
-                                var e_10, _a;
-                                try {
-                                    for (var _b = tslib_1.__values(entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
-                                        var x = _c.value;
-                                        if (!cols_1.get(x).readonly || (0, RepositoryImplementation_js_1.isAutoIncrement)(x)) {
-                                            if ((0, RepositoryImplementation_js_1.isAutoIncrement)(x))
-                                                b.increments(cols_1.get(x).name);
-                                            else {
-                                                buildColumn(x, cols_1.get(x).name, b, supportsJsonDataStorage(_this.knex));
-                                                if (x == entity.idMetadata.field)
-                                                    b.primary([cols_1.get(x).name]);
-                                            }
-                                        }
-                                    }
-                                }
-                                catch (e_10_1) { e_10 = { error: e_10_1 }; }
-                                finally {
-                                    try {
-                                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                                    }
-                                    finally { if (e_10) throw e_10.error; }
-                                }
-                            }))];
+                        if (!!(_a.sent())) return [3 /*break*/, 4];
+                        return [4 /*yield*/, logSql(this.createTableKnexCommand(entity, e))];
                     case 3:
-                        _d.sent();
-                        _d.label = 4;
+                        _a.sent();
+                        _a.label = 4;
                     case 4: return [2 /*return*/];
                 }
             });
         });
     };
+    KnexSchemaBuilder.prototype.createTableKnexCommand = function (entity, e) {
+        var e_9, _a;
+        var _this = this;
+        var cols = new Map();
+        try {
+            for (var _b = tslib_1.__values(entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var f = _c.value;
+                cols.set(f, {
+                    name: e.$dbNameOf(f),
+                    readonly: (0, filter_consumer_bridge_to_sql_request_js_2.shouldNotCreateField)(f, e),
+                });
+            }
+        }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_9) throw e_9.error; }
+        }
+        return this.knex.schema.createTable(e.$entityName, function (b) {
+            var e_10, _a;
+            try {
+                for (var _b = tslib_1.__values(entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var x = _c.value;
+                    if (!cols.get(x).readonly || (0, RepositoryImplementation_js_1.isAutoIncrement)(x)) {
+                        if ((0, RepositoryImplementation_js_1.isAutoIncrement)(x))
+                            b.increments(cols.get(x).name);
+                        else {
+                            buildColumn(x, cols.get(x).name, b, supportsJsonDataStorage(_this.knex));
+                            if (x == entity.idMetadata.field)
+                                b.primary([cols.get(x).name]);
+                        }
+                    }
+                }
+            }
+            catch (e_10_1) { e_10 = { error: e_10_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_10) throw e_10.error; }
+            }
+        });
+    };
     KnexSchemaBuilder.prototype.addColumnIfNotExist = function (entity, c) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, col, colName;
-            var _this = this;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(entity, function (x) { return x; })];
+                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_2.dbNamesOf)(entity, function (x) { return x; })];
                     case 1:
                         e = _a.sent();
-                        if ((0, filter_consumer_bridge_to_sql_request_js_1.shouldNotCreateField)(c(entity), e))
+                        if ((0, filter_consumer_bridge_to_sql_request_js_2.shouldNotCreateField)(c(entity), e))
                             return [2 /*return*/];
                         col = c(entity);
                         colName = e.$dbNameOf(col);
                         return [4 /*yield*/, this.knex.schema.hasColumn(e.$entityName, colName)];
                     case 2:
                         if (!!(_a.sent())) return [3 /*break*/, 4];
-                        return [4 /*yield*/, logSql(this.knex.schema.alterTable(e.$entityName, function (b) {
-                                buildColumn(col, colName, b, supportsJsonDataStorage(_this.knex));
-                            }))];
+                        return [4 /*yield*/, logSql(this.createColumnKnexCommand(e, col, colName))];
                     case 3:
                         _a.sent();
                         _a.label = 4;
@@ -809,13 +877,19 @@ var KnexSchemaBuilder = /** @class */ (function () {
             });
         });
     };
+    KnexSchemaBuilder.prototype.createColumnKnexCommand = function (e, col, colName) {
+        var _this = this;
+        return this.knex.schema.alterTable(e.$entityName, function (b) {
+            buildColumn(col, colName, b, supportsJsonDataStorage(_this.knex));
+        });
+    };
     KnexSchemaBuilder.prototype.verifyAllColumns = function (entity) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, _loop_2, this_2, _a, _b, col, e_11_1, err_3;
             var e_11, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
-                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(entity, function (x) { return x; })];
+                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_2.dbNamesOf)(entity, function (x) { return x; })];
                     case 1:
                         e = _d.sent();
                         _d.label = 2;
@@ -825,7 +899,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
                             return tslib_1.__generator(this, function (_e) {
                                 switch (_e.label) {
                                     case 0:
-                                        if (!!(0, filter_consumer_bridge_to_sql_request_js_1.shouldNotCreateField)(col, e)) return [3 /*break*/, 2];
+                                        if (!!(0, filter_consumer_bridge_to_sql_request_js_2.shouldNotCreateField)(col, e)) return [3 /*break*/, 2];
                                         return [4 /*yield*/, this_2.addColumnIfNotExist(entity, function () { return col; })];
                                     case 1:
                                         _e.sent();
@@ -934,16 +1008,24 @@ function buildColumn(x, dbName, b, supportsJson) {
         else if (x.valueConverter.fieldTypeInDb == 'json')
             if (supportsJson)
                 b.json(dbName);
-            else
-                b.text(dbName);
+            else {
+                var c = b.text(dbName);
+                if (!x.allowNull)
+                    c.defaultTo('').notNullable();
+            }
         else
             b.specificType(dbName, x.valueConverter.fieldTypeInDb);
     }
-    else {
+    else if (x.valueType === String) {
         var c = b.string(dbName, x.options.maxLength);
         if (!x.allowNull)
             c.defaultTo('').notNullable();
     }
+    else {
+        var c = b.text(dbName);
+        if (!x.allowNull)
+            c.defaultTo('').notNullable();
+    }
 }
 exports.buildColumn = buildColumn;
 function logSql(who) {
@@ -972,3 +1054,88 @@ function translateValueAndHandleArrayAndHandleArray(field, val) {
         return JSON.stringify(result);
     return result;
 }
+var KnexCommandHelper = /** @class */ (function () {
+    function KnexCommandHelper() {
+        this.values = {};
+        this.i = 0;
+    }
+    KnexCommandHelper.prototype.addParameterAndReturnSqlToken = function (val) {
+        return this.param(val);
+    };
+    KnexCommandHelper.prototype.param = function (val) {
+        if (Array.isArray(val))
+            val = JSON.stringify(val);
+        var key = ':' + this.i++;
+        this.values[key.substring(1)] = val;
+        return key;
+    };
+    return KnexCommandHelper;
+}());
+var KnexBridgeToSQLCommand = /** @class */ (function (_super) {
+    tslib_1.__extends(KnexBridgeToSQLCommand, _super);
+    function KnexBridgeToSQLCommand(source) {
+        var _this = _super.call(this) || this;
+        _this.source = source;
+        _this.values = {};
+        _this.i = 0;
+        return _this;
+    }
+    KnexBridgeToSQLCommand.prototype.addParameterAndReturnSqlToken = function (val) {
+        return this.param(val);
+    };
+    KnexBridgeToSQLCommand.prototype.param = function (val) {
+        if (Array.isArray(val))
+            val = JSON.stringify(val);
+        var key = ':' + this.i++;
+        this.values[key.substring(1)] = val;
+        return key;
+    };
+    KnexBridgeToSQLCommand.prototype.execute = function (sql) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.source.raw(sql, this.values).then(function (r) {
+                            switch (_this.source.client.config.client) {
+                                case 'mysql':
+                                case 'mysql2':
+                                    return new KnexPostgresBridgeToSQLQueryResult({
+                                        fields: r[1],
+                                        rows: r[0],
+                                    });
+                                case 'pg':
+                                    return new KnexPostgresBridgeToSQLQueryResult(r);
+                                default:
+                                case 'better-sqlite3':
+                                case 'mssql':
+                                    return new KnexPostgresBridgeToSQLQueryResult({
+                                        rows: r,
+                                    });
+                            }
+                        })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    return KnexBridgeToSQLCommand;
+}(KnexCommandHelper));
+var KnexPostgresBridgeToSQLQueryResult = /** @class */ (function () {
+    function KnexPostgresBridgeToSQLQueryResult(r) {
+        this.r = r;
+        this.rows = r.rows;
+    }
+    KnexPostgresBridgeToSQLQueryResult.prototype.getColumnKeyInResultForIndexInSelect = function (index) {
+        if (this.r.fields)
+            return this.r.fields[index].name;
+        if (this.rows.length == 0)
+            throw Error('No rows');
+        var i = 0;
+        for (var m in this.rows[0]) {
+            if (i++ == index)
+                return m;
+        }
+        throw Error('index not found');
+    };
+    return KnexPostgresBridgeToSQLQueryResult;
+}());

package/remult-mongo.d.ts

@@ -1,5 +1,5 @@
 import { type ClientSession, type Db, type MongoClient } from 'mongodb';
-import type { DataProvider, EntityDataProvider, EntityFilter, EntityMetadata, Remult } from './index.js';
+import type { DataProvider, EntityDataProvider, EntityFilter, EntityMetadata } from './index.js';
 import type { RepositoryOverloads } from './src/remult3/RepositoryImplementation.js';
 export declare class MongoDataProvider implements DataProvider {
     private db;
@@ -10,7 +10,7 @@ export declare class MongoDataProvider implements DataProvider {
     });
     session?: ClientSession;
     disableTransactions: boolean;
-    static getDb(remult?: Remult): {
+    static getDb(dataProvider?: DataProvider): {
         db: Db;
         session: ClientSession;
     };

package/remult-mongo.js

@@ -17,8 +17,8 @@ var MongoDataProvider = /** @class */ (function () {
         this.session = options === null || options === void 0 ? void 0 : options.session;
         this.disableTransactions = Boolean(options === null || options === void 0 ? void 0 : options.disableTransactions);
     }
-    MongoDataProvider.getDb = function (remult) {
-        var r = (remult || remult_proxy_js_1.remult).dataProvider;
+    MongoDataProvider.getDb = function (dataProvider) {
+        var r = (dataProvider || remult_proxy_js_1.remult.dataProvider);
         if (!r.db)
             throw 'the data provider is not a MongoDataProvider';
         return { db: r.db, session: r.session };