Author: max.andersen(a)jboss.com Date: 2006-10-24 11:52:48 -0400 (Tue, 24 Oct 2006) New Revision: 10647 Modified: trunk/Hibernate3/test/org/hibernate/test/hql/FooBarCopy.hbm.xml trunk/Hibernate3/test/org/hibernate/test/legacy/Baz.hbm.xml trunk/Hibernate3/test/org/hibernate/test/legacy/FooBar.hbm.xml Log: Make Ingres 2006 happy by not having $ in the start of a table nor column name. (merged from 3.2 branch) Modified: trunk/Hibernate3/test/org/hibernate/test/hql/FooBarCopy.hbm.xml =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/hql/FooBarCopy.hbm.xml 2006-10-24 15:13:50 UTC (rev 10646) +++ trunk/Hibernate3/test/org/hibernate/test/hql/FooBarCopy.hbm.xml 2006-10-24 15:52:48 UTC (rev 10647) @@ -23,7 +23,7 @@ </generator> </id> - <discriminator column="`$foo_subclass^1234`" type="character" force="true"/> + <discriminator column="`^foo_subclass$1234`" type="character" force="true"/> <version name="version"/> <many-to-one name="foo" class="Foo"> Modified: trunk/Hibernate3/test/org/hibernate/test/legacy/Baz.hbm.xml =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/legacy/Baz.hbm.xml 2006-10-24 15:13:50 UTC (rev 10646) +++ trunk/Hibernate3/test/org/hibernate/test/legacy/Baz.hbm.xml 2006-10-24 15:52:48 UTC (rev 10647) @@ -60,7 +60,7 @@ <index column="j"/> <element column="the_time" type="time"/> </array> - <bag name="bag" order-by="`name!`" table="`$%^^bxaxg`"> + <bag name="bag" order-by="`name!`" table="`^%$^bxaxg`"> <key> <column name="`baz_id$`" length="16"/> </key> Modified: trunk/Hibernate3/test/org/hibernate/test/legacy/FooBar.hbm.xml =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/legacy/FooBar.hbm.xml 2006-10-24 15:13:50 UTC (rev 10646) +++ trunk/Hibernate3/test/org/hibernate/test/legacy/FooBar.hbm.xml 2006-10-24 15:52:48 UTC (rev 10647) @@ -25,7 +25,7 @@ <param name="seperator">:</param> </generator> </id> - <discriminator column="`$foo_subclass^1234`" type="character" force="true"/> + <discriminator column="`^foo_subclass$1234`" type="character" force="true"/> <version name="version"/> <!--<version name="versionCalendar" type="calendar"/>--> <!--<timestamp name="versionTimestamp"/>-->