@nattyjs/orm 0.0.1-beta.3 → 0.0.1-beta.31

package/dist/index.cjs

@@ -344,6 +344,32 @@ class SqlDbTransaction {
   }
 }
 
+const connectionCacheContainer = new class {
+  constructor() {
+    this.connectionPoolState = {};
+  }
+  getCacheKey(config) {
+    return `${config.server}-${config.database}`;
+  }
+  async getConnectionPool(mssql, config) {
+    return await new Promise((resolve, error) => {
+      const cacheKey = this.getCacheKey(config);
+      if (this.connectionPoolState[cacheKey])
+        return resolve(this.connectionPoolState[cacheKey]);
+      const pool = new mssql.ConnectionPool(config);
+      const errorHandler = (error2) => {
+      };
+      pool.on("error", errorHandler);
+      const connection = pool.connect((err) => {
+        if (err)
+          return error(err);
+        this.connectionPoolState[cacheKey] = connection;
+        resolve(connection);
+      });
+    });
+  }
+}();
+
 class SqlConnection extends DbConnection {
   constructor(config) {
     super(config);
@@ -370,6 +396,7 @@ class SqlConnection extends DbConnection {
       }
       return records;
     } catch (ex) {
+      throw ex;
     }
   }
   async runNestedObjectQueries(outputInfo, relationProps, config) {
@@ -443,20 +470,23 @@ class SqlConnection extends DbConnection {
       else
         request.input(param.name, param.value);
     }
-    const resolveQuery = (resolve) => (error, raw) => {
+    const resolveQuery = (resolve, errorResolver) => (error, raw) => {
       if (error)
-        throw error;
+        errorResolver(error);
       resolve(raw);
     };
+    const catchFn = (ex) => {
+      throw ex;
+    };
     if (queryInfo.query) {
       const raw = await new Promise((resolve, error) => {
-        request.query(queryInfo.query, resolveQuery(resolve));
-      });
+        request.query(queryInfo.query, resolveQuery(resolve, error));
+      }).catch(catchFn);
       return raw;
     } else if (queryInfo.sp) {
       const raw = await new Promise((resolve, error) => {
-        request.execute(queryInfo.sp, resolveQuery(resolve));
-      });
+        request.execute(queryInfo.sp, resolveQuery(resolve, error));
+      }).catch(catchFn);
       return raw;
     }
   }
@@ -477,19 +507,7 @@ class SqlConnection extends DbConnection {
     return this.createPool();
   }
   async createPool() {
-    return await new Promise((resolve, error) => {
-      if (this.baseTransaction.transactionConnection)
-        return resolve(this.baseTransaction.transactionConnection);
-      const pool = new this.mssql.ConnectionPool(this.config);
-      const errorHandler = (error2) => {
-      };
-      pool.on("error", errorHandler);
-      const connection = pool.connect((err) => {
-        if (err)
-          return error(err);
-        resolve(connection);
-      });
-    });
+    return await connectionCacheContainer.getConnectionPool(this.mssql, this.config);
   }
 }
 
@@ -649,6 +667,7 @@ class DbContext {
   }
 }
 
+exports.DbConnectionContext = DbConnectionContext;
 exports.DbContext = DbContext;
 exports.DbSet = DbSet;
 exports.StoreProc = StoreProc;

package/dist/index.d.ts

@@ -119,4 +119,4 @@ declare class StoreProc<SpName, Entity, SpParamterModel> {
     private get properties();
 }
 
-export { DbContext, DbSet, StoreProc };
+export { DbConnectionContext, DbContext, DbSet, StoreProc };

package/dist/index.mjs

@@ -328,6 +328,32 @@ class SqlDbTransaction {
   }
 }
 
+const connectionCacheContainer = new class {
+  constructor() {
+    this.connectionPoolState = {};
+  }
+  getCacheKey(config) {
+    return `${config.server}-${config.database}`;
+  }
+  async getConnectionPool(mssql, config) {
+    return await new Promise((resolve, error) => {
+      const cacheKey = this.getCacheKey(config);
+      if (this.connectionPoolState[cacheKey])
+        return resolve(this.connectionPoolState[cacheKey]);
+      const pool = new mssql.ConnectionPool(config);
+      const errorHandler = (error2) => {
+      };
+      pool.on("error", errorHandler);
+      const connection = pool.connect((err) => {
+        if (err)
+          return error(err);
+        this.connectionPoolState[cacheKey] = connection;
+        resolve(connection);
+      });
+    });
+  }
+}();
+
 class SqlConnection extends DbConnection {
   constructor(config) {
     super(config);
@@ -354,6 +380,7 @@ class SqlConnection extends DbConnection {
       }
       return records;
     } catch (ex) {
+      throw ex;
     }
   }
   async runNestedObjectQueries(outputInfo, relationProps, config) {
@@ -427,20 +454,23 @@ class SqlConnection extends DbConnection {
       else
         request.input(param.name, param.value);
     }
-    const resolveQuery = (resolve) => (error, raw) => {
+    const resolveQuery = (resolve, errorResolver) => (error, raw) => {
       if (error)
-        throw error;
+        errorResolver(error);
       resolve(raw);
     };
+    const catchFn = (ex) => {
+      throw ex;
+    };
     if (queryInfo.query) {
       const raw = await new Promise((resolve, error) => {
-        request.query(queryInfo.query, resolveQuery(resolve));
-      });
+        request.query(queryInfo.query, resolveQuery(resolve, error));
+      }).catch(catchFn);
       return raw;
     } else if (queryInfo.sp) {
       const raw = await new Promise((resolve, error) => {
-        request.execute(queryInfo.sp, resolveQuery(resolve));
-      });
+        request.execute(queryInfo.sp, resolveQuery(resolve, error));
+      }).catch(catchFn);
       return raw;
     }
   }
@@ -461,19 +491,7 @@ class SqlConnection extends DbConnection {
     return this.createPool();
   }
   async createPool() {
-    return await new Promise((resolve, error) => {
-      if (this.baseTransaction.transactionConnection)
-        return resolve(this.baseTransaction.transactionConnection);
-      const pool = new this.mssql.ConnectionPool(this.config);
-      const errorHandler = (error2) => {
-      };
-      pool.on("error", errorHandler);
-      const connection = pool.connect((err) => {
-        if (err)
-          return error(err);
-        resolve(connection);
-      });
-    });
+    return await connectionCacheContainer.getConnectionPool(this.mssql, this.config);
   }
 }
 
@@ -633,4 +651,4 @@ class DbContext {
   }
 }
 
-export { DbContext, DbSet, StoreProc };
+export { DbConnectionContext, DbContext, DbSet, StoreProc };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nattyjs/orm",
-  "version": "0.0.1-beta.3",
+  "version": "0.0.1-beta.31",
   "description": "",
   "module": "./dist/index.mjs",
   "main": "./dist/index.cjs",
@@ -18,9 +18,9 @@
   },
   "dependencies": {
     "mssql": "^9.1.1",
-    "@nattyjs/core": "0.0.1-beta.3",
-    "@nattyjs/common": "0.0.1-beta.3",
-    "@nattyjs/entity": "0.0.1-beta.3",
-    "@nattyjs/types": "0.0.1-beta.3"
+    "@nattyjs/core": "0.0.1-beta.31",
+    "@nattyjs/common": "0.0.1-beta.31",
+    "@nattyjs/entity": "0.0.1-beta.31",
+    "@nattyjs/types": "0.0.1-beta.31"
   }
 }