Diff of /incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm

Parent Directory | Revision Log | Patch

--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm	2005/04/21 16:26:57	164081
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm	2005/04/21 16:41:09	164082
@@ -16,11 +16,9 @@ has application identity.
         </class>
 
         <class name="Company" table="companies">
-            <field name="companyid" primary-key="true"/>
-                <column name="ID"/>
+            <field name="companyid" column="ID" primary-key="true"/>
             <field name="name" column="NAME"/>
-            <field name="founded"/>
-                <column name="FOUNDEDDATE"/>
+            <field name="founded" column="FOUNDEDDATE"/>
             <field name="address">
                 <embedded null-indicator-column="COUNTRY">
                     <field name="street" column="STREET"/>
@@ -38,7 +36,8 @@ has application identity.
             <field name="name" column="NAME"/>
             <field name="company" column="COMPANYID"/>
             <field name="employees" mapped-by="department"/>
-            <field name="fundedEmps" mapped-by="fundingdept"/>
+            <field name="fundedEmps" mapped-by="fundingDept"/>
+            <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
         </class>
 
         <class name="PartTimeEmployee">
@@ -69,9 +68,7 @@ has application identity.
             <field name="mentor" column="MENTOR">
                         <foreign-key/>
             </field>
-            <field name="protege" column="PROTEGE">
-                        <foreign-key/>
-            </field>
+            <field name="protege" mapped-by="mentor"/>
             <field name="hradvisor" column="HRADVISOR">
                         <foreign-key/>
             </field>