7953-devToTest_2438 #2942
|
@ -1,4 +1,5 @@
|
|||
CREATE USER 'vn'@'localhost';
|
||||
INSERT INTO `ormConfig`(`id`,`selectLimit`) VALUES(1,1000);
|
||||
|
||||
GRANT SELECT,
|
||||
INSERT,
|
||||
|
|
|
@ -186,12 +186,12 @@ module.exports = Self => {
|
|||
}
|
||||
if (ctx.req.query.showBadDates === 'true') {
|
||||
stmt.merge({
|
||||
sql: `WHERE
|
||||
fp.started> util.VN_CURDATE() `});
|
||||
}
|
||||
|
||||
stmt.merge(conn.makeSuffix(filter));
|
||||
|
||||
sql: ` WHERE
|
||||
fp.started> util.VN_CURDATE() `});
|
||||
} else
|
||||
stmt.merge(conn.makeWhere(filter.where));
|
||||
stmt.merge(conn.makeOrderBy(filter.order));
|
||||
stmt.merge(conn.makeLimit(filter));
|
||||
const fixedPriceIndex = stmts.push(stmt) - 1;
|
||||
const sql = ParameterizedSQL.join(stmts, ';');
|
||||
const result = await conn.executeStmt(sql, myOptions);
|
||||
|
|
Loading…
Reference in New Issue