Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test In directory sc8-pr-cvs1:/tmp/cvs-serv28341/hibernate/test Modified Files: Bar.java Child.java Detail.java Fo.hbm.xml Fo.java Foo.java FooBar.hbm.xml FooBarTest.java Glarch.hbm.xml Glarch.java Many.hbm.xml Many.java Master.java MasterDetail.hbm.xml One.hbm.xml One.java Parent.java ParentChild.hbm.xml Log Message: added some new logging support SQL-style escapes in HQL strings Index: Bar.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Bar.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Bar.java 5 Jan 2003 02:11:23 -0000 1.3 --- Bar.java 20 Mar 2003 13:59:09 -0000 1.4 *************** *** 6,10 **** --- 6,18 ---- private FooComponent barComponent = new FooComponent("bar", 69, null, null); private Baz baz; + private int x; + public int getX() { + return x; + } + public void setX(int x) { + this.x = x; + } + public String getBarString() { return barString; Index: Child.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Child.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Child.java 5 Jan 2003 02:11:23 -0000 1.3 --- Child.java 20 Mar 2003 13:59:09 -0000 1.4 *************** *** 5,8 **** --- 5,16 ---- private Parent parent; private int count; + private int x; + + public int getX() { + return x; + } + public void setX(int x) { + this.x = x; + } public Parent getParent() { Index: Detail.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Detail.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Detail.java 5 Jan 2003 02:11:23 -0000 1.3 --- Detail.java 20 Mar 2003 13:59:09 -0000 1.4 *************** *** 10,13 **** --- 10,21 ---- private int i; private Set details; + private int x; + + public int getX() { + return x; + } + public void setX(int x) { + this.x = x; + } public Master getMaster() { Index: Fo.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Fo.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Fo.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2 --- Fo.hbm.xml 20 Mar 2003 13:59:09 -0000 1.3 *************** *** 14,17 **** --- 14,18 ---- <property name="serial" column="serial_"/> <property name="buf"/> + <property name="x"/> </class> Index: Fo.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Fo.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Fo.java 15 Feb 2003 08:00:52 -0000 1.4 --- Fo.java 20 Mar 2003 13:59:09 -0000 1.5 *************** *** 15,18 **** --- 15,26 ---- private Serializable serial; private long version; + private int x; + + public int getX() { + return x; + } + public void setX(int x) { + this.x = x; + } public byte[] getBuf() { Index: Foo.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Foo.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Foo.java 19 Jan 2003 11:47:08 -0000 1.4 --- Foo.java 20 Mar 2003 13:59:09 -0000 1.5 *************** *** 63,66 **** --- 63,74 ---- private Timestamp versionTimestamp; + private int x; + + public int getX() { + return x; + } + public void setX(int x) { + this.x = x; + } public boolean onSave(Session db) throws CallbackException { _string = "a string"; Index: FooBar.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/FooBar.hbm.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FooBar.hbm.xml 9 Feb 2003 06:28:16 -0000 1.8 --- FooBar.hbm.xml 20 Mar 2003 13:59:09 -0000 1.9 *************** *** 33,36 **** --- 33,37 ---- <column name="float_" unique-key="abc" not-null="true"/> </property> + <property name="x"/> <property name="double" column="double_"/> Index: FooBarTest.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/FooBarTest.java,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** FooBarTest.java 13 Mar 2003 03:16:02 -0000 1.42 --- FooBarTest.java 20 Mar 2003 13:59:09 -0000 1.43 *************** *** 1143,1146 **** --- 1143,1148 ---- list = s.find("from foo in class net.sf.hibernate.test.Foo where foo.string='from BoogieDown -tinsel town =!@#$^&*())'"); assertTrue( list.size()==1, "single quotes" ); + list = s.find("from foo in class net.sf.hibernate.test.Foo where not foo.string='foo''bar'"); + assertTrue( list.size()==2, "single quotes" ); list = s.find("from foo in class net.sf.hibernate.test.Foo where foo.component.glarch.next is null"); assertTrue( list.size()==2, "query association in component" ); Index: Glarch.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Glarch.hbm.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Glarch.hbm.xml 19 Feb 2003 02:02:15 -0000 1.6 --- Glarch.hbm.xml 20 Mar 2003 13:59:10 -0000 1.7 *************** *** 17,20 **** --- 17,21 ---- <property name="bar" type="integer"/> </dynabean> + <property name="x"/> <list name="strings"> <key column="glarch_key"/> Index: Glarch.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Glarch.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Glarch.java 19 Feb 2003 02:02:15 -0000 1.7 --- Glarch.java 20 Mar 2003 13:59:10 -0000 1.8 *************** *** 33,36 **** --- 33,44 ---- private int derivedVersion; private Object any; + private int x; + + public int getX() { + return x; + } + public void setX(int x) { + this.x = x; + } public int getVersion() { Index: Many.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Many.hbm.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Many.hbm.xml 9 Feb 2003 06:28:16 -0000 1.4 --- Many.hbm.xml 20 Mar 2003 13:59:10 -0000 1.5 *************** *** 8,11 **** --- 8,12 ---- <generator class="native" /> </id> + <property name="x"/> <many-to-one name="one" column="one_key" class="net.sf.hibernate.test.One"/> </class> Index: Many.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Many.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Many.java 5 Jan 2003 02:11:23 -0000 1.3 --- Many.java 20 Mar 2003 13:59:10 -0000 1.4 *************** *** 6,9 **** --- 6,17 ---- long key; One one; + private int x; + + public int getX() { + return x; + } + public void setX(int x) { + this.x = x; + } public void setKey(long key) Index: Master.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Master.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Master.java 5 Jan 2003 02:11:23 -0000 1.3 --- Master.java 20 Mar 2003 13:59:10 -0000 1.4 *************** *** 16,19 **** --- 16,27 ---- private Date stamp; private BigDecimal bigDecimal = new BigDecimal("1234.123"); + private int x; + + public int getX() { + return x; + } + public void setX(int x) { + this.x = x; + } public Set getDetails() { Index: MasterDetail.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/MasterDetail.hbm.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MasterDetail.hbm.xml 16 Mar 2003 01:45:53 -0000 1.4 --- MasterDetail.hbm.xml 20 Mar 2003 13:59:10 -0000 1.5 *************** *** 9,12 **** --- 9,13 ---- <timestamp name="stamp" column="ts_"/> <property name="name"/> + <property name="x"/> <property name="bigDecimal" length="5" column="big_dec"> <column name="big_dec" sql-type="DECIMAL(5,3)"/> *************** *** 35,38 **** --- 36,40 ---- <generator class="native"/> </id> + <property name="x"/> <property name="i"/> <many-to-one name="master" column="master_key"/> <!--not-null="true"--> Index: One.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/One.hbm.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** One.hbm.xml 9 Feb 2003 06:28:16 -0000 1.4 --- One.hbm.xml 20 Mar 2003 13:59:10 -0000 1.5 *************** *** 8,11 **** --- 8,12 ---- <generator class="native" /> </id> + <property name="x"/> <property column="one_value" name="value"/> <set name="manies" inverse="true" lazy="true"> Index: One.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/One.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** One.java 5 Jan 2003 02:11:23 -0000 1.3 --- One.java 20 Mar 2003 13:59:10 -0000 1.4 *************** *** 9,12 **** --- 9,20 ---- String value; Set manies; + private int x; + + public int getX() { + return x; + } + public void setX(int x) { + this.x = x; + } public void setKey(long key) Index: Parent.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Parent.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Parent.java 19 Feb 2003 02:02:15 -0000 1.4 --- Parent.java 20 Mar 2003 13:59:10 -0000 1.5 *************** *** 7,10 **** --- 7,18 ---- private Child child; private Object any; + private int x; + + public int getX() { + return x; + } + public void setX(int x) { + this.x = x; + } public int getCount() { Index: ParentChild.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/ParentChild.hbm.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ParentChild.hbm.xml 19 Feb 2003 02:02:16 -0000 1.4 --- ParentChild.hbm.xml 20 Mar 2003 13:59:10 -0000 1.5 *************** *** 9,12 **** --- 9,13 ---- </generator> </id> + <property name="x"/> <property name="count" column="count_"/> <one-to-one name="child"/> *************** *** 21,24 **** --- 22,26 ---- <generator class="assigned"/> </id> + <property name="x"/> <one-to-one name="parent" class="net.sf.hibernate.test.Parent" constrained="true"/> <property name="count" column="count_"/> |