svn commit: r500365 - in /ofbiz/trunk/applications/order/entitydef: entitygroup.xml entitymodel_view.xml

[sichen]

Author: sichen
Date: Fri Jan 26 13:32:45 2007
New Revision: 500365

URL: http://svn.apache.org/viewvc?view=rev&rev=500365
Log:
OFBIZ-654:  Replace the view-entity chain with a single count-distinct view entity.

Modified:
    ofbiz/trunk/applications/order/entitydef/entitygroup.xml
    ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml

Modified: ofbiz/trunk/applications/order/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitygroup.xml?view=diff&rev=500365&r1=500364&r2=500365
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitygroup.xml Fri Jan 26 13:32:45 2007
@@ -148,7 +148,6 @@
     <entity-group group="org.ofbiz" entity="RequirementAttribute" />
     <entity-group group="org.ofbiz" entity="RequirementBudgetAllocation" />
     <entity-group group="org.ofbiz" entity="RequirementByProductFacility" />
-    <entity-group group="org.ofbiz" entity="RequirementPartyProductCountSubquery" />
     <entity-group group="org.ofbiz" entity="RequirementPartyProductCount" />
     <entity-group group="org.ofbiz" entity="RequirementCustRequest" />
     <entity-group group="org.ofbiz" entity="RequirementCustRequestView" />

Modified: ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml?view=diff&rev=500365&r1=500364&r2=500365
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitymodel_view.xml Fri Jan 26 13:32:45 2007
@@ -1292,34 +1292,21 @@
       <alias entity-alias="RQ" name="facilityId" group-by="true"/>
       <alias entity-alias="RQ" name="quantity" function="sum"/>
     </view-entity>
-    <!-- Note how we chain the next two view entities to simulate a subquery operation -->
-    <view-entity entity-name="RequirementPartyProductCountSubquery"
+    <view-entity entity-name="RequirementPartyProductCount"
             package-name="org.ofbiz.order.request"
-            title="A subquery of RequirementPartyProductCount.  Not intended for direct use.">
+            title="A join on Requirement and RequirementRole to count number of distinict products required from a supplier party">
       <member-entity entity-alias="RQ" entity-name="Requirement"/>
       <member-entity entity-alias="RQR" entity-name="RequirementRole"/>
-      <alias entity-alias="RQ" name="requirementTypeId" group-by="true"/>
-      <alias entity-alias="RQ" name="statusId" group-by="true"/>
-      <alias entity-alias="RQ" name="productId" group-by="true"/>
+      <alias entity-alias="RQ" name="requirementTypeId" group-by="false"/>
+      <alias entity-alias="RQ" name="statusId" group-by="false"/>
+      <alias entity-alias="RQ" name="productId" function="count-distinct"/>
       <alias entity-alias="RQR" name="partyId" group-by="true"/>
-      <alias entity-alias="RQR" name="roleTypeId" group-by="true"/>
+      <alias entity-alias="RQR" name="roleTypeId" group-by="false"/>
       <alias entity-alias="RQR" name="fromDate" group-by="false"/>
       <alias entity-alias="RQR" name="thruDate" group-by="false"/>
       <view-link entity-alias="RQ" rel-entity-alias="RQR">
         <key-map field-name="requirementId"/>
       </view-link>
-    </view-entity>
-    <view-entity entity-name="RequirementPartyProductCount"
-            package-name="org.ofbiz.order.request"
-            title="Reports number of distinct product requirements per party.">
-      <member-entity entity-alias="R" entity-name="RequirementPartyProductCountSubquery"/>
-      <alias entity-alias="R" name="requirementTypeId" group-by="true"/>
-      <alias entity-alias="R" name="statusId" group-by="true"/>
-      <alias entity-alias="R" name="productId" function="count"/>
-      <alias entity-alias="R" name="partyId" group-by="true"/>
-      <alias entity-alias="R" name="roleTypeId" group-by="true"/>
-      <alias entity-alias="R" name="fromDate" group-by="false"/>
-      <alias entity-alias="R" name="thruDate" group-by="false"/>
     </view-entity>