2394 - Removed call to order_total() #358
|
@ -136,14 +136,10 @@ module.exports = Self => {
|
||||||
let stmts = [];
|
let stmts = [];
|
||||||
let stmt;
|
let stmt;
|
||||||
|
|
||||||
stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.filter');
|
|
||||||
|
|
||||||
stmt = new ParameterizedSQL(
|
stmt = new ParameterizedSQL(
|
||||||
`CREATE TEMPORARY TABLE tmp.filter
|
`SELECT
|
||||||
(INDEX (id))
|
|
||||||
ENGINE = MEMORY
|
|
||||||
SELECT
|
|
||||||
o.id,
|
o.id,
|
||||||
|
o.total,
|
||||||
o.date_send landed,
|
o.date_send landed,
|
||||||
o.date_make created,
|
o.date_make created,
|
||||||
o.customer_id clientFk,
|
o.customer_id clientFk,
|
||||||
|
@ -178,36 +174,13 @@ module.exports = Self => {
|
||||||
}
|
}
|
||||||
|
|
||||||
stmt.merge(conn.makeWhere(filter.where));
|
stmt.merge(conn.makeWhere(filter.where));
|
||||||
stmt.merge({
|
stmt.merge(`GROUP BY o.id`);
|
||||||
sql: `GROUP BY o.id`
|
|
||||||
});
|
|
||||||
stmt.merge(conn.makePagination(filter));
|
stmt.merge(conn.makePagination(filter));
|
||||||
stmts.push(stmt);
|
stmts.push(stmt);
|
||||||
|
|
||||||
stmts.push(`
|
const sql = ParameterizedSQL.join(stmts, ';');
|
||||||
CREATE TEMPORARY TABLE tmp.order
|
const result = await conn.executeStmt(sql);
|
||||||
(INDEX (orderFk))
|
|
||||||
ENGINE = MEMORY
|
|
||||||
SELECT id AS orderFk
|
|
||||||
FROM tmp.filter`);
|
|
||||||
|
|
||||||
stmts.push('CALL hedera.order_getTotal()');
|
return result;
|
||||||
|
|
||||||
stmt = new ParameterizedSQL(
|
|
||||||
`SELECT f.*, ot.*
|
|
||||||
FROM tmp.filter f
|
|
||||||
LEFT JOIN tmp.orderTotal ot ON ot.orderFk = f.id`);
|
|
||||||
const orderIndex = stmts.push(stmt) - 1;
|
|
||||||
|
|
||||||
stmts.push(`
|
|
||||||
DROP TEMPORARY TABLE
|
|
||||||
tmp.order,
|
|
||||||
tmp.orderTotal,
|
|
||||||
tmp.filter`);
|
|
||||||
|
|
||||||
let sql = ParameterizedSQL.join(stmts, ';');
|
|
||||||
let result = await conn.executeStmt(sql);
|
|
||||||
|
|
||||||
return result[orderIndex];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -79,6 +79,9 @@
|
||||||
"mysql": {
|
"mysql": {
|
||||||
"columnName": "confirm_date"
|
"columnName": "confirm_date"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"total": {
|
||||||
|
"type": "Number"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"relations": {
|
"relations": {
|
||||||
|
|
Loading…
Reference in New Issue