verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

refs #5595 VnModel.rawSql() bugfix
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Juan Ferrer 2023-06-19 14:54:32 +02:00
parent 63888e2d64
commit 9fa6e2df71
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
loopback/common/models/vn-model.js
View File

@ -200,10 +200,11 @@ module.exports = function(Self) {
const connector = this.dataSource.connector; const connector = this.dataSource.connector;
let conn; let conn;
let res; let res;
const opts = Object.assign({}, options);
try { try {
if (userId) { if (userId) {
if (!options.transaction) {
options = Object.assign({}, options);
conn = await new Promise((resolve, reject) => { conn = await new Promise((resolve, reject) => {
connector.client.getConnection(function(err, conn) { connector.client.getConnection(function(err, conn) {
if (err) if (err)
@ -212,10 +213,7 @@ module.exports = function(Self) {
resolve(conn); resolve(conn);
}); });
}); });
options.transaction = {
const opts = Object.assign({}, options);
if (!opts.transaction) {
opts.transaction = {
connection: conn, connection: conn,
connector connector
}; };
@ -223,15 +221,14 @@ module.exports = function(Self) {
await connector.executeP( await connector.executeP(
'CALL account.myUser_loginWithName((SELECT name FROM account.user WHERE id = ?))', 'CALL account.myUser_loginWithName((SELECT name FROM account.user WHERE id = ?))',
[userId], opts [userId], options
); );
} }
res = await connector.executeP(query, params, opts); res = await connector.executeP(query, params, options);
if (userId) { if (userId)
await connector.executeP('CALL account.myUser_logout()', null, opts); await connector.executeP('CALL account.myUser_logout()', null, options);
}
} finally { } finally {
if (conn) conn.release(); if (conn) conn.release();
} }

1
modules/order/back/methods/order/confirm.js
View File

@ -21,7 +21,6 @@ module.exports = Self => {
Self.confirm = async(ctx, orderFk) => { Self.confirm = async(ctx, orderFk) => {
const userId = ctx.req.accessToken.userId; const userId = ctx.req.accessToken.userId;
console.log(orderFk, userId);
const query = `CALL hedera.order_confirmWithUser(?, ?)`; const query = `CALL hedera.order_confirmWithUser(?, ?)`;
const response = await Self.rawSql(query, [orderFk, userId], {userId}); const response = await Self.rawSql(query, [orderFk, userId], {userId});