SONAR-4925 Intercept parameters to format SQL string
SONAR-4925 Remove duplicate SQL logging code from batch