@oino-ts/db-mssql 0.18.1 → 0.20.0

package/dist/cjs/OINODbMsSql.js

@@ -6,14 +6,15 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OINODbMsSql = void 0;
+const common_1 = require("@oino-ts/common");
 const db_1 = require("@oino-ts/db");
 const mssql_1 = require("mssql");
 /**
- * Implmentation of OINODbDataSet for MariaDb.
+ * Implmentation of OINODbDataSet for MsSql.
  *
  */
 class OINOMsSqlData extends db_1.OINODbDataSet {
-    _recordsets = [db_1.OINODB_EMPTY_ROWS];
+    _recordsets;
     _rows = db_1.OINODB_EMPTY_ROWS;
     _currentRecordset;
     _currentRow;
@@ -25,10 +26,10 @@ class OINOMsSqlData extends db_1.OINODbDataSet {
     constructor(data, messages = []) {
         super(data, messages);
         if (data == null) {
-            this.messages.push(db_1.OINO_INFO_PREFIX + "SQL result is empty");
+            this.messages.push(common_1.OINO_INFO_PREFIX + "SQL result is empty");
         }
-        else if (!(Array.isArray(data) && (data.length > 0) && Array.isArray(data[0]))) {
-            throw new Error(db_1.OINO_ERROR_PREFIX + ": OINOMsSqlData constructor: invalid data!");
+        else if (!(Array.isArray(data)) && (data.length > 0)) {
+            throw new Error(common_1.OINO_ERROR_PREFIX + ": OINOMsSqlData constructor: invalid data!");
         }
         else {
             this._recordsets = data;
@@ -50,7 +51,7 @@ class OINOMsSqlData extends db_1.OINODbDataSet {
      *
      */
     isEmpty() {
-        return (this._rows.length == 0);
+        return (this._recordsets.length == 0) || (this._rows == undefined) || (this._rows.length == 0);
     }
     /**
      * Is there no more content, i.e. either dataset is empty or we have moved beyond last line
@@ -98,7 +99,7 @@ class OINOMsSqlData extends db_1.OINODbDataSet {
     }
 }
 /**
- * Implementation of MariaDb/MySql-database.
+ * Implementation of MsSql-database.
  *
  */
 class OINODbMsSql extends db_1.OINODb {
@@ -110,7 +111,7 @@ class OINODbMsSql extends db_1.OINODb {
     constructor(params) {
         super(params);
         if (this._params.type !== "OINODbMsSql") {
-            throw new Error(db_1.OINO_ERROR_PREFIX + ": Not OINODbMsSql-type: " + this._params.type);
+            throw new Error(common_1.OINO_ERROR_PREFIX + ": Not OINODbMsSql-type: " + this._params.type);
         }
         this._pool = new mssql_1.ConnectionPool({
             user: this._params.user,
@@ -128,18 +129,32 @@ 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("@oino-ts/db-mssql", "OINODbMsSql", "constructor", "OINODbMsSql error event", conn);
+            common_1.OINOLog.error("@oino-ts/db-mssql", "OINODbMsSql", "constructor", "OINODbMsSql error event", conn);
         });
     }
     async _query(sql) {
-        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;
+        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("_query: result=", sql_res.recordsets, sql_res.recordsets?.length) // TODO: remove
+            return new OINOMsSqlData(sql_res.recordsets, []);
+        }
+        catch (e) {
+            common_1.OINOLog.exception("@oino-ts/db-mssql", "OINODbMsSql", "_query", "exception in SQL query", { message: e.message, stack: e.stack, sql: sql });
+            return new OINOMsSqlData(db_1.OINODB_EMPTY_ROWS, []).setError(500, common_1.OINO_ERROR_PREFIX + ": Exception in db query: " + e.message, "OINODbMsSql._query");
+        }
     }
     async _exec(sql) {
-        const sql_res = await this._pool.request().query(sql);
-        return new OINOMsSqlData(db_1.OINODB_EMPTY_ROWS);
+        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("_exec: result=", sql_res.recordsets, sql_res.recordsets?.length) // TODO: remove
+            return new OINOMsSqlData(sql_res.recordsets, []);
+        }
+        catch (e) {
+            common_1.OINOLog.exception("@oino-ts/db-mssql", "OINODbMsSql", "_exec", "exception in SQL exec", { message: e.message, stack: e.stack, sql: sql });
+            return new OINOMsSqlData(db_1.OINODB_EMPTY_ROWS, []).setError(500, common_1.OINO_ERROR_PREFIX + ": Exception in db exec: " + e.message, "OINODbMsSql._exec");
+        }
     }
     /**
      * Print a table name using database specific SQL escaping.
@@ -258,15 +273,32 @@ class OINODbMsSql extends db_1.OINODb {
         }
         if ((limitCondition != "") && (limit_parts.length == 2)) {
             if (orderCondition == "") {
-                db_1.OINOLog.error("@oino-ts/db-mssql", "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");
+                common_1.OINOLog.error("@oino-ts/db-mssql", "OINODbMsSql", "printSqlSelect", "LIMIT without ORDER BY is not supported in MS SQL Server");
+                throw new Error(common_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 += ";";
-        db_1.OINOLog.debug("@oino-ts/db-mssql", "OINODbMsSql", "printSqlSelect", "Result", { sql: result });
+        common_1.OINOLog.debug("@oino-ts/db-mssql", "OINODbMsSql", "printSqlSelect", "Result", { sql: result });
+        return result;
+    }
+    /**
+     * Print SQL select statement with DB specific formatting.
+     *
+     * @param tableName - The name of the table to select from.
+     * @param columns - The columns to be selected.
+     * @param values - The values to be inserted.
+     * @param returnIdFields - the id fields to return if returnIds is true (if supported by the database)
+     *
+     */
+    printSqlInsert(tableName, columns, values, returnIdFields) {
+        let result = "INSERT INTO " + tableName + " (" + columns + ")";
+        if (returnIdFields) {
+            result += " OUTPUT " + returnIdFields.map(f => "INSERTED." + f).join(", ");
+        }
+        result += " VALUES (" + values + ");";
         return result;
     }
     /**
@@ -274,7 +306,10 @@ class OINODbMsSql extends db_1.OINODb {
      *
      */
     async connect() {
-        let result = new db_1.OINOResult();
+        let result = new common_1.OINOResult();
+        if (this.isConnected) {
+            return result;
+        }
         try {
             // make sure that any items are correctly URL encoded in the connection string
             await this._pool.connect();
@@ -283,7 +318,7 @@ class OINODbMsSql extends db_1.OINODb {
         catch (e) {
             // ... error checks
             result.setError(500, "Exception connecting to database: " + e.message, "OINODbMsSql.connect");
-            db_1.OINOLog.exception("@oino-ts/db-mssql", "OINODbMsSql", "connect", "exception in connect", { message: e.message, stack: e.stack });
+            common_1.OINOLog.exception("@oino-ts/db-mssql", "OINODbMsSql", "connect", "exception in connect", { message: e.message, stack: e.stack });
         }
         return Promise.resolve(result);
     }
@@ -292,15 +327,15 @@ class OINODbMsSql extends db_1.OINODb {
      *
      */
     async validate() {
-        let result = new db_1.OINOResult();
+        let result = new common_1.OINOResult();
         if (!this.isConnected) {
             result.setError(400, "Database is not connected!", "OINODbMsSql.validate");
             return result;
         }
-        db_1.OINOBenchmark.startMetric("OINODb", "validate");
+        common_1.OINOBenchmark.startMetric("OINODb", "validate");
         try {
             const sql = this._getValidateSql(this._params.database);
-            const sql_res = await this.sqlSelect(sql);
+            const sql_res = await this._query(sql);
             if (sql_res.isEmpty()) {
                 result.setError(400, "DB returned no rows for select!", "OINODbMsSql.validate");
             }
@@ -317,11 +352,27 @@ class OINODbMsSql extends db_1.OINODb {
         }
         catch (e) {
             result.setError(500, "Exception in validating connection: " + e.message, "OINODbMsSql.validate");
-            db_1.OINOLog.exception("@oino-ts/db-mssql", "OINODbMsSql", "validate", "exception in validate", { message: e.message, stack: e.stack });
+            common_1.OINOLog.exception("@oino-ts/db-mssql", "OINODbMsSql", "validate", "exception in validate", { message: e.message, stack: e.stack });
         }
-        db_1.OINOBenchmark.endMetric("OINODb", "validate");
+        common_1.OINOBenchmark.endMetric("OINODb", "validate");
         return result;
     }
+    /**
+     * Disconnect from database.
+     *
+     */
+    async disconnect() {
+        if (this._pool) {
+            try {
+                await this._pool.close();
+            }
+            catch (e) {
+                common_1.OINOLog.exception("@oino-ts/db-mssql", "OINODbMsSql", "disconnect", "exception in disconnect", { message: e.message, stack: e.stack });
+            }
+        }
+        this.isConnected = false;
+        this.isValidated = false;
+    }
     /**
      * Execute a select operation.
      *
@@ -329,16 +380,12 @@ class OINODbMsSql extends db_1.OINODb {
      *
      */
     async sqlSelect(sql) {
-        db_1.OINOBenchmark.startMetric("OINODb", "sqlSelect");
-        let result;
-        try {
-            result = await this._query(sql);
-        }
-        catch (e) {
-            db_1.OINOLog.exception("@oino-ts/db-mssql", "OINODbMsSql", "sqlSelect", "exception in SQL select", { 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]);
+        if (!this.isValidated) {
+            throw new Error(common_1.OINO_ERROR_PREFIX + ": Database connection not validated!");
         }
-        db_1.OINOBenchmark.endMetric("OINODb", "sqlSelect");
+        common_1.OINOBenchmark.startMetric("OINODb", "sqlSelect");
+        let result = await this._query(sql);
+        common_1.OINOBenchmark.endMetric("OINODb", "sqlSelect");
         return result;
     }
     /**
@@ -348,16 +395,12 @@ class OINODbMsSql extends db_1.OINODb {
      *
      */
     async sqlExec(sql) {
-        db_1.OINOBenchmark.startMetric("OINODb", "sqlExec");
-        let result;
-        try {
-            result = await this._exec(sql);
-        }
-        catch (e) {
-            db_1.OINOLog.exception("@oino-ts/db-mssql", "OINODbMsSql", "sqlExec", "exception in SQL exec", { 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 + "]"]);
+        if (!this.isValidated) {
+            throw new Error(common_1.OINO_ERROR_PREFIX + ": Database connection not validated!");
         }
-        db_1.OINOBenchmark.endMetric("OINODb", "sqlExec");
+        common_1.OINOBenchmark.startMetric("OINODb", "sqlExec");
+        let result = await this._exec(sql);
+        common_1.OINOBenchmark.endMetric("OINODb", "sqlExec");
         return result;
     }
     _getSchemaSql(dbName, tableName) {
@@ -424,9 +467,9 @@ WHERE C.TABLE_CATALOG = '${dbName}';`;
                 isNotNull: row[1] == "NO"
             };
             if (api.isFieldIncluded(field_name) == false) {
-                db_1.OINOLog.info("@oino-ts/db-mssql", "OINODbMsSql", "initializeApiDatamodel", "Field excluded in API parameters.", { field: field_name });
+                common_1.OINOLog.info("@oino-ts/db-mssql", "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);
+                    throw new Error(common_1.OINO_ERROR_PREFIX + "Primary key field excluded in API parameters: " + field_name);
                 }
             }
             else {
@@ -454,13 +497,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("@oino-ts/db-mssql", "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 });
+                    common_1.OINOLog.info("@oino-ts/db-mssql", "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 schema_res.next();
         }
-        db_1.OINOLog.info("@oino-ts/db-mssql", "OINODbMsSql", "initializeApiDatamodel", "\n" + api.datamodel.printDebug("\n"));
+        common_1.OINOLog.info("@oino-ts/db-mssql", "OINODbMsSql", "initializeApiDatamodel", "\n" + api.datamodel.printDebug("\n"));
         return Promise.resolve();
     }
 }

package/dist/esm/OINODbMsSql.js

@@ -3,14 +3,15 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-import { OINODb, OINODbDataSet, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINO_ERROR_PREFIX, OINOBenchmark, OINODatetimeDataField, OINOBlobDataField, OINO_INFO_PREFIX, OINODB_EMPTY_ROW, OINODB_EMPTY_ROWS, OINOLog, OINOResult } from "@oino-ts/db";
+import { OINO_ERROR_PREFIX, OINOBenchmark, OINO_INFO_PREFIX, OINOLog, OINOResult } from "@oino-ts/common";
+import { OINODb, OINODbDataSet, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINODatetimeDataField, OINOBlobDataField, OINODB_EMPTY_ROW, OINODB_EMPTY_ROWS } from "@oino-ts/db";
 import { ConnectionPool } from "mssql";
 /**
- * Implmentation of OINODbDataSet for MariaDb.
+ * Implmentation of OINODbDataSet for MsSql.
  *
  */
 class OINOMsSqlData extends OINODbDataSet {
-    _recordsets = [OINODB_EMPTY_ROWS];
+    _recordsets;
     _rows = OINODB_EMPTY_ROWS;
     _currentRecordset;
     _currentRow;
@@ -24,7 +25,7 @@ class OINOMsSqlData extends OINODbDataSet {
         if (data == null) {
             this.messages.push(OINO_INFO_PREFIX + "SQL result is empty");
         }
-        else if (!(Array.isArray(data) && (data.length > 0) && Array.isArray(data[0]))) {
+        else if (!(Array.isArray(data)) && (data.length > 0)) {
             throw new Error(OINO_ERROR_PREFIX + ": OINOMsSqlData constructor: invalid data!");
         }
         else {
@@ -47,7 +48,7 @@ class OINOMsSqlData extends OINODbDataSet {
      *
      */
     isEmpty() {
-        return (this._rows.length == 0);
+        return (this._recordsets.length == 0) || (this._rows == undefined) || (this._rows.length == 0);
     }
     /**
      * Is there no more content, i.e. either dataset is empty or we have moved beyond last line
@@ -95,7 +96,7 @@ class OINOMsSqlData extends OINODbDataSet {
     }
 }
 /**
- * Implementation of MariaDb/MySql-database.
+ * Implementation of MsSql-database.
  *
  */
 export class OINODbMsSql extends OINODb {
@@ -129,14 +130,28 @@ export class OINODbMsSql extends OINODb {
         });
     }
     async _query(sql) {
-        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;
+        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("_query: result=", sql_res.recordsets, sql_res.recordsets?.length) // TODO: remove
+            return new OINOMsSqlData(sql_res.recordsets, []);
+        }
+        catch (e) {
+            OINOLog.exception("@oino-ts/db-mssql", "OINODbMsSql", "_query", "exception in SQL query", { message: e.message, stack: e.stack, sql: sql });
+            return new OINOMsSqlData(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db query: " + e.message, "OINODbMsSql._query");
+        }
     }
     async _exec(sql) {
-        const sql_res = await this._pool.request().query(sql);
-        return new OINOMsSqlData(OINODB_EMPTY_ROWS);
+        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("_exec: result=", sql_res.recordsets, sql_res.recordsets?.length) // TODO: remove
+            return new OINOMsSqlData(sql_res.recordsets, []);
+        }
+        catch (e) {
+            OINOLog.exception("@oino-ts/db-mssql", "OINODbMsSql", "_exec", "exception in SQL exec", { message: e.message, stack: e.stack, sql: sql });
+            return new OINOMsSqlData(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db exec: " + e.message, "OINODbMsSql._exec");
+        }
     }
     /**
      * Print a table name using database specific SQL escaping.
@@ -266,12 +281,32 @@ export class OINODbMsSql extends OINODb {
         OINOLog.debug("@oino-ts/db-mssql", "OINODbMsSql", "printSqlSelect", "Result", { sql: result });
         return result;
     }
+    /**
+     * Print SQL select statement with DB specific formatting.
+     *
+     * @param tableName - The name of the table to select from.
+     * @param columns - The columns to be selected.
+     * @param values - The values to be inserted.
+     * @param returnIdFields - the id fields to return if returnIds is true (if supported by the database)
+     *
+     */
+    printSqlInsert(tableName, columns, values, returnIdFields) {
+        let result = "INSERT INTO " + tableName + " (" + columns + ")";
+        if (returnIdFields) {
+            result += " OUTPUT " + returnIdFields.map(f => "INSERTED." + f).join(", ");
+        }
+        result += " VALUES (" + values + ");";
+        return result;
+    }
     /**
      * Connect to database.
      *
      */
     async connect() {
         let result = new OINOResult();
+        if (this.isConnected) {
+            return result;
+        }
         try {
             // make sure that any items are correctly URL encoded in the connection string
             await this._pool.connect();
@@ -297,7 +332,7 @@ export class OINODbMsSql extends OINODb {
         OINOBenchmark.startMetric("OINODb", "validate");
         try {
             const sql = this._getValidateSql(this._params.database);
-            const sql_res = await this.sqlSelect(sql);
+            const sql_res = await this._query(sql);
             if (sql_res.isEmpty()) {
                 result.setError(400, "DB returned no rows for select!", "OINODbMsSql.validate");
             }
@@ -319,6 +354,22 @@ export class OINODbMsSql extends OINODb {
         OINOBenchmark.endMetric("OINODb", "validate");
         return result;
     }
+    /**
+     * Disconnect from database.
+     *
+     */
+    async disconnect() {
+        if (this._pool) {
+            try {
+                await this._pool.close();
+            }
+            catch (e) {
+                OINOLog.exception("@oino-ts/db-mssql", "OINODbMsSql", "disconnect", "exception in disconnect", { message: e.message, stack: e.stack });
+            }
+        }
+        this.isConnected = false;
+        this.isValidated = false;
+    }
     /**
      * Execute a select operation.
      *
@@ -326,15 +377,11 @@ export class OINODbMsSql extends OINODb {
      *
      */
     async sqlSelect(sql) {
-        OINOBenchmark.startMetric("OINODb", "sqlSelect");
-        let result;
-        try {
-            result = await this._query(sql);
-        }
-        catch (e) {
-            OINOLog.exception("@oino-ts/db-mssql", "OINODbMsSql", "sqlSelect", "exception in SQL select", { message: e.message, stack: e.stack });
-            result = new OINOMsSqlData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlSelect): OINODbMsSql.sqlSelect exception in _db.query: " + e.message]);
+        if (!this.isValidated) {
+            throw new Error(OINO_ERROR_PREFIX + ": Database connection not validated!");
         }
+        OINOBenchmark.startMetric("OINODb", "sqlSelect");
+        let result = await this._query(sql);
         OINOBenchmark.endMetric("OINODb", "sqlSelect");
         return result;
     }
@@ -345,15 +392,11 @@ export class OINODbMsSql extends OINODb {
      *
      */
     async sqlExec(sql) {
-        OINOBenchmark.startMetric("OINODb", "sqlExec");
-        let result;
-        try {
-            result = await this._exec(sql);
-        }
-        catch (e) {
-            OINOLog.exception("@oino-ts/db-mssql", "OINODbMsSql", "sqlExec", "exception in SQL exec", { message: e.message, stack: e.stack });
-            result = new OINOMsSqlData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + e.message + "]"]);
+        if (!this.isValidated) {
+            throw new Error(OINO_ERROR_PREFIX + ": Database connection not validated!");
         }
+        OINOBenchmark.startMetric("OINODb", "sqlExec");
+        let result = await this._exec(sql);
         OINOBenchmark.endMetric("OINODb", "sqlExec");
         return result;
     }

package/dist/types/OINODbMsSql.d.ts

@@ -1,6 +1,7 @@
-import { OINODb, OINODbParams, OINODbDataSet, OINODbApi, OINODataCell, OINOResult } from "@oino-ts/db";
+import { OINOResult } from "@oino-ts/common";
+import { OINODb, OINODbParams, OINODbDataSet, OINODbApi, OINODataCell } from "@oino-ts/db";
 /**
- * Implementation of MariaDb/MySql-database.
+ * Implementation of MsSql-database.
  *
  */
 export declare class OINODbMsSql extends OINODb {
@@ -63,6 +64,16 @@ export declare class OINODbMsSql extends OINODb {
      *
      */
     printSqlSelect(tableName: string, columnNames: string, whereCondition: string, orderCondition: string, limitCondition: string, groupByCondition: string): string;
+    /**
+     * Print SQL select statement with DB specific formatting.
+     *
+     * @param tableName - The name of the table to select from.
+     * @param columns - The columns to be selected.
+     * @param values - The values to be inserted.
+     * @param returnIdFields - the id fields to return if returnIds is true (if supported by the database)
+     *
+     */
+    printSqlInsert(tableName: string, columns: string, values: string, returnIdFields?: string[]): string;
     /**
      * Connect to database.
      *
@@ -73,6 +84,11 @@ export declare class OINODbMsSql extends OINODb {
      *
      */
     validate(): Promise<OINOResult>;
+    /**
+     * Disconnect from database.
+     *
+     */
+    disconnect(): Promise<void>;
     /**
      * Execute a select operation.
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db-mssql",
-  "version": "0.18.1",
+  "version": "0.20.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.18.1",
+    "@oino-ts/db": "0.20.0",
     "mssql": "^11.0.1"
   },
   "devDependencies": {

package/src/OINODbMsSql.ts

@@ -4,16 +4,17 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-import { OINODb, OINODbParams, OINODbDataSet, OINODbApi, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINODbDataFieldParams, OINO_ERROR_PREFIX, OINODataRow, OINODataCell, OINOBenchmark, OINODatetimeDataField, OINOBlobDataField, OINO_INFO_PREFIX, OINODB_EMPTY_ROW, OINODB_EMPTY_ROWS, OINOLog, OINOResult } from "@oino-ts/db";
+import { OINO_ERROR_PREFIX, OINOBenchmark, OINO_INFO_PREFIX, OINOLog, OINOResult } from "@oino-ts/common";
+import { OINODb, OINODbParams, OINODbDataSet, OINODbApi, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINODbDataFieldParams, OINODataRow, OINODataCell, OINODatetimeDataField, OINOBlobDataField, OINODB_EMPTY_ROW, OINODB_EMPTY_ROWS } from "@oino-ts/db";
 
 import {ConnectionPool, config} from "mssql";
 
 /**
- * Implmentation of OINODbDataSet for MariaDb.
+ * Implmentation of OINODbDataSet for MsSql.
  * 
  */
 class OINOMsSqlData extends OINODbDataSet {
-    private _recordsets:OINODataRow[][] = [OINODB_EMPTY_ROWS]
+    private _recordsets:any
     private _rows:OINODataRow[] = OINODB_EMPTY_ROWS
 
     private _currentRecordset: number
@@ -29,11 +30,11 @@ class OINOMsSqlData extends OINODbDataSet {
         if (data == null) {
             this.messages.push(OINO_INFO_PREFIX + "SQL result is empty")
 
-        } else if (!(Array.isArray(data) && (data.length>0) && Array.isArray(data[0]))) {
+        } else if (!(Array.isArray(data)) && (data.length > 0)) {
             throw new Error(OINO_ERROR_PREFIX + ": OINOMsSqlData constructor: invalid data!")
 
         } else {
-            this._recordsets = data as OINODataRow[][]
+            this._recordsets = data
             this._rows = this._recordsets[0]
         }
         if (this.isEmpty()) {
@@ -52,7 +53,7 @@ class OINOMsSqlData extends OINODbDataSet {
      *
      */
     isEmpty():boolean {
-        return (this._rows.length == 0)
+        return (this._recordsets.length == 0) || (this._rows == undefined) || (this._rows.length == 0)
     }
 
     /**
@@ -105,7 +106,7 @@ class OINOMsSqlData extends OINODbDataSet {
 }
 
 /**
- * Implementation of MariaDb/MySql-database.
+ * Implementation of MsSql-database.
  * 
  */
 export class OINODbMsSql extends OINODb {
@@ -144,15 +145,27 @@ export class OINODbMsSql extends OINODb {
     }
 
     private async _query(sql:string):Promise<OINOMsSqlData> {
-        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
+        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("_query: result=", sql_res.recordsets, sql_res.recordsets?.length) // TODO: remove
+            return new OINOMsSqlData(sql_res.recordsets, [])
+        } catch (e:any) {
+            OINOLog.exception("@oino-ts/db-mssql", "OINODbMsSql", "_query", "exception in SQL query", {message:e.message, stack:e.stack, sql:sql})
+            return new OINOMsSqlData(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db query: " + e.message, "OINODbMsSql._query") as OINOMsSqlData
+        }
     }
 
     private async _exec(sql:string):Promise<OINOMsSqlData> {
-        const sql_res = await this._pool.request().query(sql);
-        return new OINOMsSqlData(OINODB_EMPTY_ROWS)
+        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("_exec: result=", sql_res.recordsets, sql_res.recordsets?.length) // TODO: remove
+            return new OINOMsSqlData(sql_res.recordsets, [])
+        } catch (e:any) {
+            OINOLog.exception("@oino-ts/db-mssql", "OINODbMsSql", "_exec", "exception in SQL exec", {message:e.message, stack:e.stack, sql:sql})
+            return new OINOMsSqlData(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db exec: " + e.message, "OINODbMsSql._exec") as OINOMsSqlData
+        }
     }
 
     /**
@@ -288,12 +301,34 @@ export class OINODbMsSql extends OINODb {
         return result;
     }
 
+    /**
+     * Print SQL select statement with DB specific formatting.
+     * 
+     * @param tableName - The name of the table to select from.
+     * @param columns - The columns to be selected.
+     * @param values - The values to be inserted.
+     * @param returnIdFields - the id fields to return if returnIds is true (if supported by the database)
+     * 
+     */
+    printSqlInsert(tableName:string, columns:string, values:string, returnIdFields?:string[]): string {
+        let result = "INSERT INTO " + tableName + " (" + columns + ")"
+        if (returnIdFields) {
+            result += " OUTPUT " + returnIdFields.map(f => "INSERTED."+f ).join(", ") 
+        }
+        result += " VALUES (" + values + ");"
+        return result;
+    }
+
+
     /**
      * Connect to database.
      *
      */
     async connect(): Promise<OINOResult> {
         let result:OINOResult = new OINOResult()
+        if (this.isConnected) {
+            return result
+        }
         try {
             // make sure that any items are correctly URL encoded in the connection string
             await this._pool.connect()
@@ -320,7 +355,7 @@ export class OINODbMsSql extends OINODb {
         OINOBenchmark.startMetric("OINODb", "validate")
         try {
             const sql = this._getValidateSql(this._params.database)
-            const sql_res:OINODbDataSet = await this.sqlSelect(sql)
+            const sql_res:OINODbDataSet = await this._query(sql)
             if (sql_res.isEmpty()) {
                 result.setError(400, "DB returned no rows for select!", "OINODbMsSql.validate")
 
@@ -342,6 +377,23 @@ export class OINODbMsSql extends OINODb {
         return result
     }
 
+    /**
+     * Disconnect from database.
+     *
+     */
+    async disconnect(): Promise<void> {
+        if (this._pool) {
+            try {
+                await this._pool.close()
+
+            } catch (e:any) {
+                OINOLog.exception("@oino-ts/db-mssql", "OINODbMsSql", "disconnect", "exception in disconnect", {message:e.message, stack:e.stack}) 
+            }
+        }
+        this.isConnected = false
+        this.isValidated = false
+    }
+
     /**
      * Execute a select operation.
      * 
@@ -349,15 +401,11 @@ export class OINODbMsSql extends OINODb {
      *
      */
     async sqlSelect(sql:string): Promise<OINODbDataSet> {
-        OINOBenchmark.startMetric("OINODb", "sqlSelect")
-        let result:OINODbDataSet
-        try {
-            result = await this._query(sql)
-
-        } catch (e:any) {
-            OINOLog.exception("@oino-ts/db-mssql", "OINODbMsSql", "sqlSelect", "exception in SQL select", {message:e.message, stack:e.stack})
-            result = new OINOMsSqlData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlSelect): OINODbMsSql.sqlSelect exception in _db.query: " + e.message])
+        if (!this.isValidated) {
+            throw new Error(OINO_ERROR_PREFIX + ": Database connection not validated!")
         }
+        OINOBenchmark.startMetric("OINODb", "sqlSelect")
+        let result:OINODbDataSet = await this._query(sql)
         OINOBenchmark.endMetric("OINODb", "sqlSelect")
         return result
     }
@@ -369,15 +417,11 @@ export class OINODbMsSql extends OINODb {
      *
      */
     async sqlExec(sql:string): Promise<OINODbDataSet> {
-        OINOBenchmark.startMetric("OINODb", "sqlExec")
-        let result:OINODbDataSet
-        try {
-            result = await this._exec(sql)
-
-        } catch (e:any) {
-            OINOLog.exception("@oino-ts/db-mssql", "OINODbMsSql", "sqlExec", "exception in SQL exec", {message:e.message, stack:e.stack})
-            result = new OINOMsSqlData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + e.message + "]"])
+        if (!this.isValidated) {
+            throw new Error(OINO_ERROR_PREFIX + ": Database connection not validated!")
         }
+        OINOBenchmark.startMetric("OINODb", "sqlExec")
+        let result:OINODbDataSet = await this._exec(sql)
         OINOBenchmark.endMetric("OINODb", "sqlExec")
         return result
     }