db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r233567 - in /incubator/jdo/trunk/tck20/test/orm: applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm
Date Fri, 19 Aug 2005 22:46:53 GMT
Author: mcaisse
Date: Fri Aug 19 15:46:42 2005
New Revision: 233567

URL: http://svn.apache.org/viewcvs?rev=233567&view=rev
Log:
xml metadata testing: added <column allows-null...> <column sql-type...>

Modified:
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm?rev=233567&r1=233566&r2=233567&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm
Fri Aug 19 15:46:42 2005
@@ -9,7 +9,9 @@
 
         <class name="Company" table="companies">
             <field name="companyid" column="ID" primary-key="true"/>
-            <field name="name" column="NAME"/>
+            <field name="name" column="NAME">
+              <column name="NAME" sql-type="VARCHAR"/>
+            </field>
             <field name="founded" column="FOUNDEDDATE"/>
             <field name="address">
                 <embedded null-indicator-column="COUNTRY">
@@ -80,15 +82,29 @@
             <field name="personid" column="PERSONID" primary-key="true"/>
             <field name="firstname" column="FIRSTNAME"/>
             <field name="lastname" column="LASTNAME"/>
-            <field name="middlename" column="MIDDLENAME"/>
+            <field name="middlename">
+              <column name="MIDDLENAME" allows-null="true"/>
+            </field>
             <field name="address">
                 <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
+                    <field name="addrid">
+                      <column name="ADDRID" allows-null="true"/>
+                    </field>
+                    <field name="street">
+                      <column name="STREET" allows-null="true"/>
+                    </field>
+                    <field name="city">
+                      <column name="CITY" allows-null="true"/>
+                    </field>
+                    <field name="state">
+                      <column name="STATE" allows-null="true"/>
+                    </field>
+                    <field name="zipcode">
+                      <column name="ZIPCODE" allows-null="true"/>
+                    </field>
+                    <field name="country">
+                      <column name="COUNTRY" allows-null="true"/>
+                    </field>
                 </embedded>
             </field>
             <field name="phoneNumbers" table="employee_phoneno_type" >

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm?rev=233567&r1=233566&r2=233567&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm
Fri Aug 19 15:46:42 2005
@@ -10,16 +10,30 @@
         <class name="Company" table="companies">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <field name="companyid" column="ID"/>
-            <field name="name" column="NAME"/>
+            <field name="name" column="NAME">
+              <column name="NAME" sql-type="VARCHAR"/>
+            </field>
             <field name="founded" column="FOUNDEDDATE"/>
             <field name="address">
                 <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
+                    <field name="addrid">
+                      <column name="ADDRID" allows-null="true"/>
+                    </field>
+                    <field name="street">
+                      <column name="STREET" allows-null="true"/>
+                    </field>
+                    <field name="city">
+                      <column name="CITY" allows-null="true"/>
+                    </field>
+                    <field name="state">
+                      <column name="STATE" allows-null="true"/>
+                    </field>
+                    <field name="zipcode">
+                      <column name="ZIPCODE" allows-null="true"/>
+                    </field>
+                    <field name="country">
+                      <column name="COUNTRY" allows-null="true"/>
+                    </field>
                 </embedded>
             </field>
             <field name="departments" mapped-by="company"/>
@@ -85,7 +99,9 @@
             <field name="personid" column="PERSONID"/>
             <field name="firstname" column="FIRSTNAME"/>
             <field name="lastname" column="LASTNAME"/>
-            <field name="middlename" column="MIDDLENAME"/>
+            <field name="middlename">
+              <column name="MIDDLENAME" allows-null="true"/>
+            </field>
             <field name="address">
                 <embedded null-indicator-column="COUNTRY">
                     <field name="addrid" column="ADDRID"/>



Mime
View raw message