github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#5834] Improve formatting of multi-argument named parameter procedure calls

Browse Source
This commit is contained in:
lukaseder 2017-02-05 15:54:42 +01:00
parent 633d630bf5
commit c0de46eef8
1 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
View File

@ -59,8 +59,10 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import org.jooq.AggregateFunction;
@ -609,6 +611,7 @@ public abstract class AbstractRoutine<T> extends AbstractQueryPart implements Ro
String separator = "";
List<Parameter<?>> parameters = getParameters();
Map<Integer, Parameter<?>> indexes = new LinkedHashMap<Integer, Parameter<?>>();
for (int i = 0; i < parameters.size(); i++) {
Parameter<?> parameter = parameters.get(i);
@ -616,26 +619,49 @@ public abstract class AbstractRoutine<T> extends AbstractQueryPart implements Ro
if (parameter.equals(getReturnParameter()))
continue;
// OUT and IN OUT parameters are always written as a '?' bind variable
if (getOutParameters().contains(parameter)) {
context.sql(separator);
toSQLOutParam(context, parameter, i);
}
// [#1183] [#3533] Omit defaulted parameters
else if (inValuesDefaulted.contains(parameter)) {
else if (inValuesDefaulted.contains(parameter))
continue;
}
// Ordinary IN, INOUT, and OUT parameters
else
indexes.put(i, parameter);
}
boolean indent = false;
if (indent)
context.formatIndentStart()
.formatNewLine();
int i = 0;
for (Entry<Integer, Parameter<?>> entry : indexes.entrySet()) {
Parameter<?> parameter = entry.getValue();
int index = entry.getKey();
context.sql(separator);
if (indent && i++ > 0)
context.formatNewLine();
// OUT and IN OUT parameters are always written as a '?' bind variable
if (getOutParameters().contains(parameter))
toSQLOutParam(context, parameter, index);
// IN parameters are rendered normally
else {
context.sql(separator);
toSQLInParam(context, parameter, i, getInValues().get(parameter));
}
else
toSQLInParam(context, parameter, index, getInValues().get(parameter));
separator = ", ";
}
if (indent)
context.formatIndentEnd().formatNewLine();
context.sql(')');
toSQLEnd(context);
}