This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit 2df25602c6e8b6c391386d45fed5dd5e2e4babc3
Author: andreykravchenko <andrey.kravche...@objectstyle.com>
AuthorDate: Tue Nov 3 18:22:10 2020 +0300

    fixed return of statement when using FrontBase DB
---
 .../main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git 
a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
 
b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
index 118cdd6..07e6353 100644
--- 
a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
+++ 
b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
@@ -41,6 +41,7 @@ import org.apache.cayenne.access.types.ExtendedType;
 import org.apache.cayenne.access.types.ExtendedTypeMap;
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.dba.TypesMapping;
+import org.apache.cayenne.dba.frontbase.FrontBaseAdapter;
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DefaultScalarResultSegment;
@@ -188,6 +189,9 @@ public class SQLTemplateAction implements SQLAction {
                boolean iteratedResult = callback.isIteratedResult();
                int generatedKeys = query.isReturnGeneratedKeys() ? 
Statement.RETURN_GENERATED_KEYS : Statement.NO_GENERATED_KEYS;
                PreparedStatement statement = 
connection.prepareStatement(compiled.getSql(), generatedKeys);
+               if (statement == null && this.dbAdapter instanceof 
FrontBaseAdapter) {
+                       statement = 
connection.prepareStatement(compiled.getSql());
+               }
                try {
                        bind(statement, compiled.getBindings());
 

Reply via email to