Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 98136 invoked from network); 7 Mar 2009 17:49:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Mar 2009 17:49:55 -0000 Received: (qmail 35908 invoked by uid 500); 7 Mar 2009 17:49:55 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 35895 invoked by uid 500); 7 Mar 2009 17:49:54 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 35886 invoked by uid 99); 7 Mar 2009 17:49:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Mar 2009 09:49:54 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Mar 2009 17:49:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CA1BD2388920; Sat, 7 Mar 2009 17:49:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r751301 - in /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc: kernel/FinderQueryImpl.java sql/SelectImpl.java Date: Sat, 07 Mar 2009 17:49:31 -0000 To: commits@openjpa.apache.org From: fancy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090307174931.CA1BD2388920@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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(); }