qaq-core-db-v2 1.0.1 → 1.0.8

package/lib/pool.manger.js

@@ -16,27 +16,30 @@ async function initializePools(){
 
 
    
-async function initializePoolsList(poolList){
-
-  var databaseConfig = await readDatabaseConfigfile('config/ezInit.json');
-  //console.log("databaseConfig",databaseConfig)
-  if(poolList!=null && poolList.length>0){
-    for(var i=0;i<poolList.length;i++){
-      var poolNme = poolList[i];
-      //console.log("poolNme",poolNme);
-      var poolConfig = databaseConfig[poolNme];
-      var dbName = poolConfig["dbname"];
-      if(dbName=='POSTGRES'){
-          poolsList[poolNme] =  await createPostGresPool(poolConfig);
-        }else if(dbName=='ORACLE'){
-            poolsList[poolNme] =  await createOraclePool(poolConfig);
-        }else if(dbName=='MONGO'){
-            poolsList[poolNme] =  await createMongiPool(poolConfig);
-        }
-    } }
-    //console.log("poolsList",poolsList)
-   return poolsList;
-}
+  async function initializePoolsList(poolList){
+    var dbConfigFile='ezInit.json';
+    if(process.env.ENVIRONMENT == 'DEVELOPMENT'){
+      dbConfigFile='dev_ezInit.json';
+    }
+    var databaseConfig = await readDatabaseConfigfile('config/'+dbConfigFile);
+    // console.log("databaseConfig",databaseConfig)
+    if(poolList!=null && poolList.length>0){
+      for(var i=0;i<poolList.length;i++){
+        var poolNme = poolList[i];
+        //console.log("poolNme",poolNme);
+        var poolConfig = databaseConfig[poolNme];
+        var dbName = poolConfig["dbname"];
+        if(dbName=='POSTGRES'){
+            poolsList[poolNme] =  await createPostGresPool(poolConfig);
+          }else if(dbName=='ORACLE'){
+              poolsList[poolNme] =  await createOraclePool(poolConfig);
+          }else if(dbName=='MONGO'){
+              poolsList[poolNme] =  await createMongiPool(poolConfig);
+          }
+      } }
+      //console.log("poolsList",poolsList)
+     return poolsList;
+  }
 
  async function readDatabaseConfigfile(file){
     let params = {Bucket: "qsol", Key: file};
@@ -85,22 +88,30 @@ async function initializePoolsList(poolList){
     password = decryptResult["result"] || '';
   
     return new Promise(function(resolve,reject) {
-    oracledb.createPool (
-      {
-        poolAlias:  config["poolAlias"],
-        user:       config["username"],
-        password:     password,
-        connectString:   config["connectionString"],
-        poolMax:         parseInt(config["poolMax"]),
-        poolMin:        parseInt( config["poolMin"]),
-        poolIncrement:   parseInt(config["poolIncrement"]),
-        poolTimeout:     parseInt(config["poolTimeout"])
-      },
-      function(err, pool) {
+    // oracledb.createPool (
+    //  ,
+    //   function(err, pool) {
       
-        resolve(pool);
-      }
-    );
+    //     resolve(pool);
+    //   }
+    // );
+try {
+  const pool=await oracledb.createPool( {
+    poolAlias:  config["poolAlias"],
+    user:       config["username"],
+    password:     password,
+    connectString:   config["connectionString"],
+    poolMax:         parseInt(config["poolMax"]),
+    poolMin:        parseInt( config["poolMin"]),
+    poolIncrement:   parseInt(config["poolIncrement"]),
+    poolTimeout:     parseInt(config["poolTimeout"])
+  })
+  resolve(pool)
+} catch (error) {
+  reject(error)
+}
+    
+   
   });
   }
 

package/package.json

@@ -39,5 +39,5 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "1.0.1"
+  "version": "1.0.8"
 }

package/test.js

@@ -1,7 +1,7 @@
 var coreDB = require('./index');
 
 
-const util = require('qaq-core-util-v2');
+const util = require('qaq-core-util');
 let poolList = [];
 poolList.push("TPOOL");