svn commit: r1231265 - /velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java

[nbubna]

Author: nbubna
Date: Fri Jan 13 19:35:44 2012
New Revision: 1231265

URL: http://svn.apache.org/viewvc?rev=1231265&view=rev
Log:
VELOCITY-814 support query modification in DataSourceResourceLoader (thx to 
Darren Cruse)

Modified:
    
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java

Modified: 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java?rev=1231265&r1=1231264&r2=1231265&view=diff
==============================================================================
--- 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
 (original)
+++ 
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
 Fri Jan 13 19:35:44 2012
@@ -230,7 +230,7 @@ public class DataSourceResourceLoader ex
         try
         {
             conn = openDbConnection();
-            ps = getStatement(conn, templateColumn, name);
+            ps = getStatement(conn, templateColumn, tableName, keyColumn, 
name);
             rs = ps.executeQuery();
 
             if (rs.next())
@@ -306,7 +306,7 @@ public class DataSourceResourceLoader ex
             try
             {
                 conn = openDbConnection();
-                ps = getStatement(conn, timestampColumn, name);
+                ps = getStatement(conn, timestampColumn, tableName, keyColumn, 
name);
                 rs = ps.executeQuery();
 
                 if (rs.next())
@@ -454,11 +454,15 @@ public class DataSourceResourceLoader ex
      *
      * @param conn connection to datasource
      * @param columnNames columns to fetch from datasource
+     * @param tableName table to fetch from
+     * @param keyColumn column whose value should match templateName
      * @param templateName name of template to fetch
      * @return PreparedStatement
      */
-    private PreparedStatement getStatement(final Connection conn,
+    protected PreparedStatement getStatement(final Connection conn,
                                final String columnNames,
+                               final String tableName,
+                               final String keyColumn,
                                final String templateName) throws SQLException
     {
         PreparedStatement ps = conn.prepareStatement("SELECT " + columnNames + 
" FROM "+ tableName + " WHERE " + keyColumn + " = ?");