@oino-ts/db 0.7.2 → 0.8.0

package/src/OINODbApi.test.ts

@@ -126,13 +126,12 @@ const OWASP_CROSSCHECKS:string[] = [
 
 Math.random()
 
-OINOLog.setLogger(new OINOConsoleLog(OINOLogLevel.error))
+OINOLog.setLogger(new OINOConsoleLog(OINOLogLevel.warning))
 OINODbFactory.registerDb("OINODbBunSqlite", OINODbBunSqlite)
 OINODbFactory.registerDb("OINODbPostgresql", OINODbPostgresql)
 OINODbFactory.registerDb("OINODbMariadb", OINODbMariadb)
 OINODbFactory.registerDb("OINODbMsSql", OINODbMsSql)
 
-OINOLog.setLogLevel(OINOLogLevel.debug)
 OINOBenchmark.setEnabled(["doRequest"])
 OINOBenchmark.reset()
 
@@ -158,8 +157,6 @@ function createApiTemplate(api:OINODbApi):OINODbHtmlTemplate {
 }
 
 export async function OINOTestApi(dbParams:OINODbParams, testParams: OINOTestParams) {
-    // OINOLog.info("OINOTestApi", {dbParams:dbParams, apiDataset:apiDataset})
-
     let target_name:string = ""
     if (testParams.name) {
         target_name = "[" + testParams.name + "]"
@@ -200,19 +197,13 @@ export async function OINOTestApi(dbParams:OINODbParams, testParams: OINOTestPar
     
     // const new_row_id:string = OINODbConfig.printOINOId(post_modelset.datamodel.getRowPrimarykeyValues(apiDataset.postRow))
     const new_row_id:string = OINODbConfig.printOINOId(post_modelset.datamodel.getRowPrimarykeyValues(testParams.postRow, true))
-    // OINOLog.debug("OINOTestApi", {new_row_id:new_row_id})
 
     const empty_params:OINODbApiRequestParams = { sqlParams: {}}
     const request_params:OINODbApiRequestParams = Object.assign({}, testParams.requestParams)
     request_params.sqlParams = {}
     const request_params_with_filters:OINODbApiRequestParams = Object.assign({}, request_params)
     request_params_with_filters.sqlParams = testParams.requestParams.sqlParams
-    // OINOLog.debug("OINOTestApi", {request_params:request_params, request_params_with_filters:request_params_with_filters})
     
-    // await test("dummy", () => {
-    //     expect({foo:"h\\i"}).toMatchSnapshot()
-    // })
-
     target_group = "[SCHEMA]"
     await test(target_name + target_db + target_table + target_group + " public properties", async () => {
         expect(api.datamodel.printFieldPublicPropertiesJson()).toMatchSnapshot("SCHEMA")
@@ -244,7 +235,6 @@ export async function OINOTestApi(dbParams:OINODbParams, testParams: OINOTestPar
 
     target_group = "[HTTP POST]"
     const post_body_json:string = await post_modelset.writeString(OINOContentType.json)
-    // OINOLog.info("HTTP POST json", {post_body_json:post_body_json})
     await test(target_name + target_db + target_table + target_group + " insert with id", async () => {
         expect(encodeResult((await api.doRequest("POST", new_row_id, post_body_json, empty_params)))).toMatchSnapshot("POST")
     })
@@ -262,7 +252,6 @@ export async function OINOTestApi(dbParams:OINODbParams, testParams: OINOTestPar
     
     target_group = "[HTTP PUT]"
     const put_body_json = await put_modelset.writeString(OINOContentType.json)
-    // OINOLog.info("HTTP PUT JSON", {put_body_json:put_body_json})
     await test(target_name + target_db + target_table + target_group + " update JSON", async () => {
         request_params.requestType = OINOContentType.json
         expect(encodeResult((await api.doRequest("PUT", new_row_id, post_body_json, empty_params)))).toMatchSnapshot("PUT JSON reset")
@@ -272,7 +261,6 @@ export async function OINOTestApi(dbParams:OINODbParams, testParams: OINOTestPar
 
     put_dataset.first()
     const put_body_csv = await put_modelset.writeString(OINOContentType.csv)
-    // OINOLog.info("HTTP PUT csv", {put_body_csv:put_body_csv})
     await test(target_name + target_db + target_table + target_group + " update CSV", async () => {
         request_params.requestType = OINOContentType.csv
         expect(encodeResult((await api.doRequest("PUT", new_row_id, post_body_json, empty_params)))).toMatchSnapshot("PUT CSV reset")
@@ -284,7 +272,6 @@ export async function OINOTestApi(dbParams:OINODbParams, testParams: OINOTestPar
     let put_body_formdata = await put_modelset.writeString(OINOContentType.formdata)
     const multipart_boundary = put_body_formdata.substring(0, put_body_formdata.indexOf('\r'))
     put_body_formdata = put_body_formdata.replaceAll(multipart_boundary, "---------OINO999999999")
-    // OINOLog.info("HTTP PUT FORMDATA", {put_body_formdata:put_body_formdata})
     await test(target_name + target_db + target_table + target_group + " update FORMDATA", async () => {
         request_params.requestType = OINOContentType.formdata
         request_params.multipartBoundary = "---------OINO999999999"
@@ -296,7 +283,6 @@ export async function OINOTestApi(dbParams:OINODbParams, testParams: OINOTestPar
     
     put_dataset.first()
     const put_body_urlencode = await put_modelset.writeString(OINOContentType.urlencode)
-    // OINOLog.info("HTTP PUT URLENCODE", {put_body_urlencode:put_body_urlencode})
     await test(target_name + target_db + target_table + target_group + " update URLENCODE", async () => {
         request_params.requestType = OINOContentType.urlencode
         request_params.multipartBoundary = undefined // for some reason this needs reset here so previous test value settings does not leak
@@ -311,7 +297,7 @@ export async function OINOTestApi(dbParams:OINODbParams, testParams: OINOTestPar
 
     const primary_keys:OINODbDataField[] = api.datamodel.filterFields((field:OINODbDataField) => { return field.fieldParams.isPrimaryKey })
     if (primary_keys.length != 1) {
-        OINOLog.info("HTTP PUT table " + testParams.apiParams.tableName + " does not have an individual primary key so 'invalid null' and 'oversized data' tests are skipped")
+        OINOLog.info("@oinots/db", "OINODbApi.test.ts", "OINOTestApi", "HTTP PUT table " + testParams.apiParams.tableName + " does not have an individual primary key so 'invalid null' and 'oversized data' tests are skipped", {}) 
     } else {
         const id_field:string = primary_keys[0].name 
         const notnull_fields:OINODbDataField[] = api.datamodel.filterFields((field:OINODbDataField) => { return (field.fieldParams.isPrimaryKey == false) && (field.fieldParams.isNotNull == true) })
@@ -331,7 +317,6 @@ export async function OINOTestApi(dbParams:OINODbParams, testParams: OINOTestPar
         const numeric_fields:OINODbDataField[] = api.datamodel.filterFields((field:OINODbDataField) => { return (field instanceof OINONumberDataField) && (field.fieldParams.isPrimaryKey == false) })
         if (numeric_fields.length > 0) {
             const nan_value = "[{\"" + id_field + "\":\"" + new_row_id + "\",\"" + numeric_fields[0].name + "\":\"" + "; FOO" + "\"}]"
-            // OINOLog.debug("HTTP PUT NAN-value", {nan_value:nan_value})
             await test(target_name + target_db + target_table + target_group + " update NAN-value", async () => {
                 expect(encodeResult((await api.doRequest("PUT", new_row_id, nan_value, empty_params)))).toMatchSnapshot("PUT NAN-value")
             })
@@ -339,7 +324,6 @@ export async function OINOTestApi(dbParams:OINODbParams, testParams: OINOTestPar
         const date_fields:OINODbDataField[] = api.datamodel.filterFields((field:OINODbDataField) => { return (field instanceof OINODatetimeDataField) && (field.fieldParams.isPrimaryKey == false) })
         if (date_fields.length > 0) {
             const non_date = "[{\"" + id_field + "\":\"" + new_row_id + "\",\"" + date_fields[0].name + "\":\"" + "; FOO" + "\"}]"
-            // OINOLog.debug("HTTP PUT invalid date value", {non_date:non_date})
             await test(target_name + target_db + target_table + target_group + " update invalid date value", async () => {
                 expect(encodeResult((await api.doRequest("PUT", new_row_id, non_date, empty_params)))).toMatchSnapshot("PUT invalid date value")
             })
@@ -349,7 +333,7 @@ export async function OINOTestApi(dbParams:OINODbParams, testParams: OINOTestPar
     target_group = "[BATCH UPDATE]"
     const reversable_fields:OINODbDataField[] = api.datamodel.filterFields((field:OINODbDataField) => { return ((field instanceof OINOStringDataField) || (field instanceof OINONumberDataField)) && (field.fieldParams.isPrimaryKey == false) && (field.fieldParams.isForeignKey == false) })
     if (reversable_fields.length == 0) {
-        OINOLog.info("BATCH UPDATE table " + testParams.apiParams.tableName + " does not have numeric fields and batch update tests are skipped")
+        OINOLog.info("@oinots/db", "OINODbApi.test.ts", "OINOTestApi", "BATCH UPDATE table " + testParams.apiParams.tableName + " does not have numeric fields and batch update tests are skipped", {}) 
     } else {
         const batch_field = reversable_fields[0]
         const batch_field_name:string = batch_field.name
@@ -400,7 +384,6 @@ export async function OINOTestApi(dbParams:OINODbParams, testParams: OINOTestPar
 }
 
 export async function OINOTestOwasp(dbParams:OINODbParams, testParams: OINOTestParams) {
-    // OINOLog.info("OINOTestOwasp", {dbParams:dbParams, apiDataset:testParams})
     const db:OINODb = await OINODbFactory.createDb( dbParams )
     const api:OINODbApi = await OINODbFactory.createApi(db, testParams.apiParams)
     
@@ -411,14 +394,12 @@ export async function OINOTestOwasp(dbParams:OINODbParams, testParams: OINOTestP
     const put_modelset:OINODbModelSet = new OINODbModelSet(api.datamodel, put_dataset)
     
     const new_row_id:string = OINODbConfig.printOINOId(post_modelset.datamodel.getRowPrimarykeyValues(testParams.postRow, true))
-    // OINOLog.debug("OINOTestOwasp", {new_row_id:new_row_id})
 
     const empty_params:OINODbApiRequestParams = { sqlParams: {}}
     const request_params:OINODbApiRequestParams = Object.assign({}, testParams.requestParams)
     request_params.sqlParams = {}
     const request_params_with_filters:OINODbApiRequestParams = Object.assign({}, request_params)
     request_params_with_filters.sqlParams = testParams.requestParams.sqlParams
-    // OINOLog.debug("OINOTestOwasp", {request_params:request_params, request_params_with_filters:request_params_with_filters})
     
     let target_name:string = ""
     if (testParams.name) {

package/src/OINODbApi.ts

@@ -108,23 +108,19 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
         const api:OINODbApi = modelset.datamodel.api
         const modified_index = datamodel.findFieldIndexByName(api.params.cacheModifiedField || "")
         let last_modified:number = this.modified
-        // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {last_modified:last_modified})
         
         while (!dataset.isEof()) {
             const row:OINODataRow = dataset.getRow()
             if (modified_index >= 0) {
                 last_modified = Math.max(last_modified, new Date(row[modified_index] as Date).getTime())
-                // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {last_modified:last_modified})
             }
             let row_id_seed:string = datamodel.getRowPrimarykeyValues(row).join(' ')
             let primary_key_values:string[] = []
             this.clearVariables()
             this.setVariableFromValue(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:OINODbDataField = datamodel.fields[i]
                 let value:string|null|undefined
-                // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {field:f.name, row_value:row[i], value_type:typeof row[i]})
                 if ((this._locale != null) && (f instanceof OINODatetimeDataField)) {
                     value = f.serializeCellWithLocale(row[i], this._locale)
                 } else {
@@ -138,16 +134,13 @@ export class OINODbHtmlTemplate extends 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(OINODbConfig.OINODB_ID_FIELD, 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:OINOHttpResult = this._createHttpResult(html, false)
         OINOBenchmark.end("OINOHtmlTemplate", "renderFromDbData")
@@ -186,7 +179,6 @@ export class OINODbApi {
      * 
      */
     constructor (db: OINODb, params:OINODbApiParams) {
-        // OINOLog.debug("OINODbApi.constructor", {db:db, tableName:tableName, params:params})
         if (!params.tableName) {
             throw new Error(OINO_ERROR_PREFIX + ": OINODbApiParams needs to define a table name!")
         }
@@ -200,25 +192,11 @@ export class OINODbApi {
         }
     }
 
-    private _printSql(result: OINODbApiResult, rows: OINODataRow[], requirePrimaryKey: boolean, printer: (row: OINODataRow) => string): string {
-        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;
-    }
     private _validateRow(result:OINODbApiResult, row:OINODataRow, requirePrimaryKey:boolean):void {
         let field:OINODbDataField
         for (let i=0; i<this.datamodel.fields.length; i++) {
             field = this.datamodel.fields[i]
-            // OINOLog.debug("OINODbApi.validateHttpValues", {field:field})
             const val:OINODataCell = 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")
 
@@ -231,7 +209,6 @@ export class OINODbApi {
             } else {
                 if ((field instanceof 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")
@@ -265,18 +242,22 @@ export class OINODbApi {
         let sql:string = ""
         try {
             sql = this.datamodel.printSqlSelect(id, params.sqlParams || {})
-            // OINOLog.debug("OINODbApi.doGet sql", {sql:sql})
+            OINOLog.debug("@oinots/db", "OINODbApi", "_doGet", "Print SQL", {sql:sql})
             const sql_res:OINODbDataSet = 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 OINODbModelSet(this.datamodel, sql_res, params.sqlParams)
             }
         } catch (e:any) {
             result.setError(500, "Unhandled exception in doGet: " + e.message, "DoGet")
-            result.addDebug("OINO GET SQL [" + sql + "]", "DoGet")
+            OINOLog.exception("@oinots/db", "OINODbApi", "_doGet", "Exception", {message:e.message, stack:e.stack})
+            if (this._debugOnError) {
+                result.addDebug("OINO GET SQL [" + sql + "]", "DoGet")
+            }
         }
     }
     
@@ -296,7 +277,7 @@ export class OINODbApi {
                 result.setError(405, "No valid rows for POST!", "DoPost")
 
             } else if (result.success) {
-                // OINOLog.debug("OINODbApi.doPost sql", {sql:sql})
+                OINOLog.debug("@oinots/db", "OINODbApi", "_doPost", "Print SQL", {sql:sql})
                 const sql_res:OINODbDataSet = await this.db.sqlExec(sql)
                 // OINOLog.debug("OINODbApi.doPost sql_res", {sql_res:sql_res})
                 if (sql_res.hasErrors()) {
@@ -309,7 +290,10 @@ export class OINODbApi {
             }
         } catch (e:any) {
             result.setError(500, "Unhandled exception in doPost: " + e.message, "DoPost")
-            result.addDebug("OINO POST SQL [" + sql + "]", "DoPost")
+            OINOLog.exception("@oinots/db", "OINODbApi", "_doGet", "Exception", {message:e.message, stack:e.stack})
+            if (this._debugOnError) {
+                result.addDebug("OINO POST SQL [" + sql + "]", "DoPost")
+            }
         }
     }
 
@@ -331,9 +315,8 @@ export 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})
+                OINOLog.debug("@oinots/db", "OINODbApi", "_doPut", "Print SQL", {sql:sql})
                 const sql_res:OINODbDataSet = 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) {
@@ -344,7 +327,10 @@ export class OINODbApi {
             }
         } catch (e:any) {
             result.setError(500, "Unhandled exception: " + e.message, "DoPut")
-            result.addDebug("OINO POST SQL [" + sql + "]", "DoPut")
+            OINOLog.exception("@oinots/db", "OINODbApi", "_doGet", "Exception", {message:e.message, stack:e.stack})
+            if (this._debugOnError) {
+                result.addDebug("OINO POST SQL [" + sql + "]", "DoPut")
+            }
         }
     }
 
@@ -368,9 +354,8 @@ export class OINODbApi {
 
             } else if (result.success) {
             
-                // OINOLog.debug("OINODbApi.doDelete sql", {sql:sql})
+                OINOLog.debug("@oinots/db", "OINODbApi", "_doDelete", "Print SQL", {sql:sql})
                 const sql_res:OINODbDataSet = 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) {
@@ -381,7 +366,9 @@ export class OINODbApi {
             }
         } catch (e:any) {
             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")
+            }
         }
     }
 
@@ -406,7 +393,7 @@ export class OINODbApi {
      */
     async doRequest(method:string, id: string, data:string|OINODataRow[]|Buffer|any, params:OINODbApiRequestParams = API_EMPTY_PARAMS):Promise<OINODbApiResult> {
         OINOBenchmark.start("OINODbApi", "doRequest")
-        // OINOLog.debug("OINODbApi.doRequest enter", {method:method, id:id, body:body, params:params})
+        OINOLog.debug("@oinots/db", "OINODbApi", "doRequest", "Request", {method:method, id:id, data:data})
         let result:OINODbApiResult = new OINODbApiResult(params)
         let rows:OINODataRow[] = []
         if ((method == "POST") || (method == "PUT")) {
@@ -439,7 +426,6 @@ export class OINODbApi {
 
             } else {
                 try {
-                    // OINOLog.debug("OINODbApi.doRequest / POST", {rows:rows})
                     await this._doPost(result, rows)
 
                 } catch (e:any) {
@@ -476,7 +462,7 @@ export class OINODbApi {
      */
     async doBatchUpdate(method:string, data:string|OINODataRow[]|Buffer|any, params:OINODbApiRequestParams = API_EMPTY_PARAMS):Promise<OINODbApiResult> {
         OINOBenchmark.start("OINODbApi", "doBatchUpdate")
-        // OINOLog.debug("OINODbApi.doRequest enter", {method:method, id:id, body:body, params:params})
+        OINOLog.debug("@oinots/db", "OINODbApi", "doBatchUpdate", "Request", {method:method, data:data, params:params})
         let result:OINODbApiResult = new OINODbApiResult(params)
         let rows:OINODataRow[] = []
         if ((method == "PUT")) {
@@ -513,7 +499,6 @@ export class OINODbApi {
      */
 
     public isFieldIncluded(fieldName:string):boolean {
-        // 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)) && 

package/src/OINODbDataField.ts

@@ -48,7 +48,6 @@ export class OINODbDataField {
         this.maxLength = maxLength
         this.sqlType = sqlType
         this.fieldParams = fieldParams
-        // OINOLog.debug("OINODbDataField.constructor", {this:this})
     }
 
     /**
@@ -258,7 +257,7 @@ export class OINONumberDataField extends OINODbDataField {
         } else {
             const result:number = parseFloat(value)
             if (isNaN(result)) {
-                OINOLog.error("OINONumberDataField.toSql: Invalid value!", {value:value})
+                OINOLog.error("@oinots/db", "OINONumberDataField", "toSql", "Invalid value!", {value:value})
                 throw new Error(OINO_ERROR_PREFIX + ": OINONumberDataField.deserializeCell - Invalid value '" + value + "'") // incorrectly formatted data could be a security risk, abort processing
             }
             return result
@@ -293,7 +292,6 @@ export class OINOBlobDataField extends OINODbDataField {
      *
      */
     serializeCell(cellVal: OINODataCell):string|null|undefined {
-        // OINOLog.debug("OINOBlobDataField.serializeCell", {cellVal:cellVal})
         if ((cellVal === null) || (cellVal === undefined))  {
             return cellVal
 
@@ -348,10 +346,8 @@ export class OINODatetimeDataField extends OINODbDataField {
      *
      */
     serializeCell(cellVal: OINODataCell): string|null|undefined {
-        // 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
@@ -372,10 +368,8 @@ export class OINODatetimeDataField extends OINODbDataField {
      *
      */
     serializeCellWithLocale(cellVal: OINODataCell, locale:Intl.DateTimeFormat): string|null|undefined {
-        // 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
@@ -395,7 +389,6 @@ export class OINODatetimeDataField extends OINODbDataField {
      *
      */
     deserializeCell(value: string|null|undefined): OINODataCell {
-        // OINOLog.debug("OINODatetimeDataField.deserializeCell", {strVal:strVal})
         if ((value === null) || (value === undefined)) {
             return value
         } else {

package/src/OINODbDataModel.ts

@@ -30,8 +30,6 @@ export class OINODbDataModel {
         this._columnLookup = {}
         this.api = api
         this.fields = []
-
-        // OINOLog_debug("OINODbDataModel (" + tableName + "):\n" + this._printTableDebug("\n"))
     }
     /**
      * Initialize datamodel from SQL schema.
@@ -79,7 +77,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 += ",";
@@ -107,7 +104,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
             }
@@ -136,7 +132,6 @@ export class OINODbDataModel {
      *
      */
     findFieldByName(name:string):OINODbDataField|null {
-        // OINOLog.debug("OINODbDataModel.findFieldByName", {_columnLookup:this._columnLookup})
         const i:number = this._columnLookup[name]
         if (i >= 0) {
             return this.fields[i]
@@ -152,7 +147,6 @@ export class OINODbDataModel {
      *
      */
     findFieldIndexByName(name:string):number {
-        // OINOLog.debug("OINODbDataModel.findFieldIndexByName", {_columnLookup:this._columnLookup})
         const i:number = this._columnLookup[name]
         if (i >= 0) {
             return i
@@ -244,14 +238,12 @@ 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
         } else if ((id != null) && (id != "")) {
@@ -260,7 +252,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;
     }
 
@@ -272,6 +264,7 @@ export class OINODbDataModel {
      */
     printSqlInsert(row: OINODataRow): string {
         let result: string = "INSERT INTO " + this.api.db.printSqlTablename(this.api.params.tableName) + " " + this._printSqlInsertColumnsAndValues(row) + ";";
+        OINOLog.debug("@oinots/db", "OINODbDataModel", "printSqlInsert", "Result", {sql:result})
         return result;
     }
 
@@ -284,7 +277,7 @@ export class OINODbDataModel {
      */
     printSqlUpdate(id: string, row: OINODataRow): string {
         let result: string = "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;
     }
 
@@ -296,6 +289,7 @@ export class OINODbDataModel {
      */
     printSqlDelete(id: string): string {
         let result: string = "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/src/OINODbFactory.ts

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-import { OINODbApi, OINODbApiParams, OINODbParams, OINOContentType, OINODb, OINODbConstructor, OINODbApiRequestParams, OINODbSqlFilter, OINODbConfig, OINODbSqlOrder, OINODbSqlLimit, OINODbSqlParams, OINODbSqlAggregate, OINODbSqlSelect } from "./index.js"
+import { OINODbApi, OINODbApiParams, OINODbParams, OINOContentType, OINODb, OINODbConstructor, OINODbApiRequestParams, OINODbSqlFilter, OINODbConfig, OINODbSqlOrder, OINODbSqlLimit, OINODbSqlParams, OINODbSqlAggregate, OINODbSqlSelect, OINOLog } from "./index.js"
 
 /**
  * Static factory class for easily creating things based on data
@@ -21,9 +21,7 @@ export class OINODbFactory {
      * @param dbTypeClass constructor for creating a database of that type
      */
     static registerDb(dbName:string, dbTypeClass: OINODbConstructor):void {
-        // OINOLog.debug("OINODbFactory.registerDb", {dbType:dbName})
         this._dbRegistry[dbName] = dbTypeClass
-
     }
 
     /**
@@ -115,12 +113,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] as OINOContentType)) {
                 result.responseType = accept_types[i] as OINOContentType
-                // OINOLog.debug("createParamsFromRequest: response type found", {respnse_type:result.responseType})
                 break
             }
         }
@@ -136,7 +132,7 @@ export class OINODbFactory {
             result.etags = etags
         }
 
-        // OINOLog.debug("createParamsFromRequest", {params:result})
+        OINOLog.debug("@oinots/db", "OINODbFactory", "createParamsFromRequest", "Result", {params:result})
         return result
     }
 }