remult 0.26.7 → 0.26.8-next.1

package/esm/remult-knex/index.js

@@ -7,6 +7,7 @@ import { Sort } from '../src/sort.js';
 import { ValueConverters } from '../src/valueConverters.js';
 import { getRepositoryInternals } from '../src/remult3/repository-internals.js';
 import { remultStatic } from '../src/remult-static.js';
+import { getRowAfterUpdate } from '../src/data-providers/sql-database.js';
 export class KnexDataProvider {
     knex;
     constructor(knex) {
@@ -196,9 +197,6 @@ class KnexEntityDataProvider {
         const e = await this.init();
         let f = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
         Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
-        let resultFilter = this.entity.idMetadata.getIdFilter(id);
-        if (data.id != undefined)
-            resultFilter = this.entity.idMetadata.getIdFilter(data.id);
         let updateObject = {};
         for (const x of this.entity.fields) {
             if (isDbReadonly(x, e)) {
@@ -215,9 +213,7 @@ class KnexEntityDataProvider {
         await this.knex(e.$entityName)
             .update(updateObject)
             .where((b) => where.forEach((w) => w(b)));
-        return this.find({
-            where: Filter.fromEntityFilter(this.entity, resultFilter),
-        }).then((y) => y[0]);
+        return getRowAfterUpdate(this.entity, this, data, id, 'update');
     }
     async delete(id) {
         const e = await this.init();
@@ -230,8 +226,6 @@ class KnexEntityDataProvider {
     }
     async insert(data) {
         const e = await this.init();
-        let resultFilter;
-        resultFilter = Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(data[this.entity.idMetadata.field.key]));
         let insertObject = {};
         for (const x of this.entity.fields) {
             if (isDbReadonly(x, e)) {
@@ -256,13 +250,13 @@ class KnexEntityDataProvider {
                 let result = await insert.returning(this.entity.idMetadata.field.key);
                 newId = result[0].id;
             }
-            resultFilter = new Filter((x) => x.isEqualTo(this.entity.idMetadata.field, newId));
+            return this.find({
+                where: new Filter((x) => x.isEqualTo(this.entity.idMetadata.field, newId)),
+            }).then((y) => y[0]);
         }
         else
             await insert;
-        return this.find({ where: resultFilter }).then((y) => {
-            return y[0];
-        });
+        return getRowAfterUpdate(this.entity, this, data, undefined, 'insert');
     }
 }
 class FilterConsumerBridgeToKnexRequest {

package/esm/remult-mongo.js

@@ -4,6 +4,7 @@ import { dbNamesOf } from './src/filter/filter-consumer-bridge-to-sql-request.js
 import { remult as remultContext } from './src/remult-proxy.js';
 import { getRepository } from './src/remult3/RepositoryImplementation.js';
 import { getRepositoryInternals } from './src/remult3/repository-internals.js';
+import { getRowAfterUpdate } from './src/data-providers/sql-database.js';
 export class MongoDataProvider {
     db;
     client;
@@ -126,9 +127,6 @@ class MongoEntityDataProvider {
         let { collection, e } = await this.collection();
         let f = new FilterConsumerBridgeToMongo(e);
         Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
-        let resultFilter = this.entity.idMetadata.getIdFilter(id);
-        if (data.id != undefined)
-            resultFilter = this.entity.idMetadata.getIdFilter(data.id);
         let newR = {};
         let keys = Object.keys(data);
         for (const f of this.entity.fields) {
@@ -141,9 +139,7 @@ class MongoEntityDataProvider {
         let r = await collection.updateOne(await f.resolveWhere(), {
             $set: newR,
         }, { session: this.session });
-        return this.find({
-            where: Filter.fromEntityFilter(this.entity, resultFilter),
-        }).then((y) => y[0]);
+        return getRowAfterUpdate(this.entity, this, data, id, 'update');
     }
     async delete(id) {
         const { e, collection } = await this.collection();

package/esm/remult-sqlite-core.js

@@ -4,9 +4,11 @@ import { isAutoIncrement } from './src/remult3/RepositoryImplementation.js';
 export class SqliteCoreDataProvider {
     createCommand;
     end;
-    constructor(createCommand, end) {
+    doesNotSupportReturningSyntax;
+    constructor(createCommand, end, doesNotSupportReturningSyntax = false) {
         this.createCommand = createCommand;
         this.end = end;
+        this.doesNotSupportReturningSyntax = doesNotSupportReturningSyntax;
     }
     orderByNullsFirst;
     getLimitSqlSyntax(limit, offset) {

package/esm/remult-sqlite3.js

@@ -1,9 +1,9 @@
-import { SqliteCoreDataProvider } from '../core/remult-sqlite-core.js';
+import { SqliteCoreDataProvider } from './remult-sqlite-core.js';
 export class Sqlite3DataProvider extends SqliteCoreDataProvider {
     constructor(db) {
         super(() => new Sqlite3Command(db), async () => {
             db.close();
-        });
+        }, true);
     }
 }
 class Sqlite3Command {
@@ -15,13 +15,21 @@ class Sqlite3Command {
     }
     async execute(sql) {
         return new Promise((resolve, error) => {
-            this.db.all(sql, this.values, (err, rows) => {
-                console.log(sql, rows);
-                if (err)
-                    error(err);
-                else
-                    resolve(new Sqlite3SqlResult(rows));
-            });
+            if (sql.startsWith('insert into')) {
+                this.db.run(sql, this.values, function (err, rows) {
+                    if (err)
+                        error(err);
+                    else
+                        resolve(new Sqlite3SqlResult([this.lastID]));
+                });
+            }
+            else
+                this.db.all(sql, this.values, (err, rows) => {
+                    if (err)
+                        error(err);
+                    else
+                        resolve(new Sqlite3SqlResult(rows));
+                });
         });
     }
     addParameterAndReturnSqlToken(val) {
@@ -37,7 +45,7 @@ class Sqlite3Command {
         return key;
     }
 }
-export class Sqlite3SqlResult {
+class Sqlite3SqlResult {
     result;
     constructor(result) {
         this.result = result;

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

@@ -1,7 +1,7 @@
 import { FilterConsumerBridgeToSqlRequest, dbNamesOf, isDbReadonly, } from '../filter/filter-consumer-bridge-to-sql-request.js';
 import { Filter, customDatabaseFilterToken, } from '../filter/filter-interfaces.js';
 import { remult as defaultRemult } from '../remult-proxy.js';
-import { getRepository } from '../remult3/RepositoryImplementation.js';
+import { getRepository, isAutoIncrement, } from '../remult3/RepositoryImplementation.js';
 import { Sort } from '../sort.js';
 import { ValueConverters } from '../valueConverters.js';
 import { getRepositoryInternals } from '../remult3/repository-internals.js';
@@ -323,8 +323,6 @@ class ActualSQLServerDataProvider {
     async update(id, data) {
         let e = await this.init();
         let r = this.sql.createCommand();
-        let f = new FilterConsumerBridgeToSqlRequest(r, e);
-        Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
         let statement = 'update ' + e.$entityName + ' set ';
         let added = false;
         for (const x of this.entity.fields) {
@@ -341,11 +339,18 @@ class ActualSQLServerDataProvider {
                 }
             }
         }
+        const idFilter = this.entity.idMetadata.getIdFilter(id);
+        let f = new FilterConsumerBridgeToSqlRequest(r, e);
+        Filter.fromEntityFilter(this.entity, idFilter).__applyToConsumer(f);
         statement += await f.resolveWhere();
         let { colKeys, select } = this.buildSelect(e);
-        statement += ' returning ' + select;
+        if (!this.sql._getSourceSql().doesNotSupportReturningSyntax)
+            statement += ' returning ' + select;
         return r.execute(statement).then((sqlResult) => {
             this.sql._getSourceSql().afterMutation?.();
+            if (this.sql._getSourceSql().doesNotSupportReturningSyntax) {
+                return getRowAfterUpdate(this.entity, this, data, id, 'update');
+            }
             if (sqlResult.rows.length != 1)
                 throw new Error('Failed to update row with id ' +
                     id +
@@ -390,9 +395,24 @@ class ActualSQLServerDataProvider {
         }
         let statement = `insert into ${e.$entityName} (${cols}) values (${vals})`;
         let { colKeys, select } = this.buildSelect(e);
-        statement += ' returning ' + select;
+        if (!this.sql._getSourceSql().doesNotSupportReturningSyntax)
+            statement += ' returning ' + select;
         return await r.execute(statement).then((sql) => {
             this.sql._getSourceSql().afterMutation?.();
+            if (this.sql._getSourceSql().doesNotSupportReturningSyntax) {
+                if (isAutoIncrement(this.entity.idMetadata.field)) {
+                    const id = sql.rows[0];
+                    if (typeof id !== '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));
+                    return this.find({
+                        where: new Filter((x) => x.isEqualTo(this.entity.idMetadata.field, id)),
+                    }).then((r) => r[0]);
+                }
+                else {
+                    return getRowAfterUpdate(this.entity, this, data, undefined, 'insert');
+                }
+            }
             return this.buildResultRow(colKeys, sql.rows[0], sql);
         });
     }
@@ -440,3 +460,19 @@ async function bulkInsert(array, db) {
         await c.execute(sql);
     }
 }
+export function getRowAfterUpdate(meta, dataProvider, data, id, operation) {
+    const idFilter = id !== undefined ? meta.idMetadata.getIdFilter(id) : {};
+    return dataProvider
+        .find({
+        where: new Filter((x) => {
+            for (const field of meta.idMetadata.fields) {
+                x.isEqualTo(field, data[field.key] ?? idFilter[field.key]);
+            }
+        }),
+    })
+        .then((r) => {
+        if (r.length != 1)
+            throw new Error(`Failed to ${operation} row - result contained ${r.length} rows`);
+        return r[0];
+    });
+}

package/esm/src/filter/filter-interfaces.js

@@ -304,7 +304,7 @@ class filterHelper {
     processVal(val) {
         let ei = getEntitySettings(this.metadata.valueType, false);
         if (ei) {
-            if (!val) {
+            if (val === undefined || val === null) {
                 if (val === null && !this.metadata.allowNull) {
                     const rel = getRelationFieldInfo(this.metadata);
                     if (rel?.type === 'reference')

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.26.7",
+    "version": "0.26.8-next.1",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {
@@ -111,6 +111,11 @@
             "import": "./esm/remult-better-sqlite3.js",
             "types": "./remult-better-sqlite3.d.ts"
         },
+        "./remult-sqlite3": {
+            "require": "./remult-sqlite3.js",
+            "import": "./esm/remult-sqlite3.js",
+            "types": "./remult-sqlite3.d.ts"
+        },
         "./remult-bun-sqlite": {
             "require": "./remult-bun-sqlite.js",
             "import": "./esm/remult-bun-sqlite.js",

package/remult-knex/index.js

@@ -11,6 +11,7 @@ var sort_js_1 = require("../src/sort.js");
 var valueConverters_js_1 = require("../src/valueConverters.js");
 var repository_internals_js_1 = require("../src/remult3/repository-internals.js");
 var remult_static_js_1 = require("../src/remult-static.js");
+var sql_database_js_1 = require("../src/data-providers/sql-database.js");
 var KnexDataProvider = /** @class */ (function () {
     function KnexDataProvider(knex) {
         var _this = this;
@@ -326,7 +327,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
     };
     KnexEntityDataProvider.prototype.update = function (id, data) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, f, resultFilter, updateObject, _a, _b, x, v, key, e_4_1, where;
+            var e, f, updateObject, _a, _b, x, v, key, e_4_1, where;
             var e_4, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
@@ -335,9 +336,6 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         e = _d.sent();
                         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)
-                            resultFilter = this.entity.idMetadata.getIdFilter(data.id);
                         updateObject = {};
                         _d.label = 2;
                     case 2:
@@ -380,9 +378,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                                 .where(function (b) { return where.forEach(function (w) { return w(b); }); })];
                     case 12:
                         _d.sent();
-                        return [2 /*return*/, this.find({
-                                where: filter_interfaces_js_1.Filter.fromEntityFilter(this.entity, resultFilter),
-                            }).then(function (y) { return y[0]; })];
+                        return [2 /*return*/, (0, sql_database_js_1.getRowAfterUpdate)(this.entity, this, data, id, 'update')];
                 }
             });
         });
@@ -412,7 +408,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
     };
     KnexEntityDataProvider.prototype.insert = function (data) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, resultFilter, insertObject, _a, _b, x, v, key, e_5_1, insert, newId_1, result, result;
+            var e, insertObject, _a, _b, x, v, key, e_5_1, insert, newId_1, result, result;
             var e_5, _c;
             var _this = this;
             return tslib_1.__generator(this, function (_d) {
@@ -420,7 +416,6 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.init()];
                     case 1:
                         e = _d.sent();
-                        resultFilter = filter_interfaces_js_1.Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(data[this.entity.idMetadata.field.key]));
                         insertObject = {};
                         _d.label = 2;
                     case 2:
@@ -469,18 +464,16 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         result = _d.sent();
                         newId_1 = result[0].id;
                         _d.label = 14;
-                    case 14:
-                        resultFilter = new filter_interfaces_js_1.Filter(function (x) {
-                            return x.isEqualTo(_this.entity.idMetadata.field, newId_1);
-                        });
-                        return [3 /*break*/, 17];
+                    case 14: return [2 /*return*/, this.find({
+                            where: new filter_interfaces_js_1.Filter(function (x) {
+                                return x.isEqualTo(_this.entity.idMetadata.field, newId_1);
+                            }),
+                        }).then(function (y) { return y[0]; })];
                     case 15: return [4 /*yield*/, insert];
                     case 16:
                         _d.sent();
                         _d.label = 17;
-                    case 17: return [2 /*return*/, this.find({ where: resultFilter }).then(function (y) {
-                            return y[0];
-                        })];
+                    case 17: return [2 /*return*/, (0, sql_database_js_1.getRowAfterUpdate)(this.entity, this, data, undefined, 'insert')];
                 }
             });
         });

package/remult-mongo.js

@@ -8,6 +8,7 @@ var filter_consumer_bridge_to_sql_request_js_1 = require("./src/filter/filter-co
 var remult_proxy_js_1 = require("./src/remult-proxy.js");
 var RepositoryImplementation_js_1 = require("./src/remult3/RepositoryImplementation.js");
 var repository_internals_js_1 = require("./src/remult3/repository-internals.js");
+var sql_database_js_1 = require("./src/data-providers/sql-database.js");
 var MongoDataProvider = /** @class */ (function () {
     function MongoDataProvider(db, client, options) {
         this.db = db;
@@ -221,7 +222,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
     };
     MongoEntityDataProvider.prototype.update = function (id, data) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, collection, e, f, resultFilter, newR, keys, _b, _c, f_1, r, _d, _e;
+            var _a, collection, e, f, newR, keys, _b, _c, f_1, r, _d, _e;
             var e_4, _f;
             return tslib_1.__generator(this, function (_g) {
                 switch (_g.label) {
@@ -230,9 +231,6 @@ var MongoEntityDataProvider = /** @class */ (function () {
                         _a = _g.sent(), collection = _a.collection, e = _a.e;
                         f = new FilterConsumerBridgeToMongo(e);
                         index_js_1.Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
-                        resultFilter = this.entity.idMetadata.getIdFilter(id);
-                        if (data.id != undefined)
-                            resultFilter = this.entity.idMetadata.getIdFilter(data.id);
                         newR = {};
                         keys = Object.keys(data);
                         try {
@@ -260,9 +258,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
                             { session: this.session }])];
                     case 3:
                         r = _g.sent();
-                        return [2 /*return*/, this.find({
-                                where: index_js_1.Filter.fromEntityFilter(this.entity, resultFilter),
-                            }).then(function (y) { return y[0]; })];
+                        return [2 /*return*/, (0, sql_database_js_1.getRowAfterUpdate)(this.entity, this, data, id, 'update')];
                 }
             });
         });

package/remult-sqlite-core.d.ts

@@ -4,7 +4,8 @@ import type { CanBuildMigrations, MigrationBuilder, MigrationCode } from './migr
 export declare class SqliteCoreDataProvider implements SqlImplementation, CanBuildMigrations {
     createCommand: () => SqlCommand;
     end: () => Promise<void>;
-    constructor(createCommand: () => SqlCommand, end: () => Promise<void>);
+    doesNotSupportReturningSyntax: boolean;
+    constructor(createCommand: () => SqlCommand, end: () => Promise<void>, doesNotSupportReturningSyntax?: boolean);
     orderByNullsFirst?: boolean;
     getLimitSqlSyntax(limit: number, offset: number): string;
     afterMutation?: VoidFunction;

package/remult-sqlite-core.js

@@ -6,9 +6,11 @@ var sql_database_js_1 = require("./src/data-providers/sql-database.js");
 var filter_consumer_bridge_to_sql_request_js_1 = require("./src/filter/filter-consumer-bridge-to-sql-request.js");
 var RepositoryImplementation_js_1 = require("./src/remult3/RepositoryImplementation.js");
 var SqliteCoreDataProvider = /** @class */ (function () {
-    function SqliteCoreDataProvider(createCommand, end) {
+    function SqliteCoreDataProvider(createCommand, end, doesNotSupportReturningSyntax) {
+        if (doesNotSupportReturningSyntax === void 0) { doesNotSupportReturningSyntax = false; }
         this.createCommand = createCommand;
         this.end = end;
+        this.doesNotSupportReturningSyntax = doesNotSupportReturningSyntax;
     }
     SqliteCoreDataProvider.prototype.getLimitSqlSyntax = function (limit, offset) {
         return ' limit ' + limit + ' offset ' + offset;

package/remult-sqlite3.d.ts

@@ -1,12 +1,5 @@
-import { SqlResult } from '../core/index.js';
-import { SqliteCoreDataProvider } from '../core/remult-sqlite-core.js';
+import { SqliteCoreDataProvider } from './remult-sqlite-core.js';
 import { Database } from 'sqlite3';
 export declare class Sqlite3DataProvider extends SqliteCoreDataProvider {
     constructor(db: Database);
 }
-export declare class Sqlite3SqlResult implements SqlResult {
-    private result;
-    constructor(result: any[]);
-    rows: any[];
-    getColumnKeyInResultForIndexInSelect(index: number): string;
-}

package/remult-sqlite3.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Sqlite3SqlResult = exports.Sqlite3DataProvider = void 0;
+exports.Sqlite3DataProvider = void 0;
 var tslib_1 = require("tslib");
-var remult_sqlite_core_js_1 = require("../core/remult-sqlite-core.js");
+var remult_sqlite_core_js_1 = require("./remult-sqlite-core.js");
 var Sqlite3DataProvider = /** @class */ (function (_super) {
     tslib_1.__extends(Sqlite3DataProvider, _super);
     function Sqlite3DataProvider(db) {
@@ -11,7 +11,7 @@ var Sqlite3DataProvider = /** @class */ (function (_super) {
                 db.close();
                 return [2 /*return*/];
             });
-        }); }) || this;
+        }); }, true) || this;
         return _this;
     }
     return Sqlite3DataProvider;
@@ -28,13 +28,21 @@ var Sqlite3Command = /** @class */ (function () {
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
                 return [2 /*return*/, new Promise(function (resolve, error) {
-                        _this.db.all(sql, _this.values, function (err, rows) {
-                            console.log(sql, rows);
-                            if (err)
-                                error(err);
-                            else
-                                resolve(new Sqlite3SqlResult(rows));
-                        });
+                        if (sql.startsWith('insert into')) {
+                            _this.db.run(sql, _this.values, function (err, rows) {
+                                if (err)
+                                    error(err);
+                                else
+                                    resolve(new Sqlite3SqlResult([this.lastID]));
+                            });
+                        }
+                        else
+                            _this.db.all(sql, _this.values, function (err, rows) {
+                                if (err)
+                                    error(err);
+                                else
+                                    resolve(new Sqlite3SqlResult(rows));
+                            });
                     })];
             });
         });
@@ -63,4 +71,3 @@ var Sqlite3SqlResult = /** @class */ (function () {
     };
     return Sqlite3SqlResult;
 }());
-exports.Sqlite3SqlResult = Sqlite3SqlResult;

package/src/data-providers/sql-database.d.ts

@@ -44,3 +44,4 @@ export declare class SqlDatabase implements DataProvider, HasWrapIdentifier, Can
     private createdEntities;
     end: () => Promise<void>;
 }
+export declare function getRowAfterUpdate<entityType>(meta: EntityMetadata<entityType>, dataProvider: EntityDataProvider, data: any, id: any, operation: string): any;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SqlDatabase = void 0;
+exports.getRowAfterUpdate = exports.SqlDatabase = void 0;
 var tslib_1 = require("tslib");
 var filter_consumer_bridge_to_sql_request_js_1 = require("../filter/filter-consumer-bridge-to-sql-request.js");
 var filter_interfaces_js_1 = require("../filter/filter-interfaces.js");
@@ -475,7 +475,7 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
     };
     ActualSQLServerDataProvider.prototype.update = function (id, data) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, r, f, statement, added, _a, _b, x, v, _c, _d, colKeys, select;
+            var e, r, statement, added, _a, _b, x, v, idFilter, f, _c, _d, colKeys, select;
             var e_5, _e;
             var _this = this;
             return tslib_1.__generator(this, function (_f) {
@@ -484,8 +484,6 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
                     case 1:
                         e = _f.sent();
                         r = this.sql.createCommand();
-                        f = new filter_consumer_bridge_to_sql_request_js_1.FilterConsumerBridgeToSqlRequest(r, e);
-                        filter_interfaces_js_1.Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
                         statement = 'update ' + e.$entityName + ' set ';
                         added = false;
                         try {
@@ -512,15 +510,22 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
                             }
                             finally { if (e_5) throw e_5.error; }
                         }
+                        idFilter = this.entity.idMetadata.getIdFilter(id);
+                        f = new filter_consumer_bridge_to_sql_request_js_1.FilterConsumerBridgeToSqlRequest(r, e);
+                        filter_interfaces_js_1.Filter.fromEntityFilter(this.entity, idFilter).__applyToConsumer(f);
                         _c = statement;
                         return [4 /*yield*/, f.resolveWhere()];
                     case 2:
                         statement = _c + _f.sent();
                         _d = this.buildSelect(e), colKeys = _d.colKeys, select = _d.select;
-                        statement += ' returning ' + select;
+                        if (!this.sql._getSourceSql().doesNotSupportReturningSyntax)
+                            statement += ' returning ' + select;
                         return [2 /*return*/, r.execute(statement).then(function (sqlResult) {
                                 var _a, _b;
                                 (_b = (_a = _this.sql._getSourceSql()).afterMutation) === null || _b === void 0 ? void 0 : _b.call(_a);
+                                if (_this.sql._getSourceSql().doesNotSupportReturningSyntax) {
+                                    return getRowAfterUpdate(_this.entity, _this, data, id, 'update');
+                                }
                                 if (sqlResult.rows.length != 1)
                                     throw new Error('Failed to update row with id ' +
                                         id +
@@ -600,10 +605,27 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
                         }
                         statement = "insert into ".concat(e.$entityName, " (").concat(cols, ") values (").concat(vals, ")");
                         _c = this.buildSelect(e), colKeys = _c.colKeys, select = _c.select;
-                        statement += ' returning ' + select;
+                        if (!this.sql._getSourceSql().doesNotSupportReturningSyntax)
+                            statement += ' returning ' + select;
                         return [4 /*yield*/, r.execute(statement).then(function (sql) {
                                 var _a, _b;
                                 (_b = (_a = _this.sql._getSourceSql()).afterMutation) === null || _b === void 0 ? void 0 : _b.call(_a);
+                                if (_this.sql._getSourceSql().doesNotSupportReturningSyntax) {
+                                    if ((0, RepositoryImplementation_js_1.isAutoIncrement)(_this.entity.idMetadata.field)) {
+                                        var id_1 = sql.rows[0];
+                                        if (typeof id_1 !== 'number')
+                                            throw new Error('Auto increment, for a database that is does not support returning syntax, should return an array with the single last added id. Instead it returned: ' +
+                                                JSON.stringify(id_1));
+                                        return _this.find({
+                                            where: new filter_interfaces_js_1.Filter(function (x) {
+                                                return x.isEqualTo(_this.entity.idMetadata.field, id_1);
+                                            }),
+                                        }).then(function (r) { return r[0]; });
+                                    }
+                                    else {
+                                        return getRowAfterUpdate(_this.entity, _this, data, undefined, 'insert');
+                                    }
+                                }
                                 return _this.buildResultRow(colKeys, sql.rows[0], sql);
                             })];
                     case 2: return [2 /*return*/, _e.sent()];
@@ -696,3 +718,32 @@ function bulkInsert(array, db) {
         });
     });
 }
+function getRowAfterUpdate(meta, dataProvider, data, id, operation) {
+    var idFilter = id !== undefined ? meta.idMetadata.getIdFilter(id) : {};
+    return dataProvider
+        .find({
+        where: new filter_interfaces_js_1.Filter(function (x) {
+            var e_7, _a;
+            var _b;
+            try {
+                for (var _c = tslib_1.__values(meta.idMetadata.fields), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    var field = _d.value;
+                    x.isEqualTo(field, (_b = data[field.key]) !== null && _b !== void 0 ? _b : idFilter[field.key]);
+                }
+            }
+            catch (e_7_1) { e_7 = { error: e_7_1 }; }
+            finally {
+                try {
+                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                }
+                finally { if (e_7) throw e_7.error; }
+            }
+        }),
+    })
+        .then(function (r) {
+        if (r.length != 1)
+            throw new Error("Failed to ".concat(operation, " row - result contained ").concat(r.length, " rows"));
+        return r[0];
+    });
+}
+exports.getRowAfterUpdate = getRowAfterUpdate;

package/src/filter/filter-interfaces.js

@@ -396,7 +396,7 @@ var filterHelper = /** @class */ (function () {
     filterHelper.prototype.processVal = function (val) {
         var ei = (0, getEntityRef_js_1.getEntitySettings)(this.metadata.valueType, false);
         if (ei) {
-            if (!val) {
+            if (val === undefined || val === null) {
                 if (val === null && !this.metadata.allowNull) {
                     var rel = (0, relationInfoMember_js_1.getRelationFieldInfo)(this.metadata);
                     if ((rel === null || rel === void 0 ? void 0 : rel.type) === 'reference')

package/src/sql-command.d.ts

@@ -6,6 +6,8 @@ export interface SqlImplementation extends HasWrapIdentifier {
     entityIsUsedForTheFirstTime(entity: EntityMetadata): Promise<void>;
     ensureSchema?(entities: EntityMetadata[]): Promise<void>;
     supportsJsonColumnType?: boolean;
+    /** true by default */
+    doesNotSupportReturningSyntax?: boolean;
     orderByNullsFirst?: boolean;
     end(): Promise<void>;
     afterMutation?: VoidFunction;