Author: mcaisse
Date: Thu Apr 21 13:42:43 2005
New Revision: 164117
URL: http://svn.apache.org/viewcvs?rev=164117&view=rev
Log:
JDO-9 metadata & schema for instancecallbacks, inheritance
Added:
incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
(with props)
incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm
(with props)
incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
(with props)
incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm
(with props)
Modified:
incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package.jdo
incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo
incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql
incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql
Modified:
incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package.jdo
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package.jdo?rev=164117&r1=164116&r2=164117&view=diff
==============================================================================
---
incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package.jdo
(original)
+++
incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package.jdo
Thu Apr 21 13:42:43 2005
@@ -5,6 +5,7 @@
<class
name="AllPersist"
identity-type="datastore">
+ <field name="keyValue" persistence-modifier="none"/>
<field name="intA" persistence-modifier="none"/>
</class>
@@ -33,9 +34,8 @@
<field name="fourthObj" persistence-modifier="none"/>
</class>
- <class
- name="TopNonPersistB"
- identity-type="datastore">
+ <class name="TopNonPersistB" identity-type="datastore">
+ <field name="keyValue" persistence-modifier="none"/>
</class>
<class
@@ -59,9 +59,8 @@
persistence-capable-superclass="org.apache.jdo.tck.pc.inheritance.TopNonPersistF">
</class>
- <class
- name="TopPersist"
- identity-type="datastore">
+ <class name="TopPersist" identity-type="datastore">
+ <field name="keyValue" persistence-modifier="none"/>
<field name="intA" persistence-modifier="none"/>
</class>
@@ -89,6 +88,7 @@
<class
name="FieldSameName"
identity-type="datastore">
+ <field name="keyValue" persistence-modifier="none"/>
<field name="n1" persistence-modifier="none"/>
<field name="n2" persistence-modifier="persistent"/>
<field name="n3" persistence-modifier="persistent"/>
Modified:
incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo?rev=164117&r1=164116&r2=164117&view=diff
==============================================================================
---
incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo
(original)
+++
incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo
Thu Apr 21 13:42:43 2005
@@ -4,6 +4,7 @@
<package name="org.apache.jdo.tck.pc.instancecallbacks">
<class name="InstanceCallbackNonPersistFdsClass"
identity-type="datastore">
+ <field name="keyValue" persistence-modifier="none"/>
<field name="i" persistence-modifier="none"/>
<field name="c" persistence-modifier="none"/>
<field name="d" persistence-modifier="transactional"/>
@@ -13,6 +14,7 @@
</class>
<class name="InstanceCallbackClass"
identity-type="datastore">
+ <field name="keyValue" persistence-modifier="none"/>
<field name="nextObj" persistence-modifier="persistent"
null-value="default"/>
<field name="children" >
<collection
element-type="org.apache.jdo.tck.pc.instancecallbacks.InstanceCallbackClass" />
Added:
incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm?rev=164117&view=auto
==============================================================================
---
incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
(added)
+++
incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
Thu Apr 21 13:42:43 2005
@@ -0,0 +1,110 @@
+<?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.inheritance">
+ <class name="AllPersist" table="AllPersist">
+ <inheritance strategy="new-table">
+ <discriminator strategy="class-name" column="DISCRIMINATOR"/>
+ </inheritance>
+ <field name="intB" column="INT_B"/>
+ <field name="doubleB" column="DOUBLE_B"/>
+ <field name="keyValue" column="KEY_VALUE" primary-key="true"/>
+ </class>
+
+ <class name="AllPersist2">
+ <inheritance strategy="superclass-table"/>
+ <field name="floatE" column="FLOAT_E"/>
+ </class>
+
+ <class name="AllPersist3">
+ <inheritance strategy="superclass-table"/>
+ <field name="shortF" column="SHORT_F"/>
+ <field name="secondObj" column="SECOND_OBJ"/>
+ <field name="thirdObj" column="THIRD_OBJ"/>
+ </class>
+
+ <class name="AllPersist4">
+ <inheritance strategy="superclass-table"/>
+ <field name="intH" column="INT_H"/>
+ </class>
+
+ <class name="TopNonPersistB" table="TopNonPersistB">
+ <inheritance strategy="new-table">
+ <discriminator strategy="class-name" column="DISCRIMINATOR"/>
+ </inheritance>
+ <field name="keyValue" column="KEY_VALUE" primary-key="true" />
+ <field name="doubleB" column="DOUBLE_B"/>
+ <field name="intB" column="INT_B"/>
+ </class>
+
+ <class name="TopNonPersistE">
+ <inheritance strategy="superclass-table"/>
+ <field name="floatE" column="FLOAT_E"/>
+ </class>
+
+ <class name="TopNonPersistF">
+ <inheritance strategy="superclass-table"/>
+ <field name="shortF" column="SHORT_F"/>
+ <field name="secondObj" column="SECOND_OBJ"/>
+ <field name="thirdObj" column="THIRD_OBJ"/>
+ </class>
+
+ <class name="TopNonPersistH">
+ <inheritance strategy="superclass-table"/>
+ <field name="intH" column="INT_H"/>
+ </class>
+
+ <class name="TopPersist" table="TopPersist">
+ <inheritance strategy="new-table">
+ <discriminator strategy="class-name" column="DISCRIMINATOR"/>
+ </inheritance>
+ <field name="doubleB" column="DOUBLE_B"/>
+ <field name="intB" column="INT_B"/>
+ <field name="keyValue" column="KEY_VALUE" primary-key="true" />
+ </class>
+
+ <class name="TopPersistE">
+ <inheritance strategy="superclass-table"/>
+ <field name="floatE" persistence-modifier="transactional"/>
+ </class>
+
+ <class name="TopPersistF">
+ <inheritance strategy="superclass-table"/>
+ <field name="shortF" column="SHORT_F"/>
+ <field name="secondObj" column="SECOND_OBJ"/>
+ <field name="thirdObj" column="THIRD_OBJ"/>
+ </class>
+
+ <class name="TopPersistH">
+ <inheritance strategy="superclass-table"/>
+ <field name="intH" column="INT_H"/>
+ </class>
+
+ <class name="FieldSameName" table="FieldSameName">
+ <inheritance strategy="new-table">
+ <discriminator strategy="class-name" column="DISCRIMINATOR"/>
+ </inheritance>
+ <field name="n2" column="N2"/>
+ <field name="n3" column="N3"/>
+ <field name="keyValue" column="KEY_VALUE" primary-key="true"/>
+ </class>
+
+ <class name="FieldSameName2">
+ <inheritance strategy="superclass-table"/>
+ <field name="n3" column="FSN2_N3"/>
+ </class>
+
+ <class name="FieldSameName3">
+ <inheritance strategy="superclass-table"/>
+ <field name="n1" column="FSN3_N1"/>
+ <field name="n2" column="FSN3_N2"/>
+ <field name="n3" column="FSN3_N3"/>
+ </class>
+
+ <class name="FieldSameName4">
+ <inheritance strategy="superclass-table"/>
+ <field name="n3" column="FSN4_N3"/>
+ </class>
+
+</package>
+</orm>
Propchange:
incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
------------------------------------------------------------------------------
svn:executable = *
Added:
incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm?rev=164117&view=auto
==============================================================================
---
incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm
(added)
+++
incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm
Thu Apr 21 13:42:43 2005
@@ -0,0 +1,47 @@
+<?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.dtd";>
+<orm>
+ <package name="org.apache.jdo.tck.pc.instancecallbacks">
+ <class name="InstanceCallbackNonPersistFdsClass"
table="ICNonPersistFds">
+ <field name="keyValue" primary-key="true">
+ <column name="ICKEY"/>
+ </field>
+ <field name="d" column="D"/>
+ <field name="s" column="S"/>
+ <field name="floatValue">
+ <column name="FLOATVAL"/>
+ </field>
+ <field name="intValue">
+ <column name="INTVAL"/>
+ </field>
+ </class>
+
+ <class name="InstanceCallbackClass" table="InstanceCallbacks">
+ <field name="keyValue" primary-key="true">
+ <column name="ICKEY"/>
+ </field>
+ <field name="name" column="NAME"/>
+ <field name="timeStamp">
+ <column name="TIMEDATE"/>
+ </field>
+ <field name="nextObj">
+ <column name="NEXTOBJ"/>
+ </field>
+ <field name="children">
+ <element column="CHILD"/>
+ </field>
+ <field name="intValue">
+ <column name="INTVAL"/>
+ </field>
+ <field name="doubleValue">
+ <column name="DOUBLEVAL"/>
+ </field>
+ <field name="childToDelete">
+ <column name="CHILD2DEL"/>
+ </field>
+ <field name="charValue">
+ <column name="CHARVAL"/>
+ </field>
+ </class>
+ </package>
+</orm>
Propchange:
incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm
------------------------------------------------------------------------------
svn:executable = *
Added:
incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm?rev=164117&view=auto
==============================================================================
---
incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
(added)
+++
incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
Thu Apr 21 13:42:43 2005
@@ -0,0 +1,110 @@
+<?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.inheritance">
+ <class name="AllPersist" table="AllPersist">
+ <datastore-identity strategy="identity" column="KEY_VALUE"/>
+ <inheritance strategy="new-table">
+ <discriminator strategy="class-name" column="DISCRIMINATOR"/>
+ </inheritance>
+ <field name="intB" column="INT_B"/>
+ <field name="doubleB" column="DOUBLE_B"/>
+ </class>
+
+ <class name="AllPersist2">
+ <inheritance strategy="superclass-table"/>
+ <field name="floatE" column="FLOAT_E"/>
+ </class>
+
+ <class name="AllPersist3">
+ <inheritance strategy="superclass-table"/>
+ <field name="shortF" column="SHORT_F"/>
+ <field name="secondObj" column="SECOND_OBJ"/>
+ <field name="thirdObj" column="THIRD_OBJ"/>
+ </class>
+
+ <class name="AllPersist4">
+ <inheritance strategy="superclass-table"/>
+ <field name="intH" column="INT_H"/>
+ </class>
+
+ <class name="TopNonPersistB" table="TopNonPersistB">
+ <datastore-identity strategy="identity" column="KEY_VALUE"/>
+ <inheritance strategy="new-table">
+ <discriminator strategy="class-name" column="DISCRIMINATOR"/>
+ </inheritance>
+ <field name="doubleB" column="DOUBLE_B"/>
+ <field name="intB" column="INT_B"/>
+ </class>
+
+ <class name="TopNonPersistE">
+ <inheritance strategy="superclass-table"/>
+ <field name="floatE" column="FLOAT_E"/>
+ </class>
+
+ <class name="TopNonPersistF">
+ <inheritance strategy="superclass-table"/>
+ <field name="shortF" column="SHORT_F"/>
+ <field name="secondObj" column="SECOND_OBJ"/>
+ <field name="thirdObj" column="THIRD_OBJ"/>
+ </class>
+
+ <class name="TopNonPersistH">
+ <inheritance strategy="superclass-table"/>
+ <field name="intH" column="INT_H"/>
+ </class>
+
+ <class name="TopPersist" table="TopPersist">
+ <datastore-identity strategy="identity" column="KEY_VALUE"/>
+ <inheritance strategy="new-table">
+ <discriminator strategy="class-name" column="DISCRIMINATOR"/>
+ </inheritance>
+ <field name="doubleB" column="DOUBLE_B"/>
+ <field name="intB" column="INT_B"/>
+ </class>
+
+ <class name="TopPersistE">
+ <inheritance strategy="superclass-table"/>
+ <field name="floatE" persistence-modifier="transactional"/>
+ </class>
+
+ <class name="TopPersistF">
+ <inheritance strategy="superclass-table"/>
+ <field name="shortF" column="SHORT_F"/>
+ <field name="secondObj" column="SECOND_OBJ"/>
+ <field name="thirdObj" column="THIRD_OBJ"/>
+ </class>
+
+ <class name="TopPersistH">
+ <inheritance strategy="superclass-table"/>
+ <field name="intH" column="INT_H"/>
+ </class>
+
+ <class name="FieldSameName" table="FieldSameName">
+ <datastore-identity strategy="identity" column="KEY_VALUE"/>
+ <inheritance strategy="new-table">
+ <discriminator strategy="class-name" column="DISCRIMINATOR"/>
+ </inheritance>
+ <field name="n2" column="N2"/>
+ <field name="n3" column="N3"/>
+ </class>
+
+ <class name="FieldSameName2">
+ <inheritance strategy="superclass-table"/>
+ <field name="n3" column="FSN2_N3"/>
+ </class>
+
+ <class name="FieldSameName3">
+ <inheritance strategy="superclass-table"/>
+ <field name="n1" column="FSN3_N1"/>
+ <field name="n2" column="FSN3_N2"/>
+ <field name="n3" column="FSN3_N3"/>
+ </class>
+
+ <class name="FieldSameName4">
+ <inheritance strategy="superclass-table"/>
+ <field name="n3" column="FSN4_N3"/>
+ </class>
+
+</package>
+</orm>
Propchange:
incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
------------------------------------------------------------------------------
svn:executable = *
Added:
incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm?rev=164117&view=auto
==============================================================================
---
incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm
(added)
+++
incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm
Thu Apr 21 13:42:43 2005
@@ -0,0 +1,52 @@
+<?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.dtd";>
+<orm>
+ <package name="org.apache.jdo.tck.pc.instancecallbacks">
+ <class name="InstanceCallbackNonPersistFdsClass"
table="ICNonPersistFds">
+ <datastore-identity strategy="identity">
+ <column name="ICKEY"/>
+ </datastore-identity>
+ <!--
+ <field name="keyValue">
+ <column name="ICKEY"/>
+ </field>
+ -->
+ <field name="d" column="D"/>
+ <field name="s" column="S"/>
+ <field name="floatValue">
+ <column name="FLOATVAL"/>
+ </field>
+ <field name="intValue">
+ <column name="INTVAL"/>
+ </field>
+ </class>
+
+ <class name="InstanceCallbackClass" table="InstanceCallbacks">
+ <datastore-identity strategy="identity">
+ <column name="ICKEY"/>
+ </datastore-identity>
+ <field name="name" column="NAME"/>
+ <field name="timeStamp">
+ <column name="TIMEDATE"/>
+ </field>
+ <field name="nextObj">
+ <column name="NEXTOBJ"/>
+ </field>
+ <field name="children">
+ <element column="CHILD"/>
+ </field>
+ <field name="intValue">
+ <column name="INTVAL"/>
+ </field>
+ <field name="doubleValue">
+ <column name="DOUBLEVAL"/>
+ </field>
+ <field name="childToDelete">
+ <column name="CHILD2DEL"/>
+ </field>
+ <field name="charValue">
+ <column name="CHARVAL"/>
+ </field>
+ </class>
+ </package>
+</orm>
Propchange:
incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql?rev=164117&r1=164116&r2=164117&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql Thu Apr 21 13:42:43
2005
@@ -149,11 +149,13 @@
CREATE TABLE AllPersist (
KEY_VALUE INTEGER NOT NULL,
DOUBLE_B DOUBLE,
+ INT_B INTEGER,
FLOAT_E FLOAT,
SHORT_F SMALLINT,
SECOND_OBJ INTEGER,
THIRD_OBJ INTEGER,
INT_H INTEGER,
+ DISCRIMINATOR varchar(64) NOT NULL,
CONSTRAINT AllPersist_PK PRIMARY KEY (KEY_VALUE),
FOREIGN KEY (SECOND_OBJ) REFERENCES AllPersist (KEY_VALUE),
FOREIGN KEY (THIRD_OBJ) REFERENCES AllPersist (KEY_VALUE)
@@ -168,6 +170,7 @@
SECOND_OBJ INTEGER,
THIRD_OBJ INTEGER,
INT_H INTEGER,
+ DISCRIMINATOR varchar(64) NOT NULL,
CONSTRAINT TopNonPersistB_PK PRIMARY KEY (KEY_VALUE),
FOREIGN KEY (SECOND_OBJ) REFERENCES TopNonPersistB (KEY_VALUE),
FOREIGN KEY (THIRD_OBJ) REFERENCES TopNonPersistB (KEY_VALUE)
@@ -182,6 +185,7 @@
SECOND_OBJ INTEGER,
THIRD_OBJ INTEGER,
INT_H INTEGER,
+ DISCRIMINATOR varchar(64) NOT NULL,
CONSTRAINT TopPersist_PK PRIMARY KEY (KEY_VALUE),
FOREIGN KEY (SECOND_OBJ) REFERENCES TopPersist (KEY_VALUE),
FOREIGN KEY (THIRD_OBJ) REFERENCES TopPersist (KEY_VALUE)
@@ -196,6 +200,7 @@
FSN3_N2 INTEGER,
FSN3_N3 INTEGER,
FSN4_N3 INTEGER,
+ DISCRIMINATOR varchar(64) NOT NULL,
CONSTRAINT FieldSameName_PK PRIMARY KEY (KEY_VALUE),
FOREIGN KEY (FSN3_N2) REFERENCES FieldSameName (KEY_VALUE),
FOREIGN KEY (FSN3_N3) REFERENCES FieldSameName (KEY_VALUE)
Modified: incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql?rev=164117&r1=164116&r2=164117&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql Thu Apr 21 13:42:43
2005
@@ -146,6 +146,66 @@
--inheritance
-------------------------
+CREATE TABLE AllPersist (
+ KEY_VALUE INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+ DOUBLE_B DOUBLE,
+ INT_B INTEGER,
+ FLOAT_E FLOAT,
+ SHORT_F SMALLINT,
+ SECOND_OBJ INTEGER,
+ THIRD_OBJ INTEGER,
+ INT_H INTEGER,
+ DISCRIMINATOR varchar(64) NOT NULL,
+ CONSTRAINT AllPersist_PK PRIMARY KEY (KEY_VALUE),
+ FOREIGN KEY (SECOND_OBJ) REFERENCES AllPersist (KEY_VALUE),
+ FOREIGN KEY (THIRD_OBJ) REFERENCES AllPersist (KEY_VALUE)
+);
+
+CREATE TABLE TopNonPersistB (
+ KEY_VALUE INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+ DOUBLE_B DOUBLE,
+ INT_B INTEGER,
+ FLOAT_E FLOAT,
+ SHORT_F SMALLINT,
+ SECOND_OBJ INTEGER,
+ THIRD_OBJ INTEGER,
+ INT_H INTEGER,
+ DISCRIMINATOR varchar(64) NOT NULL,
+ CONSTRAINT TopNonPersistB_PK PRIMARY KEY (KEY_VALUE),
+ FOREIGN KEY (SECOND_OBJ) REFERENCES TopNonPersistB (KEY_VALUE),
+ FOREIGN KEY (THIRD_OBJ) REFERENCES TopNonPersistB (KEY_VALUE)
+);
+
+CREATE TABLE TopPersist (
+ KEY_VALUE INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+ DOUBLE_B DOUBLE,
+ INT_B INTEGER,
+ FLOAT_E FLOAT,
+ SHORT_F SMALLINT,
+ SECOND_OBJ INTEGER,
+ THIRD_OBJ INTEGER,
+ INT_H INTEGER,
+ DISCRIMINATOR varchar(64) NOT NULL,
+ CONSTRAINT TopPersist_PK PRIMARY KEY (KEY_VALUE),
+ FOREIGN KEY (SECOND_OBJ) REFERENCES TopPersist (KEY_VALUE),
+ FOREIGN KEY (THIRD_OBJ) REFERENCES TopPersist (KEY_VALUE)
+);
+
+CREATE TABLE FieldSameName (
+ KEY_VALUE INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+ N2 DOUBLE,
+ N3 INTEGER,
+ FSN2_N3 FLOAT,
+ FSN3_N1 SMALLINT,
+ FSN3_N2 INTEGER,
+ FSN3_N3 INTEGER,
+ FSN4_N3 INTEGER,
+ DISCRIMINATOR varchar(64) NOT NULL,
+ CONSTRAINT FieldSameName_PK PRIMARY KEY (KEY_VALUE),
+ FOREIGN KEY (FSN3_N2) REFERENCES FieldSameName (KEY_VALUE),
+ FOREIGN KEY (FSN3_N3) REFERENCES FieldSameName (KEY_VALUE)
+);
+
-------------------------
--instancecallbacks
-------------------------
