From 1ece64d1df09297becfd9ff9387aec7d6ce93667 Mon Sep 17 00:00:00 2001 From: Fay Wang Date: Mon, 9 Mar 2009 17:41:58 +0000 Subject: [PATCH] OPENJPA-965: Open up FinderQueryImpl for jdbc-like and non-jdbc implementation git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@751775 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/openjpa/jdbc/kernel/FinderQueryImpl.java | 2 +- .../src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderQueryImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderQueryImpl.java index c5ccef4fa..dfeb01ece 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderQueryImpl.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderQueryImpl.java @@ -151,7 +151,7 @@ public class FinderQueryImpl } rs = _select.executeQuery(conn, stmnt, getQueryString(), jstore, - params); + params, _pkCols); return _select.getEagerResult(conn, stmnt, rs, jstore, (JDBCFetchConfiguration)fetch, forUpdate, _buffer); } catch (SQLException se) { diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java index 8e2adef24..79b9d8aa2 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java @@ -483,7 +483,7 @@ public class SelectImpl * implementation of executing query. */ public ResultSet executeQuery(Connection conn, PreparedStatement stmnt, - String sql, JDBCStore store, Object[] params) + String sql, JDBCStore store, Object[] params, Column[] cols) throws SQLException { return stmnt.executeQuery(); }