[cvs] expresso commit by lhamel: Message posted by user 'wesleywu' at

[JCorporate Ltd]

Log Message:
-----------
Message posted by user 'wesleywu' at 2005-08-14 22:55:47
At line 1596 of JoinedDataObject.java, a limitation after order by clause was missed.

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

Revision Data
-------------
Index: JoinedDataObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObject.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObject.java -u -r1.50 -r1.51
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JoinedDataObject.java
@@ -1594,6 +1594,18 @@
             }
 
             myStatement.append(this.buildOrderByString(sortOrder));
+
+            if (myConnection.getLimitationPosition()
+                    == DBConnection.LIMITATION_AFTER_ORDER_BY &&
+                    (offsetRecord > 0 || maxRecords > 0)) {
+                // Insert limitation stub after order by
+                String limitStub = JDBCUtil.getInstance().makeLimitationStub(myConnection, this);
+
+                myStatement.append(" ");
+                myStatement.append(limitStub);
+                myStatement.append(" ");
+            }
+
             myConnection.execute(myStatement.toString());
 
             int recordCount = 0;