You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by fa...@apache.org on 2009/03/09 18:41:58 UTC
svn commit: r751775 - in
/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc:
kernel/FinderQueryImpl.java sql/SelectImpl.java
Author: faywang
Date: Mon Mar 9 17:41:58 2009
New Revision: 751775
URL: http://svn.apache.org/viewvc?rev=751775&view=rev
Log:
OPENJPA-965: Open up FinderQueryImpl for jdbc-like and non-jdbc
implementation
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderQueryImpl.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderQueryImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderQueryImpl.java?rev=751775&r1=751774&r2=751775&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderQueryImpl.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderQueryImpl.java Mon Mar 9 17:41:58 2009
@@ -151,7 +151,7 @@
}
rs = _select.executeQuery(conn, stmnt, getQueryString(), jstore,
- params);
+ params, _pkCols);
return _select.getEagerResult(conn, stmnt, rs, jstore,
(JDBCFetchConfiguration)fetch, forUpdate, _buffer);
} catch (SQLException se) {
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java?rev=751775&r1=751774&r2=751775&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java Mon Mar 9 17:41:58 2009
@@ -483,7 +483,7 @@
* 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();
}