Index: src/java/com/opensymphony/workflow/spi/jdbc/JDBCWorkflowStore.java
===================================================================
RCS file: /cvs/osworkflow/src/java/com/opensymphony/workflow/spi/jdbc/JDBCWorkflowStore.java,v
retrieving revision 1.33
diff -u -r1.33 JDBCWorkflowStore.java
--- src/java/com/opensymphony/workflow/spi/jdbc/JDBCWorkflowStore.java	15 Feb 2006 03:01:54 -0000	1.33
+++ src/java/com/opensymphony/workflow/spi/jdbc/JDBCWorkflowStore.java	6 Apr 2009 08:48:18 -0000
@@ -559,7 +559,7 @@
         //  the queries including nested queries are ANDed
         //
         //	SELECT DISTINCT (a1.ENTRY_ID) AS retrieved
-        //		FROM OS_CURRENTSTEP AS a1 , OS_CURRENTSTEP AS a2 , OS_CURRENTSTEP AS a3 , OS_CURRENTSTEP AS a4
+        //		FROM OS_CURRENTSTEP a1 , OS_CURRENTSTEP a2 , OS_CURRENTSTEP a3 , OS_CURRENTSTEP a4
         //			WHERE ((a1.ENTRY_ID = a1.ENTRY_ID AND a1.ENTRY_ID = a2.ENTRY_ID) AND
         //					 (a2.ENTRY_ID = a3.ENTRY_ID AND a3.ENTRY_ID = a4.ENTRY_ID))
         //				AND ( a1.OWNER =  ?  AND a2.STATUS !=  ?  AND a3.OWNER =  ?  AND a4.STATUS !=  ?  )
@@ -568,7 +568,7 @@
         //  For this method to work, order of queries is matter
         //  This doNestedLeftJoin() method will generate the queries but it works if and only if
         //  the query is in correct order -- it is your luck
-        //                SELECT DISTINCT (a0.ENTRY_ID) AS retrieved FROM OS_CURRENTSTEP AS a0
+        //                SELECT DISTINCT (a0.ENTRY_ID) AS retrieved FROM OS_CURRENTSTEP a0
         //                                LEFT JOIN OS_CURRENTSTEP a1  ON a0.ENTRY_ID = a1.ENTRY_ID
         //
         //                                LEFT JOIN OS_CURRENTSTEP a2  ON a1.ENTRY_ID = a2.ENTRY_ID
@@ -610,7 +610,7 @@
                 //columnName = "retrieved";
                 //columns.append(") AS " + columnName);
                 //columns.append(" FROM ");
-                //columns.append(currentTable + " AS " + "a0");
+                //columns.append(currentTable + " a0");
                 //where.append("WHERE ");
                 //doNestedLeftJoin(e, nestedExp, leftJoin, where, values, queries, orderBy);
                 //selectString = columns.toString() + " " + leftJoin.toString() + " " + where.toString() + " " + orderBy.toString();
@@ -903,13 +903,13 @@
                     columns.append(" , ");
                 }
 
-                //do; OS_CURRENTSTEP AS a1 ....
+                //do; OS_CURRENTSTEP a1 ....
                 if (fieldExp.getContext() == FieldExpression.CURRENT_STEPS) {
-                    columns.append(currentTable + " AS " + 'a' + queryId);
+                    columns.append(currentTable + " a" + queryId);
                 } else if (fieldExp.getContext() == FieldExpression.HISTORY_STEPS) {
-                    columns.append(historyTable + " AS " + 'a' + queryId);
+                    columns.append(historyTable + " a" + queryId);
                 } else {
-                    columns.append(entryTable + " AS " + 'a' + queryId);
+                    columns.append(entryTable + " a" + queryId);
                 }
 
                 ///////// beginning of WHERE JOINS/s :   //////////////////////////////////////////