You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-dev@db.apache.org by Michael Watzek <mw...@spree.de> on 2005/09/01 19:14:12 UTC
Re: Second patch for new tests of schema orm attribute
Hi Michelle,
the patch looks fine.
Regards,
Michael
> Hi,
>
> I've attached a revised patch for new tests of the schema attribute in
> orm metadata. I made the suggested changes except for changing table
> names in the new schemas.
>
> -- :Michelle
>
>
> ------------------------------------------------------------------------
>
> Index: test/sql/derby/datastoreidentity/schema5.sql
> ===================================================================
> --- test/sql/derby/datastoreidentity/schema5.sql (revision 0)
> +++ test/sql/derby/datastoreidentity/schema5.sql (revision 0)
> @@ -0,0 +1,29 @@
> +-- SchemaType: datastore identity orm
> +
> +connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
> +
> +CREATE SCHEMA datastoreidentity_orm;
> +SET SCHEMA datastoreidentity_orm;
> +
> +-------------------------
> +-- 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)
> +);
> Index: test/sql/derby/datastoreidentity/schema6.sql
> ===================================================================
> --- test/sql/derby/datastoreidentity/schema6.sql (revision 0)
> +++ test/sql/derby/datastoreidentity/schema6.sql (revision 0)
> @@ -0,0 +1,29 @@
> +-- SchemaType: datastore identity pkg
> +
> +connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
> +
> +CREATE SCHEMA datastoreidentity_pkg;
> +SET SCHEMA datastoreidentity_pkg;
> +
> +-------------------------
> +-- 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)
> +);
> Index: test/sql/derby/datastoreidentity/schema7.sql
> ===================================================================
> --- test/sql/derby/datastoreidentity/schema7.sql (revision 0)
> +++ test/sql/derby/datastoreidentity/schema7.sql (revision 0)
> @@ -0,0 +1,29 @@
> +-- SchemaType: datastore identity cls
> +
> +connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
> +
> +CREATE SCHEMA datastoreidentity_cls;
> +SET SCHEMA datastoreidentity_cls;
> +
> +-------------------------
> +-- 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)
> +);
> Index: test/sql/derby/applicationidentity/schema5.sql
> ===================================================================
> --- test/sql/derby/applicationidentity/schema5.sql (revision 0)
> +++ test/sql/derby/applicationidentity/schema5.sql (revision 0)
> @@ -0,0 +1,27 @@
> +-- SchemaType: application identity orm
> +
> +connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
> +
> +CREATE SCHEMA applicationidentity_orm;
> +SET SCHEMA applicationidentity_orm;
> +
> +-------------------------
> +-- 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)
> +);
> Index: test/sql/derby/applicationidentity/schema6.sql
> ===================================================================
> --- test/sql/derby/applicationidentity/schema6.sql (revision 0)
> +++ test/sql/derby/applicationidentity/schema6.sql (revision 0)
> @@ -0,0 +1,27 @@
> +-- SchemaType: application identity pkg
> +
> +connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
> +
> +CREATE SCHEMA applicationidentity_pkg;
> +SET SCHEMA applicationidentity_pkg;
> +
> +-------------------------
> +-- 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)
> +);
> Index: test/sql/derby/applicationidentity/schema7.sql
> ===================================================================
> --- test/sql/derby/applicationidentity/schema7.sql (revision 0)
> +++ test/sql/derby/applicationidentity/schema7.sql (revision 0)
> @@ -0,0 +1,27 @@
> +-- SchemaType: application identity cls
> +
> +connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
> +
> +CREATE SCHEMA applicationidentity_cls;
> +SET SCHEMA applicationidentity_cls;
> +
> +-------------------------
> +-- 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)
> +);
> 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 = 6
> 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 orm 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 = 5
> 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 class 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 = 7
> Index: test/conf/configurations.list
> ===================================================================
> --- test/conf/configurations.list (revision 265539)
> +++ test/conf/configurations.list (working copy)
> @@ -9,5 +9,7 @@
> inheritance1.conf \
> inheritance2.conf \
> inheritance3.conf \
> - inheritance4.conf
> -
> + inheritance4.conf \
> + schemaAttributeClass.conf \
> + schemaAttributeORM.conf \
> + schemaAttributePackage.conf
> Index: test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby5.orm
> ===================================================================
> --- test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby5.orm (revision 0)
> +++ test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby5.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="datastoreidentity_orm">
> + <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>
> +
> Index: test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby6.orm
> ===================================================================
> --- test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby6.orm (revision 0)
> +++ test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby6.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="datastoreidentity_pkg" >
> +
> + <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>
> +
> Index: test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby7.orm
> ===================================================================
> --- test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby7.orm (revision 0)
> +++ test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby7.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="datastoreidentity_cls">
> + <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="datastoreidentity_cls">
> + <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="datastoreidentity_cls">
> + <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="datastoreidentity_cls">
> + <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>
> +
> Index: test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby5.orm
> ===================================================================
> --- test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby5.orm (revision 0)
> +++ test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby5.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="applicationidentity_orm">
> + <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>
> +
> Index: test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby6.orm
> ===================================================================
> --- test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby6.orm (revision 0)
> +++ test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby6.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="applicationidentity_pkg">
> +
> + <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>
> +
> Index: test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby7.orm
> ===================================================================
> --- test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby7.orm (revision 0)
> +++ test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby7.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="applicationidentity_cls">
> + <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="applicationidentity_cls">
> + <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="applicationidentity_cls">
> + <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="applicationidentity_cls">
> + <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>
> +
--
-------------------------------------------------------------------
Michael Watzek Tech@Spree Engineering GmbH
mailto:mwa.tech@spree.de Buelowstr. 66
Tel.: ++49/30/235 520 36 10783 Berlin - Germany
Fax.: ++49/30/217 520 12 http://www.spree.de/
-------------------------------------------------------------------
Re: Second patch for new tests of schema orm attribute
Posted by Michelle Caisse <Mi...@Sun.COM>.
Thanks! I'll check it in.
-- Michelle
Michael Watzek wrote:
> Hi Michelle,
>
> the patch looks fine.
>
> Regards,
> Michael
>
>> Hi,
>>
>> I've attached a revised patch for new tests of the schema attribute
>> in orm metadata. I made the suggested changes except for changing
>> table names in the new schemas.
>>
>> -- :Michelle
>>
>>
>> ------------------------------------------------------------------------
>>
>> Index: test/sql/derby/datastoreidentity/schema5.sql
>> ===================================================================
>> --- test/sql/derby/datastoreidentity/schema5.sql (revision 0)
>> +++ test/sql/derby/datastoreidentity/schema5.sql (revision 0)
>> @@ -0,0 +1,29 @@
>> +-- SchemaType: datastore identity orm
>> +
>> +connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password
>> 'tckuser';
>> +
>> +CREATE SCHEMA datastoreidentity_orm;
>> +SET SCHEMA datastoreidentity_orm;
>> +
>> +-------------------------
>> +-- 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)
>> +);
>> Index: test/sql/derby/datastoreidentity/schema6.sql
>> ===================================================================
>> --- test/sql/derby/datastoreidentity/schema6.sql (revision 0)
>> +++ test/sql/derby/datastoreidentity/schema6.sql (revision 0)
>> @@ -0,0 +1,29 @@
>> +-- SchemaType: datastore identity pkg
>> +
>> +connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password
>> 'tckuser';
>> +
>> +CREATE SCHEMA datastoreidentity_pkg;
>> +SET SCHEMA datastoreidentity_pkg;
>> +
>> +-------------------------
>> +-- 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)
>> +);
>> Index: test/sql/derby/datastoreidentity/schema7.sql
>> ===================================================================
>> --- test/sql/derby/datastoreidentity/schema7.sql (revision 0)
>> +++ test/sql/derby/datastoreidentity/schema7.sql (revision 0)
>> @@ -0,0 +1,29 @@
>> +-- SchemaType: datastore identity cls
>> +
>> +connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password
>> 'tckuser';
>> +
>> +CREATE SCHEMA datastoreidentity_cls;
>> +SET SCHEMA datastoreidentity_cls;
>> +
>> +-------------------------
>> +-- 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)
>> +);
>> Index: test/sql/derby/applicationidentity/schema5.sql
>> ===================================================================
>> --- test/sql/derby/applicationidentity/schema5.sql (revision 0)
>> +++ test/sql/derby/applicationidentity/schema5.sql (revision 0)
>> @@ -0,0 +1,27 @@
>> +-- SchemaType: application identity orm
>> +
>> +connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password
>> 'tckuser';
>> +
>> +CREATE SCHEMA applicationidentity_orm;
>> +SET SCHEMA applicationidentity_orm;
>> +
>> +-------------------------
>> +-- 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)
>> +);
>> Index: test/sql/derby/applicationidentity/schema6.sql
>> ===================================================================
>> --- test/sql/derby/applicationidentity/schema6.sql (revision 0)
>> +++ test/sql/derby/applicationidentity/schema6.sql (revision 0)
>> @@ -0,0 +1,27 @@
>> +-- SchemaType: application identity pkg
>> +
>> +connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password
>> 'tckuser';
>> +
>> +CREATE SCHEMA applicationidentity_pkg;
>> +SET SCHEMA applicationidentity_pkg;
>> +
>> +-------------------------
>> +-- 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)
>> +);
>> Index: test/sql/derby/applicationidentity/schema7.sql
>> ===================================================================
>> --- test/sql/derby/applicationidentity/schema7.sql (revision 0)
>> +++ test/sql/derby/applicationidentity/schema7.sql (revision 0)
>> @@ -0,0 +1,27 @@
>> +-- SchemaType: application identity cls
>> +
>> +connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password
>> 'tckuser';
>> +
>> +CREATE SCHEMA applicationidentity_cls;
>> +SET SCHEMA applicationidentity_cls;
>> +
>> +-------------------------
>> +-- 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)
>> +);
>> 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 = 6
>> 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 orm 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 = 5
>> 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 class 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 = 7
>> Index: test/conf/configurations.list
>> ===================================================================
>> --- test/conf/configurations.list (revision 265539)
>> +++ test/conf/configurations.list (working copy)
>> @@ -9,5 +9,7 @@
>> inheritance1.conf \
>> inheritance2.conf \
>> inheritance3.conf \
>> - inheritance4.conf
>> -
>> + inheritance4.conf \
>> + schemaAttributeClass.conf \
>> + schemaAttributeORM.conf \
>> + schemaAttributePackage.conf
>> Index:
>> test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby5.orm
>>
>> ===================================================================
>> ---
>> test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby5.orm
>> (revision 0)
>> +++
>> test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby5.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="datastoreidentity_orm">
>> + <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>
>> +
>> Index:
>> test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby6.orm
>>
>> ===================================================================
>> ---
>> test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby6.orm
>> (revision 0)
>> +++
>> test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby6.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="datastoreidentity_pkg" >
>> +
>> + <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>
>> +
>> Index:
>> test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby7.orm
>>
>> ===================================================================
>> ---
>> test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby7.orm
>> (revision 0)
>> +++
>> test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby7.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="datastoreidentity_cls">
>> + <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="datastoreidentity_cls">
>> + <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="datastoreidentity_cls">
>> + <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="datastoreidentity_cls">
>> + <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>
>> +
>> Index:
>> test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby5.orm
>>
>> ===================================================================
>> ---
>> test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby5.orm
>> (revision 0)
>> +++
>> test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby5.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="applicationidentity_orm">
>> + <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>
>> +
>> Index:
>> test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby6.orm
>>
>> ===================================================================
>> ---
>> test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby6.orm
>> (revision 0)
>> +++
>> test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby6.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="applicationidentity_pkg">
>> +
>> + <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>
>> +
>> Index:
>> test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby7.orm
>>
>> ===================================================================
>> ---
>> test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby7.orm
>> (revision 0)
>> +++
>> test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby7.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="applicationidentity_cls">
>> + <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="applicationidentity_cls">
>> + <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="applicationidentity_cls">
>> + <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="applicationidentity_cls">
>> + <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>
>> +
>
>
>