jon 02/03/15 16:20:02
Modified: src/java/org/apache/torque/util BasePeer.java
Log:
fixes:
http://scarab.tigris.org/issues/show_bug.cgi?id=213
john, if this is a problem, please let me know.
-jon
Revision Changes Path
1.33 +33 -7
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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- BasePeer.java 14 Mar 2002 00:59:29 -0000 1.32
+++ BasePeer.java 16 Mar 2002 00:20:02 -0000 1.33
@@ -115,7 +115,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.32 2002/03/14 00:59:29 mpoeschl Exp $
+ * @version $Id: BasePeer.java,v 1.33 2002/03/16 00:20:02 jon Exp $
*/
public abstract class BasePeer implements java.io.Serializable
{
@@ -1255,16 +1255,29 @@
int spacePos = orderByColumn.indexOf(' ');
String columnName;
if (spacePos == -1)
- columnName = orderByColumn.substring(orderByColumn.indexOf('.')
+ 1);
+ {
+ columnName = orderByColumn
+ .substring(orderByColumn.indexOf('.') + 1);
+ }
else
- columnName = orderByColumn.substring(orderByColumn.indexOf('.')
+ 1, spacePos);
+ {
+ columnName = orderByColumn
+ .substring(orderByColumn.indexOf('.') + 1, spacePos);
+ }
ColumnMap column = dbMap.getTable(table).getColumn( columnName );
if ( column.getType() instanceof String )
{
if (spacePos == -1)
+ {
orderByClause.add( db.ignoreCaseInOrderBy(orderByColumn) );
+ }
else
- orderByClause.add(
db.ignoreCaseInOrderBy(orderByColumn.substring(0, spacePos)) +
orderByColumn.substring(spacePos) );
+ {
+ orderByClause.add(
+ db.ignoreCaseInOrderBy(orderByColumn.substring(0,
spacePos))
+ + orderByColumn.substring(spacePos) );
+ }
+ selectClause.add( db.ignoreCaseInOrderBy(table + '.' +
columnName) );
}
else
{
@@ -2438,16 +2451,29 @@
int spacePos = orderByColumn.indexOf(' ');
String columnName;
if (spacePos == -1)
- columnName = orderByColumn.substring(orderByColumn.indexOf('.')
+ 1);
+ {
+ columnName = orderByColumn
+ .substring(orderByColumn.indexOf('.') + 1);
+ }
else
- columnName = orderByColumn.substring(orderByColumn.indexOf('.')
+ 1, spacePos);
+ {
+ columnName = orderByColumn
+ .substring(orderByColumn.indexOf('.') + 1, spacePos);
+ }
ColumnMap column = dbMap.getTable(table).getColumn( columnName );
if ( column.getType() instanceof String )
{
if (spacePos == -1)
+ {
orderByClause.add( db.ignoreCaseInOrderBy(orderByColumn) );
+ }
else
- orderByClause.add(
db.ignoreCaseInOrderBy(orderByColumn.substring(0, spacePos)) +
orderByColumn.substring(spacePos) );
+ {
+ orderByClause.add(
+ db.ignoreCaseInOrderBy(orderByColumn.substring(0,
spacePos))
+ + orderByColumn.substring(spacePos) );
+ }
+ selectClause.add( db.ignoreCaseInOrderBy(table + '.' +
columnName) );
}
else
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
