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

[jOOQ/jOOQ#7673] Cannot call SQL Server stored procedure on HSQLDB

Browse Source
This commit is contained in:
Lukas Eder 2020-06-11 12:27:47 +02:00
parent e4ba788abc
commit 8785396888
4 changed files with 122 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
View File

@ -6130,12 +6130,22 @@ public class JavaGenerator extends AbstractGenerator {
final String paramId = getStrategy().getJavaIdentifier(parameter);
if (parameter.equals(routine.getReturnValue())) {
if (scala)
out.println("setReturnParameter(%s.%s)", className, paramId);
else if (kotlin)
out.println("returnParameter = %s", paramId);
else
out.println("setReturnParameter(%s);", paramId);
if (parameter.isSynthetic()) {
if (scala)
out.println("setSyntheticReturnParameter(%s.%s)", className, paramId);
else if (kotlin)
out.println("syntheticReturnParameter = %s", paramId);
else
out.println("setSyntheticReturnParameter(%s);", paramId);
}
else {
if (scala)
out.println("setReturnParameter(%s.%s)", className, paramId);
else if (kotlin)
out.println("returnParameter = %s", paramId);
else
out.println("setReturnParameter(%s);", paramId);
}
}
else if (routine.getInParameters().contains(parameter)) {
if (routine.getOutParameters().contains(parameter)) {

11
jOOQ-meta/src/main/java/org/jooq/meta/DefaultParameterDefinition.java
View File

@ -51,6 +51,7 @@ public class DefaultParameterDefinition
private final int position;
private final boolean isDefaulted;
private final boolean isUnnamed;
private final boolean isSynthetic;
public DefaultParameterDefinition(RoutineDefinition routine, String name, int position, DataTypeDefinition type) {
this(routine, name, position, type, false, false);
@ -69,11 +70,16 @@ public class DefaultParameterDefinition
}
public DefaultParameterDefinition(RoutineDefinition routine, String name, int position, DataTypeDefinition type, boolean isDefaulted, boolean isUnnamed, String comment, String overload) {
this(routine, name, position, type, isDefaulted, isUnnamed, comment, overload, false);
}
public DefaultParameterDefinition(RoutineDefinition routine, String name, int position, DataTypeDefinition type, boolean isDefaulted, boolean isUnnamed, String comment, String overload, boolean isSynthetic) {
super(routine, name, position, type, comment, overload);
this.position = position;
this.isDefaulted = isDefaulted;
this.isUnnamed = isUnnamed;
this.isSynthetic = isSynthetic;
}
@Override
@ -90,4 +96,9 @@ public class DefaultParameterDefinition
public boolean isUnnamed() {
return isUnnamed;
}
@Override
public boolean isSynthetic() {
return isSynthetic;
}
}

5
jOOQ-meta/src/main/java/org/jooq/meta/ParameterDefinition.java
View File

@ -59,4 +59,9 @@ public interface ParameterDefinition extends TypedElementDefinition<RoutineDefin
* @see Parameter#isUnnamed()
*/
boolean isUnnamed();
/**
* Whether the parameter is synthetic.
*/
boolean isSynthetic();
}

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

@ -153,8 +153,13 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
/**
* Generated UID
*/
private static final long serialVersionUID = 6330037113167106443L;
private static final Clause[] CLAUSES = { FIELD, FIELD_FUNCTION };
private static final long serialVersionUID = 6330037113167106443L;
private static final Clause[] CLAUSES = { FIELD, FIELD_FUNCTION };
// ------------------------------------------------------------------------
// Meta-data attributes (the same for every call)
@ -191,6 +196,8 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
// ------------------------------------------------------------------------
// Call-data attributes (call-specific)
// ------------------------------------------------------------------------
@ -371,6 +378,12 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
else {
switch (family) {
@ -569,6 +582,8 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
}
final void bind0(BindContext context) {
List<Parameter<?>> all = getParameters0(context.configuration());
List<Parameter<?>> in = getInParameters0(context.configuration());
@ -616,13 +631,14 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
for (Parameter<?> parameter : getParameters()) {
for (Parameter<?> parameter : all) {
// [#1183] [#3533] Skip defaulted parameters
if (getInParameters().contains(parameter) && inValuesDefaulted.contains(parameter))
if (in.contains(parameter) && inValuesDefaulted.contains(parameter))
continue;
bind1(context, parameter, getInValues().get(parameter) != null, resultParameter(parameter));
bind1(context, parameter, getInValues().get(parameter) != null, resultParameter(context.configuration(), parameter));
}
}
@ -688,25 +704,20 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
toSQLDeclare(context);
toSQLBegin(context);
if (getReturnParameter() != null)
if (getReturnParameter0(context.configuration()) != null)
toSQLAssign(context);
toSQLCall(context);
context.sql(' ');
//
context.sql('(');
context.sql(" (");
String separator = "";
List<Parameter<?>> parameters = getParameters();
List<Parameter<?>> all = getParameters0(context.configuration());
Map<Integer, Parameter<?>> indexes = new LinkedHashMap<>();
for (int i = 0; i < parameters.size(); i++) {
Parameter<?> parameter = parameters.get(i);
for (int i = 0; i < all.size(); i++) {
Parameter<?> parameter = all.get(i);
// The return value has already been written
if (parameter.equals(getReturnParameter()))
if (parameter.equals(getReturnParameter0(context.configuration())))
continue;
// [#1183] [#3533] Omit defaulted parameters
@ -739,7 +750,7 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
context.formatNewLine();
// OUT and IN OUT parameters are always written as a '?' bind variable
if (getOutParameters().contains(parameter))
if (getOutParameters0(context.configuration()).contains(parameter))
toSQLOutParam(context, parameter, index);
// IN parameters are rendered normally
@ -752,9 +763,6 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
if (indent)
context.formatIndentEnd().formatNewLine();
//
context.sql(')');
toSQLEnd(context);
}
@ -789,6 +797,8 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
@ -864,6 +874,9 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
@ -911,6 +924,9 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
@ -1184,8 +1200,8 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
}
private final void fetchOutParameters(ExecuteContext ctx) throws SQLException {
for (Parameter<?> parameter : getParameters())
if (resultParameter(parameter))
for (Parameter<?> parameter : getParameters0(ctx.configuration()))
if (resultParameter(ctx.configuration(), parameter))
try {
fetchOutParameter(ctx, parameter);
}
@ -1229,8 +1245,8 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
// Register all out / inout parameters according to their position
// Note that some RDBMS do not support binding by name very well
for (Parameter<?> parameter : getParameters())
if (resultParameter(parameter))
for (Parameter<?> parameter : getParameters0(ctx.configuration()))
if (resultParameter(c, parameter))
registerOutParameter(c, data, statement, parameter);
}
@ -1295,6 +1311,35 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
return Collections.unmodifiableList(allParameters);
}
private final List<Parameter<?>> getOutParameters0(Configuration c) {
return getOutParameters();
}
@SuppressWarnings("unused")
private final List<Parameter<?>> getInParameters0(Configuration c) {
return getInParameters();
}
private final List<Parameter<?>> getParameters0(Configuration c) {
return getParameters();
}
@Override
public final Catalog getCatalog() {
return getSchema() == null ? null : getSchema().getCatalog();
@ -1318,6 +1363,15 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
return returnParameter;
}
private final Parameter<T> getReturnParameter0(Configuration c) {
return getReturnParameter();
}
protected final void setOverloaded(boolean overloaded) {
this.overloaded = overloaded;
}
@ -1422,8 +1476,8 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
private final boolean resultParameter(Parameter<?> parameter) {
return parameter.equals(getReturnParameter()) || getOutParameters().contains(parameter);
private final boolean resultParameter(Configuration c, Parameter<?> parameter) {
return parameter.equals(getReturnParameter0(c)) || getOutParameters0(c).contains(parameter);
}
protected final void addInParameter(Parameter<?> parameter) {
@ -1464,10 +1518,15 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
public final Field<T> asField() {
if (function == null) {
if (function == null)
function = new RoutineField();
}
return function;
}
@ -1748,6 +1807,7 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
@SuppressWarnings({ "rawtypes", "unchecked" })
@ -1757,7 +1817,7 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
String name;
DataType<?> returnType;
List<Field<?>> fields = new ArrayList<>(getInParameters().size());
List<Field<?>> fields = new ArrayList<>(getInParameters0(ctx.configuration()).size());
@ -1790,7 +1850,7 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
name = local.render();
}
for (Parameter<?> parameter : getInParameters()) {
for (Parameter<?> parameter : getInParameters0(ctx.configuration())) {
// [#1183] [#3533] Skip defaulted parameters
if (inValuesDefaulted.contains(parameter))