@oino-ts/db 0.7.1 → 0.8.0

package/dist/esm/OINODbDataModel.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, OINODbConfig, OINONumberDataField, OINODB_UNDEFINED } from "./index.js";
+import { OINO_ERROR_PREFIX, OINODbConfig, OINONumberDataField, OINOLog, OINODB_UNDEFINED } from "./index.js";
 /**
  * OINO Datamodel object for representing one database table and it's columns.
  *
@@ -25,7 +25,6 @@ export class OINODbDataModel {
         this._columnLookup = {};
         this.api = api;
         this.fields = [];
-        // OINOLog_debug("OINODbDataModel (" + tableName + "):\n" + this._printTableDebug("\n"))
     }
     /**
      * Initialize datamodel from SQL schema.
@@ -71,7 +70,6 @@ export class OINODbDataModel {
         for (let i = 0; i < this.fields.length; i++) {
             const f = this.fields[i];
             const val = row[i];
-            // OINOLog_debug("OINODbDataModel._printSqlUpdateValues", {field:f.name, primary_key:f.fieldParams.isPrimaryKey, val:val})
             if ((!f.fieldParams.isPrimaryKey) && (val !== undefined)) {
                 if (result != "") {
                     result += ",";
@@ -98,7 +96,6 @@ export class OINODbDataModel {
                 if (value == "") { // ids are user input and could be specially crafted to be empty
                     throw new Error(OINO_ERROR_PREFIX + ": empty condition for id '" + id_value + "' for table " + this.api.params.tableName);
                 }
-                // OINOLog.debug("OINODbDataModel._printSqlPrimaryKeyCondition", {field:f.name, value:value, id_value:id_value})
                 result += f.printSqlColumnName() + "=" + value;
                 i = i + 1;
             }
@@ -125,7 +122,6 @@ export class OINODbDataModel {
      *
      */
     findFieldByName(name) {
-        // OINOLog.debug("OINODbDataModel.findFieldByName", {_columnLookup:this._columnLookup})
         const i = this._columnLookup[name];
         if (i >= 0) {
             return this.fields[i];
@@ -141,7 +137,6 @@ export class OINODbDataModel {
      *
      */
     findFieldIndexByName(name) {
-        // OINOLog.debug("OINODbDataModel.findFieldIndexByName", {_columnLookup:this._columnLookup})
         const i = this._columnLookup[name];
         if (i >= 0) {
             return i;
@@ -232,13 +227,11 @@ export class OINODbDataModel {
         else {
             column_names = this._printSqlColumnNames(params.select);
         }
-        // OINOLog.debug("OINODbDataModel.printSqlSelect", {column_names:column_names})
         const order_sql = params.order?.toSql(this) || "";
         const limit_sql = params.limit?.toSql(this) || "";
         const filter_sql = params.filter?.toSql(this) || "";
         const groupby_sql = params.aggregate?.toSql(this, params.select) || "";
         let where_sql = "";
-        // OINOLog.debug("OINODbDataModel.printSqlSelect", {order_sql:order_sql, limit_sql:limit_sql, filter_sql:filter_sql, groupby_sql:groupby_sql})
         if ((id != null) && (id != "") && (filter_sql != "")) {
             where_sql = this._printSqlPrimaryKeyCondition(id) + " AND " + filter_sql;
         }
@@ -249,7 +242,7 @@ export class OINODbDataModel {
             where_sql = filter_sql;
         }
         const result = this.api.db.printSqlSelect(this.api.params.tableName, column_names, where_sql, order_sql, limit_sql, groupby_sql);
-        // OINOLog.debug("OINODbDataModel.printSqlSelect", {result:result})
+        OINOLog.debug("@oinots/db", "OINODbDataModel", "printSqlSelect", "Result", { sql: result });
         return result;
     }
     /**
@@ -260,6 +253,7 @@ export class OINODbDataModel {
      */
     printSqlInsert(row) {
         let result = "INSERT INTO " + this.api.db.printSqlTablename(this.api.params.tableName) + " " + this._printSqlInsertColumnsAndValues(row) + ";";
+        OINOLog.debug("@oinots/db", "OINODbDataModel", "printSqlInsert", "Result", { sql: result });
         return result;
     }
     /**
@@ -271,7 +265,7 @@ export class OINODbDataModel {
      */
     printSqlUpdate(id, row) {
         let result = "UPDATE " + this.api.db.printSqlTablename(this.api.params.tableName) + " SET " + this._printSqlUpdateValues(row) + " WHERE " + this._printSqlPrimaryKeyCondition(id) + ";";
-        // OINOLog.debug("OINODbDataModel.printSqlUpdate", {result:result, id:id, row:row})
+        OINOLog.debug("@oinots/db", "OINODbDataModel", "printSqlUpdate", "Result", { sql: result });
         return result;
     }
     /**
@@ -282,6 +276,7 @@ export class OINODbDataModel {
      */
     printSqlDelete(id) {
         let result = "DELETE FROM " + this.api.db.printSqlTablename(this.api.params.tableName) + " WHERE " + this._printSqlPrimaryKeyCondition(id) + ";";
+        OINOLog.debug("@oinots/db", "OINODbDataModel", "printSqlDelete", "Result", { sql: result });
         return result;
     }
 }

package/dist/esm/OINODbFactory.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 { OINODbApi, OINOContentType, OINODbSqlFilter, OINODbConfig, OINODbSqlOrder, OINODbSqlLimit, OINODbSqlAggregate, OINODbSqlSelect } from "./index.js";
+import { OINODbApi, OINOContentType, OINODbSqlFilter, OINODbConfig, OINODbSqlOrder, OINODbSqlLimit, OINODbSqlAggregate, OINODbSqlSelect, OINOLog } from "./index.js";
 /**
  * Static factory class for easily creating things based on data
  *
@@ -18,7 +18,6 @@ export class OINODbFactory {
      * @param dbTypeClass constructor for creating a database of that type
      */
     static registerDb(dbName, dbTypeClass) {
-        // OINOLog.debug("OINODbFactory.registerDb", {dbType:dbName})
         this._dbRegistry[dbName] = dbTypeClass;
     }
     /**
@@ -106,12 +105,10 @@ export class OINODbFactory {
             result.requestType = OINOContentType.json;
         }
         const response_type = url.searchParams.get(OINODbConfig.OINODB_RESPONSE_TYPE) || request.headers.get("accept"); // accept header can be overridden by query parameter
-        // OINOLog.debug("createParamsFromRequest: accept headers", {accept:accept})
         const accept_types = response_type?.split(', ') || [];
         for (let i = 0; i < accept_types.length; i++) {
             if (Object.values(OINOContentType).includes(accept_types[i])) {
                 result.responseType = accept_types[i];
-                // OINOLog.debug("createParamsFromRequest: response type found", {respnse_type:result.responseType})
                 break;
             }
         }
@@ -126,7 +123,7 @@ export class OINODbFactory {
         if (etags) {
             result.etags = etags;
         }
-        // OINOLog.debug("createParamsFromRequest", {params:result})
+        OINOLog.debug("@oinots/db", "OINODbFactory", "createParamsFromRequest", "Result", { params: result });
         return result;
     }
 }

package/dist/esm/OINODbModelSet.js

@@ -60,7 +60,7 @@ export class OINODbModelSet {
             }
             let value = f.serializeCell(row[i]);
             if (value === undefined) {
-                // OINOLog.info("OINODbModelSet._writeRowJson: undefined value skipped", {field_name:f.name})
+                OINOLog.info("@oinots/db", "OINODbModelSet", "_writeRowJson", "Undefined value skipped", { field_name: f.name });
             }
             else if (value === null) {
                 json_row += "," + OINOStr.encode(f.name, OINOContentType.json) + ":null";
@@ -76,7 +76,6 @@ export class OINODbModelSet {
             }
         }
         json_row = OINOStr.encode(OINODbConfig.OINODB_ID_FIELD, OINOContentType.json) + ":" + OINOStr.encode(OINODbConfig.printOINOId(primary_key_values), OINOContentType.json) + json_row;
-        // OINOLog_debug("OINODbModelSet._writeRowJson="+json_row)
         return "{" + json_row + "}";
     }
     async _writeStringJson() {
@@ -86,12 +85,10 @@ export class OINODbModelSet {
                 result += ",\r\n";
             }
             const row = this.dataset.getRow();
-            // OINOLog.debug("OINODbModelSet._writeStringJson: row", {row:row})
             result += this._writeRowJson(row);
             await this.dataset.next();
         }
         result = "[\r\n" + result + "\r\n]";
-        // OINOLog_debug("OINODbModelSet._writeStringJson="+result)
         return result;
     }
     _writeHeaderCsv() {
@@ -101,11 +98,9 @@ export class OINODbModelSet {
         for (let i = 0; i < fields.length; i++) {
             csv_header += ",\"" + fields[i].name + "\"";
         }
-        // OINOLog_debug("OINODbModelSet._writeHeaderCsv="+csv_header)
         return csv_header;
     }
     _writeRowCsv(row) {
-        // OINOLog_debug("OINODbModelSet._writeRowCsv", {row:row})
         const model = this.datamodel;
         const fields = model.fields;
         let row_id_seed = model.getRowPrimarykeyValues(row).join(' ');
@@ -126,7 +121,6 @@ export class OINODbModelSet {
             }
         }
         csv_row = OINOStr.encode(OINODbConfig.printOINOId(primary_key_values), OINOContentType.csv) + csv_row;
-        // OINOLog_debug("OINODbModelSet._writeRowCsv="+csv_row)
         return csv_row;
     }
     async _writeStringCsv() {
@@ -136,11 +130,9 @@ export class OINODbModelSet {
                 result += "\r\n";
             }
             const row = this.dataset.getRow();
-            // OINOLog.debug("OINODbModelSet._writeStringCsv: row", {row:row})
             result += this._writeRowCsv(row);
             await this.dataset.next();
         }
-        // OINOLog_debug("OINODbModelSet._writeStringCsv="+result)
         return result;
     }
     _writeRowFormdataParameterBlock(blockName, blockValue, multipartBoundary) {
@@ -155,7 +147,6 @@ export class OINODbModelSet {
         return multipartBoundary + "\r\n" + "Content-Disposition: form-data; name=\"" + blockName + "\"; filename=" + blockName + "\"\r\nContent-Type: application/octet-stream\r\nContent-Transfer-Encoding: BASE64\r\n\r\n" + blockValue + "\r\n";
     }
     _writeRowFormdata(row) {
-        // console.log("OINODbModelSet._writeRowFormdata: row", row)
         const multipart_boundary = "---------OINOMultipartBoundary35424568"; // this method is just used for test data generation and we want it to be static
         const model = this.datamodel;
         const fields = model.fields;
@@ -171,7 +162,7 @@ export class OINODbModelSet {
             let formdata_block = "";
             let is_file = (f instanceof OINOBlobDataField);
             if (value === undefined) {
-                OINOLog.info("OINODbModelSet._writeRowFormdata: undefined value skipped.", { field: f.name });
+                OINOLog.info("@oinots/db", "OINODbModelSet", "_writeRowFormdata", "Undefined value skipped", { field_name: f.name });
             }
             else if (value === null) {
                 formdata_block = this._writeRowFormdataParameterBlock(fields[i].name, null, multipart_boundary);
@@ -185,7 +176,6 @@ export class OINODbModelSet {
                     formdata_block = this._writeRowFormdataParameterBlock(fields[i].name, value, multipart_boundary);
                 }
             }
-            // OINOLog.debug("OINODbModelSet._writeRowFormdata next block", {formdata_block:formdata_block})
             result += formdata_block;
         }
         result = this._writeRowFormdataParameterBlock(OINODbConfig.OINODB_ID_FIELD, OINODbConfig.printOINOId(primary_key_values), multipart_boundary) + result;
@@ -193,12 +183,10 @@ export class OINODbModelSet {
     }
     _writeStringFormdata() {
         const row = this.dataset.getRow();
-        // OINOLog.debug("OINODbModelSet._writeStringFormdata: row", {row:row})
         let result = this._writeRowFormdata(row);
         return result;
     }
     _writeRowUrlencode(row) {
-        // console.log("OINODbModelSet._writeRowUrlencode row=" + row)
         const model = this.datamodel;
         const fields = model.fields;
         let row_id_seed = model.getRowPrimarykeyValues(row).join(' ');
@@ -222,7 +210,6 @@ export class OINODbModelSet {
             }
         }
         urlencode_row = OINOStr.encode(OINODbConfig.OINODB_ID_FIELD, OINOContentType.urlencode) + "=" + OINOStr.encode(OINODbConfig.printOINOId(primary_key_values), OINOContentType.urlencode) + "&" + urlencode_row;
-        // OINOLog_debug("OINODbModelSet._writeRowCsv="+csv_row)
         return urlencode_row;
     }
     async _writeStringUrlencode() {
@@ -230,14 +217,12 @@ export class OINODbModelSet {
         let line_count = 0;
         while (!this.dataset.isEof()) {
             const row = this.dataset.getRow();
-            // OINOLog.debug("OINODbModelSet._writeStringUrlencode: row", {row:row})
             result += this._writeRowUrlencode(row) + "\r\n";
             await this.dataset.next();
             line_count += 1;
         }
-        // OINOLog_debug("OINODbModelSet._writeStringCsv="+result)
         if (line_count > 1) {
-            OINOLog.warning("OINODbModelSet._writeStringUrlencode: content type " + OINOContentType.urlencode + " does not officially support multiline content!");
+            OINOLog.warning("@oinots/db", "OINODbModelSet", "_writeStringUrlencode", "Content type " + OINOContentType.urlencode + " does not officially support multiline content!", {});
         }
         return result;
     }
@@ -262,7 +247,7 @@ export class OINODbModelSet {
             result += await this._writeStringUrlencode();
         }
         else {
-            OINOLog.error("OINODbModelSet.writeString: content type is only for input!", { contentType: contentType });
+            OINOLog.error("@oinots/db", "OINODbModelSet", "writeString", "Content type is only for input!", { contentType: contentType });
         }
         return result;
     }

package/dist/esm/OINODbParser.js

@@ -52,11 +52,11 @@ export class OINODbParser {
             return this._createRowFromUrlencoded(datamodel, data);
         }
         else if (requestParams.requestType == OINOContentType.html) {
-            OINOLog.error("HTML can't be used as an input content type!", { contentType: OINOContentType.html });
+            OINOLog.error("@oinots/db", "OINODbParser", "createRowsFromText", "HTML can't be used as an input content type!", { contentType: OINOContentType.html });
             return [];
         }
         else {
-            OINOLog.error("Unrecognized input content type!", { contentType: requestParams.requestType });
+            OINOLog.error("@oinots/db", "OINODbParser", "createRowsFromText", "Unrecognized input content type!", { contentType: requestParams.requestType });
             return [];
         }
     }
@@ -82,11 +82,11 @@ export class OINODbParser {
             return this._createRowFromUrlencoded(datamodel, data.toString()); // data is urlencoded so it's a string
         }
         else if (requestParams.requestType == OINOContentType.html) {
-            OINOLog.error("HTML can't be used as an input content type!", { contentType: OINOContentType.html });
+            OINOLog.error("@oinots/db", "OINODbParser", "createRowsFromBlob", "HTML can't be used as an input content type!", { contentType: OINOContentType.html });
             return [];
         }
         else {
-            OINOLog.error("Unrecognized input content type!", { contentType: requestParams.requestType });
+            OINOLog.error("@oinots/db", "OINODbParser", "createRowsFromBlob", "Unrecognized input content type!", { contentType: requestParams.requestType });
             return [];
         }
     }
@@ -199,7 +199,6 @@ export class OINODbParser {
             field_to_header_mapping[i] = headers.indexOf(datamodel.fields[i].name);
             headers_found = headers_found || (field_to_header_mapping[i] >= 0);
         }
-        // OINOLog.debug("createRowFromCsv", {headers:headers, field_to_header_mapping:field_to_header_mapping})
         if (!headers_found) {
             return result;
         }
@@ -240,7 +239,7 @@ export class OINODbParser {
                 result.push(row);
             }
             else {
-                OINOLog.warning("createRowFromCsv: empty row skipped");
+                OINOLog.warning("@oinots/db", "OINODbParser", "_createRowFromCsv", "Empty row skipped", {});
             }
             start = end;
             end = start;
@@ -281,7 +280,7 @@ export class OINODbParser {
             return result;
         }
         else {
-            OINOLog.warning("createRowFromJsonObj: empty row skipped");
+            OINOLog.warning("@oinots/db", "OINODbParser", "_createRowFromJsonObj", "Empty row skipped", {});
             return undefined;
         }
     }
@@ -331,18 +330,15 @@ export class OINODbParser {
             const n = data.length;
             let start = this._findMultipartBoundary(data, multipartBoundary, 0);
             let end = this._findMultipartBoundary(data, multipartBoundary, start);
-            // OINOLog.debug("createRowFromFormdata: enter", {start:start, end:end, multipartBoundary:multipartBoundary})
             const row = new Array(datamodel.fields.length);
             let has_data = false;
             while (end < n) {
-                // OINOLog.debug("createRowFromFormdata: next block", {start:start, end:end, block:data.substring(start, end)})
                 let block_ok = true;
                 let l = this._parseMultipartLine(data, start);
-                // OINOLog.debug("createRowFromFormdata: next line", {start:start, end:end, line:l})
                 start += l.length + 2;
                 const header_matches = OINODbParser._multipartHeaderRegex.exec(l);
                 if (!header_matches) {
-                    OINOLog.warning("OINODbFactory.createRowFromFormdata: unsupported block skipped!", { header_line: l });
+                    OINOLog.warning("@oinots/db", "OINODbParser", "_createRowFromFormdata", "Unsupported block skipped", { header_line: l });
                     block_ok = false;
                 }
                 else {
@@ -350,18 +346,16 @@ export class OINODbParser {
                     const is_file = header_matches[3] != null;
                     let is_base64 = false;
                     const field_index = datamodel.findFieldIndexByName(field_name);
-                    // OINOLog.debug("createRowFromFormdata: header", {field_name:field_name, field_index:field_index, is_file:is_file, is_base64:is_base64})
                     if (field_index < 0) {
-                        OINOLog.warning("OINODbFactory.createRowFromFormdata: form field not found and skipped!", { field_name: field_name });
+                        OINOLog.warning("@oinots/db", "OINODbParser", "_createRowFromFormdata", "Form field not found and skipped!", { field_name: field_name });
                         block_ok = false;
                     }
                     else {
                         const field = datamodel.fields[field_index];
                         l = this._parseMultipartLine(data, start);
-                        // OINOLog.debug("createRowFromFormdata: next line", {start:start, end:end, line:l})
                         while (block_ok && (l != '')) {
                             if (l.startsWith('Content-Type:') && (l.indexOf('multipart/mixed') >= 0)) {
-                                OINOLog.warning("OINODbFactory.createRowFromFormdata: mixed multipart files not supported and skipped!", { header_line: l });
+                                OINOLog.warning("@oinots/db", "OINODbParser", "_createRowFromFormdata", "Mixed multipart files not supported and skipped!", { header_line: l });
                                 block_ok = false;
                             }
                             else if (l.startsWith('Content-Transfer-Encoding:') && (l.indexOf('BASE64') >= 0)) {
@@ -369,14 +363,12 @@ export class OINODbParser {
                             }
                             start += l.length + 2;
                             l = this._parseMultipartLine(data, start);
-                            // OINOLog.debug("createRowFromFormdata: next line", {start:start, end:end, line:l})
                         }
                         start += 2;
                         if (!block_ok) {
-                            OINOLog.warning("OINODbFactory.createRowFromFormdata: invalid block skipped", { field_name: field_name });
+                            OINOLog.warning("@oinots/db", "OINODbParser", "_createRowFromFormdata", "Invalid block skipped", { field_name: field_name });
                         }
                         else if (start + multipartBoundary.length + 2 >= end) {
-                            // OINOLog.debug("OINODbFactory.createRowFromFormdata: null value", {field_name:field_name})
                             row[field_index] = null;
                         }
                         else if (is_file) {
@@ -389,11 +381,9 @@ export class OINODbParser {
                                 const value = data.subarray(start, e - 2);
                                 row[field_index] = value;
                             }
-                            // console.log("OINODbFactory.createRowFromFormdata: file field", {field_name:field_name, value:row[field_index]})
                         }
                         else {
                             let value = OINOStr.decode(this._parseMultipartLine(data, start).trim(), OINOContentType.formdata);
-                            // OINOLog.debug("OINODbFactory.createRowFromFormdata: parse form field", {field_name:field_name, value:value})
                             if (value && (field.fieldParams.isPrimaryKey || field.fieldParams.isForeignKey) && (field instanceof OINONumberDataField) && (datamodel.api.hashid)) {
                                 value = datamodel.api.hashid.decode(value);
                             }
@@ -405,21 +395,19 @@ export class OINODbParser {
                 start = end;
                 end = this._findMultipartBoundary(data, multipartBoundary, start);
             }
-            // OINOLog.debug("createRowFromFormdata: next row", {row:row})
             if (has_data) {
                 result.push(row);
             }
             else {
-                OINOLog.warning("createRowFromFormdata: empty row skipped");
+                OINOLog.warning("@oinots/db", "OINODbParser", "_createRowFromFormdata", "Empty row skipped", {});
             }
         }
         catch (e) {
-            OINOLog.error("createRowFromFormdata: error parsing formdata", { exception: e.message });
+            OINOLog.exception("@oinots/db", "OINODbParser", "_createRowFromFormdata", "Exception parsing formdata", { message: e.message, stack: e.stack });
         }
         return result;
     }
     static _createRowFromUrlencoded(datamodel, data) {
-        // OINOLog.debug("createRowFromUrlencoded: enter", {data:data})
         let result = [];
         const row = new Array(datamodel.fields.length);
         let has_data = false;
@@ -427,12 +415,11 @@ export class OINODbParser {
         try {
             for (let i = 0; i < data_parts.length; i++) {
                 const param_parts = data_parts[i].split('=');
-                // OINOLog.debug("createRowFromUrlencoded: next param", {param_parts:param_parts})
                 if (param_parts.length == 2) {
                     const key = OINOStr.decodeUrlencode(param_parts[0]) || "";
                     const field_index = datamodel.findFieldIndexByName(key);
                     if (field_index < 0) {
-                        OINOLog.info("createRowFromUrlencoded: param field not found", { field: key });
+                        OINOLog.info("@oinots/db", "OINODbParser", "_createRowFromUrlencoded", "Param field not found", { field: key });
                     }
                     else {
                         const field = datamodel.fields[field_index];
@@ -450,13 +437,12 @@ export class OINODbParser {
                 result.push(row);
             }
             else {
-                OINOLog.warning("createRowFromUrlencoded: empty row skipped");
+                OINOLog.warning("@oinots/db", "OINODbParser", "_createRowFromUrlencoded", "Empty row skipped", {});
             }
         }
         catch (e) {
-            OINOLog.error("createRowFromUrlencoded: error parsing urlencoded data", { exception: e.message });
+            OINOLog.exception("@oinots/db", "OINODbParser", "_createRowFromUrlencoded", "Exception parsing urlencoded data", { message: e.message, stack: e.stack });
         }
-        // console.log("createRowFromUrlencoded: next row=" + row)
         return result;
     }
 }

package/dist/esm/OINODbSqlParams.js

@@ -55,7 +55,7 @@ export class OINODbSqlFilter {
             ((operation !== null) && (Object.values(OINODbSqlComparison).includes(operation)) && (typeof (leftSide) == "string") && (leftSide != "") && (typeof (rightSide) == "string") && (rightSide != "")) ||
             ((operation == OINODbSqlBooleanOperation.not) && (leftSide == "") && (rightSide instanceof OINODbSqlFilter)) ||
             (((operation == OINODbSqlBooleanOperation.and) || (operation == OINODbSqlBooleanOperation.or)) && (leftSide instanceof OINODbSqlFilter) && (rightSide instanceof OINODbSqlFilter)))) {
-            OINOLog.debug("Unsupported OINODbSqlFilter format!", { leftSide: leftSide, operation: operation, rightSide: rightSide });
+            OINOLog.error("@oinots/db", "OINODbSqlFilter", "constructor", "Unsupported OINODbSqlFilter format", { leftSide: leftSide, operation: operation, rightSide: rightSide });
             throw new Error(OINO_ERROR_PREFIX + ": Unsupported OINODbSqlFilter format!");
         }
         this._leftSide = leftSide;
@@ -69,7 +69,6 @@ export class OINODbSqlFilter {
      *
      */
     static parse(filterString) {
-        // OINOLog_debug("OINODbSqlFilter.constructor", {filterString:filterString})
         if (!filterString) {
             return new OINODbSqlFilter("", null, "");
         }
@@ -85,11 +84,11 @@ export class OINODbSqlFilter {
                 }
                 else {
                     let boolean_parts = OINOStr.splitByBrackets(filterString, true, false, '(', ')');
-                    // OINOLog_debug("OINODbSqlFilter.constructor", {boolean_parts:boolean_parts})
                     if (boolean_parts.length == 3 && (boolean_parts[1].match(OINODbSqlFilter._booleanOperationRegex))) {
                         return new OINODbSqlFilter(OINODbSqlFilter.parse(boolean_parts[0]), boolean_parts[1].trim().toLowerCase().substring(1), OINODbSqlFilter.parse(boolean_parts[2]));
                     }
                     else {
+                        OINOLog.error("@oinots/db", "OINODbSqlFilter", "constructor", "Invalid filter", { filterString: filterString });
                         throw new Error(OINO_ERROR_PREFIX + ": Invalid filter '" + filterString + "'"); // invalid filter could be a security risk, stop processing
                     }
                 }
@@ -146,7 +145,6 @@ export class OINODbSqlFilter {
      *
      */
     toSql(dataModel) {
-        // OINOLog.debug("OINODbSqlFilter.toSql", {_leftSide:this._leftSide, _operator:this._operator, _rightSide:this._rightSide})
         if (this.isEmpty()) {
             return "";
         }
@@ -158,7 +156,7 @@ export class OINODbSqlFilter {
         else {
             field = dataModel.findFieldByName(this._leftSide);
             if (!field) {
-                OINOLog.error("OINODbSqlFilter.toSql: Invalid field!", { field: this._leftSide });
+                OINOLog.error("@oinots/db", "OINODbSqlFilter", "toSql", "Invalid field!", { field: this._leftSide });
                 throw new Error(OINO_ERROR_PREFIX + ": OINODbSqlFilter.toSql - Invalid field '" + this._leftSide + "'"); // invalid field name could be a security risk, stop processing
             }
             result += dataModel.api.db.printSqlColumnname(field?.name || this._leftSide);
@@ -169,14 +167,15 @@ export class OINODbSqlFilter {
         }
         else {
             const value = field.deserializeCell(this._rightSide);
-            if (!value) {
-                OINOLog.error("OINODbSqlFilter.toSql: Invalid value!", { value: value });
+            if ((value == null) || (value === "")) {
+                OINOLog.error("@oinots/db", "OINODbSqlFilter", "toSql", "Invalid value!", { value: value });
                 throw new Error(OINO_ERROR_PREFIX + ": OINODbSqlFilter.toSql - Invalid value '" + value + "'"); // invalid value could be a security risk, stop processing
             }
             result += field.printCellAsSqlValue(value);
         }
-        // OINOLog.debug("OINODbSqlFilter.toSql", {result:result})
-        return "(" + result + ")";
+        result = "(" + result + ")";
+        OINOLog.debug("@oinots/db", "OINODbSqlFilter", "toSql", "Result", { sql: result });
+        return result;
     }
 }
 /**
@@ -195,7 +194,6 @@ export class OINODbSqlOrder {
      *
      */
     constructor(column_or_array, descending_or_array) {
-        OINOLog.debug("OINODbSqlOrder.constructor", { columns: column_or_array, directions: descending_or_array });
         if (Array.isArray(column_or_array)) {
             this._columns = column_or_array;
         }
@@ -246,12 +244,11 @@ export class OINODbSqlOrder {
         if (this.isEmpty()) {
             return "";
         }
-        // OINOLog.debug("OINODbSqlOrder.toSql", {columns:this._columns, directions:this._directions})
         let result = "";
         for (let i = 0; i < this._columns.length; i++) {
             const field = dataModel.findFieldByName(this._columns[i]);
             if (!field) {
-                OINOLog.error("OINODbSqlOrder.toSql: Invalid field!", { field: this._columns[i] });
+                OINOLog.error("@oinots/db", "OINODbSqlOrder", "toSql", "Invalid field!", { field: this._columns[i] });
                 throw new Error(OINO_ERROR_PREFIX + ": OINODbSqlOrder.toSql - Invalid field '" + this._columns[i] + "'"); // invalid field name could be a security risk, stop processing
             }
             if (result) {
@@ -265,7 +262,7 @@ export class OINODbSqlOrder {
                 result += "ASC";
             }
         }
-        // OINOLog.debug("OINODbSqlOrder.toSql", {result:result})
+        OINOLog.debug("@oinots/db", "OINODbSqlOrder", "toSql", "Result", { sql: result });
         return result;
     }
 }
@@ -327,6 +324,7 @@ export class OINODbSqlLimit {
         if (this._page > 0) {
             result += " OFFSET " + (this._limit * (this._page - 1) + 1).toString();
         }
+        OINOLog.debug("@oinots/db", "OINODbSqlLimit", "toSql", "Result", { sql: result });
         return result;
     }
 }
@@ -373,7 +371,6 @@ export class OINODbSqlAggregate {
         const aggregator_parts = aggregatorString.split(',');
         for (let i = 0; i < aggregator_parts.length; i++) {
             let match = OINODbSqlAggregate._aggregateRegex.exec(aggregator_parts[i]);
-            // OINOLog.debug("OINODbSqlAggregate.parse - next aggregator", {aggregator: aggregator_parts[i], match:match})
             if ((match != null) && (match.length == 3)) {
                 funtions.push(match[1]);
                 fields.push(match[2]);
@@ -406,8 +403,9 @@ export class OINODbSqlAggregate {
                 result += f.printSqlColumnName() + ",";
             }
         }
-        // OINOLog.debug("OINODbSqlAggregate.toSql", {result:result})
-        return result.substring(0, result.length - 1);
+        result = result.substring(0, result.length - 1);
+        OINOLog.debug("@oinots/db", "OINODbSqlAggregate", "toSql", "Result", { sql: result });
+        return result;
     }
     /**
      * Print non-aggregated fields as SQL GROUP BY-condition based on the datamodel of the API.
@@ -434,7 +432,6 @@ export class OINODbSqlAggregate {
                 }
             }
         }
-        // OINOLog.debug("OINODbSqlAggregate.printSqlColumnNames", {result:result})
         return result.substring(0, result.length - 1);
     }
     /**
@@ -459,7 +456,6 @@ export class OINODbSqlSelect {
      *
      */
     constructor(columns) {
-        // OINOLog.debug("OINODbSqlSelect.constructor", {columns:columns})
         this._columns = columns;
     }
     /**
@@ -490,7 +486,6 @@ export class OINODbSqlSelect {
      *
      */
     isSelected(field) {
-        // OINOLog.debug("OINODbSqlSelect.isSelected", {column:column, columns:this._columns})
         return ((this._columns.length == 0) || (field.fieldParams.isPrimaryKey == true) || (this._columns.includes(field.name)));
     }
 }

package/dist/types/OINODbApi.d.ts

@@ -80,7 +80,6 @@ export declare class OINODbApi {
      *
      */
     constructor(db: OINODb, params: OINODbApiParams);
-    private _printSql;
     private _validateRow;
     private _parseData;
     private _doGet;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "OINO TS library package for publishing an SQL database tables as a REST API.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -19,12 +19,12 @@
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "dependencies": {
-    "@oino-ts/common": "0.7.1"
+    "@oino-ts/common": "0.8.0"
   },
   "devDependencies": {
     "@types/node": "^20.14.10",
     "@types/bun": "^1.1.14",
-    "@oino-ts/types": "0.7.1",
+    "@oino-ts/types": "0.8.0",
     "typedoc": "^0.25.13"
   },
   "files": [

package/src/OINODb.ts

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-import { OINODbParams, OINODbApi, OINODataCell, OINO_ERROR_PREFIX, OINODataRow, OINODB_EMPTY_ROW, OINOResult } from "./index.js"
+import { OINODbParams, OINODbApi, OINODataCell, OINO_ERROR_PREFIX, OINODataRow, OINODB_EMPTY_ROW, OINOResult, OINOLog } from "./index.js"
 
 /**
  * Base class for database abstraction, implementing methods for connecting, making queries and parsing/formatting data 
@@ -124,7 +124,6 @@ export abstract class OINODb {
      */
     printSqlSelect(tableName:string, columnNames:string, whereCondition:string, orderCondition:string, limitCondition:string, groupByCondition: string): string {
         let result:string = "SELECT " + columnNames + " FROM " + tableName;
-        // OINOLog.debug("OINODb.printSqlSelect", {tableName:tableName, columnNames:columnNames, whereCondition:whereCondition, orderCondition:orderCondition, limitCondition:limitCondition })
         if (whereCondition != "")  {
             result += " WHERE " + whereCondition
         }
@@ -138,7 +137,7 @@ export abstract class OINODb {
             result += " LIMIT " + limitCondition 
         }
         result += ";"
-        // OINOLog.debug("OINODb.printSqlSelect", {result:result})
+        OINOLog.debug("@oinots/db", "OINODb", "printSqlSelect", "Result", {sql:result})
         return result;
     }
 }