This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit f209c3da9795a6be88c561d770ceb51905e780f6 Author: Andrus Adamchik <[email protected]> AuthorDate: Fri Jul 3 15:52:25 2026 -0400 cleanup --- .../cayenne/velocity/VelocitySQLTemplateTranslator.java | 2 +- .../org/apache/cayenne/access/jdbc/ProcedureAction.java | 7 ++++--- .../java/org/apache/cayenne/access/jdbc/SelectAction.java | 15 +++------------ .../translator/procedure/DefaultProcedureTranslator.java | 2 +- .../access/translator/procedure/TranslatedProcedure.java | 2 +- .../access/translator/select/SelectTranslatorContext.java | 3 +-- .../access/translator/select/TranslatedSelect.java | 2 +- .../sqltemplate/DefaultSQLTemplateTranslator.java | 2 +- .../access/translator/sqltemplate/TranslatedSQL.java | 5 +---- 9 files changed, 14 insertions(+), 26 deletions(-) diff --git a/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocitySQLTemplateTranslator.java b/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocitySQLTemplateTranslator.java index 390a4143f..a020d69c1 100644 --- a/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocitySQLTemplateTranslator.java +++ b/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocitySQLTemplateTranslator.java @@ -169,7 +169,7 @@ public class VelocitySQLTemplateTranslator implements SQLTemplateTranslator { RSColumn[] resultsArray = new RSColumn[results.size()]; results.toArray(resultsArray); - return new TranslatedSQL(sql, resultsArray, bindingsArray); + return new TranslatedSQL(sql, bindingsArray, resultsArray); } String buildStatement(VelocityContext context, String template, SimpleNode parsedTemplate) throws Exception { diff --git a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java index 1db6de0fe..6befd015d 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java @@ -130,7 +130,7 @@ public class ProcedureAction extends BaseSQLAction { protected void bindParameters(CallableStatement statement, TranslatedProcedure translated) throws Exception { DbAdapter adapter = dataNode.getAdapter(); ProcedureParameter[] callParams = translated.callParams(); - PSParameter[] bindings = translated.bindings(); + PSParameter<?>[] bindings = translated.bindings(); for (int i = 0; i < callParams.length; i++) { ProcedureParameter param = callParams[i]; @@ -198,7 +198,7 @@ public class ProcedureAction extends BaseSQLAction { RSColumn[] result = new RSColumn[columns.length]; for (int i = 0; i < columns.length; i++) { ProcedureColumn c = columns[i]; - ExtendedType type = typeMap.getRegisteredType(c.javaClass()); + ExtendedType<?> type = typeMap.getRegisteredType(c.javaClass()); result[i] = new RSColumn(c.name(), c.jdbcType(), c.dataRowKey(), type, null); } return result; @@ -232,7 +232,8 @@ public class ProcedureAction extends BaseSQLAction { result = new DataRow(2); } - ExtendedType type = dataNode.getAdapter().getExtendedTypes() + ExtendedType<?> type = dataNode.getAdapter() + .getExtendedTypes() .getRegisteredType(TypesMapping.getJavaBySqlType(parameter.getType())); Object val = type.materializeObject(statement, i + 1, parameter.getType()); diff --git a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java index 82aca9978..fc55a967f 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java @@ -72,19 +72,10 @@ public class SelectAction extends BaseSQLAction { DbAdapter adapter = dataNode.getAdapter(); PreparedStatement statement = connection.prepareStatement(translated.sql()); - for (PSParameter<?> b : translated.bindings()) { - - // null DbAttributes are a result of inferior qualifier - // processing (qualifier can't map parameters to DbAttributes - // and therefore only supports standard java types now) hence, a - // special moronic case here: - if (b.attribute() == null) { - statement.setObject(b.psPosition(), b.value()); - } else { - adapter.bindParameter(statement, b); - } + for (PSParameter<?> p : translated.bindings()) { + adapter.bindParameter(statement, p); } - + int fetchSize = queryMetadata.getStatementFetchSize(); if (fetchSize != 0) { statement.setFetchSize(fetchSize); diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/DefaultProcedureTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/DefaultProcedureTranslator.java index c62c36929..1294ca38b 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/DefaultProcedureTranslator.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/DefaultProcedureTranslator.java @@ -69,7 +69,7 @@ public class DefaultProcedureTranslator implements ProcedureTranslator { } String sql = createSqlString(procedure, callParams.length); - return new TranslatedProcedure(sql, callParams, bindings); + return new TranslatedProcedure(sql, bindings, callParams); } /** diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/TranslatedProcedure.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/TranslatedProcedure.java index df0b73951..66b08651f 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/TranslatedProcedure.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/procedure/TranslatedProcedure.java @@ -27,5 +27,5 @@ import org.apache.cayenne.map.ProcedureParameter; * * @since 5.0 */ -public record TranslatedProcedure(String sql, ProcedureParameter[] callParams, PSParameter<?>[] bindings) { +public record TranslatedProcedure(String sql, PSParameter<?>[] bindings, ProcedureParameter[] callParams) { } diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/SelectTranslatorContext.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/select/SelectTranslatorContext.java index 261a87de8..1806f6224 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/SelectTranslatorContext.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/select/SelectTranslatorContext.java @@ -157,8 +157,7 @@ class SelectTranslatorContext implements SQLGenerationContext { public TranslatedSelect getTranslation() { return new TranslatedSelect( getFinalSQL(), - getColumnDescriptors().toArray(new RSColumn[0]), - getBindings().toArray(new PSParameter[0]), + getBindings().toArray(new PSParameter[0]), getColumnDescriptors().toArray(new RSColumn[0]), isDistinctSuppression(), getTableCount() > 1); } diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/TranslatedSelect.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/select/TranslatedSelect.java index bc29ee0fe..31f3cb9d8 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/TranslatedSelect.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/select/TranslatedSelect.java @@ -30,8 +30,8 @@ import org.apache.cayenne.access.jdbc.PSParameter; */ public record TranslatedSelect( String sql, - RSColumn[] resultColumns, PSParameter<?>[] bindings, + RSColumn[] resultColumns, boolean suppressingDistinct, boolean hasJoins) { } diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/DefaultSQLTemplateTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/DefaultSQLTemplateTranslator.java index a10dc8bf2..ae393c99d 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/DefaultSQLTemplateTranslator.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/DefaultSQLTemplateTranslator.java @@ -84,6 +84,6 @@ public class DefaultSQLTemplateTranslator implements SQLTemplateTranslator { node.evaluate(context); - return new TranslatedSQL(context.buildTemplate(), context.getColumnDescriptors(), context.getParameterBindings()); + return new TranslatedSQL(context.buildTemplate(), context.getParameterBindings(), context.getColumnDescriptors()); } } diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/TranslatedSQL.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/TranslatedSQL.java index 7236b3c09..68f5f8076 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/TranslatedSQL.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/sqltemplate/TranslatedSQL.java @@ -27,8 +27,5 @@ import org.apache.cayenne.access.jdbc.PSParameter; * * @since 5.0 */ -public record TranslatedSQL( - String sql, - RSColumn[] resultColumns, - PSParameter<?>[] bindings) { +public record TranslatedSQL(String sql, PSParameter<?>[] bindings, RSColumn[] resultColumns) { }
