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

JCorporate Ltd jcorp at jcorporate.com
Wed Dec 22 19:46:20 UTC 2004


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

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj:
        MultiDBObject.java

Revision Data
-------------
Index: MultiDBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/MultiDBObject.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/MultiDBObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/MultiDBObject.java -u -r1.59 -r1.60
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/MultiDBObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/MultiDBObject.java
@@ -75,8 +75,8 @@
 import com.jcorporate.expresso.core.misc.ConfigManager;
 import com.jcorporate.expresso.core.misc.ConfigurationException;
 import com.jcorporate.expresso.core.misc.StringUtil;
-import com.jcorporate.expresso.core.security.filters.Filter;
 import com.jcorporate.expresso.core.registry.RequestRegistry;
+import com.jcorporate.expresso.core.security.filters.Filter;
 import com.jcorporate.expresso.kernel.util.ClassLocator;
 import com.jcorporate.expresso.kernel.util.FastStringBuffer;
 import org.apache.log4j.Logger;
@@ -1622,11 +1622,12 @@
                     myStatement.append((String) e.nextElement());
                     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));
             }
 
             if (log.isDebugEnabled()) {


More information about the cvs mailing list