mpoeschl 2002/11/11 04:09:24
Modified: src/test/org/apache/torque/util CriteriaTest.java
src/java/org/apache/torque/util BasePeer.java
xdocs changes.xml
Log:
TRQ37: Problem retrieving object/row count using Criteria
Revision Changes Path
1.14 +25 -1
jakarta-turbine-torque/src/test/org/apache/torque/util/CriteriaTest.java
Index: CriteriaTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/test/org/apache/torque/util/CriteriaTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- CriteriaTest.java 14 Oct 2002 01:44:08 -0000 1.13
+++ CriteriaTest.java 11 Nov 2002 12:09:24 -0000 1.14
@@ -335,4 +335,28 @@
}
+ public void testCountAster()
+ {
+ Criteria c = new Criteria()
+ .addSelectColumn("COUNT(*)")
+ .add("TABLE.DATE_COLUMN", Criteria.CURRENT_DATE)
+ .add("TABLE.TIME_COLUMN", Criteria.CURRENT_TIME);
+
+ String expect = "SELECT COUNT(*) FROM TABLE WHERE
TABLE.TIME_COLUMN=CURRENT_TIME AND TABLE.DATE_COLUMN=CURRENT_DATE";
+
+ String result = null;
+ try
+ {
+ result = BasePeer.createQueryString(c);
+ }
+ catch (TorqueException e)
+ {
+ e.printStackTrace();
+ fail("TorqueException thrown in BasePeer.createQueryString()");
+ }
+
+ assertEquals(expect,result);
+
+ }
+
}
1.53 +3 -3
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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- BasePeer.java 22 Aug 2002 15:40:11 -0000 1.52
+++ BasePeer.java 11 Nov 2002 12:09:24 -0000 1.53
@@ -936,7 +936,7 @@
for (int i = 0; i < select.size(); i++)
{
String columnName = select.get(i);
- if (columnName.indexOf('.') == -1)
+ if (columnName.indexOf('.') == -1 && columnName.indexOf('*') == -1)
{
throwMalformedColumnNameException("select", columnName);
}
@@ -947,7 +947,7 @@
{
tableName = columnName.substring(0, columnName.indexOf('.'));
}
- else
+ else if (columnName.indexOf('.') > -1)
{
tableName =
columnName.substring(parenPos + 1, columnName.indexOf('.'));
1.48 +3 -0 jakarta-turbine-torque/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/xdocs/changes.xml,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- changes.xml 11 Nov 2002 11:38:24 -0000 1.47
+++ changes.xml 11 Nov 2002 12:09:24 -0000 1.48
@@ -43,6 +43,9 @@
<p>
<ul>
<li>
+ TRQ37: Problem retrieving object/row count using Criteria
+ </li>
+ <li>
TRQD6: update README (ant 1.5 is required)
</li>
<li>
--
To unsubscribe, e-mail: <mailto:turbine-torque-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:turbine-torque-dev-help@;jakarta.apache.org>
