@oino-ts/db-postgresql 0.6.1 → 0.7.1

package/dist/cjs/OINODbPostgresql.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OINODbPostgresql = void 0;
 const db_1 = require("@oino-ts/db");
 const pg_1 = require("pg");
-const EMPTY_ROW = [];
 /**
  * Implmentation of OINODbDataSet for Postgresql.
  *
@@ -73,9 +72,16 @@ class OINOPostgresqlData extends db_1.OINODbDataSet {
             return this._rows[this._currentRow];
         }
         else {
-            return EMPTY_ROW;
+            return db_1.OINODB_EMPTY_ROW;
         }
     }
+    /**
+     * Gets all rows of data.
+     *
+     */
+    async getAllRows() {
+        return this._rows; // at the moment theres no result streaming, so we can just return the rows
+    }
 }
 /**
  * Implementation of Postgresql-database.
@@ -123,10 +129,18 @@ class OINODbPostgresql extends db_1.OINODb {
         return Promise.resolve(query_result.rows);
     }
     async _exec(sql) {
-        // OINOLog.debug("OINODbPostgresql._query", {sql:sql})
+        // OINOLog.debug("OINODbPostgresql._exec", {sql:sql})
         const query_result = await this._pool.query({ rowMode: "array", text: sql });
-        // OINOLog.debug("OINODbPostgresql._query", {result:query_result})
-        return Promise.resolve(query_result.rows);
+        // OINOLog.debug("OINODbPostgresql._exec", {result:query_result})
+        if (Array.isArray(query_result) == true) {
+            return Promise.resolve(query_result.flatMap((q) => q.rows));
+        }
+        else if (query_result.rows) {
+            return Promise.resolve(query_result.rows);
+        }
+        else {
+            return Promise.resolve(db_1.OINODB_EMPTY_ROWS); // return empty row if no rows returned
+        }
     }
     /**
      * Print a table name using database specific SQL escaping.
@@ -286,7 +300,7 @@ class OINODbPostgresql extends db_1.OINODb {
             result = new OINOPostgresqlData(rows, []);
         }
         catch (e) {
-            result = new OINOPostgresqlData([[]], [db_1.OINO_ERROR_PREFIX + " (sqlSelect): exception in _db.query [" + e.message + "]"]);
+            result = new OINOPostgresqlData(db_1.OINODB_EMPTY_ROWS, [db_1.OINO_ERROR_PREFIX + " (sqlSelect): exception in _db.query [" + e.message + "]"]);
         }
         db_1.OINOBenchmark.end("OINODb", "sqlSelect");
         return result;
@@ -306,7 +320,7 @@ class OINODbPostgresql extends db_1.OINODb {
             result = new OINOPostgresqlData(rows, []);
         }
         catch (e) {
-            result = new OINOPostgresqlData([[]], [db_1.OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + e.message + "]"]);
+            result = new OINOPostgresqlData(db_1.OINODB_EMPTY_ROWS, [db_1.OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + e.message + "]"]);
         }
         db_1.OINOBenchmark.end("OINODb", "sqlExec");
         return result;

package/dist/esm/OINODbPostgresql.js

@@ -3,9 +3,8 @@
  * 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, OINOLog, OINOResult } from "@oino-ts/db";
+import { OINODb, OINODbDataSet, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINO_ERROR_PREFIX, OINOBenchmark, OINODatetimeDataField, OINOBlobDataField, OINOLog, OINOResult, OINODB_EMPTY_ROW, OINODB_EMPTY_ROWS } from "@oino-ts/db";
 import { Pool } from "pg";
-const EMPTY_ROW = [];
 /**
  * Implmentation of OINODbDataSet for Postgresql.
  *
@@ -70,9 +69,16 @@ class OINOPostgresqlData extends OINODbDataSet {
             return this._rows[this._currentRow];
         }
         else {
-            return EMPTY_ROW;
+            return OINODB_EMPTY_ROW;
         }
     }
+    /**
+     * Gets all rows of data.
+     *
+     */
+    async getAllRows() {
+        return this._rows; // at the moment theres no result streaming, so we can just return the rows
+    }
 }
 /**
  * Implementation of Postgresql-database.
@@ -120,10 +126,18 @@ export class OINODbPostgresql extends OINODb {
         return Promise.resolve(query_result.rows);
     }
     async _exec(sql) {
-        // OINOLog.debug("OINODbPostgresql._query", {sql:sql})
+        // OINOLog.debug("OINODbPostgresql._exec", {sql:sql})
         const query_result = await this._pool.query({ rowMode: "array", text: sql });
-        // OINOLog.debug("OINODbPostgresql._query", {result:query_result})
-        return Promise.resolve(query_result.rows);
+        // OINOLog.debug("OINODbPostgresql._exec", {result:query_result})
+        if (Array.isArray(query_result) == true) {
+            return Promise.resolve(query_result.flatMap((q) => q.rows));
+        }
+        else if (query_result.rows) {
+            return Promise.resolve(query_result.rows);
+        }
+        else {
+            return Promise.resolve(OINODB_EMPTY_ROWS); // return empty row if no rows returned
+        }
     }
     /**
      * Print a table name using database specific SQL escaping.
@@ -283,7 +297,7 @@ export class OINODbPostgresql extends OINODb {
             result = new OINOPostgresqlData(rows, []);
         }
         catch (e) {
-            result = new OINOPostgresqlData([[]], [OINO_ERROR_PREFIX + " (sqlSelect): exception in _db.query [" + e.message + "]"]);
+            result = new OINOPostgresqlData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlSelect): exception in _db.query [" + e.message + "]"]);
         }
         OINOBenchmark.end("OINODb", "sqlSelect");
         return result;
@@ -303,7 +317,7 @@ export class OINODbPostgresql extends OINODb {
             result = new OINOPostgresqlData(rows, []);
         }
         catch (e) {
-            result = new OINOPostgresqlData([[]], [OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + e.message + "]"]);
+            result = new OINOPostgresqlData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + e.message + "]"]);
         }
         OINOBenchmark.end("OINODb", "sqlExec");
         return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db-postgresql",
-  "version": "0.6.1",
+  "version": "0.7.1",
   "description": "OINO TS package for using Postgresql databases.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -20,7 +20,7 @@
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "dependencies": {
-    "@oino-ts/db": "0.6.1",
+    "@oino-ts/db": "0.7.1",
     "pg": "^8.11.3"
   },
   "devDependencies": {

package/src/OINODbPostgresql.ts

@@ -4,11 +4,10 @@
  * 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, OINOLog, OINOResult } from "@oino-ts/db";
+import { OINODb, OINODbParams, OINODbDataSet, OINODbApi, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINODbDataFieldParams, OINO_ERROR_PREFIX, OINODataRow, OINODataCell, OINOBenchmark, OINODatetimeDataField, OINOBlobDataField, OINOLog, OINOResult, OINODB_EMPTY_ROW, OINODB_EMPTY_ROWS } from "@oino-ts/db";
 
 import { Pool, QueryResult } from "pg";
 
-const EMPTY_ROW:string[] = []
 
 /**
  * Implmentation of OINODbDataSet for Postgresql.
@@ -77,9 +76,17 @@ class OINOPostgresqlData extends OINODbDataSet {
         if ((this._currentRow >=0) && (this._currentRow < this._rows.length)) {
             return this._rows[this._currentRow]
         } else {
-            return EMPTY_ROW
+            return OINODB_EMPTY_ROW
         }
     }
+
+    /**
+     * Gets all rows of data.
+     *
+     */
+    async getAllRows(): Promise<OINODataRow[]> {
+        return this._rows // at the moment theres no result streaming, so we can just return the rows
+    }    
 }
 
 /**
@@ -135,10 +142,16 @@ export class OINODbPostgresql extends OINODb {
     }
 
     private async _exec(sql:string):Promise<OINODataRow[]> {
-        // OINOLog.debug("OINODbPostgresql._query", {sql:sql})
+        // OINOLog.debug("OINODbPostgresql._exec", {sql:sql})
         const query_result:QueryResult = await this._pool.query({rowMode: "array", text: sql})
-        // OINOLog.debug("OINODbPostgresql._query", {result:query_result})
-        return Promise.resolve(query_result.rows)
+        // OINOLog.debug("OINODbPostgresql._exec", {result:query_result})
+        if (Array.isArray(query_result) == true) {
+            return Promise.resolve(query_result.flatMap((q) => q.rows))
+        } else if (query_result.rows) {
+            return Promise.resolve(query_result.rows)
+        } else {
+            return Promise.resolve(OINODB_EMPTY_ROWS) // return empty row if no rows returned
+        }
     }
 
     /**
@@ -304,7 +317,7 @@ export class OINODbPostgresql extends OINODb {
             result = new OINOPostgresqlData(rows, [])
 
         } catch (e:any) {
-            result = new OINOPostgresqlData([[]], [OINO_ERROR_PREFIX + " (sqlSelect): exception in _db.query [" + e.message + "]"])
+            result = new OINOPostgresqlData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlSelect): exception in _db.query [" + e.message + "]"])
         }
         OINOBenchmark.end("OINODb", "sqlSelect")
         return result
@@ -325,7 +338,7 @@ export class OINODbPostgresql extends OINODb {
             result = new OINOPostgresqlData(rows, [])
 
         } catch (e:any) {
-            result = new OINOPostgresqlData([[]], [OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + e.message + "]"])
+            result = new OINOPostgresqlData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + e.message + "]"])
         }
         OINOBenchmark.end("OINODb", "sqlExec")
         return result