Author: adityasharma
Date: Wed Dec 19 10:33:30 2018
New Revision: 1849288
URL: http://svn.apache.org/viewvc?rev=1849288&view=rev
Log:
Applied fix from trunk for revision: 1849275
===
Improved: Remove all the fk dependencies from stats entities to the business
entities
(OFBIZ-10721)
stats related entities foreign key relation has been removed by Jacopo at
r#1647271 and new group org.apache.ofbiz.stats introduced for stats related
entity. Some remnants were still left in stats entities.
Removed relations of Party, ContactMech and Content from ServerHit entity.
Removed relations of Content from ServerHitBin entity.
Removed relations of UserLogin from Visitor entity.
Thanks Jacques Le Roux and Deepak Dixit for the review.
Modified:
ofbiz/ofbiz-framework/branches/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/applications/datamodel/entitydef/party-entitymodel.xml
ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/entitydef/entitymodel.xml
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 19 10:33:30 2018
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,1847890,1848263,
1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849191,1849193
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,1847890,1848263,
1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849191,1849193,1849275
Modified:
ofbiz/ofbiz-framework/branches/release17.12/applications/datamodel/entitydef/party-entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/datamodel/entitydef/party-entitymodel.xml?rev=1849288&r1=1849287&r2=1849288&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release17.12/applications/datamodel/entitydef/party-entitymodel.xml
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/applications/datamodel/entitydef/party-entitymodel.xml
Wed Dec 19 10:33:30 2018
@@ -2914,24 +2914,9 @@ under the License.
<field name="partyId" type="id"></field>
<field name="idByIpContactMechId" type="id"></field>
<field name="refByWebContactMechId" type="id"></field>
- <relation type="one" fk-name="SERVER_HIT_PARTY"
rel-entity-name="Party">
- <key-map field-name="partyId"/>
- </relation>
- <relation type="one" fk-name="SERVER_HIT_IDBYIP" title="IdByIp"
rel-entity-name="ContactMech">
- <key-map field-name="idByIpContactMechId"
rel-field-name="contactMechId"/>
- </relation>
- <relation type="one" fk-name="SERVER_HIT_REFWEB" title="RefByWeb"
rel-entity-name="ContactMech">
- <key-map field-name="refByWebContactMechId"
rel-field-name="contactMechId"/>
- </relation>
- <relation type="one" fk-name="SERVER_HIT_CNT"
rel-entity-name="Content">
- <key-map field-name="internalContentId"
rel-field-name="contentId"/>
- </relation>
</extend-entity>
<extend-entity entity-name="ServerHitBin">
<field name="internalContentId" type="id"></field>
- <relation type="one" fk-name="SERVER_HBIN_CNT"
rel-entity-name="Content">
- <key-map field-name="internalContentId"
rel-field-name="contentId"/>
- </relation>
</extend-entity>
<extend-entity entity-name="Visit">
<field name="contactMechId" type="id"></field>
Modified:
ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/entitydef/entitymodel.xml?rev=1849288&r1=1849287&r2=1849288&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/entitydef/entitymodel.xml
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/entitydef/entitymodel.xml
Wed Dec 19 10:33:30 2018
@@ -193,9 +193,6 @@ under the License.
<field name="visitorId" type="id"></field>
<field name="userLoginId" type="id-vlong"></field>
<prim-key field="visitorId"/>
- <relation type="one" fk-name="VISITOR_USRLGN"
rel-entity-name="UserLogin">
- <key-map field-name="userLoginId"/>
- </relation>
</entity>
<!-- ========================================================= -->
