Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2011-12-05 11:48:31 +0000
committerMartin Taal2011-12-05 11:48:31 +0000
commitc8dc953e51b1bfb61933f0e5c8239f421bd66335 (patch)
tree1b010e67224a4cc8cb9167d80d9183e84ba54e2a /tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations
parent84829d35c078e5a3716362d4469da7b5a28e373b (diff)
downloadorg.eclipse.emf.teneo-c8dc953e51b1bfb61933f0e5c8239f421bd66335.tar.gz
org.eclipse.emf.teneo-c8dc953e51b1bfb61933f0e5c8239f421bd66335.tar.xz
org.eclipse.emf.teneo-c8dc953e51b1bfb61933f0e5c8239f421bd66335.zip
Fixes issue [365568] - Combining External and Transient results in a NPE
Diffstat (limited to 'tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations')
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_hsqldb_e_o_hibernate.hbm.xml19
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_hsqldb_h_o_hibernate.hbm.xml19
2 files changed, 38 insertions, 0 deletions
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_hsqldb_e_o_hibernate.hbm.xml
index 95790c618..7e575e247 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_hsqldb_e_o_hibernate.hbm.xml
@@ -41,5 +41,24 @@
<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
</type>
</property>
+ <property name="externalObject" lazy="false" insert="true" update="true" not-null="false" unique="false">
+ <column not-null="false" unique="false" name="`EXTERNALOBJECT`"/>
+ <type name="org.eclipse.emf.teneo.hibernate.mapping.ExternalType">
+ <param name="eclassName">ExternalObject</param>
+ <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/external</param>
+ </type>
+ </property>
+ <list name="externalObjects" lazy="true" cascade="persist,merge,refresh,save-update,lock">
+ <key update="true">
+ <column name="`EXTERNALTEST_EXTERNALOBJECTS_E_ID`" unique="false"/>
+ </key>
+ <list-index column="`EXTERNALTEST_EXTERNALOBJECTS_IDX`"/>
+ <element>
+ <type name="org.eclipse.emf.teneo.hibernate.mapping.ExternalType">
+ <param name="eclassName">ExternalObject</param>
+ <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/external</param>
+ </type>
+ </element>
+ </list>
</class>
</hibernate-mapping> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_hsqldb_h_o_hibernate.hbm.xml
index 0abaa8aed..a1802f969 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ExternalAction_hsqldb_h_o_hibernate.hbm.xml
@@ -44,5 +44,24 @@
<param name="epackage">http://www.eclipse.org/emf/2002/Ecore</param>
</type>
</property>
+ <property name="externalObject" lazy="false" insert="true" update="true" not-null="false" unique="false">
+ <column not-null="false" unique="false" name="`EXTERNALOBJECT`"/>
+ <type name="org.eclipse.emf.teneo.hibernate.mapping.ExternalType">
+ <param name="eclassName">ExternalObject</param>
+ <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/external</param>
+ </type>
+ </property>
+ <list name="externalObjects" lazy="true" cascade="persist,merge,refresh,save-update,lock">
+ <key update="true">
+ <column name="`EXTERNALTEST_EXTERNALOBJECTS_E_ID`" unique="false"/>
+ </key>
+ <list-index column="`EXTERNALTEST_EXTERNALOBJECTS_IDX`"/>
+ <element>
+ <type name="org.eclipse.emf.teneo.hibernate.mapping.ExternalType">
+ <param name="eclassName">ExternalObject</param>
+ <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/external</param>
+ </type>
+ </element>
+ </list>
</class>
</hibernate-mapping> \ No newline at end of file

Back to the top