@oino-ts/db-mssql 0.7.2 → 0.8.0

package/dist/cjs/OINODbMsSql.js

@@ -34,7 +34,6 @@ class OINOMsSqlData extends db_1.OINODbDataSet {
             this._recordsets = data;
             this._rows = this._recordsets[0];
         }
-        // OINOLog.debug("OINOMsSqlData.constructor", {_rows:this._rows})
         if (this.isEmpty()) {
             this._currentRecordset = -1;
             this._currentRow = -1;
@@ -65,7 +64,6 @@ class OINOMsSqlData extends db_1.OINODbDataSet {
      *
      */
     async next() {
-        // OINOLog.debug("OINODbDataSet.next", {currentRow:this._currentRow, length:this.sqlResult.data.length})
         if (this._currentRow < this._rows.length - 1) {
             this._currentRow = this._currentRow + 1;
         }
@@ -111,7 +109,6 @@ class OINODbMsSql extends db_1.OINODb {
      */
     constructor(params) {
         super(params);
-        // OINOLog.debug("OINODbMsSql.constructor", {params:params})
         if (this._params.type !== "OINODbMsSql") {
             throw new Error(db_1.OINO_ERROR_PREFIX + ": Not OINODbMsSql-type: " + this._params.type);
         }
@@ -131,44 +128,18 @@ class OINODbMsSql extends db_1.OINODb {
         });
         delete this._params.password; // do not store password in db object
         this._pool.on("error", (conn) => {
-            db_1.OINOLog.error("OINODbMsSql error event", conn);
+            db_1.OINOLog.error("@oinots/db", "OINODbMsSql", "constructor", "OINODbMsSql error event", conn);
         });
-        // this._pool.on("debug", (event:any) => {
-        //     console.log("OINODbMsSql debug",event)
-        // })
     }
     async _query(sql) {
-        // OINOLog.debug("OINODbMsSql._query", {sql:sql})
-        try {
-            const request = this._pool.request(); // this does not need to be released but the pool will handle it
-            const sql_res = await request.query(sql);
-            // console.log("OINODbMsSql._query result:" + JSON.stringify(sql_res.recordsets))
-            const result = new OINOMsSqlData(sql_res.recordsets);
-            return Promise.resolve(result);
-        }
-        catch (err) {
-            db_1.OINOLog.error("OINODbMsSql._query exception", { err: err });
-            throw err;
-        }
-        finally {
-            // console.log("OINODbMsSql._query finally");
-        }
-        // OINOLog.debug("OINODbMsSql._query", {result:query_result})
+        const request = this._pool.request(); // this does not need to be released but the pool will handle it
+        const sql_res = await request.query(sql);
+        const result = new OINOMsSqlData(sql_res.recordsets);
+        return result;
     }
     async _exec(sql) {
-        // OINOLog.debug("OINODbMsSql._exec", {sql:sql})
-        try {
-            const sql_res = await this._pool.request().query(sql);
-            // console.log("OINODbMsSql._exec result", sql_res); 
-            return Promise.resolve(new OINOMsSqlData(db_1.OINODB_EMPTY_ROWS));
-        }
-        catch (err) {
-            db_1.OINOLog.error("OINODbMsSql._exec exception", { err: err });
-            throw err;
-        }
-        finally {
-        }
-        // OINOLog.debug("OINODbMsSql._exec", {result:query_result})
+        const sql_res = await this._pool.request().query(sql);
+        return new OINOMsSqlData(db_1.OINODB_EMPTY_ROWS);
     }
     /**
      * Print a table name using database specific SQL escaping.
@@ -197,7 +168,6 @@ class OINODbMsSql extends db_1.OINODb {
      *
      */
     printCellAsSqlValue(cellValue, sqlType) {
-        // OINOLog.debug("OINODbMsSql.printCellAsSqlValue", {cellValue:cellValue, sqlType:sqlType})
         if (cellValue === null) {
             return "NULL";
         }
@@ -243,7 +213,6 @@ class OINODbMsSql extends db_1.OINODb {
      *
      */
     parseSqlValueAsCell(sqlValue, sqlType) {
-        // OINOLog.debug("OINODbMsSql.parseSqlValueAsCell", {sqlValue:sqlValue, sqlType:sqlType})
         if ((sqlValue === null) || (sqlValue == "NULL")) {
             return null;
         }
@@ -275,7 +244,6 @@ class OINODbMsSql extends db_1.OINODb {
             result += "TOP " + limit_parts[0] + " ";
         }
         result += columnNames + " FROM " + tableName;
-        // OINOLog.debug("OINODb.printSqlSelect", {tableName:tableName, columnNames:columnNames, whereCondition:whereCondition, orderCondition:orderCondition, limitCondition:limitCondition })
         if (whereCondition != "") {
             result += " WHERE " + whereCondition;
         }
@@ -287,14 +255,15 @@ class OINODbMsSql extends db_1.OINODb {
         }
         if ((limitCondition != "") && (limit_parts.length == 2)) {
             if (orderCondition == "") {
-                db_1.OINOLog.error("OINODbMsSql.printSqlSelect: LIMIT without ORDER BY is not supported in MS SQL Server");
+                db_1.OINOLog.error("@oinots/db", "OINODbMsSql", "printSqlSelect", "LIMIT without ORDER BY is not supported in MS SQL Server");
+                throw new Error(db_1.OINO_ERROR_PREFIX + "LIMIT without ORDER BY is not supported in MS SQL Server");
             }
             else {
                 result += " OFFSET " + limit_parts[1] + " ROWS FETCH NEXT " + limit_parts[0] + " ROWS ONLY";
             }
         }
         result += ";";
-        // OINOLog.debug("OINODb.printSqlSelect", {result:result})
+        db_1.OINOLog.debug("@oinots/db", "OINODbMsSql", "printSqlSelect", "Result", { sql: result });
         return result;
     }
     /**
@@ -306,14 +275,12 @@ class OINODbMsSql extends db_1.OINODb {
         try {
             // make sure that any items are correctly URL encoded in the connection string
             await this._pool.connect();
-            // OINOLog.info("OINODbMsSql.connect: Connected to database server.")
-            // await this._pool.request().query("SELECT 1 as test")
             this.isConnected = true;
         }
-        catch (err) {
+        catch (e) {
             // ... error checks
-            result.setError(500, "Exception connecting to database: " + err.message, "OINODbMsSql.connect");
-            db_1.OINOLog.error(result.statusMessage, { error: err });
+            result.setError(500, "Exception connecting to database: " + e.message, "OINODbMsSql.connect");
+            db_1.OINOLog.exception("@oinots/db", "OINODbMsSql", "connect", "Exception", { message: e.message, stack: e.stack });
         }
         return Promise.resolve(result);
     }
@@ -330,9 +297,7 @@ class OINODbMsSql extends db_1.OINODb {
         db_1.OINOBenchmark.start("OINODb", "validate");
         try {
             const sql = this._getValidateSql(this._params.database);
-            // OINOLog.debug("OINODbMsSql.validate", {sql:sql})
             const sql_res = await this.sqlSelect(sql);
-            // OINOLog.debug("OINODbMsSql.validate", {sql_res:sql_res})
             if (sql_res.isEmpty()) {
                 result.setError(400, "DB returned no rows for select!", "OINODbMsSql.validate");
             }
@@ -349,6 +314,7 @@ class OINODbMsSql extends db_1.OINODb {
         }
         catch (e) {
             result.setError(500, "Exception in validating connection: " + e.message, "OINODbMsSql.validate");
+            db_1.OINOLog.exception("@oinots/db", "OINODbMsSql", "validate", "Exception", { message: e.message, stack: e.stack });
         }
         db_1.OINOBenchmark.end("OINODb", "validate");
         return result;
@@ -363,10 +329,10 @@ class OINODbMsSql extends db_1.OINODb {
         db_1.OINOBenchmark.start("OINODb", "sqlSelect");
         let result;
         try {
-            // OINOLog.debug("OINODbMsSql.sqlSelect", {sql:sql})
             result = await this._query(sql);
         }
         catch (e) {
+            db_1.OINOLog.exception("@oinots/db", "OINODbMsSql", "sqlSelect", "SQL select exception", { message: e.message, stack: e.stack });
             result = new OINOMsSqlData(db_1.OINODB_EMPTY_ROWS, [db_1.OINO_ERROR_PREFIX + " (sqlSelect): OINODbMsSql.sqlSelect exception in _db.query: " + e.message]);
         }
         db_1.OINOBenchmark.end("OINODb", "sqlSelect");
@@ -385,6 +351,7 @@ class OINODbMsSql extends db_1.OINODb {
             result = await this._exec(sql);
         }
         catch (e) {
+            db_1.OINOLog.exception("@oinots/db", "OINODbMsSql", "sqlExec", "SQL exec exception", { message: e.message, stack: e.stack });
             result = new OINOMsSqlData(db_1.OINODB_EMPTY_ROWS, [db_1.OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + e.message + "]"]);
         }
         db_1.OINOBenchmark.end("OINODb", "sqlExec");
@@ -438,10 +405,9 @@ WHERE C.TABLE_CATALOG = '${dbName}';`;
      */
     async initializeApiDatamodel(api) {
         //"SELECT COLUMN_NAME, IS_NULLABLE, DATA_TYPE, CHARACTER_MAXIMUM_LENGTH, NUMERIC_PRECISION, NUMERIC_PRECISION_RADIX 
-        const res = await this.sqlSelect(this._getSchemaSql(this._params.database, api.params.tableName));
-        while (!res.isEof()) {
-            const row = res.getRow();
-            // OINOLog.debug("OINODbMsSql.initializeApiDatamodel", { description:row })
+        const schema_res = await this.sqlSelect(this._getSchemaSql(this._params.database, api.params.tableName));
+        while (!schema_res.isEof()) {
+            const row = schema_res.getRow();
             const field_name = row[0]?.toString() || "";
             const sql_type = row[2] || "";
             const char_field_length = row[3] || 0;
@@ -455,13 +421,12 @@ WHERE C.TABLE_CATALOG = '${dbName}';`;
                 isNotNull: row[1] == "NO"
             };
             if (api.isFieldIncluded(field_name) == false) {
-                db_1.OINOLog.info("OINODbMsSql.initializeApiDatamodel: field excluded in API parameters.", { field: field_name });
+                db_1.OINOLog.info("@oinots/db", "OINODbMsSql", "initializeApiDatamodel", "Field excluded in API parameters.", { field: field_name });
                 if (field_params.isPrimaryKey) {
                     throw new Error(db_1.OINO_ERROR_PREFIX + "Primary key field excluded in API parameters: " + field_name);
                 }
             }
             else {
-                // OINOLog.debug("OINODbMsSql.initializeApiDatamodel: next field ", {field_name: field_name, sql_type:sql_type, char_field_length:char_field_length, numeric_field_length1:numeric_field_length1, numeric_field_length2:numeric_field_length2, field_params:field_params })
                 if ((sql_type == "tinyint") || (sql_type == "smallint") || (sql_type == "int") || (sql_type == "bigint") || (sql_type == "float") || (sql_type == "real")) {
                     api.datamodel.addField(new db_1.OINONumberDataField(this, field_name, sql_type, field_params));
                 }
@@ -486,13 +451,13 @@ WHERE C.TABLE_CATALOG = '${dbName}';`;
                     api.datamodel.addField(new db_1.OINOBooleanDataField(this, field_name, sql_type, field_params));
                 }
                 else {
-                    db_1.OINOLog.info("OINODbMsSql.initializeApiDatamodel: unrecognized field type treated as string", { field_name: field_name, sql_type: sql_type, char_length: char_field_length, numeric_field_length1: numeric_field_length1, numeric_field_length2: numeric_field_length2, field_params: field_params });
+                    db_1.OINOLog.info("@oinots/db", "OINODbMsSql", "initializeApiDatamodel", "Unrecognized field type treated as string", { field_name: field_name, sql_type: sql_type, char_length: char_field_length, numeric_field_length1: numeric_field_length1, numeric_field_length2: numeric_field_length2, field_params: field_params });
                     api.datamodel.addField(new db_1.OINOStringDataField(this, field_name, sql_type, field_params, 0));
                 }
             }
-            await res.next();
+            await schema_res.next();
         }
-        db_1.OINOLog.debug("OINODbMsSql.initializeDatasetModel:\n" + api.datamodel.printDebug("\n"));
+        db_1.OINOLog.info("@oinots/db", "OINODbMsSql", "initializeApiDatamodel", "\n" + api.datamodel.printDebug("\n"));
         return Promise.resolve();
     }
 }

package/dist/esm/OINODbMsSql.js

@@ -31,7 +31,6 @@ class OINOMsSqlData extends OINODbDataSet {
             this._recordsets = data;
             this._rows = this._recordsets[0];
         }
-        // OINOLog.debug("OINOMsSqlData.constructor", {_rows:this._rows})
         if (this.isEmpty()) {
             this._currentRecordset = -1;
             this._currentRow = -1;
@@ -62,7 +61,6 @@ class OINOMsSqlData extends OINODbDataSet {
      *
      */
     async next() {
-        // OINOLog.debug("OINODbDataSet.next", {currentRow:this._currentRow, length:this.sqlResult.data.length})
         if (this._currentRow < this._rows.length - 1) {
             this._currentRow = this._currentRow + 1;
         }
@@ -108,7 +106,6 @@ export class OINODbMsSql extends OINODb {
      */
     constructor(params) {
         super(params);
-        // OINOLog.debug("OINODbMsSql.constructor", {params:params})
         if (this._params.type !== "OINODbMsSql") {
             throw new Error(OINO_ERROR_PREFIX + ": Not OINODbMsSql-type: " + this._params.type);
         }
@@ -128,44 +125,18 @@ export class OINODbMsSql extends OINODb {
         });
         delete this._params.password; // do not store password in db object
         this._pool.on("error", (conn) => {
-            OINOLog.error("OINODbMsSql error event", conn);
+            OINOLog.error("@oinots/db", "OINODbMsSql", "constructor", "OINODbMsSql error event", conn);
         });
-        // this._pool.on("debug", (event:any) => {
-        //     console.log("OINODbMsSql debug",event)
-        // })
     }
     async _query(sql) {
-        // OINOLog.debug("OINODbMsSql._query", {sql:sql})
-        try {
-            const request = this._pool.request(); // this does not need to be released but the pool will handle it
-            const sql_res = await request.query(sql);
-            // console.log("OINODbMsSql._query result:" + JSON.stringify(sql_res.recordsets))
-            const result = new OINOMsSqlData(sql_res.recordsets);
-            return Promise.resolve(result);
-        }
-        catch (err) {
-            OINOLog.error("OINODbMsSql._query exception", { err: err });
-            throw err;
-        }
-        finally {
-            // console.log("OINODbMsSql._query finally");
-        }
-        // OINOLog.debug("OINODbMsSql._query", {result:query_result})
+        const request = this._pool.request(); // this does not need to be released but the pool will handle it
+        const sql_res = await request.query(sql);
+        const result = new OINOMsSqlData(sql_res.recordsets);
+        return result;
     }
     async _exec(sql) {
-        // OINOLog.debug("OINODbMsSql._exec", {sql:sql})
-        try {
-            const sql_res = await this._pool.request().query(sql);
-            // console.log("OINODbMsSql._exec result", sql_res); 
-            return Promise.resolve(new OINOMsSqlData(OINODB_EMPTY_ROWS));
-        }
-        catch (err) {
-            OINOLog.error("OINODbMsSql._exec exception", { err: err });
-            throw err;
-        }
-        finally {
-        }
-        // OINOLog.debug("OINODbMsSql._exec", {result:query_result})
+        const sql_res = await this._pool.request().query(sql);
+        return new OINOMsSqlData(OINODB_EMPTY_ROWS);
     }
     /**
      * Print a table name using database specific SQL escaping.
@@ -194,7 +165,6 @@ export class OINODbMsSql extends OINODb {
      *
      */
     printCellAsSqlValue(cellValue, sqlType) {
-        // OINOLog.debug("OINODbMsSql.printCellAsSqlValue", {cellValue:cellValue, sqlType:sqlType})
         if (cellValue === null) {
             return "NULL";
         }
@@ -240,7 +210,6 @@ export class OINODbMsSql extends OINODb {
      *
      */
     parseSqlValueAsCell(sqlValue, sqlType) {
-        // OINOLog.debug("OINODbMsSql.parseSqlValueAsCell", {sqlValue:sqlValue, sqlType:sqlType})
         if ((sqlValue === null) || (sqlValue == "NULL")) {
             return null;
         }
@@ -272,7 +241,6 @@ export class OINODbMsSql extends OINODb {
             result += "TOP " + limit_parts[0] + " ";
         }
         result += columnNames + " FROM " + tableName;
-        // OINOLog.debug("OINODb.printSqlSelect", {tableName:tableName, columnNames:columnNames, whereCondition:whereCondition, orderCondition:orderCondition, limitCondition:limitCondition })
         if (whereCondition != "") {
             result += " WHERE " + whereCondition;
         }
@@ -284,14 +252,15 @@ export class OINODbMsSql extends OINODb {
         }
         if ((limitCondition != "") && (limit_parts.length == 2)) {
             if (orderCondition == "") {
-                OINOLog.error("OINODbMsSql.printSqlSelect: LIMIT without ORDER BY is not supported in MS SQL Server");
+                OINOLog.error("@oinots/db", "OINODbMsSql", "printSqlSelect", "LIMIT without ORDER BY is not supported in MS SQL Server");
+                throw new Error(OINO_ERROR_PREFIX + "LIMIT without ORDER BY is not supported in MS SQL Server");
             }
             else {
                 result += " OFFSET " + limit_parts[1] + " ROWS FETCH NEXT " + limit_parts[0] + " ROWS ONLY";
             }
         }
         result += ";";
-        // OINOLog.debug("OINODb.printSqlSelect", {result:result})
+        OINOLog.debug("@oinots/db", "OINODbMsSql", "printSqlSelect", "Result", { sql: result });
         return result;
     }
     /**
@@ -303,14 +272,12 @@ export class OINODbMsSql extends OINODb {
         try {
             // make sure that any items are correctly URL encoded in the connection string
             await this._pool.connect();
-            // OINOLog.info("OINODbMsSql.connect: Connected to database server.")
-            // await this._pool.request().query("SELECT 1 as test")
             this.isConnected = true;
         }
-        catch (err) {
+        catch (e) {
             // ... error checks
-            result.setError(500, "Exception connecting to database: " + err.message, "OINODbMsSql.connect");
-            OINOLog.error(result.statusMessage, { error: err });
+            result.setError(500, "Exception connecting to database: " + e.message, "OINODbMsSql.connect");
+            OINOLog.exception("@oinots/db", "OINODbMsSql", "connect", "Exception", { message: e.message, stack: e.stack });
         }
         return Promise.resolve(result);
     }
@@ -327,9 +294,7 @@ export class OINODbMsSql extends OINODb {
         OINOBenchmark.start("OINODb", "validate");
         try {
             const sql = this._getValidateSql(this._params.database);
-            // OINOLog.debug("OINODbMsSql.validate", {sql:sql})
             const sql_res = await this.sqlSelect(sql);
-            // OINOLog.debug("OINODbMsSql.validate", {sql_res:sql_res})
             if (sql_res.isEmpty()) {
                 result.setError(400, "DB returned no rows for select!", "OINODbMsSql.validate");
             }
@@ -346,6 +311,7 @@ export class OINODbMsSql extends OINODb {
         }
         catch (e) {
             result.setError(500, "Exception in validating connection: " + e.message, "OINODbMsSql.validate");
+            OINOLog.exception("@oinots/db", "OINODbMsSql", "validate", "Exception", { message: e.message, stack: e.stack });
         }
         OINOBenchmark.end("OINODb", "validate");
         return result;
@@ -360,10 +326,10 @@ export class OINODbMsSql extends OINODb {
         OINOBenchmark.start("OINODb", "sqlSelect");
         let result;
         try {
-            // OINOLog.debug("OINODbMsSql.sqlSelect", {sql:sql})
             result = await this._query(sql);
         }
         catch (e) {
+            OINOLog.exception("@oinots/db", "OINODbMsSql", "sqlSelect", "SQL select exception", { message: e.message, stack: e.stack });
             result = new OINOMsSqlData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlSelect): OINODbMsSql.sqlSelect exception in _db.query: " + e.message]);
         }
         OINOBenchmark.end("OINODb", "sqlSelect");
@@ -382,6 +348,7 @@ export class OINODbMsSql extends OINODb {
             result = await this._exec(sql);
         }
         catch (e) {
+            OINOLog.exception("@oinots/db", "OINODbMsSql", "sqlExec", "SQL exec exception", { message: e.message, stack: e.stack });
             result = new OINOMsSqlData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + e.message + "]"]);
         }
         OINOBenchmark.end("OINODb", "sqlExec");
@@ -435,10 +402,9 @@ WHERE C.TABLE_CATALOG = '${dbName}';`;
      */
     async initializeApiDatamodel(api) {
         //"SELECT COLUMN_NAME, IS_NULLABLE, DATA_TYPE, CHARACTER_MAXIMUM_LENGTH, NUMERIC_PRECISION, NUMERIC_PRECISION_RADIX 
-        const res = await this.sqlSelect(this._getSchemaSql(this._params.database, api.params.tableName));
-        while (!res.isEof()) {
-            const row = res.getRow();
-            // OINOLog.debug("OINODbMsSql.initializeApiDatamodel", { description:row })
+        const schema_res = await this.sqlSelect(this._getSchemaSql(this._params.database, api.params.tableName));
+        while (!schema_res.isEof()) {
+            const row = schema_res.getRow();
             const field_name = row[0]?.toString() || "";
             const sql_type = row[2] || "";
             const char_field_length = row[3] || 0;
@@ -452,13 +418,12 @@ WHERE C.TABLE_CATALOG = '${dbName}';`;
                 isNotNull: row[1] == "NO"
             };
             if (api.isFieldIncluded(field_name) == false) {
-                OINOLog.info("OINODbMsSql.initializeApiDatamodel: field excluded in API parameters.", { field: field_name });
+                OINOLog.info("@oinots/db", "OINODbMsSql", "initializeApiDatamodel", "Field excluded in API parameters.", { field: field_name });
                 if (field_params.isPrimaryKey) {
                     throw new Error(OINO_ERROR_PREFIX + "Primary key field excluded in API parameters: " + field_name);
                 }
             }
             else {
-                // OINOLog.debug("OINODbMsSql.initializeApiDatamodel: next field ", {field_name: field_name, sql_type:sql_type, char_field_length:char_field_length, numeric_field_length1:numeric_field_length1, numeric_field_length2:numeric_field_length2, field_params:field_params })
                 if ((sql_type == "tinyint") || (sql_type == "smallint") || (sql_type == "int") || (sql_type == "bigint") || (sql_type == "float") || (sql_type == "real")) {
                     api.datamodel.addField(new OINONumberDataField(this, field_name, sql_type, field_params));
                 }
@@ -483,13 +448,13 @@ WHERE C.TABLE_CATALOG = '${dbName}';`;
                     api.datamodel.addField(new OINOBooleanDataField(this, field_name, sql_type, field_params));
                 }
                 else {
-                    OINOLog.info("OINODbMsSql.initializeApiDatamodel: unrecognized field type treated as string", { field_name: field_name, sql_type: sql_type, char_length: char_field_length, numeric_field_length1: numeric_field_length1, numeric_field_length2: numeric_field_length2, field_params: field_params });
+                    OINOLog.info("@oinots/db", "OINODbMsSql", "initializeApiDatamodel", "Unrecognized field type treated as string", { field_name: field_name, sql_type: sql_type, char_length: char_field_length, numeric_field_length1: numeric_field_length1, numeric_field_length2: numeric_field_length2, field_params: field_params });
                     api.datamodel.addField(new OINOStringDataField(this, field_name, sql_type, field_params, 0));
                 }
             }
-            await res.next();
+            await schema_res.next();
         }
-        OINOLog.debug("OINODbMsSql.initializeDatasetModel:\n" + api.datamodel.printDebug("\n"));
+        OINOLog.info("@oinots/db", "OINODbMsSql", "initializeApiDatamodel", "\n" + api.datamodel.printDebug("\n"));
         return Promise.resolve();
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db-mssql",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "description": "OINO TS package for using Microsoft Sql databases.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -22,7 +22,7 @@
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "dependencies": {
-    "@oino-ts/db": "0.7.2",
+    "@oino-ts/db": "0.8.0",
     "mssql": "^11.0.1"
   },
   "devDependencies": {

package/src/OINODbMsSql.ts

@@ -36,7 +36,6 @@ class OINOMsSqlData extends OINODbDataSet {
             this._recordsets = data as OINODataRow[][]
             this._rows = this._recordsets[0]
         }
-        // OINOLog.debug("OINOMsSqlData.constructor", {_rows:this._rows})
         if (this.isEmpty()) {
             this._currentRecordset = -1
             this._currentRow = -1
@@ -69,7 +68,6 @@ class OINOMsSqlData extends OINODbDataSet {
      *
      */
     async next():Promise<boolean> {
-        // OINOLog.debug("OINODbDataSet.next", {currentRow:this._currentRow, length:this.sqlResult.data.length})
         if (this._currentRow < this._rows.length-1) {
             this._currentRow = this._currentRow + 1
 
@@ -121,7 +119,6 @@ export class OINODbMsSql extends OINODb {
     constructor(params:OINODbParams) {
         super(params)
 
-        // OINOLog.debug("OINODbMsSql.constructor", {params:params})
         if (this._params.type !== "OINODbMsSql") {
             throw new Error(OINO_ERROR_PREFIX + ": Not OINODbMsSql-type: " + this._params.type)
         } 
@@ -142,45 +139,20 @@ export class OINODbMsSql extends OINODb {
         delete this._params.password // do not store password in db object
        
         this._pool.on("error", (conn:any) => {
-            OINOLog.error("OINODbMsSql error event", conn)
+            OINOLog.error("@oinots/db", "OINODbMsSql", "constructor", "OINODbMsSql error event", conn)
         })
-        // this._pool.on("debug", (event:any) => {
-        //     console.log("OINODbMsSql debug",event)
-        // })
     }
 
     private async _query(sql:string):Promise<OINOMsSqlData> {
-        // OINOLog.debug("OINODbMsSql._query", {sql:sql})
-        try {
-            const request = this._pool.request() // this does not need to be released but the pool will handle it
-            const sql_res = await request.query(sql)
-            // console.log("OINODbMsSql._query result:" + JSON.stringify(sql_res.recordsets))
-            const result:OINOMsSqlData = new OINOMsSqlData(sql_res.recordsets)
-            return Promise.resolve(result)
-        
-        } catch (err) {
-            OINOLog.error("OINODbMsSql._query exception", {err:err}) 
-            throw err;
-
-        } finally {
-            // console.log("OINODbMsSql._query finally");
-        }
-        // OINOLog.debug("OINODbMsSql._query", {result:query_result})
+        const request = this._pool.request() // this does not need to be released but the pool will handle it
+        const sql_res = await request.query(sql)
+        const result:OINOMsSqlData = new OINOMsSqlData(sql_res.recordsets)
+        return result
     }
 
     private async _exec(sql:string):Promise<OINOMsSqlData> {
-        // OINOLog.debug("OINODbMsSql._exec", {sql:sql})
-        try {
-            const sql_res = await this._pool.request().query(sql);
-            // console.log("OINODbMsSql._exec result", sql_res); 
-            return Promise.resolve(new OINOMsSqlData(OINODB_EMPTY_ROWS))
-        
-        } catch (err) {
-            OINOLog.error("OINODbMsSql._exec exception", {err:err}) 
-            throw err;
-        } finally {
-        }
-        // OINOLog.debug("OINODbMsSql._exec", {result:query_result})
+        const sql_res = await this._pool.request().query(sql);
+        return new OINOMsSqlData(OINODB_EMPTY_ROWS)
     }
 
     /**
@@ -213,7 +185,6 @@ export class OINODbMsSql extends OINODb {
      *
      */
     printCellAsSqlValue(cellValue:OINODataCell, sqlType: string): string {
-        // OINOLog.debug("OINODbMsSql.printCellAsSqlValue", {cellValue:cellValue, sqlType:sqlType})
         if (cellValue === null) {
             return "NULL"
 
@@ -259,7 +230,6 @@ export class OINODbMsSql extends OINODb {
      * 
      */
     parseSqlValueAsCell(sqlValue:OINODataCell, sqlType: string): OINODataCell {
-        // OINOLog.debug("OINODbMsSql.parseSqlValueAsCell", {sqlValue:sqlValue, sqlType:sqlType})
         if ((sqlValue === null) || (sqlValue == "NULL")) {
             return null
 
@@ -293,7 +263,6 @@ export class OINODbMsSql extends OINODb {
             result += "TOP " + limit_parts[0] + " "
         }
         result += columnNames + " FROM " + tableName
-        // OINOLog.debug("OINODb.printSqlSelect", {tableName:tableName, columnNames:columnNames, whereCondition:whereCondition, orderCondition:orderCondition, limitCondition:limitCondition })
         if (whereCondition != "")  {
             result += " WHERE " + whereCondition
         }
@@ -305,13 +274,14 @@ export class OINODbMsSql extends OINODb {
         }
         if ((limitCondition != "") && (limit_parts.length == 2)) {
             if (orderCondition == "") {
-                OINOLog.error("OINODbMsSql.printSqlSelect: LIMIT without ORDER BY is not supported in MS SQL Server")
+                OINOLog.error("@oinots/db", "OINODbMsSql", "printSqlSelect", "LIMIT without ORDER BY is not supported in MS SQL Server")
+                throw new Error(OINO_ERROR_PREFIX + "LIMIT without ORDER BY is not supported in MS SQL Server")
             } else {
                 result += " OFFSET " + limit_parts[1] + " ROWS FETCH NEXT " + limit_parts[0] + " ROWS ONLY"
             }
         }
         result += ";"
-        // OINOLog.debug("OINODb.printSqlSelect", {result:result})
+        OINOLog.debug("@oinots/db", "OINODbMsSql", "printSqlSelect", "Result", {sql:result})
         return result;
     }
 
@@ -324,14 +294,12 @@ export class OINODbMsSql extends OINODb {
         try {
             // make sure that any items are correctly URL encoded in the connection string
             await this._pool.connect()
-            // OINOLog.info("OINODbMsSql.connect: Connected to database server.")
-            // await this._pool.request().query("SELECT 1 as test")
             this.isConnected = true
             
-        } catch (err:any) {
+        } catch (e:any) {
             // ... error checks
-            result.setError(500, "Exception connecting to database: " + err.message, "OINODbMsSql.connect")
-            OINOLog.error(result.statusMessage, {error:err})
+            result.setError(500, "Exception connecting to database: " + e.message, "OINODbMsSql.connect")
+            OINOLog.exception("@oinots/db", "OINODbMsSql", "connect", "Exception", {message:e.message, stack:e.stack}) 
         }        
         return Promise.resolve(result)
     }
@@ -349,9 +317,7 @@ export class OINODbMsSql extends OINODb {
         OINOBenchmark.start("OINODb", "validate")
         try {
             const sql = this._getValidateSql(this._params.database)
-            // OINOLog.debug("OINODbMsSql.validate", {sql:sql})
             const sql_res:OINODbDataSet = await this.sqlSelect(sql)
-            // OINOLog.debug("OINODbMsSql.validate", {sql_res:sql_res})
             if (sql_res.isEmpty()) {
                 result.setError(400, "DB returned no rows for select!", "OINODbMsSql.validate")
 
@@ -367,6 +333,7 @@ export class OINODbMsSql extends OINODb {
             }
         } catch (e:any) {
             result.setError(500, "Exception in validating connection: " + e.message, "OINODbMsSql.validate")
+            OINOLog.exception("@oinots/db", "OINODbMsSql", "validate", "Exception", {message:e.message, stack:e.stack}) 
         }
         OINOBenchmark.end("OINODb", "validate")
         return result
@@ -382,10 +349,10 @@ export class OINODbMsSql extends OINODb {
         OINOBenchmark.start("OINODb", "sqlSelect")
         let result:OINODbDataSet
         try {
-            // OINOLog.debug("OINODbMsSql.sqlSelect", {sql:sql})
             result = await this._query(sql)
 
         } catch (e:any) {
+            OINOLog.exception("@oinots/db", "OINODbMsSql", "sqlSelect", "SQL select exception", {message:e.message, stack:e.stack})
             result = new OINOMsSqlData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlSelect): OINODbMsSql.sqlSelect exception in _db.query: " + e.message])
         }
         OINOBenchmark.end("OINODb", "sqlSelect")
@@ -405,6 +372,7 @@ export class OINODbMsSql extends OINODb {
             result = await this._exec(sql)
 
         } catch (e:any) {
+            OINOLog.exception("@oinots/db", "OINODbMsSql", "sqlExec", "SQL exec exception", {message:e.message, stack:e.stack})
             result = new OINOMsSqlData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + e.message + "]"])
         }
         OINOBenchmark.end("OINODb", "sqlExec")
@@ -464,10 +432,9 @@ WHERE C.TABLE_CATALOG = '${dbName}';`
     async initializeApiDatamodel(api:OINODbApi): Promise<void> {
         
         //"SELECT COLUMN_NAME, IS_NULLABLE, DATA_TYPE, CHARACTER_MAXIMUM_LENGTH, NUMERIC_PRECISION, NUMERIC_PRECISION_RADIX 
-        const res:OINODbDataSet = await this.sqlSelect(this._getSchemaSql(this._params.database, api.params.tableName))
-        while (!res.isEof()) {
-            const row:OINODataRow = res.getRow()
-            // OINOLog.debug("OINODbMsSql.initializeApiDatamodel", { description:row })
+        const schema_res:OINODbDataSet = await this.sqlSelect(this._getSchemaSql(this._params.database, api.params.tableName))
+        while (!schema_res.isEof()) {
+            const row:OINODataRow = schema_res.getRow()
             const field_name:string = row[0]?.toString() || ""
             const sql_type:string = row[2] as string || ""
             const char_field_length:number = row[3] as number || 0
@@ -481,13 +448,12 @@ WHERE C.TABLE_CATALOG = '${dbName}';`
                 isNotNull: row[1] == "NO"
             }            
             if (api.isFieldIncluded(field_name) == false) {
-                OINOLog.info("OINODbMsSql.initializeApiDatamodel: field excluded in API parameters.", {field:field_name})
+                OINOLog.info("@oinots/db", "OINODbMsSql", "initializeApiDatamodel", "Field excluded in API parameters.", {field:field_name})
                 if (field_params.isPrimaryKey) {
                     throw new Error(OINO_ERROR_PREFIX + "Primary key field excluded in API parameters: " + field_name)
                 }
 
             } else {
-                // OINOLog.debug("OINODbMsSql.initializeApiDatamodel: next field ", {field_name: field_name, sql_type:sql_type, char_field_length:char_field_length, numeric_field_length1:numeric_field_length1, numeric_field_length2:numeric_field_length2, field_params:field_params })
                 if ((sql_type == "tinyint") || (sql_type == "smallint") || (sql_type == "int") || (sql_type == "bigint") || (sql_type == "float") || (sql_type == "real")) {
                     api.datamodel.addField(new OINONumberDataField(this, field_name, sql_type, field_params ))
 
@@ -511,13 +477,13 @@ WHERE C.TABLE_CATALOG = '${dbName}';`
                     api.datamodel.addField(new OINOBooleanDataField(this, field_name, sql_type, field_params))
 
                 } else {
-                    OINOLog.info("OINODbMsSql.initializeApiDatamodel: unrecognized field type treated as string", {field_name: field_name, sql_type:sql_type, char_length: char_field_length, numeric_field_length1:numeric_field_length1, numeric_field_length2:numeric_field_length2, field_params:field_params })
+                    OINOLog.info("@oinots/db", "OINODbMsSql", "initializeApiDatamodel", "Unrecognized field type treated as string", {field_name: field_name, sql_type:sql_type, char_length: char_field_length, numeric_field_length1:numeric_field_length1, numeric_field_length2:numeric_field_length2, field_params:field_params })
                     api.datamodel.addField(new OINOStringDataField(this, field_name, sql_type, field_params, 0))
                 }   
             }
-            await res.next()
+            await schema_res.next()
         }
-        OINOLog.debug("OINODbMsSql.initializeDatasetModel:\n" + api.datamodel.printDebug("\n"))
+        OINOLog.info("@oinots/db", "OINODbMsSql", "initializeApiDatamodel", "\n" + api.datamodel.printDebug("\n"))
         return Promise.resolve()
     }