svn commit: r1809383 - /ofbiz/ofbiz-framework/trunk/framework/common/entitydef/entitymodel.xml

Author: jleroux
Date: Sat Sep 23 09:59:24 2017
New Revision: 1809383

URL: http://svn.apache.org/viewvc?rev=1809383&view=rev
Log:
Improved: Missing foreign key constraint for fields userLoginId &
userPrefGroupTypeId in UserPreference entity
(OFBIZ-9678)

UserPreference.userLoginId is related to UserLogin.userLoginId.
UserPreference.userPrefGroupTypeId is related to
UserPrefGroupType.userPrefGroupTypeId.

Fixes tests by using one-nofk for UserLogin relation
Uses uppercase for fk-name as remarked by Deepaj


Thanks: Aditya

Modified:
    ofbiz/ofbiz-framework/trunk/framework/common/entitydef/entitymodel.xml

Modified: ofbiz/ofbiz-framework/trunk/framework/common/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/entitydef/entitymodel.xml?rev=1809383&r1=1809382&r2=1809383&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/entitydef/entitymodel.xml Sat Sep 23 09:59:24 2017
@@ -639,10 +639,10 @@ under the License.
       <field name="userPrefDataType" type="id-long"><description>The java data type of this preference (empty = java.lang.String)</description></field>
       <prim-key field="userLoginId"/>
       <prim-key field="userPrefTypeId"/>
-      <relation type="one" fk-name="UP_User_Login" rel-entity-name="UserLogin">
+      <relation type="one-nofk" fk-name="UP_USER_LOGIN" rel-entity-name="UserLogin">
         <key-map field-name="userLoginId"/>
       </relation>
-      <relation type="one" fk-name="UP_User_Group_Type" rel-entity-name="UserPrefGroupType">
+      <relation type="one" fk-name="UP_USER_GROUP_TYPE" rel-entity-name="UserPrefGroupType">
         <key-map field-name="userPrefGroupTypeId"/>
       </relation>
     </entity>