@oino-ts/db-mariadb 0.19.0 → 0.20.0

package/dist/cjs/OINODbMariadb.js

@@ -115,30 +115,48 @@ class OINODbMariadb extends db_1.OINODb {
     }
     async _query(sql) {
         let connection = null;
+        let rows = db_1.OINODB_EMPTY_ROWS;
         try {
             connection = await this._pool.getConnection();
-            const result = await connection.query(sql);
-            return Promise.resolve(result);
+            const sql_res = await connection.query(sql);
+            // console.log("_query: sql=", sql, " result=", result)
+            if (Array.isArray(sql_res)) {
+                rows = sql_res.filter((r) => Array.isArray(r)); // filter out OkPacket results from multiple statements
+            }
+        }
+        catch (e) {
+            common_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "_query", "exception in SQL select", { message: e.message, stack: e.stack });
+            return new OINOMariadbData(db_1.OINODB_EMPTY_ROWS, []).setError(500, common_1.OINO_ERROR_PREFIX + ": Exception in db query: " + e.message, "OINODbMariadb._query");
         }
         finally {
             if (connection) {
-                await connection.end();
+                connection.release();
             }
         }
+        return new OINOMariadbData(rows, []);
     }
     async _exec(sql) {
         let connection = null;
+        let rows = db_1.OINODB_EMPTY_ROWS;
         try {
             connection = await this._pool.getConnection();
-            const result = await connection.query(sql);
-            // console.log(result); 
-            return Promise.resolve(result);
+            const sql_res = await connection.query(sql);
+            // console.log("OINODbMariadb._exec: result=", result)
+            if (Array.isArray(sql_res)) {
+                rows = sql_res.filter((r) => Array.isArray(r)); // filter out OkPacket results from multiple statements
+            }
+        }
+        catch (e) {
+            const msg_parts = e.message.match(OINODbMariadb._sqlExceptionMessageRegex) || [];
+            common_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "_exec", "exception in SQL exec", { message: msg_parts[2], stack: e.stack });
+            return new OINOMariadbData(db_1.OINODB_EMPTY_ROWS, []).setError(500, common_1.OINO_ERROR_PREFIX + ": Exception in db exec [" + msg_parts[2] + "]", "OINODbMariadb._exec");
         }
         finally {
             if (connection) {
-                await connection.end();
+                connection.release();
             }
         }
+        return new OINOMariadbData(rows, []);
     }
     /**
      * Print a table name using database specific SQL escaping.
@@ -254,7 +272,10 @@ class OINODbMariadb extends db_1.OINODb {
      *
      */
     async connect() {
-        const result = new common_1.OINOResult();
+        let result = new common_1.OINOResult();
+        if (this.isConnected) {
+            return result;
+        }
         let connection = null;
         try {
             // make sure that any items are correctly URL encoded in the connection string
@@ -268,7 +289,7 @@ class OINODbMariadb extends db_1.OINODb {
         }
         finally {
             if (connection) {
-                await connection.end();
+                await connection.release();
             }
         }
         return Promise.resolve(result);
@@ -282,7 +303,7 @@ class OINODbMariadb extends db_1.OINODb {
         let result = new common_1.OINOResult();
         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!", "OINODbMariadb.validate");
             }
@@ -303,6 +324,17 @@ class OINODbMariadb extends db_1.OINODb {
         common_1.OINOBenchmark.endMetric("OINODb", "validate");
         return result;
     }
+    /**
+     * Disconnect from database.
+     *
+     */
+    async disconnect() {
+        if (this.isConnected) {
+            await this._pool.end();
+        }
+        this.isConnected = false;
+        this.isValidated = false;
+    }
     /**
      * Execute a select operation.
      *
@@ -310,16 +342,11 @@ class OINODbMariadb extends db_1.OINODb {
      *
      */
     async sqlSelect(sql) {
-        common_1.OINOBenchmark.startMetric("OINODb", "sqlSelect");
-        let result;
-        try {
-            const rows = await this._query(sql);
-            result = new OINOMariadbData(rows, []);
-        }
-        catch (e) {
-            common_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlSelect", "exception in SQL select", { message: e.message, stack: e.stack });
-            result = new OINOMariadbData(db_1.OINODB_EMPTY_ROWS, [common_1.OINO_ERROR_PREFIX + " (sqlSelect): OINODbMariadb.sqlSelect exception in _db.query: " + e.message]);
+        if (!this.isValidated) {
+            throw new Error(common_1.OINO_ERROR_PREFIX + ": Database connection not validated!");
         }
+        common_1.OINOBenchmark.startMetric("OINODb", "sqlSelect");
+        let result = await this._query(sql);
         common_1.OINOBenchmark.endMetric("OINODb", "sqlSelect");
         return result;
     }
@@ -330,17 +357,11 @@ class OINODbMariadb extends db_1.OINODb {
      *
      */
     async sqlExec(sql) {
-        common_1.OINOBenchmark.startMetric("OINODb", "sqlExec");
-        let result;
-        try {
-            const sql_res = await this._exec(sql);
-            result = new OINOMariadbData(sql_res, []);
-        }
-        catch (e) {
-            const msg_parts = e.message.match(OINODbMariadb._sqlExceptionMessageRegex) || [];
-            common_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlExec", "exception in SQL exec", { message: msg_parts[2], stack: e.stack });
-            result = new OINOMariadbData(db_1.OINODB_EMPTY_ROWS, [common_1.OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + msg_parts[2] + "]"]);
+        if (!this.isValidated) {
+            throw new Error(common_1.OINO_ERROR_PREFIX + ": Database connection not validated!");
         }
+        common_1.OINOBenchmark.startMetric("OINODb", "sqlExec");
+        let result = await this._exec(sql);
         common_1.OINOBenchmark.endMetric("OINODb", "sqlExec");
         return result;
     }
@@ -375,7 +396,7 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`;
      *
      */
     async initializeApiDatamodel(api) {
-        const schema_res = await this.sqlSelect(this._getSchemaSql(this._params.database, api.params.tableName));
+        const schema_res = await this._query(this._getSchemaSql(this._params.database, api.params.tableName));
         while (!schema_res.isEof()) {
             const row = schema_res.getRow();
             // console.log("OINODbMariadb.initializeApiDatamodel row", row)

package/dist/esm/OINODbMariadb.js

@@ -112,30 +112,48 @@ export class OINODbMariadb extends OINODb {
     }
     async _query(sql) {
         let connection = null;
+        let rows = OINODB_EMPTY_ROWS;
         try {
             connection = await this._pool.getConnection();
-            const result = await connection.query(sql);
-            return Promise.resolve(result);
+            const sql_res = await connection.query(sql);
+            // console.log("_query: sql=", sql, " result=", result)
+            if (Array.isArray(sql_res)) {
+                rows = sql_res.filter((r) => Array.isArray(r)); // filter out OkPacket results from multiple statements
+            }
+        }
+        catch (e) {
+            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "_query", "exception in SQL select", { message: e.message, stack: e.stack });
+            return new OINOMariadbData(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db query: " + e.message, "OINODbMariadb._query");
         }
         finally {
             if (connection) {
-                await connection.end();
+                connection.release();
             }
         }
+        return new OINOMariadbData(rows, []);
     }
     async _exec(sql) {
         let connection = null;
+        let rows = OINODB_EMPTY_ROWS;
         try {
             connection = await this._pool.getConnection();
-            const result = await connection.query(sql);
-            // console.log(result); 
-            return Promise.resolve(result);
+            const sql_res = await connection.query(sql);
+            // console.log("OINODbMariadb._exec: result=", result)
+            if (Array.isArray(sql_res)) {
+                rows = sql_res.filter((r) => Array.isArray(r)); // filter out OkPacket results from multiple statements
+            }
+        }
+        catch (e) {
+            const msg_parts = e.message.match(OINODbMariadb._sqlExceptionMessageRegex) || [];
+            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "_exec", "exception in SQL exec", { message: msg_parts[2], stack: e.stack });
+            return new OINOMariadbData(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db exec [" + msg_parts[2] + "]", "OINODbMariadb._exec");
         }
         finally {
             if (connection) {
-                await connection.end();
+                connection.release();
             }
         }
+        return new OINOMariadbData(rows, []);
     }
     /**
      * Print a table name using database specific SQL escaping.
@@ -251,7 +269,10 @@ export class OINODbMariadb extends OINODb {
      *
      */
     async connect() {
-        const result = new OINOResult();
+        let result = new OINOResult();
+        if (this.isConnected) {
+            return result;
+        }
         let connection = null;
         try {
             // make sure that any items are correctly URL encoded in the connection string
@@ -265,7 +286,7 @@ export class OINODbMariadb extends OINODb {
         }
         finally {
             if (connection) {
-                await connection.end();
+                await connection.release();
             }
         }
         return Promise.resolve(result);
@@ -279,7 +300,7 @@ export class OINODbMariadb extends OINODb {
         let result = new OINOResult();
         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!", "OINODbMariadb.validate");
             }
@@ -300,6 +321,17 @@ export class OINODbMariadb extends OINODb {
         OINOBenchmark.endMetric("OINODb", "validate");
         return result;
     }
+    /**
+     * Disconnect from database.
+     *
+     */
+    async disconnect() {
+        if (this.isConnected) {
+            await this._pool.end();
+        }
+        this.isConnected = false;
+        this.isValidated = false;
+    }
     /**
      * Execute a select operation.
      *
@@ -307,16 +339,11 @@ export class OINODbMariadb extends OINODb {
      *
      */
     async sqlSelect(sql) {
-        OINOBenchmark.startMetric("OINODb", "sqlSelect");
-        let result;
-        try {
-            const rows = await this._query(sql);
-            result = new OINOMariadbData(rows, []);
-        }
-        catch (e) {
-            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlSelect", "exception in SQL select", { message: e.message, stack: e.stack });
-            result = new OINOMariadbData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlSelect): OINODbMariadb.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;
     }
@@ -327,17 +354,11 @@ export class OINODbMariadb extends OINODb {
      *
      */
     async sqlExec(sql) {
-        OINOBenchmark.startMetric("OINODb", "sqlExec");
-        let result;
-        try {
-            const sql_res = await this._exec(sql);
-            result = new OINOMariadbData(sql_res, []);
-        }
-        catch (e) {
-            const msg_parts = e.message.match(OINODbMariadb._sqlExceptionMessageRegex) || [];
-            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlExec", "exception in SQL exec", { message: msg_parts[2], stack: e.stack });
-            result = new OINOMariadbData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + msg_parts[2] + "]"]);
+        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;
     }
@@ -372,7 +393,7 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`;
      *
      */
     async initializeApiDatamodel(api) {
-        const schema_res = await this.sqlSelect(this._getSchemaSql(this._params.database, api.params.tableName));
+        const schema_res = await this._query(this._getSchemaSql(this._params.database, api.params.tableName));
         while (!schema_res.isEof()) {
             const row = schema_res.getRow();
             // console.log("OINODbMariadb.initializeApiDatamodel row", row)

package/dist/types/OINODbMariadb.d.ts

@@ -66,6 +66,11 @@ export declare class OINODbMariadb 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-mariadb",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "OINO TS package for using Mariadb databases.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -21,8 +21,8 @@
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "dependencies": {
-    "@oino-ts/common": "^0.19.0",
-    "@oino-ts/db": "^0.19.0",
+    "@oino-ts/common": "^0.20.0",
+    "@oino-ts/db": "^0.20.0",
     "mariadb": "^3.2.3"
   },
   "devDependencies": {

package/src/OINODbMariadb.ts

@@ -125,33 +125,50 @@ export class OINODbMariadb extends OINODb {
         return result
     }
 
-    private async _query(sql:string):Promise<OINODataRow[]> {
-        let connection:mariadb.Connection|null = null
+    private async _query(sql:string):Promise<OINODbDataSet> {
+        let connection:mariadb.PoolConnection|null = null
+        let rows:OINODataRow[] = OINODB_EMPTY_ROWS
         try {
-            connection = await this._pool.getConnection();
-            const result = await connection.query(sql);
-            return Promise.resolve(result)
-        
+            connection = await this._pool.getConnection()
+            const sql_res = await connection.query(sql)
+            // console.log("_query: sql=", sql, " result=", result)
+            if (Array.isArray(sql_res)) {
+                rows = sql_res.filter((r) => Array.isArray(r)) as OINODataRow[] // filter out OkPacket results from multiple statements
+            }
+        } catch (e:any) {
+            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "_query", "exception in SQL select", {message:e.message, stack:e.stack})
+            return new OINOMariadbData(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db query: " + e.message, "OINODbMariadb._query") as OINOMariadbData 
+
         } finally {
             if (connection) {
-                await connection.end()
+                connection.release()
             }
         }
+        return new OINOMariadbData(rows, [])
     }
 
-    private async _exec(sql:string):Promise<any> {
-        let connection:mariadb.Connection|null = null
+    private async _exec(sql:string):Promise<OINODbDataSet> {
+        let connection:mariadb.PoolConnection|null = null
+        let rows:OINODataRow[] = OINODB_EMPTY_ROWS
         try {
-            connection = await this._pool.getConnection();
-            const result = await connection.query(sql);
-            // console.log(result); 
-            return Promise.resolve(result)
+            connection = await this._pool.getConnection()
+            const sql_res = await connection.query(sql)
+            // console.log("OINODbMariadb._exec: result=", result)
+            if (Array.isArray(sql_res)) {
+                rows = sql_res.filter((r) => Array.isArray(r)) // filter out OkPacket results from multiple statements
+            }
         
+        } catch (e:any) {
+            const msg_parts = e.message.match(OINODbMariadb._sqlExceptionMessageRegex) || []
+            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "_exec", "exception in SQL exec", {message:msg_parts[2], stack:e.stack})
+            return new OINOMariadbData(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db exec [" + msg_parts[2] + "]", "OINODbMariadb._exec") as OINOMariadbData
+
         } finally {
             if (connection) {
-                await connection.end()
+                connection.release()
             }
         }
+        return new OINOMariadbData(rows, [])
     }
 
     /**
@@ -271,8 +288,11 @@ export class OINODbMariadb extends OINODb {
      *
      */
     async connect(): Promise<OINOResult> {
-        const result:OINOResult = new OINOResult()
-        let connection:mariadb.Connection|null = null
+        let result:OINOResult = new OINOResult()
+        if (this.isConnected) {
+            return result
+        }
+        let connection:mariadb.PoolConnection|null = null
         try {
             // make sure that any items are correctly URL encoded in the connection string
             connection = await this._pool.getConnection()
@@ -284,7 +304,7 @@ export class OINODbMariadb extends OINODb {
             OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "connect", "exception in connect", {message:e.message, stack:e.stack})
         } finally {
             if (connection) {
-                await connection.end()
+                await connection.release()
             }
         }   
 
@@ -300,7 +320,7 @@ export class OINODbMariadb extends OINODb {
         let result:OINOResult = new OINOResult()
         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!", "OINODbMariadb.validate")
 
@@ -321,6 +341,18 @@ export class OINODbMariadb extends OINODb {
         return result
     }
 
+    /**
+     * Disconnect from database.
+     *
+     */
+    async disconnect(): Promise<void> {
+        if (this.isConnected) {
+            await this._pool.end()
+        }
+        this.isConnected = false
+        this.isValidated = false
+    }
+
     /**
      * Execute a select operation.
      * 
@@ -328,16 +360,11 @@ export class OINODbMariadb extends OINODb {
      *
      */
     async sqlSelect(sql:string): Promise<OINODbDataSet> {
-        OINOBenchmark.startMetric("OINODb", "sqlSelect")
-        let result:OINODbDataSet
-        try {
-            const rows:OINODataRow[] = await this._query(sql)
-            result = new OINOMariadbData(rows, [])
-
-        } catch (e:any) {
-            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlSelect", "exception in SQL select", {message:e.message, stack:e.stack})
-            result = new OINOMariadbData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlSelect): OINODbMariadb.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
     }
@@ -349,17 +376,11 @@ export class OINODbMariadb extends OINODb {
      *
      */
     async sqlExec(sql:string): Promise<OINODbDataSet> {
-        OINOBenchmark.startMetric("OINODb", "sqlExec")
-        let result:OINODbDataSet
-        try {
-            const sql_res:OINODataRow[] = await this._exec(sql)
-            result = new OINOMariadbData(sql_res, [])
-
-        } catch (e:any) {
-            const msg_parts = e.message.match(OINODbMariadb._sqlExceptionMessageRegex) || []
-            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlExec", "exception in SQL exec", {message:msg_parts[2], stack:e.stack})
-            result = new OINOMariadbData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + msg_parts[2] + "]"])
+        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
     }
@@ -401,7 +422,7 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`
      */
     async initializeApiDatamodel(api:OINODbApi): Promise<void> {
         
-        const schema_res:OINODbDataSet = await this.sqlSelect(this._getSchemaSql(this._params.database, api.params.tableName))
+        const schema_res:OINODbDataSet = await this._query(this._getSchemaSql(this._params.database, api.params.tableName))
         while (!schema_res.isEof()) {
             const row:OINODataRow = schema_res.getRow()
             // console.log("OINODbMariadb.initializeApiDatamodel row", row)