svn commit: r751301 - in /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc: kernel/FinderQueryImpl.java sql/SelectImpl.java

[fancy]

Author: fancy
Date: Sat Mar  7 17:49:31 2009
New Revision: 751301

URL: http://svn.apache.org/viewvc?rev=751301&view=rev
Log:
OPENJPA-965 Open up FinderCacheImpl for non-JDBC or JDBC-like  implementation 
of preparing statement/query execution
An approache not exposing FinderCacheImpl to jdbc kernel

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=751301&r1=751300&r2=751301&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
 Sat Mar  7 17:49:31 2009
@@ -150,7 +150,8 @@
                 }
             }
 
-            rs = _select.executeQuery(conn, stmnt, this, jstore, params);
+            rs = _select.executeQuery(conn, stmnt, getQueryString(), jstore,
+                params);
             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=751301&r1=751300&r2=751301&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
 Sat Mar  7 17:49:31 2009
@@ -484,7 +484,7 @@
      * implementation of executing query.
      */
     public ResultSet executeQuery(Connection conn, PreparedStatement stmnt, 
-        FinderQueryImpl finder, JDBCStore store, Object[] params) 
+        String sql, JDBCStore store, Object[] params) 
         throws SQLException {
         return stmnt.executeQuery();
     }