Re: Patch for new tests of schema orm attribute

Tue, 30 Aug 2005 07:15:02 -0700 

Hi Michelle,
your proposal is to use the same SQL schema (e.g. applicationidentity99) for different mappings. The build process seems to assume a 1:1 relationship between SQL schema and mapping. Moreover, the current build process implements a 1:1 relationship between SQL file and mapping. So, using the same schema in different SQL files might be confusing. 


Michael and I discussed the proposal. We think that it makes sense to 
introduce a separate SQL schema for each mapping. Each SQL file 
specifies a different schema name. The schema name may differ from the 
current naming pattern "<identity type><mapping id>" to indicate that 
the schema name is set by ORM meta data rather than by 
"jdori.properties". For example, we could use "applicationidentity_ORM", 
"applicationidentity_PKG", and "applicationidentity_CLS" as schema names.



Perhaps, it makes sense to map to different table names in each mapping, 
too. This ensures, that an error is thrown in case that an 
implementation mistakenly ignores the schema in the ORM meta data and, 
maps to a table in the default schema.


What do you think?

Regards,
Michael


Hi,


I've attached a patch containing three new tests for <orm 
schema="<schemaname>">,  <package schema="<schemaname>">, and <class 
schema="<schemaname>">.  In three orm files (for each identity type), 
the schema name is set to <IDENTITYTYPE>99 with the schema attribute of 
the orm, package, or class element.  The value of jdo.tck.mapping, set 
in the .conf file, selects the .orm and .sql files.  It also determines 
the value of  javax.jdo.mapping.Schema which is set in the PMF 
properties file output by the build process. This value is overriden by 
an explicit specification of the schema name in the metadata.



Because jdo.tck.mapping selects both the schema file and the mapping 
file, there must be three separate .sql files for these three tests, one 
corresponding to each orm file, although the schemas used are identical. 
In this patch, I chose to use the same schema name for them.  Thus each 
successive installation overwrites the previous.  I could also have 
chosen to install three identical schemas of different names.  Any 
opinions on whether one choice is better than another?


All three tests pass.

-- Michelle


------------------------------------------------------------------------

Index: test/sql/derby/datastoreidentity/schema1.sql
===================================================================
--- test/sql/derby/datastoreidentity/schema1.sql        (revision 0)
+++ test/sql/derby/datastoreidentity/schema1.sql        (revision 0)
@@ -0,0 +1,29 @@
+-- SchemaType: datastore identity 99
+
+connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
+
+CREATE SCHEMA datastoreidentity99;
+SET SCHEMA datastoreidentity99;
+
+-------------------------
+-- mylib
+-------------------------
+
+DROP TABLE PCRect;
+DROP TABLE PCPoint;
+
+CREATE TABLE PCPoint (
+    DATASTORE_IDENTITY BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
+    ID BIGINT,
+    X INTEGER NOT NULL,
+    Y INTEGER,
+    CONSTRAINT PCPNT_CONST PRIMARY KEY (DATASTORE_IDENTITY)
+);
+
+CREATE TABLE PCRect (
+    DATASTORE_IDENTITY BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
+    ID BIGINT,
+    UPPER_LEFT BIGINT REFERENCES PCPoint NOT NULL,
+    LOWER_RIGHT BIGINT REFERENCES PCPoint NOT NULL,
+    CONSTRAINT PCRCT_CONST PRIMARY KEY (DATASTORE_IDENTITY)
+);

Property changes on: test/sql/derby/datastoreidentity/schema1.sql
___________________________________________________________________
Name: svn:executable
   + *

Index: test/sql/derby/datastoreidentity/schema2.sql
===================================================================
--- test/sql/derby/datastoreidentity/schema2.sql        (revision 0)
+++ test/sql/derby/datastoreidentity/schema2.sql        (revision 0)
@@ -0,0 +1,29 @@
+-- SchemaType: datastore identity 99
+
+connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
+
+CREATE SCHEMA datastoreidentity99;
+SET SCHEMA datastoreidentity99;
+
+-------------------------
+-- mylib
+-------------------------
+
+DROP TABLE PCRect;
+DROP TABLE PCPoint;
+
+CREATE TABLE PCPoint (
+    DATASTORE_IDENTITY BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
+    ID BIGINT,
+    X INTEGER NOT NULL,
+    Y INTEGER,
+    CONSTRAINT PCPNT_CONST PRIMARY KEY (DATASTORE_IDENTITY)
+);
+
+CREATE TABLE PCRect (
+    DATASTORE_IDENTITY BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
+    ID BIGINT,
+    UPPER_LEFT BIGINT REFERENCES PCPoint NOT NULL,
+    LOWER_RIGHT BIGINT REFERENCES PCPoint NOT NULL,
+    CONSTRAINT PCRCT_CONST PRIMARY KEY (DATASTORE_IDENTITY)
+);

Property changes on: test/sql/derby/datastoreidentity/schema2.sql
___________________________________________________________________
Name: svn:executable
   + *

Index: test/sql/derby/datastoreidentity/schema3.sql
===================================================================
--- test/sql/derby/datastoreidentity/schema3.sql        (revision 0)
+++ test/sql/derby/datastoreidentity/schema3.sql        (revision 0)
@@ -0,0 +1,29 @@
+-- SchemaType: datastore identity 99
+
+connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
+
+CREATE SCHEMA datastoreidentity99;
+SET SCHEMA datastoreidentity99;
+
+-------------------------
+-- mylib
+-------------------------
+
+DROP TABLE PCRect;
+DROP TABLE PCPoint;
+
+CREATE TABLE PCPoint (
+    DATASTORE_IDENTITY BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
+    ID BIGINT,
+    X INTEGER NOT NULL,
+    Y INTEGER,
+    CONSTRAINT PCPNT_CONST PRIMARY KEY (DATASTORE_IDENTITY)
+);
+
+CREATE TABLE PCRect (
+    DATASTORE_IDENTITY BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
+    ID BIGINT,
+    UPPER_LEFT BIGINT REFERENCES PCPoint NOT NULL,
+    LOWER_RIGHT BIGINT REFERENCES PCPoint NOT NULL,
+    CONSTRAINT PCRCT_CONST PRIMARY KEY (DATASTORE_IDENTITY)
+);

Property changes on: test/sql/derby/datastoreidentity/schema3.sql
___________________________________________________________________
Name: svn:executable
   + *

Index: test/sql/derby/applicationidentity/schema1.sql
===================================================================
--- test/sql/derby/applicationidentity/schema1.sql      (revision 0)
+++ test/sql/derby/applicationidentity/schema1.sql      (revision 0)
@@ -0,0 +1,27 @@
+-- SchemaType: application identity 99
+
+connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
+
+CREATE SCHEMA applicationidentity99;
+SET SCHEMA applicationidentity99;
+
+-------------------------
+-- mylib
+-------------------------
+
+DROP TABLE PCRect;
+DROP TABLE PCPoint;
+
+CREATE TABLE PCPoint (
+    ID BIGINT NOT NULL,
+    X INTEGER NOT NULL,
+    Y INTEGER,
+    CONSTRAINT PCPNT_CONST PRIMARY KEY (ID)
+);
+
+CREATE TABLE PCRect (
+    ID BIGINT NOT NULL,
+    UPPER_LEFT BIGINT REFERENCES PCPoint NOT NULL,
+    LOWER_RIGHT BIGINT REFERENCES PCPoint NOT NULL,
+    CONSTRAINT PCRCT_CONST PRIMARY KEY (ID)
+);

Property changes on: test/sql/derby/applicationidentity/schema1.sql
___________________________________________________________________
Name: svn:executable
   + *

Index: test/sql/derby/applicationidentity/schema2.sql
===================================================================
--- test/sql/derby/applicationidentity/schema2.sql      (revision 0)
+++ test/sql/derby/applicationidentity/schema2.sql      (revision 0)
@@ -0,0 +1,27 @@
+-- SchemaType: application identity 99
+
+connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
+
+CREATE SCHEMA applicationidentity99;
+SET SCHEMA applicationidentity99;
+
+-------------------------
+-- mylib
+-------------------------
+
+DROP TABLE PCRect;
+DROP TABLE PCPoint;
+
+CREATE TABLE PCPoint (
+    ID BIGINT NOT NULL,
+    X INTEGER NOT NULL,
+    Y INTEGER,
+    CONSTRAINT PCPNT_CONST PRIMARY KEY (ID)
+);
+
+CREATE TABLE PCRect (
+    ID BIGINT NOT NULL,
+    UPPER_LEFT BIGINT REFERENCES PCPoint NOT NULL,
+    LOWER_RIGHT BIGINT REFERENCES PCPoint NOT NULL,
+    CONSTRAINT PCRCT_CONST PRIMARY KEY (ID)
+);

Property changes on: test/sql/derby/applicationidentity/schema2.sql
___________________________________________________________________
Name: svn:executable
   + *

Index: test/sql/derby/applicationidentity/schema3.sql
===================================================================
--- test/sql/derby/applicationidentity/schema3.sql      (revision 0)
+++ test/sql/derby/applicationidentity/schema3.sql      (revision 0)
@@ -0,0 +1,27 @@
+-- SchemaType: application identity 99
+
+connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
+
+CREATE SCHEMA applicationidentity99;
+SET SCHEMA applicationidentity99;
+
+-------------------------
+-- mylib
+-------------------------
+
+DROP TABLE PCRect;
+DROP TABLE PCPoint;
+
+CREATE TABLE PCPoint (
+    ID BIGINT NOT NULL,
+    X INTEGER NOT NULL,
+    Y INTEGER,
+    CONSTRAINT PCPNT_CONST PRIMARY KEY (ID)
+);
+
+CREATE TABLE PCRect (
+    ID BIGINT NOT NULL,
+    UPPER_LEFT BIGINT REFERENCES PCPoint NOT NULL,
+    LOWER_RIGHT BIGINT REFERENCES PCPoint NOT NULL,
+    CONSTRAINT PCRCT_CONST PRIMARY KEY (ID)
+);

Property changes on: test/sql/derby/applicationidentity/schema3.sql
___________________________________________________________________
Name: svn:executable
   + *

Index: test/conf/schemaAttributePackage.conf
===================================================================
--- test/conf/schemaAttributePackage.conf       (revision 0)
+++ test/conf/schemaAttributePackage.conf       (revision 0)
@@ -0,0 +1,4 @@
+jdo.tck.description = MakePersistent test with schema name specified as 
package attribute in orm for PCPoint. Schema name derived from jdo.tck.mapping 
1 is overriden in orm
+jdo.tck.classes = 
org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistent

+jdo.tck.testdata = 
+jdo.tck.mapping = 2


Property changes on: test/conf/schemaAttributePackage.conf
___________________________________________________________________
Name: svn:executable
   + *

Index: test/conf/schemaAttributeOrm.conf
===================================================================
--- test/conf/schemaAttributeOrm.conf   (revision 0)
+++ test/conf/schemaAttributeOrm.conf   (revision 0)
@@ -0,0 +1,4 @@
+jdo.tck.description = MakePersistent test with schema name specified as 
package attribute in orm for PCPoint. Schema name derived from jdo.tck.mapping 
1 is overriden in orm
+jdo.tck.classes = 
org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistent

+jdo.tck.testdata = 
+jdo.tck.mapping = 1


Property changes on: test/conf/schemaAttributeOrm.conf
___________________________________________________________________
Name: svn:executable
   + *

Index: test/conf/schemaAttributeClass.conf
===================================================================
--- test/conf/schemaAttributeClass.conf (revision 0)
+++ test/conf/schemaAttributeClass.conf (revision 0)
@@ -0,0 +1,4 @@
+jdo.tck.description = MakePersistent test with schema name specified as 
package attribute in orm for PCPoint. Schema name derived from jdo.tck.mapping 
1 is overriden in orm
+jdo.tck.classes = 
org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistent

+jdo.tck.testdata = 
+jdo.tck.mapping = 3


Property changes on: test/conf/schemaAttributeClass.conf
___________________________________________________________________
Name: svn:executable
   + *

Index: test/conf/configurations.list
===================================================================
--- test/conf/configurations.list       (revision 264158)
+++ test/conf/configurations.list       (working copy)
@@ -5,5 +5,8 @@
                  company1-1Relationships.conf \
                  company1-MRelationships.conf \
                  companyM-MRelationships.conf \
-                 companyAllRelationships.conf
+                 companyAllRelationships.conf \
+                 schemaAttributeClass.conf \
+                 schemaAttributeORM.conf \
+                 schemaAttributePackage.conf

 
Index: test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby1.orm

===================================================================
--- test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby1.orm   
(revision 0)
+++ test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby1.orm   
(revision 0)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 
2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd";>
+<orm schema="datastoreidentity99">
+  <package name="org.apache.jdo.tck.pc.mylib">
+
+    <class name="PCPoint" table="PCPoint">
+      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <field name="id" column="ID"/>
+      <field name="x" column="X"/>
+      <field name="y" column="Y"/>
+    </class>
+
+    <class name="PCPoint2" table="PCPoint2">
+      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <field name="id" column="ID"/>
+      <field name="x" column="X"/>
+      <field name="y" column="Y"/>
+    </class>
+
+    <class name="PCRect" table="PCRect">
+      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <field name="id" column="ID"/>
+      <field name="lowerRight" column="LOWER_RIGHT">
+        <foreign-key/>
+      </field>
+      <field name="upperLeft" column="UPPER_LEFT">
+        <foreign-key/>
+      </field>
+    </class>
+
+    <class name="PrimitiveTypes" table="PrimitiveTypes">
+      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <field name="id" column="ID"/>
+      <field name="booleanNotNull" column="booleanNotNull"/>
+      <field name="booleanNull" column="booleanNull"/>
+      <field name="byteNotNull" column="byteNotNull"/>
+      <field name="byteNull" column="byteNull"/>
+      <field name="shortNotNull" column="shortNotNull"/>
+      <field name="shortNull" column="shortNull"/>
+      <field name="intNotNull" column="intNotNull"/>
+      <field name="intNull" column="intNull"/>
+      <field name="longNotNull" column="longNotNull"/>
+      <field name="longNull" column="longNull"/>
+      <field name="floatNotNull" column="floatNotNull"/>
+      <field name="floatNull" column="floatNull"/>
+      <field name="doubleNotNull" column="doubleNotNull"/>
+      <field name="doubleNull" column="doubleNull"/>
+      <field name="charNotNull" column="charNotNull"/>
+      <field name="charNull" column="charNull"/>
+      <field name="dateNull" column="dateNull"/>
+      <field name="stringNull" column="stringNull"/>
+      <field name="bigDecimal" column="bigDecimal"/>
+      <field name="bigInteger" column="bigInteger"/>
+      <field name="PrimitiveTypes" column="PrimitiveTypes"/>
+    </class>
+
+  </package>
+</orm>
+

Property changes on: 
test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby1.orm
___________________________________________________________________
Name: svn:executable
   + *

Index: test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby2.orm
===================================================================
--- test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby2.orm   
(revision 0)
+++ test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby2.orm   
(revision 0)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 
2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd";>
+<orm>
+  <package name="org.apache.jdo.tck.pc.mylib" schema="datastoreidentity99" >
+
+    <class name="PCPoint" table="PCPoint">
+      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <field name="id" column="ID"/>
+      <field name="x" column="X"/>
+      <field name="y" column="Y"/>
+    </class>
+
+    <class name="PCPoint2" table="PCPoint2">
+      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <field name="id" column="ID"/>
+      <field name="x" column="X"/>
+      <field name="y" column="Y"/>
+    </class>
+
+    <class name="PCRect" table="PCRect">
+      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <field name="id" column="ID"/>
+      <field name="lowerRight" column="LOWER_RIGHT">
+        <foreign-key/>
+      </field>
+      <field name="upperLeft" column="UPPER_LEFT">
+        <foreign-key/>
+      </field>
+    </class>
+
+    <class name="PrimitiveTypes" table="PrimitiveTypes">
+      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <field name="id" column="ID"/>
+      <field name="booleanNotNull" column="booleanNotNull"/>
+      <field name="booleanNull" column="booleanNull"/>
+      <field name="byteNotNull" column="byteNotNull"/>
+      <field name="byteNull" column="byteNull"/>
+      <field name="shortNotNull" column="shortNotNull"/>
+      <field name="shortNull" column="shortNull"/>
+      <field name="intNotNull" column="intNotNull"/>
+      <field name="intNull" column="intNull"/>
+      <field name="longNotNull" column="longNotNull"/>
+      <field name="longNull" column="longNull"/>
+      <field name="floatNotNull" column="floatNotNull"/>
+      <field name="floatNull" column="floatNull"/>
+      <field name="doubleNotNull" column="doubleNotNull"/>
+      <field name="doubleNull" column="doubleNull"/>
+      <field name="charNotNull" column="charNotNull"/>
+      <field name="charNull" column="charNull"/>
+      <field name="dateNull" column="dateNull"/>
+      <field name="stringNull" column="stringNull"/>
+      <field name="bigDecimal" column="bigDecimal"/>
+      <field name="bigInteger" column="bigInteger"/>
+      <field name="PrimitiveTypes" column="PrimitiveTypes"/>
+    </class>
+
+  </package>
+</orm>
+

Property changes on: 
test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby2.orm
___________________________________________________________________
Name: svn:executable
   + *

Index: test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby3.orm
===================================================================
--- test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby3.orm   
(revision 0)
+++ test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby3.orm   
(revision 0)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 
2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd";>
+<orm>
+  <package name="org.apache.jdo.tck.pc.mylib">
+
+    <class name="PCPoint" table="PCPoint" schema="datastoreidentity99">
+      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <field name="id" column="ID"/>
+      <field name="x" column="X"/>
+      <field name="y" column="Y"/>
+    </class>
+
+    <class name="PCPoint2" table="PCPoint2" schema="datastoreidentity99">
+      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <field name="id" column="ID"/>
+      <field name="x" column="X"/>
+      <field name="y" column="Y"/>
+    </class>
+
+    <class name="PCRect" table="PCRect" schema="datastoreidentity99">
+      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <field name="id" column="ID"/>
+      <field name="lowerRight" column="LOWER_RIGHT">
+        <foreign-key/>
+      </field>
+      <field name="upperLeft" column="UPPER_LEFT">
+        <foreign-key/>
+      </field>
+    </class>
+
+    <class name="PrimitiveTypes" table="PrimitiveTypes" 
schema="datastoreidentity99">
+      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <field name="id" column="ID"/>
+      <field name="booleanNotNull" column="booleanNotNull"/>
+      <field name="booleanNull" column="booleanNull"/>
+      <field name="byteNotNull" column="byteNotNull"/>
+      <field name="byteNull" column="byteNull"/>
+      <field name="shortNotNull" column="shortNotNull"/>
+      <field name="shortNull" column="shortNull"/>
+      <field name="intNotNull" column="intNotNull"/>
+      <field name="intNull" column="intNull"/>
+      <field name="longNotNull" column="longNotNull"/>
+      <field name="longNull" column="longNull"/>
+      <field name="floatNotNull" column="floatNotNull"/>
+      <field name="floatNull" column="floatNull"/>
+      <field name="doubleNotNull" column="doubleNotNull"/>
+      <field name="doubleNull" column="doubleNull"/>
+      <field name="charNotNull" column="charNotNull"/>
+      <field name="charNull" column="charNull"/>
+      <field name="dateNull" column="dateNull"/>
+      <field name="stringNull" column="stringNull"/>
+      <field name="bigDecimal" column="bigDecimal"/>
+      <field name="bigInteger" column="bigInteger"/>
+      <field name="PrimitiveTypes" column="PrimitiveTypes"/>
+    </class>
+
+  </package>
+</orm>
+

Property changes on: 
test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby3.orm
___________________________________________________________________
Name: svn:executable
   + *

Index: 
test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby1.orm
===================================================================
--- test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby1.orm 
(revision 0)
+++ test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby1.orm 
(revision 0)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 
2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd";>
+<orm schema="applicationidentity99">
+  <package name="org.apache.jdo.tck.pc.mylib">
+
+    <class name="PCPoint" table="PCPoint">
+      <field name="id" column="ID" primary-key="true"/>
+      <field name="x" column="X"/>
+      <field name="y" column="Y"/>
+    </class>
+
+    <class name="PCPoint2" table="PCPoint2">
+      <field name="id" column="ID" primary-key="true"/>
+      <field name="x" column="X"/>
+      <field name="y" column="Y"/>
+    </class>
+
+    <class name="PCRect" table="PCRect">
+      <field name="id" column="ID" primary-key="true"/>
+      <field name="lowerRight" column="LOWER_RIGHT">
+        <foreign-key/>
+      </field>
+      <field name="upperLeft" column="UPPER_LEFT">
+        <foreign-key/>
+      </field>
+    </class>
+
+    <class name="PrimitiveTypes" table="PrimitiveTypes">
+      <field name="id" column="ID" primary-key="true"/>
+      <field name="booleanNotNull" column="booleanNotNull"/>
+      <field name="booleanNull" column="booleanNull"/>
+      <field name="byteNotNull" column="byteNotNull"/>
+      <field name="byteNull" column="byteNull"/>
+      <field name="shortNotNull" column="shortNotNull"/>
+      <field name="shortNull" column="shortNull"/>
+      <field name="intNotNull" column="intNotNull"/>
+      <field name="intNull" column="intNull"/>
+      <field name="longNotNull" column="longNotNull"/>
+      <field name="longNull" column="longNull"/>
+      <field name="floatNotNull" column="floatNotNull"/>
+      <field name="floatNull" column="floatNull"/>
+      <field name="doubleNotNull" column="doubleNotNull"/>
+      <field name="doubleNull" column="doubleNull"/>
+      <field name="charNotNull" column="charNotNull"/>
+      <field name="charNull" column="charNull"/>
+      <field name="dateNull" column="dateNull"/>
+      <field name="stringNull" column="stringNull"/>
+      <field name="bigDecimal" column="bigDecimal"/>
+      <field name="bigInteger" column="bigInteger"/>
+      <field name="PrimitiveTypes" column="PrimitiveTypes"/>
+    </class>
+
+  </package>
+</orm>
+

Property changes on: 
test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby1.orm
___________________________________________________________________
Name: svn:executable
   + *

Index: 
test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby2.orm
===================================================================
--- test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby2.orm 
(revision 0)
+++ test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby2.orm 
(revision 0)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 
2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd";>
+<orm>
+  <package name="org.apache.jdo.tck.pc.mylib" schema="applicationidentity99">
+
+    <class name="PCPoint" table="PCPoint">
+      <field name="id" column="ID" primary-key="true"/>
+      <field name="x" column="X"/>
+      <field name="y" column="Y"/>
+    </class>
+
+    <class name="PCPoint2" table="PCPoint2">
+      <field name="id" column="ID" primary-key="true"/>
+      <field name="x" column="X"/>
+      <field name="y" column="Y"/>
+    </class>
+
+    <class name="PCRect" table="PCRect">
+      <field name="id" column="ID" primary-key="true"/>
+      <field name="lowerRight" column="LOWER_RIGHT">
+        <foreign-key/>
+      </field>
+      <field name="upperLeft" column="UPPER_LEFT">
+        <foreign-key/>
+      </field>
+    </class>
+
+    <class name="PrimitiveTypes" table="PrimitiveTypes">
+      <field name="id" column="ID" primary-key="true"/>
+      <field name="booleanNotNull" column="booleanNotNull"/>
+      <field name="booleanNull" column="booleanNull"/>
+      <field name="byteNotNull" column="byteNotNull"/>
+      <field name="byteNull" column="byteNull"/>
+      <field name="shortNotNull" column="shortNotNull"/>
+      <field name="shortNull" column="shortNull"/>
+      <field name="intNotNull" column="intNotNull"/>
+      <field name="intNull" column="intNull"/>
+      <field name="longNotNull" column="longNotNull"/>
+      <field name="longNull" column="longNull"/>
+      <field name="floatNotNull" column="floatNotNull"/>
+      <field name="floatNull" column="floatNull"/>
+      <field name="doubleNotNull" column="doubleNotNull"/>
+      <field name="doubleNull" column="doubleNull"/>
+      <field name="charNotNull" column="charNotNull"/>
+      <field name="charNull" column="charNull"/>
+      <field name="dateNull" column="dateNull"/>
+      <field name="stringNull" column="stringNull"/>
+      <field name="bigDecimal" column="bigDecimal"/>
+      <field name="bigInteger" column="bigInteger"/>
+      <field name="PrimitiveTypes" column="PrimitiveTypes"/>
+    </class>
+
+  </package>
+</orm>
+

Property changes on: 
test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby2.orm
___________________________________________________________________
Name: svn:executable
   + *

Index: 
test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby3.orm
===================================================================
--- test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby3.orm 
(revision 0)
+++ test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby3.orm 
(revision 0)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 
2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd";>
+<orm>
+  <package name="org.apache.jdo.tck.pc.mylib">
+
+    <class name="PCPoint" table="PCPoint" schema="applicationidentity99">
+      <field name="id" column="ID" primary-key="true"/>
+      <field name="x" column="X"/>
+      <field name="y" column="Y"/>
+    </class>
+
+    <class name="PCPoint2" table="PCPoint2" schema="applicationidentity99">
+      <field name="id" column="ID" primary-key="true"/>
+      <field name="x" column="X"/>
+      <field name="y" column="Y"/>
+    </class>
+
+    <class name="PCRect" table="PCRect" schema="applicationidentity99">
+      <field name="id" column="ID" primary-key="true"/>
+      <field name="lowerRight" column="LOWER_RIGHT">
+        <foreign-key/>
+      </field>
+      <field name="upperLeft" column="UPPER_LEFT">
+        <foreign-key/>
+      </field>
+    </class>
+
+    <class name="PrimitiveTypes" table="PrimitiveTypes" 
schema="applicationidentity99">
+      <field name="id" column="ID" primary-key="true"/>
+      <field name="booleanNotNull" column="booleanNotNull"/>
+      <field name="booleanNull" column="booleanNull"/>
+      <field name="byteNotNull" column="byteNotNull"/>
+      <field name="byteNull" column="byteNull"/>
+      <field name="shortNotNull" column="shortNotNull"/>
+      <field name="shortNull" column="shortNull"/>
+      <field name="intNotNull" column="intNotNull"/>
+      <field name="intNull" column="intNull"/>
+      <field name="longNotNull" column="longNotNull"/>
+      <field name="longNull" column="longNull"/>
+      <field name="floatNotNull" column="floatNotNull"/>
+      <field name="floatNull" column="floatNull"/>
+      <field name="doubleNotNull" column="doubleNotNull"/>
+      <field name="doubleNull" column="doubleNull"/>
+      <field name="charNotNull" column="charNotNull"/>
+      <field name="charNull" column="charNull"/>
+      <field name="dateNull" column="dateNull"/>
+      <field name="stringNull" column="stringNull"/>
+      <field name="bigDecimal" column="bigDecimal"/>
+      <field name="bigInteger" column="bigInteger"/>
+      <field name="PrimitiveTypes" column="PrimitiveTypes"/>
+    </class>
+
+  </package>
+</orm>
+

Property changes on: 
test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby3.orm
___________________________________________________________________
Name: svn:executable
   + *




--
-------------------------------------------------------------------
Michael Watzek                  [EMAIL PROTECTED] Engineering GmbH
mailto:[EMAIL PROTECTED]        Buelowstr. 66
Tel.:  ++49/30/235 520 36       10783 Berlin - Germany
Fax.:  ++49/30/217 520 12       http://www.spree.de/
-------------------------------------------------------------------






















					Reply via email to