@oino-ts/db 0.19.0 → 0.20.1

package/dist/cjs/OINODb.js

@@ -55,6 +55,23 @@ class OINODb {
         result += ";";
         return result;
     }
+    /**
+     * Print SQL select statement with DB specific formatting.
+     *
+     * @param tableName - The name of the table to select from.
+     * @param columns - The columns to be selected.
+     * @param values - The values to be inserted.
+     * @param returnIdFields - the id fields to return if returnIds is true (if supported by the database)
+     *
+     */
+    printSqlInsert(tableName, columns, values, returnIdFields) {
+        let result = "INSERT INTO " + tableName + " (" + columns + ") VALUES (" + values + ")";
+        if (returnIdFields) {
+            result += " RETURNING " + returnIdFields.join(",");
+        }
+        result += ";";
+        return result;
+    }
 }
 exports.OINODb = OINODb;
 /**
@@ -65,7 +82,7 @@ exports.OINODb = OINODb;
  * `OINODbDataSet` will serve it out consistently.
  *
  */
-class OINODbDataSet {
+class OINODbDataSet extends common_1.OINOResult {
     _data;
     /** Error messages */
     messages;
@@ -77,6 +94,7 @@ class OINODbDataSet {
      *
      */
     constructor(data, messages = []) {
+        super();
         this._data = data;
         this.messages = messages;
     }

package/dist/cjs/OINODbApi.js

@@ -17,7 +17,7 @@ class OINODbApiRequest extends common_1.OINOHttpRequest {
     constructor(init) {
         super(init);
         this.rowId = init?.rowId || "";
-        this.rowData = init?.rowData || null;
+        this.rowData = init?.rowData || null; // rowData is not compatible with OINOHttpRequest body so it's not automatically set, caller can set both if needed
         this.sqlParams = init?.sqlParams || {};
         if (init?.filter) {
             if (init.filter instanceof index_js_1.OINODbSqlFilter) {
@@ -28,9 +28,15 @@ class OINODbApiRequest extends common_1.OINOHttpRequest {
             }
         }
         if (!this.sqlParams.filter) {
-            const filter_param = this.url?.searchParams.get(index_js_1.OINODbConfig.OINODB_SQL_FILTER_PARAM);
-            if (filter_param) {
-                this.sqlParams.filter = index_js_1.OINODbSqlFilter.parse(filter_param);
+            const filter_params = this.url?.searchParams.getAll(index_js_1.OINODbConfig.OINODB_SQL_FILTER_PARAM) || [];
+            for (let i = 0; i < filter_params.length; i++) {
+                const f = index_js_1.OINODbSqlFilter.parse(filter_params[i]);
+                if (i > 0) {
+                    this.sqlParams.filter = index_js_1.OINODbSqlFilter.combine(this.sqlParams.filter, index_js_1.OINODbSqlBooleanOperation.and, f);
+                }
+                else {
+                    this.sqlParams.filter = f;
+                }
             }
         }
         if (init?.order) {
@@ -348,8 +354,8 @@ class OINODbApi {
             sql = this.datamodel.printSqlSelect(rowId, request.sqlParams || {});
             common_1.OINOLog.debug("@oino-ts/db", "OINODbApi", "_doGet", "Print SQL", { sql: sql });
             const sql_res = await this.db.sqlSelect(sql);
-            if (sql_res.hasErrors()) {
-                result.setError(500, sql_res.getFirstError(), "DoGet");
+            if (sql_res.success == false) {
+                result.setError(500, sql_res.statusText, "DoGet");
                 if (this._debugOnError) {
                     result.addDebug("OINO GET SQL [" + sql + "]", "DoPut");
                 }
@@ -366,7 +372,7 @@ class OINODbApi {
             }
         }
     }
-    async _doPost(result, rows) {
+    async _doPost(result, rows, request) {
         let sql = "";
         try {
             for (let i = 0; i < rows.length; i++) {
@@ -384,13 +390,16 @@ class OINODbApi {
             else if (result.success) {
                 common_1.OINOLog.debug("@oino-ts/db", "OINODbApi", "_doPost", "Print SQL", { sql: sql });
                 const sql_res = await this.db.sqlExec(sql);
-                if (sql_res.hasErrors()) {
-                    result.setError(500, sql_res.getFirstError(), "DoPost");
+                if (sql_res.success == false) {
+                    result.setError(500, sql_res.statusText, "DoPost");
                     if (this._debugOnError) {
-                        result.addDebug("OINO POST MESSAGES [" + sql_res.messages.join('|') + "]", "DoPost");
+                        result.addDebug("OINO POST MESSAGES [" + sql_res.statusText + "]", "DoPost");
                         result.addDebug("OINO POST SQL [" + sql + "]", "DoPost");
                     }
                 }
+                else if (this.params.returnInsertedIds) {
+                    result.data = new index_js_1.OINODbModelSet(this.datamodel, sql_res, request.sqlParams); // return the inserted ids as data
+                }
             }
         }
         catch (e) {
@@ -421,10 +430,10 @@ class OINODbApi {
             else if (result.success) {
                 common_1.OINOLog.debug("@oino-ts/db", "OINODbApi", "_doPut", "Print SQL", { sql: sql });
                 const sql_res = await this.db.sqlExec(sql);
-                if (sql_res.hasErrors()) {
-                    result.setError(500, sql_res.getFirstError(), "DoPut");
+                if (sql_res.success == false) {
+                    result.setError(500, sql_res.statusText, "DoPut");
                     if (this._debugOnError) {
-                        result.addDebug("OINO PUT MESSAGES [" + sql_res.messages.join('|') + "]", "DoPut");
+                        result.addDebug("OINO PUT MESSAGES [" + sql_res.statusText + "]", "DoPut");
                         result.addDebug("OINO PUT SQL [" + sql + "]", "DoPut");
                     }
                 }
@@ -434,7 +443,7 @@ class OINODbApi {
             result.setError(500, "Unhandled exception: " + e.message, "DoPut");
             common_1.OINOLog.exception("@oino-ts/db", "OINODbApi", "_doPut", "exception in put request", { message: e.message, stack: e.stack });
             if (this._debugOnError) {
-                result.addDebug("OINO POST SQL [" + sql + "]", "DoPut");
+                result.addDebug("OINO PUT SQL [" + sql + "]", "DoPut");
             }
         }
     }
@@ -461,10 +470,10 @@ class OINODbApi {
             else if (result.success) {
                 common_1.OINOLog.debug("@oino-ts/db", "OINODbApi", "_doDelete", "Print SQL", { sql: sql });
                 const sql_res = await this.db.sqlExec(sql);
-                if (sql_res.hasErrors()) {
-                    result.setError(500, sql_res.getFirstError(), "DoDelete");
+                if (sql_res.success == false) {
+                    result.setError(500, sql_res.statusText, "DoDelete");
                     if (this._debugOnError) {
-                        result.addDebug("OINO DELETE MESSAGES [" + sql_res.messages.join('|') + "]", "DoDelete");
+                        result.addDebug("OINO DELETE MESSAGES [" + sql_res.statusText + "]", "DoDelete");
                         result.addDebug("OINO DELETE SQL [" + sql + "]", "DoDelete");
                     }
                 }
@@ -550,7 +559,7 @@ class OINODbApi {
             }
             else {
                 try {
-                    await this._doPost(result, rows);
+                    await this._doPost(result, rows, request);
                 }
                 catch (e) {
                     result.setError(500, "Unhandled exception in HTTP POST doRequest: " + e.message, "DoRequest");

package/dist/cjs/OINODbDataModel.js

@@ -67,7 +67,7 @@ class OINODbDataModel {
             }
         }
         // console.log("_printSqlInsertColumnsAndValues: columns=" + columns + ", values=" + values)
-        return "(" + columns + ") VALUES (" + values + ")";
+        return [columns, values];
     }
     _printSqlUpdateValues(row) {
         let result = "";
@@ -109,6 +109,15 @@ class OINODbDataModel {
         }
         return "(" + result + ")";
     }
+    _printSqlPrimaryKeyColumns() {
+        let result = [];
+        for (let f of this.fields) {
+            if (f.fieldParams.isPrimaryKey) {
+                result.push(this.api.db.printSqlColumnname(f.name));
+            }
+        }
+        return result;
+    }
     /**
      * Add a field to the datamodel.
      *
@@ -255,8 +264,10 @@ class OINODbDataModel {
      *
      */
     printSqlInsert(row) {
-        let result = "INSERT INTO " + this.api.db.printSqlTablename(this.api.params.tableName) + " " + this._printSqlInsertColumnsAndValues(row) + ";";
-        return result;
+        const table_name = this.api.db.printSqlTablename(this.api.params.tableName);
+        const [columns, values] = this._printSqlInsertColumnsAndValues(row);
+        const return_fields = this.api.params.returnInsertedIds ? this._printSqlPrimaryKeyColumns() : undefined;
+        return this.api.db.printSqlInsert(table_name, columns, values, return_fields);
     }
     /**
      * Print SQL insert statement from one data row.

package/dist/cjs/index.js

@@ -42,6 +42,6 @@ Object.defineProperty(exports, "OINODbParser", { enumerable: true, get: function
 /** Empty row instance */
 exports.OINODB_EMPTY_ROW = [];
 /** Empty row array instance */
-exports.OINODB_EMPTY_ROWS = [exports.OINODB_EMPTY_ROW];
+exports.OINODB_EMPTY_ROWS = [];
 /** Constant for undefined values */
 exports.OINODB_UNDEFINED = ""; // original idea was to have a defined literal that get's swapped back to undefined, but current implementation just leaves it out at serialization (so value does not matter)

package/dist/esm/OINODb.js

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-import { OINO_ERROR_PREFIX } from "@oino-ts/common";
+import { OINO_ERROR_PREFIX, OINOResult } from "@oino-ts/common";
 import { OINODB_EMPTY_ROW } from "./index.js";
 /**
  * Base class for database abstraction, implementing methods for connecting, making queries and parsing/formatting data
@@ -52,6 +52,23 @@ export class OINODb {
         result += ";";
         return result;
     }
+    /**
+     * Print SQL select statement with DB specific formatting.
+     *
+     * @param tableName - The name of the table to select from.
+     * @param columns - The columns to be selected.
+     * @param values - The values to be inserted.
+     * @param returnIdFields - the id fields to return if returnIds is true (if supported by the database)
+     *
+     */
+    printSqlInsert(tableName, columns, values, returnIdFields) {
+        let result = "INSERT INTO " + tableName + " (" + columns + ") VALUES (" + values + ")";
+        if (returnIdFields) {
+            result += " RETURNING " + returnIdFields.join(",");
+        }
+        result += ";";
+        return result;
+    }
 }
 /**
  * Base class for SQL results that can be asynchronously iterated (but
@@ -61,7 +78,7 @@ export class OINODb {
  * `OINODbDataSet` will serve it out consistently.
  *
  */
-export class OINODbDataSet {
+export class OINODbDataSet extends OINOResult {
     _data;
     /** Error messages */
     messages;
@@ -73,6 +90,7 @@ export class OINODbDataSet {
      *
      */
     constructor(data, messages = []) {
+        super();
         this._data = data;
         this.messages = messages;
     }

package/dist/esm/OINODbApi.js

@@ -5,7 +5,7 @@
  */
 import { Buffer } from "node:buffer";
 import { OINOLog, OINOResult, OINOHttpRequest, OINOBenchmark, OINOHtmlTemplate, OINOContentType, OINO_ERROR_PREFIX } from "@oino-ts/common";
-import { OINODbDataModel, OINOStringDataField, OINODbModelSet, OINODbConfig, OINONumberDataField, OINODbParser, OINODatetimeDataField, OINODbSqlAggregate, OINODbSqlSelect, OINODbSqlFilter, OINODbSqlOrder, OINODbSqlLimit } from "./index.js";
+import { OINODbDataModel, OINOStringDataField, OINODbModelSet, OINODbConfig, OINONumberDataField, OINODbParser, OINODatetimeDataField, OINODbSqlAggregate, OINODbSqlSelect, OINODbSqlFilter, OINODbSqlOrder, OINODbSqlLimit, OINODbSqlBooleanOperation } from "./index.js";
 import { OINOHashid } from "@oino-ts/hashid";
 export class OINODbApiRequest extends OINOHttpRequest {
     rowId;
@@ -14,7 +14,7 @@ export class OINODbApiRequest extends OINOHttpRequest {
     constructor(init) {
         super(init);
         this.rowId = init?.rowId || "";
-        this.rowData = init?.rowData || null;
+        this.rowData = init?.rowData || null; // rowData is not compatible with OINOHttpRequest body so it's not automatically set, caller can set both if needed
         this.sqlParams = init?.sqlParams || {};
         if (init?.filter) {
             if (init.filter instanceof OINODbSqlFilter) {
@@ -25,9 +25,15 @@ export class OINODbApiRequest extends OINOHttpRequest {
             }
         }
         if (!this.sqlParams.filter) {
-            const filter_param = this.url?.searchParams.get(OINODbConfig.OINODB_SQL_FILTER_PARAM);
-            if (filter_param) {
-                this.sqlParams.filter = OINODbSqlFilter.parse(filter_param);
+            const filter_params = this.url?.searchParams.getAll(OINODbConfig.OINODB_SQL_FILTER_PARAM) || [];
+            for (let i = 0; i < filter_params.length; i++) {
+                const f = OINODbSqlFilter.parse(filter_params[i]);
+                if (i > 0) {
+                    this.sqlParams.filter = OINODbSqlFilter.combine(this.sqlParams.filter, OINODbSqlBooleanOperation.and, f);
+                }
+                else {
+                    this.sqlParams.filter = f;
+                }
             }
         }
         if (init?.order) {
@@ -342,8 +348,8 @@ export class OINODbApi {
             sql = this.datamodel.printSqlSelect(rowId, request.sqlParams || {});
             OINOLog.debug("@oino-ts/db", "OINODbApi", "_doGet", "Print SQL", { sql: sql });
             const sql_res = await this.db.sqlSelect(sql);
-            if (sql_res.hasErrors()) {
-                result.setError(500, sql_res.getFirstError(), "DoGet");
+            if (sql_res.success == false) {
+                result.setError(500, sql_res.statusText, "DoGet");
                 if (this._debugOnError) {
                     result.addDebug("OINO GET SQL [" + sql + "]", "DoPut");
                 }
@@ -360,7 +366,7 @@ export class OINODbApi {
             }
         }
     }
-    async _doPost(result, rows) {
+    async _doPost(result, rows, request) {
         let sql = "";
         try {
             for (let i = 0; i < rows.length; i++) {
@@ -378,13 +384,16 @@ export class OINODbApi {
             else if (result.success) {
                 OINOLog.debug("@oino-ts/db", "OINODbApi", "_doPost", "Print SQL", { sql: sql });
                 const sql_res = await this.db.sqlExec(sql);
-                if (sql_res.hasErrors()) {
-                    result.setError(500, sql_res.getFirstError(), "DoPost");
+                if (sql_res.success == false) {
+                    result.setError(500, sql_res.statusText, "DoPost");
                     if (this._debugOnError) {
-                        result.addDebug("OINO POST MESSAGES [" + sql_res.messages.join('|') + "]", "DoPost");
+                        result.addDebug("OINO POST MESSAGES [" + sql_res.statusText + "]", "DoPost");
                         result.addDebug("OINO POST SQL [" + sql + "]", "DoPost");
                     }
                 }
+                else if (this.params.returnInsertedIds) {
+                    result.data = new OINODbModelSet(this.datamodel, sql_res, request.sqlParams); // return the inserted ids as data
+                }
             }
         }
         catch (e) {
@@ -415,10 +424,10 @@ export class OINODbApi {
             else if (result.success) {
                 OINOLog.debug("@oino-ts/db", "OINODbApi", "_doPut", "Print SQL", { sql: sql });
                 const sql_res = await this.db.sqlExec(sql);
-                if (sql_res.hasErrors()) {
-                    result.setError(500, sql_res.getFirstError(), "DoPut");
+                if (sql_res.success == false) {
+                    result.setError(500, sql_res.statusText, "DoPut");
                     if (this._debugOnError) {
-                        result.addDebug("OINO PUT MESSAGES [" + sql_res.messages.join('|') + "]", "DoPut");
+                        result.addDebug("OINO PUT MESSAGES [" + sql_res.statusText + "]", "DoPut");
                         result.addDebug("OINO PUT SQL [" + sql + "]", "DoPut");
                     }
                 }
@@ -428,7 +437,7 @@ export class OINODbApi {
             result.setError(500, "Unhandled exception: " + e.message, "DoPut");
             OINOLog.exception("@oino-ts/db", "OINODbApi", "_doPut", "exception in put request", { message: e.message, stack: e.stack });
             if (this._debugOnError) {
-                result.addDebug("OINO POST SQL [" + sql + "]", "DoPut");
+                result.addDebug("OINO PUT SQL [" + sql + "]", "DoPut");
             }
         }
     }
@@ -455,10 +464,10 @@ export class OINODbApi {
             else if (result.success) {
                 OINOLog.debug("@oino-ts/db", "OINODbApi", "_doDelete", "Print SQL", { sql: sql });
                 const sql_res = await this.db.sqlExec(sql);
-                if (sql_res.hasErrors()) {
-                    result.setError(500, sql_res.getFirstError(), "DoDelete");
+                if (sql_res.success == false) {
+                    result.setError(500, sql_res.statusText, "DoDelete");
                     if (this._debugOnError) {
-                        result.addDebug("OINO DELETE MESSAGES [" + sql_res.messages.join('|') + "]", "DoDelete");
+                        result.addDebug("OINO DELETE MESSAGES [" + sql_res.statusText + "]", "DoDelete");
                         result.addDebug("OINO DELETE SQL [" + sql + "]", "DoDelete");
                     }
                 }
@@ -544,7 +553,7 @@ export class OINODbApi {
             }
             else {
                 try {
-                    await this._doPost(result, rows);
+                    await this._doPost(result, rows, request);
                 }
                 catch (e) {
                     result.setError(500, "Unhandled exception in HTTP POST doRequest: " + e.message, "DoRequest");

package/dist/esm/OINODbDataModel.js

@@ -64,7 +64,7 @@ export class OINODbDataModel {
             }
         }
         // console.log("_printSqlInsertColumnsAndValues: columns=" + columns + ", values=" + values)
-        return "(" + columns + ") VALUES (" + values + ")";
+        return [columns, values];
     }
     _printSqlUpdateValues(row) {
         let result = "";
@@ -106,6 +106,15 @@ export class OINODbDataModel {
         }
         return "(" + result + ")";
     }
+    _printSqlPrimaryKeyColumns() {
+        let result = [];
+        for (let f of this.fields) {
+            if (f.fieldParams.isPrimaryKey) {
+                result.push(this.api.db.printSqlColumnname(f.name));
+            }
+        }
+        return result;
+    }
     /**
      * Add a field to the datamodel.
      *
@@ -252,8 +261,10 @@ export class OINODbDataModel {
      *
      */
     printSqlInsert(row) {
-        let result = "INSERT INTO " + this.api.db.printSqlTablename(this.api.params.tableName) + " " + this._printSqlInsertColumnsAndValues(row) + ";";
-        return result;
+        const table_name = this.api.db.printSqlTablename(this.api.params.tableName);
+        const [columns, values] = this._printSqlInsertColumnsAndValues(row);
+        const return_fields = this.api.params.returnInsertedIds ? this._printSqlPrimaryKeyColumns() : undefined;
+        return this.api.db.printSqlInsert(table_name, columns, values, return_fields);
     }
     /**
      * Print SQL insert statement from one data row.

package/dist/esm/index.js

@@ -11,6 +11,6 @@ export { OINODbParser } from "./OINODbParser.js";
 /** Empty row instance */
 export const OINODB_EMPTY_ROW = [];
 /** Empty row array instance */
-export const OINODB_EMPTY_ROWS = [OINODB_EMPTY_ROW];
+export const OINODB_EMPTY_ROWS = [];
 /** Constant for undefined values */
 export const OINODB_UNDEFINED = ""; // original idea was to have a defined literal that get's swapped back to undefined, but current implementation just leaves it out at serialization (so value does not matter)

package/dist/types/OINODb.d.ts

@@ -26,6 +26,11 @@ export declare abstract class OINODb {
      *
      */
     abstract validate(): Promise<OINOResult>;
+    /**
+     * Disconnect from database.
+     *
+     */
+    abstract disconnect(): Promise<void>;
     /**
      * Print a table name using database specific SQL escaping.
      *
@@ -99,6 +104,16 @@ export declare abstract class OINODb {
      *
      */
     printSqlSelect(tableName: string, columnNames: string, whereCondition: string, orderCondition: string, limitCondition: string, groupByCondition: string): string;
+    /**
+     * Print SQL select statement with DB specific formatting.
+     *
+     * @param tableName - The name of the table to select from.
+     * @param columns - The columns to be selected.
+     * @param values - The values to be inserted.
+     * @param returnIdFields - the id fields to return if returnIds is true (if supported by the database)
+     *
+     */
+    printSqlInsert(tableName: string, columns: string, values: string, returnIdFields?: string[]): string;
 }
 /**
  * Base class for SQL results that can be asynchronously iterated (but
@@ -108,7 +123,7 @@ export declare abstract class OINODb {
  * `OINODbDataSet` will serve it out consistently.
  *
  */
-export declare abstract class OINODbDataSet {
+export declare abstract class OINODbDataSet extends OINOResult {
     private _data;
     /** Error messages */
     readonly messages: string[];

package/dist/types/OINODbDataModel.d.ts

@@ -26,6 +26,7 @@ export declare class OINODbDataModel {
     private _printSqlInsertColumnsAndValues;
     private _printSqlUpdateValues;
     private _printSqlPrimaryKeyCondition;
+    private _printSqlPrimaryKeyColumns;
     /**
      * Add a field to the datamodel.
      *

package/dist/types/index.d.ts

@@ -44,6 +44,8 @@ export type OINODbApiParams = {
     hashidStaticIds?: boolean;
     /** Name of field that has the modified field */
     cacheModifiedField?: string;
+    /** Return inserted id values */
+    returnInsertedIds?: boolean;
 };
 /**
  * Database class (constructor) type

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db",
-  "version": "0.19.0",
+  "version": "0.20.1",
   "description": "OINO TS library package for publishing an SQL database tables as a REST API.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -19,13 +19,13 @@
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "dependencies": {
-    "@oino-ts/common": "0.19.0",
+    "@oino-ts/common": "0.20.1",
     "oino-ts": "file:.."
   },
   "devDependencies": {
-    "@oino-ts/types": "0.19.0",
+    "@oino-ts/types": "0.20.1",
     "@types/bun": "^1.1.14",
-    "@types/node": "^20.19.00",
+    "@types/node": "^20.20.10",
     "typescript": "~5.9.0"
   },
   "files": [

package/src/OINODb.ts

@@ -43,6 +43,12 @@ export abstract class OINODb {
      */
     abstract validate(): Promise<OINOResult>
     
+    /**
+     * Disconnect from database.
+     *
+     */
+    abstract disconnect(): Promise<void>
+    
     /**
      * Print a table name using database specific SQL escaping.
      * 
@@ -140,6 +146,25 @@ export abstract class OINODb {
         result += ";"
         return result;
     }
+
+    /**
+     * Print SQL select statement with DB specific formatting.
+     * 
+     * @param tableName - The name of the table to select from.
+     * @param columns - The columns to be selected.
+     * @param values - The values to be inserted.
+     * @param returnIdFields - the id fields to return if returnIds is true (if supported by the database)
+     * 
+     */
+    printSqlInsert(tableName:string, columns:string, values:string, returnIdFields?:string[]): string {
+        let result = "INSERT INTO " + tableName + " (" + columns + ") VALUES (" + values + ")"
+        if (returnIdFields) {
+            result += " RETURNING " + returnIdFields.join(",")
+        }
+        result += ";"
+        return result;
+    }
+
 }
 
 /**
@@ -151,7 +176,7 @@ export abstract class OINODb {
  *
  */
 
-export abstract class OINODbDataSet {
+export abstract class OINODbDataSet extends OINOResult {
     private _data: unknown;
 
     /** Error messages */
@@ -165,6 +190,7 @@ export abstract class OINODbDataSet {
      *
      */
     constructor(data: unknown, messages: string[] = []) {
+        super();
         this._data = data;
         this.messages = messages;
     }

package/src/OINODbApi.test.ts

@@ -65,7 +65,7 @@ const API_TESTS:OINOTestParams[] = [
     },
     {
         name: "API 3",
-        apiParams: { apiName: "Employees", tableName: "Employees", hashidKey: "12345678901234567890123456789012", hashidStaticIds:true },
+        apiParams: { apiName: "Employees", tableName: "Employees", hashidKey: "12345678901234567890123456789012", hashidStaticIds:true, returnInsertedIds:true },
         sqlParams: { filter: OINODbSqlFilter.parse("(TitleOfCourtesy)-eq(Ms.)"), order: OINODbSqlOrder.parse("LastName asc"), limit: OINODbSqlLimit.parse("5") },
         postRow: [99, "LastName", "FirstName", "Title", "TitleOfCourtesy", new Date("2024-04-06"), new Date("2024-04-07"), "Address", "City", "Region", 12345, "EU", "123 456 7890", "9876", Buffer.from("0001020304", "hex"), "Line1\nLine2", 1, "http://accweb/emmployees/lastnamefirstname.bmp"],
         putRow: [99, "LastName2", "FirstName2", null, "TitleOfCourtesy2", new Date("2023-04-06"), new Date("2023-04-07"), "Address2", "City2", "Region2", 54321, "EU2", "234 567 8901", "8765", Buffer.from("0506070809", "hex"), "Line3\nLine4", 1, "http://accweb/emmployees/lastnamefirstname.bmp"],
@@ -260,7 +260,12 @@ export async function OINOTestApi(dbParams:OINODbParams, testParams: OINOTestPar
         expect(encodeResult((await api.doApiRequest(post_request_with_id)))).toMatchSnapshot("POST")
     })
     await test(target_name + target_db + target_table + target_group + " insert", async () => {
-        expect(encodeResult((await api.doApiRequest(post_request)))).toMatchSnapshot("POST")
+        const post_res = await api.doApiRequest(post_request)
+        if (testParams.apiParams.returnInsertedIds) {
+            expect(encodeData(await post_res.data?.writeString())).toMatchSnapshot("POST RETURN ID")
+        } else {
+            expect(encodeResult(post_res)).toMatchSnapshot("POST")
+        }
         expect(encodeData(await (await api.doApiRequest(get_request_with_rowid)).data?.writeString())).toMatchSnapshot("GET JSON")
         expect(encodeData(await (await api.doApiRequest(get_request_with_rowid)).data?.writeString(OINOContentType.csv))).toMatchSnapshot("GET CSV")
     })

package/src/OINODbApi.ts

@@ -6,7 +6,7 @@
 
 import { Buffer } from "node:buffer";
 import { OINOLog, OINOResult, OINOHttpRequest, type OINOHttpRequestInit, OINOBenchmark, OINOHttpResult, OINOHtmlTemplate, OINOContentType, OINO_ERROR_PREFIX } from "@oino-ts/common";
-import { OINODbApiParams, OINODb, OINODbDataSet, OINODbDataModel, OINODbDataField, OINOStringDataField, OINODataRow, OINODataCell, OINODbModelSet, OINODbConfig, OINONumberDataField, OINODbParser, OINODatetimeDataField, OINODbSqlParams, OINODbSqlAggregate, OINODbSqlSelect, OINODbSqlFilter, OINODbSqlOrder, OINODbSqlLimit } from "./index.js"
+import { OINODbApiParams, OINODb, OINODbDataSet, OINODbDataModel, OINODbDataField, OINOStringDataField, OINODataRow, OINODataCell, OINODbModelSet, OINODbConfig, OINONumberDataField, OINODbParser, OINODatetimeDataField, OINODbSqlParams, OINODbSqlAggregate, OINODbSqlSelect, OINODbSqlFilter, OINODbSqlOrder, OINODbSqlLimit, OINODbSqlBooleanOperation } from "./index.js"
 import { OINOHashid } from "@oino-ts/hashid"
 
 export type OINODbApiData = string|OINODataRow[]|Buffer|Uint8Array|object|null
@@ -30,7 +30,7 @@ export class OINODbApiRequest extends OINOHttpRequest {
     constructor (init: OINODbApiRequestInit) {
         super(init)
         this.rowId = init?.rowId || ""
-        this.rowData = init?.rowData || null
+        this.rowData = init?.rowData || null // rowData is not compatible with OINOHttpRequest body so it's not automatically set, caller can set both if needed
         this.sqlParams = init?.sqlParams || {}
 
         if (init?.filter) {
@@ -41,9 +41,14 @@ export class OINODbApiRequest extends OINOHttpRequest {
             }
         } 
         if (!this.sqlParams.filter) {
-            const filter_param = this.url?.searchParams.get(OINODbConfig.OINODB_SQL_FILTER_PARAM)
-            if (filter_param) {
-                this.sqlParams.filter = OINODbSqlFilter.parse(filter_param)
+            const filter_params = this.url?.searchParams.getAll(OINODbConfig.OINODB_SQL_FILTER_PARAM) || []
+            for (let i=0; i<filter_params.length; i++) {
+                const f = OINODbSqlFilter.parse(filter_params[i])
+                if (i > 0) {
+                    this.sqlParams.filter = OINODbSqlFilter.combine(this.sqlParams.filter, OINODbSqlBooleanOperation.and, f)
+                } else {
+                    this.sqlParams.filter = f
+                }
             }
         }
         if (init?.order) {
@@ -369,8 +374,8 @@ export class OINODbApi {
             sql = this.datamodel.printSqlSelect(rowId, request.sqlParams || {})
             OINOLog.debug("@oino-ts/db", "OINODbApi", "_doGet", "Print SQL", {sql:sql})
             const sql_res:OINODbDataSet = await this.db.sqlSelect(sql)
-            if (sql_res.hasErrors()) {
-                result.setError(500, sql_res.getFirstError(), "DoGet")
+            if (sql_res.success == false) {
+                result.setError(500, sql_res.statusText, "DoGet")
                 if (this._debugOnError) {
                     result.addDebug("OINO GET SQL [" + sql + "]", "DoPut")
                 }
@@ -386,7 +391,7 @@ export class OINODbApi {
         }
     }
     
-    private async _doPost(result:OINODbApiResult, rows:OINODataRow[]):Promise<void> {
+    private async _doPost(result:OINODbApiResult, rows:OINODataRow[], request:OINODbApiRequest):Promise<void> {
         let sql:string = "" 
         try {
             for (let i=0; i<rows.length; i++) {
@@ -404,12 +409,14 @@ export class OINODbApi {
             } else if (result.success) {
                 OINOLog.debug("@oino-ts/db", "OINODbApi", "_doPost", "Print SQL", {sql:sql})
                 const sql_res:OINODbDataSet = await this.db.sqlExec(sql)
-                if (sql_res.hasErrors()) {
-                    result.setError(500, sql_res.getFirstError(), "DoPost")
+                if (sql_res.success == false) {
+                    result.setError(500, sql_res.statusText, "DoPost")
                     if (this._debugOnError) {
-                        result.addDebug("OINO POST MESSAGES [" + sql_res.messages.join('|') + "]", "DoPost")
+                        result.addDebug("OINO POST MESSAGES [" + sql_res.statusText + "]", "DoPost")
                         result.addDebug("OINO POST SQL [" + sql + "]", "DoPost")                
                     }
+                } else if (this.params.returnInsertedIds) {
+                    result.data = new OINODbModelSet(this.datamodel, sql_res, request.sqlParams) // return the inserted ids as data
                 }
             }
         } catch (e:any) {
@@ -441,10 +448,10 @@ export class OINODbApi {
             } else if (result.success) {
                 OINOLog.debug("@oino-ts/db", "OINODbApi", "_doPut", "Print SQL", {sql:sql})
                 const sql_res:OINODbDataSet = await this.db.sqlExec(sql)
-                if (sql_res.hasErrors()) {
-                    result.setError(500, sql_res.getFirstError(), "DoPut")
+                if (sql_res.success == false) {
+                    result.setError(500, sql_res.statusText, "DoPut")
                     if (this._debugOnError) {
-                        result.addDebug("OINO PUT MESSAGES [" + sql_res.messages.join('|') + "]", "DoPut")
+                        result.addDebug("OINO PUT MESSAGES [" + sql_res.statusText + "]", "DoPut")
                         result.addDebug("OINO PUT SQL [" + sql + "]", "DoPut")
                     }
                 }
@@ -453,7 +460,7 @@ export class OINODbApi {
             result.setError(500, "Unhandled exception: " + e.message, "DoPut")
             OINOLog.exception("@oino-ts/db", "OINODbApi", "_doPut", "exception in put request", {message:e.message, stack:e.stack})
             if (this._debugOnError) {
-                result.addDebug("OINO POST SQL [" + sql + "]", "DoPut")
+                result.addDebug("OINO PUT SQL [" + sql + "]", "DoPut")
             }
         }
     }
@@ -480,10 +487,10 @@ export class OINODbApi {
             
                 OINOLog.debug("@oino-ts/db", "OINODbApi", "_doDelete", "Print SQL", {sql:sql})
                 const sql_res:OINODbDataSet = await this.db.sqlExec(sql)
-                if (sql_res.hasErrors()) {
-                    result.setError(500, sql_res.getFirstError(), "DoDelete")
+                if (sql_res.success == false) {
+                    result.setError(500, sql_res.statusText, "DoDelete")
                     if (this._debugOnError) {
-                        result.addDebug("OINO DELETE MESSAGES [" + sql_res.messages.join('|') + "]", "DoDelete")
+                        result.addDebug("OINO DELETE MESSAGES [" + sql_res.statusText + "]", "DoDelete")
                         result.addDebug("OINO DELETE SQL [" + sql + "]", "DoDelete")                    
                     }
                 }
@@ -570,7 +577,7 @@ export class OINODbApi {
 
             } else {
                 try {
-                    await this._doPost(result, rows)
+                    await this._doPost(result, rows, request)
 
                 } catch (e:any) {
                     result.setError(500, "Unhandled exception in HTTP POST doRequest: " + e.message, "DoRequest")

package/src/OINODbDataModel.ts

@@ -53,7 +53,7 @@ export class OINODbDataModel {
         return result.substring(0, result.length-1)
     }
 
-    private _printSqlInsertColumnsAndValues(row: OINODataRow): string {
+    private _printSqlInsertColumnsAndValues(row: OINODataRow): [string, string] {
         let columns: string = "";
         let values: string = "";
         for (let i=0; i< this.fields.length; i++) {
@@ -70,7 +70,7 @@ export class OINODbDataModel {
             }
         }
         // console.log("_printSqlInsertColumnsAndValues: columns=" + columns + ", values=" + values)
-        return "(" + columns + ") VALUES (" + values + ")";
+        return [ columns, values ]
     }
 
     private _printSqlUpdateValues(row: OINODataRow): string {
@@ -115,6 +115,16 @@ export class OINODbDataModel {
         return "(" + result + ")";
     }
     
+    private _printSqlPrimaryKeyColumns(): string[] {
+        let result: string[] = []
+        for (let f of this.fields) {
+            if (f.fieldParams.isPrimaryKey) {
+                result.push(this.api.db.printSqlColumnname(f.name))
+            }
+        }
+        return result
+    }
+
     /**
      * Add a field to the datamodel.
      * 
@@ -263,8 +273,10 @@ export class OINODbDataModel {
      *
      */
     printSqlInsert(row: OINODataRow): string {
-        let result: string = "INSERT INTO " + this.api.db.printSqlTablename(this.api.params.tableName) + " " + this._printSqlInsertColumnsAndValues(row) + ";";
-        return result;
+        const table_name = this.api.db.printSqlTablename(this.api.params.tableName)
+        const [columns, values] =  this._printSqlInsertColumnsAndValues(row)
+        const return_fields = this.api.params.returnInsertedIds ? this._printSqlPrimaryKeyColumns() : undefined
+        return this.api.db.printSqlInsert(table_name, columns, values, return_fields);
     }
 
     /**

package/src/index.ts

@@ -43,7 +43,9 @@ export type OINODbApiParams = {
     /** Make hashids static per row/table */
     hashidStaticIds?: boolean,
     /** Name of field that has the modified field */
-    cacheModifiedField?:string
+    cacheModifiedField?:string,
+    /** Return inserted id values */
+    returnInsertedIds?: boolean
 }
 
 /** 
@@ -107,7 +109,7 @@ export type OINODataRow = Array<OINODataCell>
 /** Empty row instance */
 export const OINODB_EMPTY_ROW:OINODataRow = []
 /** Empty row array instance */
-export const OINODB_EMPTY_ROWS:OINODataRow[] = [OINODB_EMPTY_ROW]
+export const OINODB_EMPTY_ROWS:OINODataRow[] = []
 /** Constant for undefined values */
 export const OINODB_UNDEFINED = "" // original idea was to have a defined literal that get's swapped back to undefined, but current implementation just leaves it out at serialization (so value does not matter)