Bij generic sql iets betere simpele sql-formatting toepassen

svn path=/Website/branches/v2017.2/; revision=36541
This commit is contained in:
Jos Groot Lipman
2018-01-10 12:39:53 +00:00
parent 32bb9be7f9
commit 3a64220a33

View File

@@ -21,14 +21,15 @@ __Logging = 0; // Is te laat...
var sql = getFParam("sql", getQParam("sql", ""));
// Als er exact <20><>n SELECT, FROM en WHERE is doen we een beetje formatting
if ((sql.match(/SELECT/ig) || []).length == 1 &&
if ( sql.indexOf("\n") == -1 &&
(sql.match(/SELECT/ig) || []).length == 1 &&
(sql.match(/FROM/ig) || []).length == 1 &&
(sql.match(/WHERE/ig) || []).length == 1)
{
sql = sql.replace(/[a-z] FROM/i, "\nFROM");
sql = sql.replace(/[a-z] WHERE/i, "\nWHERE");
sql = sql.replace(/[a-z] ORDER BY/i, "\nORDER BY");
sql = sql.replace(/[a-z] GROUP BY/i, "\nGROUP BY");
sql = sql.replace(/ FROM/i, "\nFROM");
sql = sql.replace(/ WHERE/i, "\nWHERE");
sql = sql.replace(/ ORDER BY/i, "\nORDER BY");
sql = sql.replace(/ GROUP BY/i, "\nGROUP BY");
sql = sql.replace(/ AND/ig, "\n AND");
sql = sql.replace(/ , /ig, ", ");
}