Scarab commit: svn commit: r10168 - branches/release/b21/src/java/org/tigris/scarab/om/AbstractScarabModule.java

Author: dabbous
Date: 2006-06-11 15:32:28-0700
New Revision: 10168

Modified:
   branches/release/b21/src/java/org/tigris/scarab/om/AbstractScarabModule.java

Log:
in AbstractScarabModule changed SQL generation for compatibility with

postgreSQL.

Modified: branches/release/b21/src/java/org/tigris/scarab/om/AbstractScarabModule.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/om/AbstractScarabModule.java?view=diff&rev=10168&p1=branches/release/b21/src/java/org/tigris/scarab/om/AbstractScarabModule.java&p2=branches/release/b21/src/java/org/tigris/scarab/om/AbstractScarabModule.java&r1=10167&r2=10168
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/om/AbstractScarabModule.java	(original)
+++ branches/release/b21/src/java/org/tigris/scarab/om/AbstractScarabModule.java	2006-06-11 15:32:28-0700
@@ -1128,20 +1128,15 @@
         throws TorqueException
     {
         Criteria crit = new Criteria();
-        crit.add(AttributePeer.ATTRIBUTE_TYPE_ID, 5);
         crit.addJoin(RModuleAttributePeer.ATTRIBUTE_ID, 
                 AttributePeer.ATTRIBUTE_ID);
-        crit.add(RModuleAttributePeer.MODULE_ID, getModuleId());
+        crit.add(AttributePeer.ATTRIBUTE_TYPE_ID, 5);
         crit.add(AttributePeer.DELETED, false);
         crit.add(RModuleAttributePeer.ACTIVE, true);
+        crit.add(RModuleAttributePeer.MODULE_ID, getModuleId());
         crit.addAscendingOrderByColumn(
                RModuleAttributePeer.DISPLAY_VALUE);
-        //crit.addAscendingOrderByColumn(
-        //        RModuleAttributePeer.PREFERRED_ORDER);
-        crit.addGroupByColumn(AttributePeer.ATTRIBUTE_ID);
-        //crit.setDistinct(); // need this here, because otherwise duplicate attributes are returned
-                            // FIXME: Mazbe it is possible to create a query without the distinct,
-                            // but i don't seem to get it managed... [HD]
+        crit.setDistinct();
         List result = AttributePeer.doSelect(crit);
         return result;
     }