@oino-ts/db 0.7.2 → 0.8.0

package/dist/cjs/OINODb.js

@@ -39,7 +39,6 @@ class OINODb {
      */
     printSqlSelect(tableName, columnNames, whereCondition, orderCondition, limitCondition, groupByCondition) {
         let result = "SELECT " + columnNames + " FROM " + tableName;
-        // OINOLog.debug("OINODb.printSqlSelect", {tableName:tableName, columnNames:columnNames, whereCondition:whereCondition, orderCondition:orderCondition, limitCondition:limitCondition })
         if (whereCondition != "") {
             result += " WHERE " + whereCondition;
         }
@@ -53,7 +52,7 @@ class OINODb {
             result += " LIMIT " + limitCondition;
         }
         result += ";";
-        // OINOLog.debug("OINODb.printSqlSelect", {result:result})
+        index_js_1.OINOLog.debug("@oinots/db", "OINODb", "printSqlSelect", "Result", { sql: result });
         return result;
     }
 }

package/dist/cjs/OINODbApi.js

@@ -106,22 +106,18 @@ class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
         const api = modelset.datamodel.api;
         const modified_index = datamodel.findFieldIndexByName(api.params.cacheModifiedField || "");
         let last_modified = this.modified;
-        // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {last_modified:last_modified})
         while (!dataset.isEof()) {
             const row = dataset.getRow();
             if (modified_index >= 0) {
                 last_modified = Math.max(last_modified, new Date(row[modified_index]).getTime());
-                // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {last_modified:last_modified})
             }
             let row_id_seed = datamodel.getRowPrimarykeyValues(row).join(' ');
             let primary_key_values = [];
             this.clearVariables();
             this.setVariableFromValue(index_js_1.OINODbConfig.OINODB_ID_FIELD, "");
-            // let html_row:string = this.template.replaceAll('###' + OINODbConfig.OINODB_ID_FIELD + '###', '###createHtmlFromData_temporary_oinoid###')
             for (let i = 0; i < datamodel.fields.length; i++) {
                 const f = datamodel.fields[i];
                 let value;
-                // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {field:f.name, row_value:row[i], value_type:typeof row[i]})
                 if ((this._locale != null) && (f instanceof index_js_1.OINODatetimeDataField)) {
                     value = f.serializeCellWithLocale(row[i], this._locale);
                 }
@@ -136,16 +132,13 @@ class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
                         primary_key_values.push(value || "");
                     }
                 }
-                // OINOLog.debug("renderFromDbData replace field value", {field:f.name, value:value }) 
                 this.setVariableFromValue(f.name, value || "");
             }
             this.setVariableFromProperties(overrideValues);
             this.setVariableFromValue(index_js_1.OINODbConfig.OINODB_ID_FIELD, index_js_1.OINODbConfig.printOINOId(primary_key_values));
-            // html_row = html_row.replaceAll('###createHtmlFromData_temporary_oinoid###', OINOStr.encode(OINODbConfig.printOINOId(primary_key_values), OINOContentType.html)) 
             html += this._renderHtml() + "\r\n";
             await dataset.next();
         }
-        // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {last_modified:last_modified})
         this.modified = last_modified;
         const result = this._createHttpResult(html, false);
         index_js_1.OINOBenchmark.end("OINOHtmlTemplate", "renderFromDbData");
@@ -177,7 +170,6 @@ class OINODbApi {
      *
      */
     constructor(db, params) {
-        // OINOLog.debug("OINODbApi.constructor", {db:db, tableName:tableName, params:params})
         if (!params.tableName) {
             throw new Error(index_js_1.OINO_ERROR_PREFIX + ": OINODbApiParams needs to define a table name!");
         }
@@ -191,26 +183,11 @@ class OINODbApi {
             this.hashid = null;
         }
     }
-    _printSql(result, rows, requirePrimaryKey, printer) {
-        let sql = "";
-        for (let i = 0; i < rows.length; i++) {
-            this._validateRow(result, rows[i], requirePrimaryKey);
-            if (result.success) {
-                sql += printer(rows[i]);
-            }
-            else if (this.params.failOnAnyInvalidRows === false) {
-                result.setOk(); // individual rows may fail and will just be messages in response similar to executing multiple sql statements
-            }
-        }
-        return sql;
-    }
     _validateRow(result, row, requirePrimaryKey) {
         let field;
         for (let i = 0; i < this.datamodel.fields.length; i++) {
             field = this.datamodel.fields[i];
-            // OINOLog.debug("OINODbApi.validateHttpValues", {field:field})
             const val = row[i];
-            // OINOLog.debug("OINODbApi.validateHttpValues", {val:val})
             if ((val === null) && ((field.fieldParams.isNotNull) || (field.fieldParams.isPrimaryKey))) { // null is a valid SQL value except if it's not allowed
                 result.setError(405, "Field '" + field.name + "' is not allowed to be NULL!", "ValidateRowValues");
             }
@@ -223,7 +200,6 @@ class OINODbApi {
             else {
                 if ((field instanceof index_js_1.OINOStringDataField) && ((field.maxLength > 0))) {
                     const str_val = val?.toString() || "";
-                    // OINOLog.debug("OINODbApi.validateHttpValues", {f:str_field, val:val})
                     if (str_val.length > field.maxLength) {
                         if (this.params.failOnOversizedValues) {
                             result.setError(405, "Field '" + field.name + "' length (" + str_val.length + ") exceeds maximum (" + field.maxLength + ") and can't be set!", "ValidateRowValues");
@@ -256,12 +232,13 @@ class OINODbApi {
         let sql = "";
         try {
             sql = this.datamodel.printSqlSelect(id, params.sqlParams || {});
-            // OINOLog.debug("OINODbApi.doGet sql", {sql:sql})
+            common_1.OINOLog.debug("@oinots/db", "OINODbApi", "_doGet", "Print SQL", { sql: sql });
             const sql_res = await this.db.sqlSelect(sql);
-            // OINOLog.debug("OINODbApi.doGet sql_res", {sql_res:sql_res})
             if (sql_res.hasErrors()) {
                 result.setError(500, sql_res.getFirstError(), "DoGet");
-                result.addDebug("OINO GET SQL [" + sql + "]", "DoPut");
+                if (this._debugOnError) {
+                    result.addDebug("OINO GET SQL [" + sql + "]", "DoPut");
+                }
             }
             else {
                 result.data = new index_js_1.OINODbModelSet(this.datamodel, sql_res, params.sqlParams);
@@ -269,7 +246,10 @@ class OINODbApi {
         }
         catch (e) {
             result.setError(500, "Unhandled exception in doGet: " + e.message, "DoGet");
-            result.addDebug("OINO GET SQL [" + sql + "]", "DoGet");
+            common_1.OINOLog.exception("@oinots/db", "OINODbApi", "_doGet", "Exception", { message: e.message, stack: e.stack });
+            if (this._debugOnError) {
+                result.addDebug("OINO GET SQL [" + sql + "]", "DoGet");
+            }
         }
     }
     async _doPost(result, rows) {
@@ -288,7 +268,7 @@ class OINODbApi {
                 result.setError(405, "No valid rows for POST!", "DoPost");
             }
             else if (result.success) {
-                // OINOLog.debug("OINODbApi.doPost sql", {sql:sql})
+                common_1.OINOLog.debug("@oinots/db", "OINODbApi", "_doPost", "Print SQL", { sql: sql });
                 const sql_res = await this.db.sqlExec(sql);
                 // OINOLog.debug("OINODbApi.doPost sql_res", {sql_res:sql_res})
                 if (sql_res.hasErrors()) {
@@ -302,7 +282,10 @@ class OINODbApi {
         }
         catch (e) {
             result.setError(500, "Unhandled exception in doPost: " + e.message, "DoPost");
-            result.addDebug("OINO POST SQL [" + sql + "]", "DoPost");
+            common_1.OINOLog.exception("@oinots/db", "OINODbApi", "_doGet", "Exception", { message: e.message, stack: e.stack });
+            if (this._debugOnError) {
+                result.addDebug("OINO POST SQL [" + sql + "]", "DoPost");
+            }
         }
     }
     async _doPut(result, id, rows) {
@@ -323,9 +306,8 @@ class OINODbApi {
                 result.setError(405, "No valid rows for PUT!", "DoPut"); // only set error if there are multiple rows and no valid sql was created
             }
             else if (result.success) {
-                // OINOLog.debug("OINODbApi.doPut sql", {sql:sql})
+                common_1.OINOLog.debug("@oinots/db", "OINODbApi", "_doPut", "Print SQL", { sql: sql });
                 const sql_res = await this.db.sqlExec(sql);
-                // OINOLog.debug("OINODbApi.doPut sql_res", {sql_res:sql_res})
                 if (sql_res.hasErrors()) {
                     result.setError(500, sql_res.getFirstError(), "DoPut");
                     if (this._debugOnError) {
@@ -337,7 +319,10 @@ class OINODbApi {
         }
         catch (e) {
             result.setError(500, "Unhandled exception: " + e.message, "DoPut");
-            result.addDebug("OINO POST SQL [" + sql + "]", "DoPut");
+            common_1.OINOLog.exception("@oinots/db", "OINODbApi", "_doGet", "Exception", { message: e.message, stack: e.stack });
+            if (this._debugOnError) {
+                result.addDebug("OINO POST SQL [" + sql + "]", "DoPut");
+            }
         }
     }
     async _doDelete(result, id, rows) {
@@ -361,9 +346,8 @@ class OINODbApi {
                 result.setError(405, "No valid rows for DELETE!", "DoDelete"); // only set error if there are multiple rows and no valid sql was created
             }
             else if (result.success) {
-                // OINOLog.debug("OINODbApi.doDelete sql", {sql:sql})
+                common_1.OINOLog.debug("@oinots/db", "OINODbApi", "_doDelete", "Print SQL", { sql: sql });
                 const sql_res = await this.db.sqlExec(sql);
-                // OINOLog.debug("OINODbApi.doDelete sql_res", {sql_res:sql_res})
                 if (sql_res.hasErrors()) {
                     result.setError(500, sql_res.getFirstError(), "DoDelete");
                     if (this._debugOnError) {
@@ -375,7 +359,9 @@ class OINODbApi {
         }
         catch (e) {
             result.setError(500, "Unhandled exception: " + e.message, "DoDelete");
-            result.addDebug("OINO DELETE SQL [" + sql + "]", "DoDelete");
+            if (this._debugOnError) {
+                result.addDebug("OINO DELETE SQL [" + sql + "]", "DoDelete");
+            }
         }
     }
     /**
@@ -398,7 +384,7 @@ class OINODbApi {
      */
     async doRequest(method, id, data, params = API_EMPTY_PARAMS) {
         index_js_1.OINOBenchmark.start("OINODbApi", "doRequest");
-        // OINOLog.debug("OINODbApi.doRequest enter", {method:method, id:id, body:body, params:params})
+        common_1.OINOLog.debug("@oinots/db", "OINODbApi", "doRequest", "Request", { method: method, id: id, data: data });
         let result = new OINODbApiResult(params);
         let rows = [];
         if ((method == "POST") || (method == "PUT")) {
@@ -432,7 +418,6 @@ class OINODbApi {
             }
             else {
                 try {
-                    // OINOLog.debug("OINODbApi.doRequest / POST", {rows:rows})
                     await this._doPost(result, rows);
                 }
                 catch (e) {
@@ -470,7 +455,7 @@ class OINODbApi {
      */
     async doBatchUpdate(method, data, params = API_EMPTY_PARAMS) {
         index_js_1.OINOBenchmark.start("OINODbApi", "doBatchUpdate");
-        // OINOLog.debug("OINODbApi.doRequest enter", {method:method, id:id, body:body, params:params})
+        common_1.OINOLog.debug("@oinots/db", "OINODbApi", "doBatchUpdate", "Request", { method: method, data: data, params: params });
         let result = new OINODbApiResult(params);
         let rows = [];
         if ((method == "PUT")) {
@@ -505,7 +490,6 @@ class OINODbApi {
      *
      */
     isFieldIncluded(fieldName) {
-        // OINOLog.debug("OINODbApi.isFieldIncluded", {fieldName:fieldName, included:this.params.includeFields})
         const params = this.params;
         return (((params.excludeFieldPrefix == undefined) || (params.excludeFieldPrefix == "") || (fieldName.startsWith(params.excludeFieldPrefix) == false)) &&
             ((params.excludeFields == undefined) || (params.excludeFields.length == 0) || (params.excludeFields.indexOf(fieldName) < 0)) &&

package/dist/cjs/OINODbDataField.js

@@ -42,7 +42,6 @@ class OINODbDataField {
         this.maxLength = maxLength;
         this.sqlType = sqlType;
         this.fieldParams = fieldParams;
-        // OINOLog.debug("OINODbDataField.constructor", {this:this})
     }
     /**
      * Pring debug information for the field
@@ -248,7 +247,7 @@ class OINONumberDataField extends OINODbDataField {
         else {
             const result = parseFloat(value);
             if (isNaN(result)) {
-                index_js_1.OINOLog.error("OINONumberDataField.toSql: Invalid value!", { value: value });
+                index_js_1.OINOLog.error("@oinots/db", "OINONumberDataField", "toSql", "Invalid value!", { value: value });
                 throw new Error(index_js_1.OINO_ERROR_PREFIX + ": OINONumberDataField.deserializeCell - Invalid value '" + value + "'"); // incorrectly formatted data could be a security risk, abort processing
             }
             return result;
@@ -281,7 +280,6 @@ class OINOBlobDataField extends OINODbDataField {
      *
      */
     serializeCell(cellVal) {
-        // OINOLog.debug("OINOBlobDataField.serializeCell", {cellVal:cellVal})
         if ((cellVal === null) || (cellVal === undefined)) {
             return cellVal;
         }
@@ -332,10 +330,8 @@ class OINODatetimeDataField extends OINODbDataField {
      *
      */
     serializeCell(cellVal) {
-        // OINOLog.debug("OINODatetimeDataField.serializeCell", {cellVal:cellVal, type:typeof(cellVal)})
         if (typeof (cellVal) == "string") {
             cellVal = this.db.parseSqlValueAsCell(cellVal, this.sqlType);
-            // OINOLog.debug("OINODatetimeDataField.serializeCell parsed", {cellVal:cellVal, type:typeof(cellVal)})
         }
         if ((cellVal === null) || (cellVal === undefined)) {
             return cellVal;
@@ -355,10 +351,8 @@ class OINODatetimeDataField extends OINODbDataField {
      *
      */
     serializeCellWithLocale(cellVal, locale) {
-        // OINOLog.debug("OINODatetimeDataField.serializeCell", {cellVal:cellVal, type:typeof(cellVal)})
         if (typeof (cellVal) == "string") {
             cellVal = this.db.parseSqlValueAsCell(cellVal, this.sqlType);
-            // OINOLog.debug("OINODatetimeDataField.serializeCell parsed", {cellVal:cellVal, type:typeof(cellVal)})
         }
         if ((cellVal === null) || (cellVal === undefined)) {
             return cellVal;
@@ -377,7 +371,6 @@ class OINODatetimeDataField extends OINODbDataField {
      *
      */
     deserializeCell(value) {
-        // OINOLog.debug("OINODatetimeDataField.deserializeCell", {strVal:strVal})
         if ((value === null) || (value === undefined)) {
             return value;
         }

package/dist/cjs/OINODbDataModel.js

@@ -28,7 +28,6 @@ class OINODbDataModel {
         this._columnLookup = {};
         this.api = api;
         this.fields = [];
-        // OINOLog_debug("OINODbDataModel (" + tableName + "):\n" + this._printTableDebug("\n"))
     }
     /**
      * Initialize datamodel from SQL schema.
@@ -74,7 +73,6 @@ 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 += ",";
@@ -101,7 +99,6 @@ class OINODbDataModel {
                 if (value == "") { // ids are user input and could be specially crafted to be empty
                     throw new Error(index_js_1.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;
             }
@@ -128,7 +125,6 @@ class OINODbDataModel {
      *
      */
     findFieldByName(name) {
-        // OINOLog.debug("OINODbDataModel.findFieldByName", {_columnLookup:this._columnLookup})
         const i = this._columnLookup[name];
         if (i >= 0) {
             return this.fields[i];
@@ -144,7 +140,6 @@ class OINODbDataModel {
      *
      */
     findFieldIndexByName(name) {
-        // OINOLog.debug("OINODbDataModel.findFieldIndexByName", {_columnLookup:this._columnLookup})
         const i = this._columnLookup[name];
         if (i >= 0) {
             return i;
@@ -235,13 +230,11 @@ 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;
         }
@@ -252,7 +245,7 @@ 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})
+        index_js_1.OINOLog.debug("@oinots/db", "OINODbDataModel", "printSqlSelect", "Result", { sql: result });
         return result;
     }
     /**
@@ -263,6 +256,7 @@ class OINODbDataModel {
      */
     printSqlInsert(row) {
         let result = "INSERT INTO " + this.api.db.printSqlTablename(this.api.params.tableName) + " " + this._printSqlInsertColumnsAndValues(row) + ";";
+        index_js_1.OINOLog.debug("@oinots/db", "OINODbDataModel", "printSqlInsert", "Result", { sql: result });
         return result;
     }
     /**
@@ -274,7 +268,7 @@ 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})
+        index_js_1.OINOLog.debug("@oinots/db", "OINODbDataModel", "printSqlUpdate", "Result", { sql: result });
         return result;
     }
     /**
@@ -285,6 +279,7 @@ class OINODbDataModel {
      */
     printSqlDelete(id) {
         let result = "DELETE FROM " + this.api.db.printSqlTablename(this.api.params.tableName) + " WHERE " + this._printSqlPrimaryKeyCondition(id) + ";";
+        index_js_1.OINOLog.debug("@oinots/db", "OINODbDataModel", "printSqlDelete", "Result", { sql: result });
         return result;
     }
 }

package/dist/cjs/OINODbFactory.js

@@ -21,7 +21,6 @@ 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;
     }
     /**
@@ -109,12 +108,10 @@ class OINODbFactory {
             result.requestType = index_js_1.OINOContentType.json;
         }
         const response_type = url.searchParams.get(index_js_1.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(index_js_1.OINOContentType).includes(accept_types[i])) {
                 result.responseType = accept_types[i];
-                // OINOLog.debug("createParamsFromRequest: response type found", {respnse_type:result.responseType})
                 break;
             }
         }
@@ -129,7 +126,7 @@ class OINODbFactory {
         if (etags) {
             result.etags = etags;
         }
-        // OINOLog.debug("createParamsFromRequest", {params:result})
+        index_js_1.OINOLog.debug("@oinots/db", "OINODbFactory", "createParamsFromRequest", "Result", { params: result });
         return result;
     }
 }

package/dist/cjs/OINODbModelSet.js

@@ -63,7 +63,7 @@ class OINODbModelSet {
             }
             let value = f.serializeCell(row[i]);
             if (value === undefined) {
-                // OINOLog.info("OINODbModelSet._writeRowJson: undefined value skipped", {field_name:f.name})
+                index_js_1.OINOLog.info("@oinots/db", "OINODbModelSet", "_writeRowJson", "Undefined value skipped", { field_name: f.name });
             }
             else if (value === null) {
                 json_row += "," + index_js_1.OINOStr.encode(f.name, index_js_1.OINOContentType.json) + ":null";
@@ -79,7 +79,6 @@ class OINODbModelSet {
             }
         }
         json_row = index_js_1.OINOStr.encode(index_js_1.OINODbConfig.OINODB_ID_FIELD, index_js_1.OINOContentType.json) + ":" + index_js_1.OINOStr.encode(index_js_1.OINODbConfig.printOINOId(primary_key_values), index_js_1.OINOContentType.json) + json_row;
-        // OINOLog_debug("OINODbModelSet._writeRowJson="+json_row)
         return "{" + json_row + "}";
     }
     async _writeStringJson() {
@@ -89,12 +88,10 @@ 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() {
@@ -104,11 +101,9 @@ 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(' ');
@@ -129,7 +124,6 @@ class OINODbModelSet {
             }
         }
         csv_row = index_js_1.OINOStr.encode(index_js_1.OINODbConfig.printOINOId(primary_key_values), index_js_1.OINOContentType.csv) + csv_row;
-        // OINOLog_debug("OINODbModelSet._writeRowCsv="+csv_row)
         return csv_row;
     }
     async _writeStringCsv() {
@@ -139,11 +133,9 @@ 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) {
@@ -158,7 +150,6 @@ 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;
@@ -174,7 +165,7 @@ class OINODbModelSet {
             let formdata_block = "";
             let is_file = (f instanceof index_js_1.OINOBlobDataField);
             if (value === undefined) {
-                index_js_1.OINOLog.info("OINODbModelSet._writeRowFormdata: undefined value skipped.", { field: f.name });
+                index_js_1.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);
@@ -188,7 +179,6 @@ 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(index_js_1.OINODbConfig.OINODB_ID_FIELD, index_js_1.OINODbConfig.printOINOId(primary_key_values), multipart_boundary) + result;
@@ -196,12 +186,10 @@ 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(' ');
@@ -225,7 +213,6 @@ class OINODbModelSet {
             }
         }
         urlencode_row = index_js_1.OINOStr.encode(index_js_1.OINODbConfig.OINODB_ID_FIELD, index_js_1.OINOContentType.urlencode) + "=" + index_js_1.OINOStr.encode(index_js_1.OINODbConfig.printOINOId(primary_key_values), index_js_1.OINOContentType.urlencode) + "&" + urlencode_row;
-        // OINOLog_debug("OINODbModelSet._writeRowCsv="+csv_row)
         return urlencode_row;
     }
     async _writeStringUrlencode() {
@@ -233,14 +220,12 @@ 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) {
-            index_js_1.OINOLog.warning("OINODbModelSet._writeStringUrlencode: content type " + index_js_1.OINOContentType.urlencode + " does not officially support multiline content!");
+            index_js_1.OINOLog.warning("@oinots/db", "OINODbModelSet", "_writeStringUrlencode", "Content type " + index_js_1.OINOContentType.urlencode + " does not officially support multiline content!", {});
         }
         return result;
     }
@@ -265,7 +250,7 @@ class OINODbModelSet {
             result += await this._writeStringUrlencode();
         }
         else {
-            index_js_1.OINOLog.error("OINODbModelSet.writeString: content type is only for input!", { contentType: contentType });
+            index_js_1.OINOLog.error("@oinots/db", "OINODbModelSet", "writeString", "Content type is only for input!", { contentType: contentType });
         }
         return result;
     }