#1115 - Trim SQL for SqlUpdate, SqlQuery and CallableSql - also replace \n with space

This commit is contained in:
rob bygrave
2017-09-08 23:45:28 +12:00
parent 8c0232fdb8
commit 06f3c000f5
2 changed files with 34 additions and 4 deletions
@@ -1034,17 +1034,24 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
@Override
public SqlQuery createSqlQuery(String sql) {
return new DefaultRelationalQuery(this, sql.trim());
return new DefaultRelationalQuery(this, trimSql(sql));
}
@Override
public SqlUpdate createSqlUpdate(String sql) {
return new DefaultSqlUpdate(this, sql.trim());
return new DefaultSqlUpdate(this, trimSql(sql));
}
@Override
public CallableSql createCallableSql(String sql) {
return new DefaultCallableSql(this, sql.trim());
return new DefaultCallableSql(this, trimSql(sql));
}
/**
* Trim and remove new line chars for better support in multi-line sql strings (logging etc).
*/
private String trimSql(String sql) {
return sql.trim().replace('\n',' ');
}
@Override