[hibernate-commits] Hibernate SVN: r19325 - in core/trunk/testsuite/src/test/java/org/hibernate/test/immutable: entitywithmutablecollection/inverse and 1 other directories.

[hibernate-commits at lists.jboss.org]

Author: gbadner
Date: 2010-04-29 17:23:51 -0400 (Thu, 29 Apr 2010)
New Revision: 19325

Modified:
   core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/ContractVariation.hbm.xml
   core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariation.hbm.xml
   core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationOneToManyJoin.hbm.xml
   core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersioned.hbm.xml
   core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersionedOneToManyJoin.hbm.xml
   core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariation.hbm.xml
   core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationOneToManyJoin.hbm.xml
   core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationUnidir.hbm.xml
   core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersioned.hbm.xml
   core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersionedOneToManyJoin.hbm.xml
Log:
HHH-5178 : Unit tests in org.hibernate.test.immutable fail on mssql and sybase due to keyword used for table and column name

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/ContractVariation.hbm.xml
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/ContractVariation.hbm.xml	2010-04-29 19:02:09 UTC (rev 19324)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/ContractVariation.hbm.xml	2010-04-29 21:23:51 UTC (rev 19325)
@@ -17,17 +17,17 @@
         <property name="text"/>        
     </class>
 
-    <class name="Plan" mutable="false">
+    <class name="Plan" table="tbl_plan" mutable="false">
         <id name="id">
             <generator class="increment"/>
         </id>
         <property name="description" not-null="true"/>
         <set name="contracts" table="plan_contract" inverse="false" mutable="true" cascade="all" fetch="join">
-            <key column="plan"/>
+            <key column="col_plan"/>
             <many-to-many column="contract" class="Contract"/>
         </set>
         <set name="infos" inverse="false"  mutable="true" cascade="all-delete-orphan">
-            <key column="plan"/>
+            <key column="col_plan"/>
             <one-to-many class="Info"/>
         </set>
     </class>
@@ -65,7 +65,7 @@
         </set>
         <set name="plans" table="plan_contract" inverse="true" mutable="true" cascade="none">
             <key column="contract"/>
-            <many-to-many column="plan" class="Plan"/>
+            <many-to-many column="col_plan" class="Plan"/>
         </set>
         <set name="parties" inverse="true"  mutable="true" cascade="all" fetch="join">
             <key column="contract"/>

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariation.hbm.xml
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariation.hbm.xml	2010-04-29 19:02:09 UTC (rev 19324)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariation.hbm.xml	2010-04-29 21:23:51 UTC (rev 19325)
@@ -17,17 +17,17 @@
         <property name="text"/>        
     </class>
 
-    <class name="Plan" mutable="false">
+    <class name="Plan" table="tbl_plan" mutable="false">
         <id name="id">
             <generator class="increment"/>
         </id>
         <property name="description" not-null="true"/>
         <set name="contracts" table="plan_contract" inverse="true" mutable="true" cascade="all" fetch="join">
-            <key column="plan"/>
+            <key column="col_plan"/>
             <many-to-many column="contract" class="Contract"/>
         </set>
         <set name="infos" inverse="true"  mutable="true" cascade="all-delete-orphan">
-            <key column="plan"/>
+            <key column="col_plan"/>
             <one-to-many class="Info"/>
         </set>
     </class>
@@ -63,7 +63,7 @@
         </set>
         <set name="plans" table="plan_contract" inverse="false" mutable="true" cascade="none">
             <key column="contract"/>
-            <many-to-many column="plan" class="Plan"/>
+            <many-to-many column="col_plan" class="Plan"/>
         </set>
         <set name="parties" inverse="true"  mutable="true" cascade="all" fetch="join">
             <key column="contract"/>

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationOneToManyJoin.hbm.xml
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationOneToManyJoin.hbm.xml	2010-04-29 19:02:09 UTC (rev 19324)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationOneToManyJoin.hbm.xml	2010-04-29 21:23:51 UTC (rev 19325)
@@ -17,17 +17,17 @@
         <property name="text"/>        
     </class>
 
-    <class name="Plan" mutable="false">
+    <class name="Plan" table="tbl_plan" mutable="false">
         <id name="id">
             <generator class="increment"/>
         </id>
         <property name="description" not-null="true"/>
         <set name="contracts" table="plan_contract" inverse="true" mutable="true" cascade="all" fetch="join">
-            <key column="plan"/>
+            <key column="col_plan"/>
             <many-to-many column="contract" class="Contract"/>
         </set>
         <set name="infos" inverse="true"  mutable="true" cascade="all-delete-orphan">
-            <key column="plan"/>
+            <key column="col_plan"/>
             <one-to-many class="Info"/>
         </set>
     </class>
@@ -70,7 +70,7 @@
         </set>
         <set name="plans" table="plan_contract" inverse="false" mutable="true" cascade="none">
             <key column="contract"/>
-            <many-to-many column="plan" class="Plan"/>
+            <many-to-many column="col_plan" class="Plan"/>
         </set>
         <set name="parties" table="contract_party" inverse="true"  mutable="true" cascade="all">
             <key column="contract"/>

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersioned.hbm.xml
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersioned.hbm.xml	2010-04-29 19:02:09 UTC (rev 19324)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersioned.hbm.xml	2010-04-29 21:23:51 UTC (rev 19325)
@@ -18,18 +18,18 @@
         <property name="text"/>        
     </class>
 
-    <class name="Plan" mutable="false">
+    <class name="Plan" table="tbl_plan" mutable="false">
         <id name="id">
             <generator class="increment"/>
         </id>
         <version name="version" column="VERS" type="long" />
         <property name="description" not-null="true"/>
         <set name="contracts" table="plan_contract" inverse="true" mutable="true" cascade="all" fetch="join">
-            <key column="plan"/>
+            <key column="col_plan"/>
             <many-to-many column="contract" class="Contract"/>
         </set>
         <set name="infos" inverse="true"  mutable="true" cascade="all-delete-orphan">
-            <key column="plan"/>
+            <key column="col_plan"/>
             <one-to-many class="Info"/>
         </set>
     </class>
@@ -67,7 +67,7 @@
         </set>
         <set name="plans" table="plan_contract" inverse="false" mutable="true" cascade="none">
             <key column="contract"/>
-            <many-to-many column="plan" class="Plan"/>
+            <many-to-many column="col_plan" class="Plan"/>
         </set>
         <set name="parties" inverse="true"  mutable="true" cascade="all" fetch="join">
             <key column="contract"/>

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersionedOneToManyJoin.hbm.xml
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersionedOneToManyJoin.hbm.xml	2010-04-29 19:02:09 UTC (rev 19324)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/ContractVariationVersionedOneToManyJoin.hbm.xml	2010-04-29 21:23:51 UTC (rev 19325)
@@ -18,18 +18,18 @@
         <property name="text"/>        
     </class>
 
-    <class name="Plan" mutable="false">
+    <class name="Plan" table="tbl_plan" mutable="false">
         <id name="id">
             <generator class="increment"/>
         </id>
         <version name="version" column="VERS" type="long" />
         <property name="description" not-null="true"/>
         <set name="contracts" table="plan_contract" inverse="true" mutable="true" cascade="all" fetch="join">
-            <key column="plan"/>
+            <key column="col_plan"/>
             <many-to-many column="contract" class="Contract"/>
         </set>
         <set name="infos" inverse="true"  mutable="true" cascade="all-delete-orphan">
-            <key column="plan"/>
+            <key column="col_plan"/>
             <one-to-many class="Info"/>
         </set>
     </class>
@@ -74,7 +74,7 @@
         </set>
         <set name="plans" table="plan_contract" inverse="false" mutable="true" cascade="none">
             <key column="contract"/>
-            <many-to-many column="plan" class="Plan"/>
+            <many-to-many column="col_plan" class="Plan"/>
         </set>
         <set name="parties" table="contract_party" inverse="true"  mutable="true" cascade="all">
             <key column="contract"/>

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariation.hbm.xml
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariation.hbm.xml	2010-04-29 19:02:09 UTC (rev 19324)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariation.hbm.xml	2010-04-29 21:23:51 UTC (rev 19325)
@@ -17,17 +17,17 @@
         <property name="text"/>        
     </class>
 
-    <class name="Plan" mutable="false">
+    <class name="Plan" table="tbl_plan" mutable="false">
         <id name="id">
             <generator class="increment"/>
         </id>
         <property name="description" not-null="true"/>
         <set name="contracts" table="plan_contract" inverse="false" mutable="true" cascade="all" fetch="join">
-            <key column="plan"/>
+            <key column="col_plan"/>
             <many-to-many column="contract" class="Contract"/>
         </set>
         <set name="infos" inverse="false"  mutable="true" cascade="all-delete-orphan">
-            <key column="plan"/>
+            <key column="col_plan"/>
             <one-to-many class="Info"/>
         </set>
     </class>
@@ -63,7 +63,7 @@
         </set>
         <set name="plans" table="plan_contract" inverse="true" mutable="true" cascade="none">
             <key column="contract"/>
-            <many-to-many column="plan" class="Plan"/>
+            <many-to-many column="col_plan" class="Plan"/>
         </set>
         <set name="parties" inverse="false"  mutable="true" cascade="all" fetch="join">
             <key column="contract"/>

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationOneToManyJoin.hbm.xml
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationOneToManyJoin.hbm.xml	2010-04-29 19:02:09 UTC (rev 19324)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationOneToManyJoin.hbm.xml	2010-04-29 21:23:51 UTC (rev 19325)
@@ -17,17 +17,17 @@
         <property name="text"/>        
     </class>
 
-    <class name="Plan" mutable="false">
+    <class name="Plan" table="tbl_plan" mutable="false">
         <id name="id">
             <generator class="increment"/>
         </id>
         <property name="description" not-null="true"/>
         <set name="contracts" table="plan_contract" inverse="false" mutable="true" cascade="all" fetch="join">
-            <key column="plan"/>
+            <key column="col_plan"/>
             <many-to-many column="contract" class="Contract"/>
         </set>
         <set name="infos" inverse="false"  mutable="true" cascade="all-delete-orphan">
-            <key column="plan"/>
+            <key column="col_plan"/>
             <one-to-many class="Info"/>
         </set>
     </class>
@@ -70,7 +70,7 @@
         </set>
         <set name="plans" table="plan_contract" inverse="true" mutable="true" cascade="none">
             <key column="contract"/>
-            <many-to-many column="plan" class="Plan"/>
+            <many-to-many column="col_plan" class="Plan"/>
         </set>
         <set name="parties" table="contract_party" inverse="false"  mutable="true" cascade="all">
             <key column="contract"/>

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationUnidir.hbm.xml
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationUnidir.hbm.xml	2010-04-29 19:02:09 UTC (rev 19324)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationUnidir.hbm.xml	2010-04-29 21:23:51 UTC (rev 19325)
@@ -17,17 +17,17 @@
         <property name="text"/>        
     </class>
 
-    <class name="Plan" mutable="false">
+    <class name="Plan" table="tbl_plan" mutable="false">
         <id name="id">
             <generator class="increment"/>
         </id>
         <property name="description" not-null="true"/>
         <set name="contracts" table="plan_contract" inverse="false" mutable="true" cascade="all" fetch="join">
-            <key column="plan"/>
+            <key column="col_plan"/>
             <many-to-many column="contract" class="Contract"/>
         </set>
         <set name="infos" inverse="false"  mutable="true" cascade="all-delete-orphan">
-            <key column="plan"/>
+            <key column="col_plan"/>
             <one-to-many class="Info"/>
         </set>
     </class>

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersioned.hbm.xml
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersioned.hbm.xml	2010-04-29 19:02:09 UTC (rev 19324)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersioned.hbm.xml	2010-04-29 21:23:51 UTC (rev 19325)
@@ -18,18 +18,18 @@
         <property name="text"/>
     </class>
 
-    <class name="Plan" mutable="false">
+    <class name="Plan" table="tbl_plan" mutable="false">
         <id name="id">
             <generator class="increment"/>
         </id>
         <version name="version" column="VERS" type="long" />
         <property name="description" not-null="true"/>
         <set name="contracts" table="plan_contract" inverse="false" mutable="true" cascade="all" fetch="join">
-            <key column="plan"/>
+            <key column="col_plan"/>
             <many-to-many column="contract" class="Contract"/>
         </set>
         <set name="infos" inverse="false"  mutable="true" cascade="all-delete-orphan">
-            <key column="plan"/>
+            <key column="col_plan"/>
             <one-to-many class="Info"/>
         </set>
     </class>
@@ -67,7 +67,7 @@
         </set>
         <set name="plans" table="plan_contract" inverse="true" mutable="true" cascade="none">
             <key column="contract"/>
-            <many-to-many column="plan" class="Plan"/>
+            <many-to-many column="col_plan" class="Plan"/>
         </set>
         <set name="parties" inverse="false"  mutable="true" cascade="all" fetch="join">
             <key column="contract"/>

Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersionedOneToManyJoin.hbm.xml
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersionedOneToManyJoin.hbm.xml	2010-04-29 19:02:09 UTC (rev 19324)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/ContractVariationVersionedOneToManyJoin.hbm.xml	2010-04-29 21:23:51 UTC (rev 19325)
@@ -18,18 +18,18 @@
         <property name="text"/>
     </class>
 
-    <class name="Plan" mutable="false">
+    <class name="Plan" table="tbl_plan" mutable="false">
         <id name="id">
             <generator class="increment"/>
         </id>
         <version name="version" column="VERS" type="long" />
         <property name="description" not-null="true"/>
         <set name="contracts" table="plan_contract" inverse="false" mutable="true" cascade="all" fetch="join">
-            <key column="plan"/>
+            <key column="col_plan"/>
             <many-to-many column="contract" class="Contract"/>
         </set>
         <set name="infos" inverse="false"  mutable="true" cascade="all-delete-orphan">
-            <key column="plan"/>
+            <key column="col_plan"/>
             <one-to-many class="Info"/>
         </set>
     </class>
@@ -74,7 +74,7 @@
         </set>
         <set name="plans" table="plan_contract" inverse="true" mutable="true" cascade="none">
             <key column="contract"/>
-            <many-to-many column="plan" class="Plan"/>
+            <many-to-many column="col_plan" class="Plan"/>
         </set>
         <set name="parties" table="contract_party" inverse="false"  mutable="true" cascade="all">
             <key column="contract"/>