7953-devToTest_2438 #2942

Merged
alexm merged 199 commits from 7953-devToTest_2438 into test 2024-09-10 07:22:31 +00:00
2 changed files with 7 additions and 6 deletions
Showing only changes of commit dbd8f94555 - Show all commits

View File

@ -1,4 +1,5 @@
CREATE USER 'vn'@'localhost';
INSERT INTO `ormConfig`(`id`,`selectLimit`) VALUES(1,1000);
GRANT SELECT,
INSERT,

View File

@ -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);