froth-webdriverio-framework 1.0.96 → 1.0.98

package/commonMethods/connectToDB.js

@@ -26,7 +26,7 @@ async function dbtype(jsondata) {
         connectionpool = mysqlconnect.connectToMySQL(jsondata.host, jsondata.username, jsondata.password, jsondata.schema_name, jsondata.port_number);
         break;
       case 'PostgreSQL':
-        connectionpool = postgreSqlConnect.connectToPostgreSQL(jsondata.database_type,jsondata.host, jsondata.username, jsondata.password, jsondata.schema_name, jsondata.port_number);
+        connectionpool = await postgreSqlConnect.connectToPostgreSQL(jsondata.database_type,jsondata.host, jsondata.username, jsondata.password, jsondata.schema_name, jsondata.port_number);
         break;
       default:
         console.log('Unknown dbtype.');

package/db/postgresOperations.js

@@ -4,22 +4,30 @@ const { Pool } = require('pg');
 async function connectToPostgreSQL(hostname, username, password, dbname, portnumber) {
     try {
         console.log('Connecting to the PostgreSQL database...');
-        const poolConfig = new Pool({
-            user: username,
+
+        const poolConfig = {
             host: hostname,
-            database: dbname,
+            user: username,
             password: password,
-            port: 5432,
-        });
-
+            database: dbname,
+            port: portnumber // Increased connection timeout
+        };
+        // const poolConfig = new Pool({
+        //     user: "postgres",
+        //     host: "10.0.222.36",
+        //     database: "testops",
+        //     password: "A6b1b/b%V9",
+        //     port: 5432,
+        // });
 
-        const client = await poolConfig.connect();
-        console.log('Connected to the database');
+        const pool = new Pool(poolConfig);
+        // const client = await poolConfig.connect();
+        console.log('PostgreSQL connection pool created.');
         // Optionally, run a simple query to verify the connection
-        const res = await client.query('SELECT NOW()');
-        console.log("postgresresults "+res.rows[0]);
-        client.release();
-
+        // const res = await client.query('SELECT NOW()');
+        // console.log("postgresresults "+res.rows[0]);
+        // client.release();
+        return pool;
     } catch (error) {
         console.error('Error creating MySQL connection pool:', error);
         throw error;
@@ -33,12 +41,12 @@ async function fetchDataFromPostgresDB(connectionpool, query) {
     let finalResult = null;
     try {
         console.log("connectionpool" + connectionpool)
-        connection = await connectionpool.getConnection();
+        connection = await connectionpool.connect();
 
-        console.log('Connected to the MySQL database.' + connection);
+        console.log('Connected to the fetchDataFromPostgresDB database.' + connection);
 
-        const [rows] = await connection.execute(query);
-        const dataArray = rows;
+        const result = await connection.query(query);
+        const dataArray = result[0] || result.rows; // Adjust for MySQL and PostgreSQL response formats
         finalResult = {
             totalNumberOfRecords: dataArray.length,
             records: dataArray

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "froth-webdriverio-framework",
-  "version": "1.0.96",
+  "version": "1.0.98",
   "readme": "WebdriverIO Integration",
   "description": "WebdriverIO and BrowserStack App Automate",
   "license": "MIT",