Merge "Avoid variable naming conflicts in DatabasePostgres::selectSQLText"