jmcnally 01/10/12 15:01:29
Modified: src/java/org/apache/torque/util BasePeer.java
Log:
fix to allow selects like count(DISTINCT columnName) to work.
Revision Changes Path
1.9 +8 -1
jakarta-turbine-torque/src/java/org/apache/torque/util/BasePeer.java
Index: BasePeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/util/BasePeer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BasePeer.java 2001/10/05 18:54:45 1.8
+++ BasePeer.java 2001/10/12 22:01:28 1.9
@@ -110,7 +110,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
- * @version $Id: BasePeer.java,v 1.8 2001/10/05 18:54:45 jon Exp $
+ * @version $Id: BasePeer.java,v 1.9 2001/10/12 22:01:28 jmcnally Exp $
*/
public abstract class BasePeer implements java.io.Serializable
{
@@ -977,6 +977,13 @@
{
tableName = columnName.substring(parenPos + 1,
columnName.indexOf('.') );
+ // functions may contain qualifiers so only take the last
+ // word as the table name.
+ int lastSpace = tableName.lastIndexOf(' ');
+ if ( lastSpace != -1 )
+ {
+ tableName = tableName.substring(lastSpace+1);
+ }
}
String tableName2 = criteria.getTableForAlias(tableName);
if ( tableName2 != null )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
