[cvs] expresso commit by lhamel: move limitation syntax outside of sort

[JCorporate Ltd]

Log Message:
-----------
move limitation syntax outside of sort conditional

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc:
        JDBCDataObject.java

Revision Data
-------------
Index: JDBCDataObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCDataObject.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCDataObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCDataObject.java -u -r1.42 -r1.43
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCDataObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCDataObject.java
@@ -836,7 +836,6 @@
 
             } /* else this is a regular (non-distinct) search */
 
-
             myStatement.append(" FROM ");
             myStatement.append(myMetadata.getTargetSQLTable(this.getDataContext()));
             if (myConnection.getLimitationPosition() == DBConnection.LIMITATION_AFTER_TABLE &&
@@ -892,11 +891,12 @@
                     myStatement.append((String) i.next());
                     needComma2 = true;
                 }
-                if (myConnection.getLimitationPosition() == DBConnection.LIMITATION_AFTER_ORDER_BY &&
-                        (offsetRecord > 0 || maxRecords > 0)) {
-                    myStatement.append(" ");
-                    myStatement.append(makeLimitationStub(myConnection));
-                }
+            }
+
+            if (myConnection.getLimitationPosition() == DBConnection.LIMITATION_AFTER_ORDER_BY
+                    && (offsetRecord > 0 || maxRecords > 0)) {
+                myStatement.append(" ");
+                myStatement.append(makeLimitationStub(myConnection));
             }
 
             myConnection.execute(myStatement.toString());