admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FCLT#52530 bugfix in sql; {1=1 or 2=2 and 1=2} != {(1=1 or 2=2) and 1=1} -> gecorrigeerd

Browse Source 
svn path=/Website/branches/v2017.3/; revision=37363
This commit is contained in:
Koen Reefman
2018-03-14 13:15:45 +00:00
parent e14dbfe81f
commit 0cf7f025ad
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
APPL/INS/ins.inc
View File

@@ -2091,11 +2091,11 @@ ins = {checkAutLevel:
else if (inspSoon) // Binnenkort is aangevinkt. else if (inspSoon) // Binnenkort is aangevinkt.
{ {
if (dtsoonfrom != null && dtsoonto != null) // Binnenkort. if (dtsoonfrom != null && dtsoonto != null) // Binnenkort.
sql = "SELECT * FROM (" + sql + ") x WHERE COALESCE(ins_deelsrtcontrole_plandatum, inspectie_next) BETWEEN " + dtsoonfrom.toSQL(true) + " AND " + dtsoonto.toSQL(true) + (sqlBC != ''? " OR " + sqlBC : ""); sql = "SELECT * FROM (" + sql + ") x WHERE (COALESCE(ins_deelsrtcontrole_plandatum, inspectie_next) BETWEEN " + dtsoonfrom.toSQL(true) + " AND " + dtsoonto.toSQL(true) + (sqlBC != ''? " OR " + sqlBC : "") + ")";
else if (dtsoonfrom == null && dtsoonto != null) // Te laat + binnenkort. else if (dtsoonfrom == null && dtsoonto != null) // Te laat + binnenkort.
sql = "SELECT * FROM (" + sql + ") x WHERE COALESCE(ins_deelsrtcontrole_plandatum, inspectie_next) < " + dtsoonto.toSQL(true) + (sqlBC != ''? " OR " + sqlBC : ""); sql = "SELECT * FROM (" + sql + ") x WHERE (COALESCE(ins_deelsrtcontrole_plandatum, inspectie_next) < " + dtsoonto.toSQL(true) + (sqlBC != ''? " OR " + sqlBC : "") + ")";
else if (dtsoonfrom != null && dtsoonto == null) // Binnenkort + toekomst. else if (dtsoonfrom != null && dtsoonto == null) // Binnenkort + toekomst.
sql = "SELECT * FROM (" + sql + ") x WHERE COALESCE(ins_deelsrtcontrole_plandatum, inspectie_next) >= " + dtsoonfrom.toSQL(true) + (sqlBC != ''? " OR " + sqlBC : ""); sql = "SELECT * FROM (" + sql + ") x WHERE (COALESCE(ins_deelsrtcontrole_plandatum, inspectie_next) >= " + dtsoonfrom.toSQL(true) + (sqlBC != ''? " OR " + sqlBC : "") + ")";
else if (dtsoonfrom == null && dtsoonto == null) else if (dtsoonfrom == null && dtsoonto == null)
sql = "SELECT * FROM (" + sql + ") x WHERE 1 = 1"; // Alles tonen onafhankelijk van sqlBC. sql = "SELECT * FROM (" + sql + ") x WHERE 1 = 1"; // Alles tonen onafhankelijk van sqlBC.
} }