anote-server-libs 0.2.7 → 0.2.10

package/models/repository/ModelDao.ts

@@ -144,7 +144,7 @@ export abstract class ModelDao<R, T extends Model<R>> extends Dao<R, T> {
         } else {
             const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
             request.input('1', id);
-            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (ROWLOCK)' : '') + ' WHERE id=@1').then(q => this.buildObject(q.recordsets[0][0]));
+            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (UPDLOCK, ROWLOCK)' : '') + ' WHERE id=@1').then(q => this.buildObject(q.recordsets[0][0]));
         }
     }
 
@@ -164,7 +164,7 @@ export abstract class ModelDao<R, T extends Model<R>> extends Dao<R, T> {
                 .then(q => q.rows.map(r => this.buildObject(r)));
         } else {
             const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
-            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (ROWLOCK)' : '') + ' WHERE id IN ('
+            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (UPDLOCK, ROWLOCK)' : '') + ' WHERE id IN ('
                 + (ids.length > 0 ? (typeof ids[0] === 'string' ? '\'' + ids.join('\',\'') + '\'' : ids.join(',')) : '') + ')')
                 .then(q => q.recordsets[0].map(r => this.buildObject(r)));
         }
@@ -178,7 +178,7 @@ export abstract class ModelDao<R, T extends Model<R>> extends Dao<R, T> {
         } else {
             const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
             if(where) where.match(/(@\d+)/g).forEach((match, i) => request.input(match.substr(1), inputs[i]));
-            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (ROWLOCK)' : '') + (where ? (' WHERE ' + where) : '')
+            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (UPDLOCK, ROWLOCK)' : '') + (where ? (' WHERE ' + where) : '')
                 + (order ? (' ORDER BY ' + order) : '') + (offset !== undefined ? (' OFFSET ' + offset + ' ROWS') : '') + (limit !== undefined ? (' FETCH NEXT ' + limit + ' ROWS ONLY') : ''))
                 .then(q => q.recordsets[0].map(r => this.buildObject(r)));
         }
@@ -196,7 +196,7 @@ export abstract class ModelDao<R, T extends Model<R>> extends Dao<R, T> {
             const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
             if(where) where.match(/(@\d+)/g).forEach((match, i) => request.input(match.substr(1), inputs[i]));
             return Promise.allConcurrent(1)([
-                () => request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (ROWLOCK)' : '') + (where ? (' WHERE ' + where) : '')
+                () => request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (UPDLOCK, ROWLOCK)' : '') + (where ? (' WHERE ' + where) : '')
                     + (order ? (' ORDER BY ' + order) : '') + (offset !== undefined ? (' OFFSET ' + offset + ' ROWS') : '') + (limit !== undefined ? (' FETCH NEXT ' + limit + ' ROWS ONLY') : '')),
                 () => request.query('SELECT COUNT(DISTINCT id) AS cnt FROM ' + this.table + (where ? (' WHERE ' + where) : ''))
             ]).then(([q1, q2]: [any, any]) => ({
@@ -219,7 +219,7 @@ export abstract class ModelDao<R, T extends Model<R>> extends Dao<R, T> {
             if(where) where.match(/(@\d+)/g).forEach((match, i) => request.input(match.substr(1), inputs[i]));
             return Promise.allConcurrent(1)([
                 () => request.query('SELECT ' + rows.map(r => '"' + r + '"').join(',') + ' FROM ' + this.table
-                    + ((client && lock) ? ' WITH (ROWLOCK)' : '') + (where ? (' WHERE ' + where) : '') + (order ? (' ORDER BY ' + order) : '')
+                    + ((client && lock) ? ' WITH (UPDLOCK, ROWLOCK)' : '') + (where ? (' WHERE ' + where) : '') + (order ? (' ORDER BY ' + order) : '')
                     + (offset !== undefined ? (' OFFSET ' + offset + ' ROWS') : '') + (limit !== undefined ? (' FETCH NEXT ' + limit + ' ROWS ONLY') : '')),
                 () => request.query('SELECT COUNT(DISTINCT id) AS cnt FROM ' + this.table + (where ? (' WHERE ' + where) : ''))
             ]).then(([q1, q2]: [any, any]) => ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anote-server-libs",
-  "version": "0.2.7",
+  "version": "0.2.10",
   "description": "Helpers for express-TS servers",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/services/WithTransaction.ts

@@ -116,13 +116,9 @@ export function withTransaction(repo: BaseModelRepository, logger: Logger, previ
                 } else {
                     finish();
                 }
-            }).catch((err: any) => {
-                if(repo.db) dbClient.release();
-                else dbClient.rollback();
-                throw err;
             });
         }).catch(err => {
-            // Error connecting to database, restarting worker after the timeout as well...
+            // Error connecting to database or acquiring transaction, restarting worker after the timeout as well...
             res.status(500).json({
                 error: {
                     errorKey: 'internal.db',