hibernate-commits — CVS commits

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/connection ConnectionProvider.java,1.4,1.5 DatasourceConnectionProvider.java,1.5,1.6

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/connection
In directory sc8-pr-cvs1:/tmp/cvs-serv22034/hibernate/connection

Modified Files:
	ConnectionProvider.java DatasourceConnectionProvider.java 
Log Message:
cleaned up imports

Index: ConnectionProvider.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/connection/ConnectionProvider.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ConnectionProvider.java	22 Feb 2003 06:42:07 -0000	1.4
--- ConnectionProvider.java	21 Mar 2003 12:03:35 -0000	1.5
***************
*** 1,5 ****
  //$Id$
  package net.sf.hibernate.connection;
! import java.sql.*;
  import java.util.Properties;
  
--- 1,6 ----
  //$Id$
  package net.sf.hibernate.connection;
! import java.sql.Connection;
! import java.sql.SQLException;
  import java.util.Properties;
  

Index: DatasourceConnectionProvider.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/connection/DatasourceConnectionProvider.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DatasourceConnectionProvider.java	22 Feb 2003 06:42:07 -0000	1.5
--- DatasourceConnectionProvider.java	21 Mar 2003 12:03:36 -0000	1.6
***************
*** 2,8 ****
  package net.sf.hibernate.connection;
  
  import java.util.Properties;
! import net.sf.hibernate.*;
! import net.sf.hibernate.cfg.*;
  import net.sf.hibernate.util.JDBCExceptionReporter;
  import net.sf.hibernate.util.NamingHelper;
--- 2,13 ----
  package net.sf.hibernate.connection;
  
+ import java.sql.Connection;
+ import java.sql.SQLException;
  import java.util.Properties;
! 
! import javax.sql.DataSource;
! 
! import net.sf.hibernate.HibernateException;
! import net.sf.hibernate.cfg.Environment;
  import net.sf.hibernate.util.JDBCExceptionReporter;
  import net.sf.hibernate.util.NamingHelper;
***************
*** 10,17 ****
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
- 
- import java.sql.*;
- 
- import javax.sql.DataSource;
  
  /**
--- 15,18 ----

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/tool/ddl2hbm Gui.java,1.4,1.5 JDBCUtil.java,1.3,1.4 MapGenerator.java,1.5,1.6 ParamsPanel.java,1.3,1.4

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/ddl2hbm
In directory sc8-pr-cvs1:/tmp/cvs-serv22034/hibernate/tool/ddl2hbm

Modified Files:
	Gui.java JDBCUtil.java MapGenerator.java ParamsPanel.java 
Log Message:
cleaned up imports

Index: Gui.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/ddl2hbm/Gui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Gui.java	20 Jan 2003 12:48:15 -0000	1.4
--- Gui.java	21 Mar 2003 12:03:41 -0000	1.5
***************
*** 6,16 ****
  
  package net.sf.hibernate.tool.ddl2hbm;
! import java.sql.*;
! import java.io.*;
! import javax.swing.*;
  
! import net.sf.hibernate.util.StringHelper;
  
! import java.util.*;
  
  /**
--- 6,28 ----
  
  package net.sf.hibernate.tool.ddl2hbm;
! import java.io.File;
! import java.io.FileInputStream;
! import java.io.FileOutputStream;
! import java.io.IOException;
! import java.sql.Connection;
! import java.sql.DriverManager;
! import java.sql.SQLException;
! import java.util.Arrays;
! import java.util.List;
! import java.util.Map;
! import java.util.Properties;
! import java.util.StringTokenizer;
  
! import javax.swing.DefaultComboBoxModel;
! import javax.swing.JFileChooser;
! import javax.swing.JFrame;
! import javax.swing.JOptionPane;
  
! import net.sf.hibernate.util.StringHelper;
  
  /**

Index: JDBCUtil.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/ddl2hbm/JDBCUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JDBCUtil.java	5 Jan 2003 02:11:23 -0000	1.3
--- JDBCUtil.java	21 Mar 2003 12:03:42 -0000	1.4
***************
*** 6,17 ****
  
  package net.sf.hibernate.tool.ddl2hbm;
! import java.sql.*;
! import java.util.*;
! 
! import org.apache.commons.logging.Log;
! import org.apache.commons.logging.LogFactory;
  
  import net.sf.hibernate.Hibernate;
  import net.sf.hibernate.type.NullableType;
  
  /**
--- 6,26 ----
  
  package net.sf.hibernate.tool.ddl2hbm;
! import java.sql.Connection;
! import java.sql.DatabaseMetaData;
! import java.sql.ResultSet;
! import java.sql.SQLException;
! import java.sql.Types;
! import java.util.HashMap;
! import java.util.HashSet;
! import java.util.LinkedList;
! import java.util.List;
! import java.util.Map;
! import java.util.Set;
  
  import net.sf.hibernate.Hibernate;
  import net.sf.hibernate.type.NullableType;
+ 
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
  
  /**

Index: MapGenerator.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/ddl2hbm/MapGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MapGenerator.java	20 Jan 2003 12:48:15 -0000	1.5
--- MapGenerator.java	21 Mar 2003 12:03:42 -0000	1.6
***************
*** 6,24 ****
  package net.sf.hibernate.tool.ddl2hbm;
  
! import java.sql.*;
! import org.w3c.dom.*;
! import javax.xml.parsers.*;
! import java.util.*;
! import java.io.*;
! import net.sf.hibernate.tool.hbm2java.*;
! import net.sf.hibernate.util.StringHelper;
  
! import javax.xml.transform.*;
! import javax.xml.transform.dom.*;
! import javax.xml.transform.stream.*;
  
  import org.apache.commons.collections.MultiHashMap;
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
  
  /**
--- 6,45 ----
  package net.sf.hibernate.tool.ddl2hbm;
  
! import java.io.ByteArrayOutputStream;
! import java.io.File;
! import java.io.FileOutputStream;
! import java.io.IOException;
! import java.io.OutputStream;
! import java.sql.Connection;
! import java.sql.SQLException;
! import java.util.Collection;
! import java.util.HashMap;
! import java.util.Iterator;
! import java.util.List;
! import java.util.Map;
! import java.util.Set;
  
! import javax.xml.parsers.DocumentBuilder;
! import javax.xml.parsers.DocumentBuilderFactory;
! import javax.xml.transform.OutputKeys;
! import javax.xml.transform.Transformer;
! import javax.xml.transform.TransformerConfigurationException;
! import javax.xml.transform.TransformerException;
! import javax.xml.transform.TransformerFactory;
! import javax.xml.transform.dom.DOMSource;
! import javax.xml.transform.stream.StreamResult;
! 
! import net.sf.hibernate.tool.hbm2java.ClassMapping;
! import net.sf.hibernate.tool.hbm2java.ClassName;
! import net.sf.hibernate.tool.hbm2java.Generator;
! import net.sf.hibernate.util.StringHelper;
  
  import org.apache.commons.collections.MultiHashMap;
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
+ import org.w3c.dom.Document;
+ import org.w3c.dom.Element;
+ import org.w3c.dom.Node;
+ import org.w3c.dom.NodeList;
  
  /**

Index: ParamsPanel.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/ddl2hbm/ParamsPanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ParamsPanel.java	5 Jan 2003 02:11:23 -0000	1.3
--- ParamsPanel.java	21 Mar 2003 12:03:42 -0000	1.4
***************
*** 6,10 ****
  
  package net.sf.hibernate.tool.ddl2hbm;
! import javax.swing.*;
  /**
   *
--- 6,10 ----
  
  package net.sf.hibernate.tool.ddl2hbm;
! import javax.swing.DefaultListModel;
  /**
   *

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/tool/hbm2ddl JdbcDatabaseInfo.java,1.4,1.5

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/hbm2ddl
In directory sc8-pr-cvs1:/tmp/cvs-serv22034/hibernate/tool/hbm2ddl

Modified Files:
	JdbcDatabaseInfo.java 
Log Message:
cleaned up imports

Index: JdbcDatabaseInfo.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/hbm2ddl/JdbcDatabaseInfo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JdbcDatabaseInfo.java	9 Jan 2003 12:24:52 -0000	1.4
--- JdbcDatabaseInfo.java	21 Mar 2003 12:03:43 -0000	1.5
***************
*** 2,7 ****
  package net.sf.hibernate.tool.hbm2ddl;
  
! import java.sql.*;
! import java.util.*;
  
  import net.sf.hibernate.dialect.Dialect;
--- 2,15 ----
  package net.sf.hibernate.tool.hbm2ddl;
  
! import java.sql.Connection;
! import java.sql.DatabaseMetaData;
! import java.sql.ResultSet;
! import java.sql.SQLException;
! import java.sql.Statement;
! import java.util.HashMap;
! import java.util.HashSet;
! import java.util.Iterator;
! import java.util.Map;
! import java.util.Set;
  
  import net.sf.hibernate.dialect.Dialect;

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/impl SessionImpl.java,1.26,1.27

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl
In directory sc8-pr-cvs1:/tmp/cvs-serv28341/hibernate/impl

Modified Files:
	SessionImpl.java 
Log Message:
added some new logging
support SQL-style escapes in HQL strings

Index: SessionImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/SessionImpl.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** SessionImpl.java	13 Mar 2003 03:16:01 -0000	1.26
--- SessionImpl.java	20 Mar 2003 13:59:06 -0000	1.27
***************
*** 1788,1791 ****
--- 1788,1793 ----
  		Type[] types = persister.getPropertyTypes();
  		
+ 		if ( log.isDebugEnabled() ) log.debug( "resolving associations for: " + infoString(persister, id) );
+ 		
  		interceptor.onLoad( object, id, hydratedState, persister.getPropertyNames(), types );
  		

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/hql ParserHelper.java,1.5,1.6 QueryTranslator.java,1.20,1.21

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hql
In directory sc8-pr-cvs1:/tmp/cvs-serv28341/hibernate/hql

Modified Files:
	ParserHelper.java QueryTranslator.java 
Log Message:
added some new logging
support SQL-style escapes in HQL strings

Index: ParserHelper.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hql/ParserHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ParserHelper.java	9 Mar 2003 04:04:07 -0000	1.5
--- ParserHelper.java	20 Mar 2003 13:59:05 -0000	1.6
***************
*** 10,14 ****
  	public static final String HQL_VARIABLE_PREFIX = ":";
  	
! 	public static final String HQL_SEPARATORS = " \n\r\f\t,()=<>&|+-=/*'^![]#~";
  	//NOTICE: no " or . since they are part of (compound) identifiers
  	public static final String PATH_SEPARATORS = ".";
--- 10,14 ----
  	public static final String HQL_VARIABLE_PREFIX = ":";
  	
! 	public static final String HQL_SEPARATORS = " \n\r\f\t,()=<>&|+-=/*'^![]#~\\";
  	//NOTICE: no " or . since they are part of (compound) identifiers
  	public static final String PATH_SEPARATORS = ".";

Index: QueryTranslator.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hql/QueryTranslator.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** QueryTranslator.java	9 Mar 2003 04:04:07 -0000	1.20
--- QueryTranslator.java	20 Mar 2003 13:59:06 -0000	1.21
***************
*** 801,805 ****
  			
  		}
! 		return StringHelper.multiply( query, placeholders.iterator(), replacements.iterator() );
  	}
  	
--- 801,807 ----
  			
  		}
! 		String[] results = StringHelper.multiply( query, placeholders.iterator(), replacements.iterator() );
! 		if (results.length==0) log.warn("no persistent classes found for query class: " + query);
! 		return results;
  	}
  	

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/engine Key.java,1.4,1.5

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv28341/hibernate/engine

Modified Files:
	Key.java 
Log Message:
added some new logging
support SQL-style escapes in HQL strings

Index: Key.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/engine/Key.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Key.java	5 Jan 2003 02:11:20 -0000	1.4
--- Key.java	20 Mar 2003 13:59:05 -0000	1.5
***************
*** 49,52 ****
--- 49,56 ----
  	
  	public int hashCode() { return id.hashCode(); }
+ 	
+ 	public String toString() {
+ 		return id.toString();
+ 	}
  }
  

[Hibernate-commits] Hibernate/cirrus/hibernate/loader Loader.java,1.35,1.36

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader
In directory sc8-pr-cvs1:/tmp/cvs-serv28555/hibernate/loader

Modified Files:
	Loader.java 
Log Message:
added some new logging

Index: Loader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader/Loader.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** Loader.java	4 Mar 2003 10:43:06 -0000	1.35
--- Loader.java	20 Mar 2003 13:58:46 -0000	1.36
***************
*** 263,266 ****
--- 263,268 ----
  		
  		Object[] rowResults = new Object[cols];
+ 		
+ 		if ( log.isDebugEnabled() ) log.debug( "result row: " + StringHelper.toString(keys) );
  
  		for ( int i=0; i<cols; i++ ) {

[Hibernate-commits] Hibernate/cirrus/hibernate/helpers StringHelper.java,1.21,1.22

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/helpers
In directory sc8-pr-cvs1:/tmp/cvs-serv28555/hibernate/helpers

Modified Files:
	StringHelper.java 
Log Message:
added some new logging

Index: StringHelper.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/helpers/StringHelper.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** StringHelper.java	4 Mar 2003 14:36:59 -0000	1.21
--- StringHelper.java	20 Mar 2003 13:58:45 -0000	1.22
***************
*** 139,142 ****
--- 139,143 ----
  	public static String toString(Object[] array) {
  		int len = array.length;
+ 		if (len==0) return "";
  		StringBuffer buf = new StringBuffer(len * 12);
  		for ( int i=0; i<len-1; i++ ) {

[Hibernate-commits] Hibernate/cirrus/hibernate/engine Key.java,1.4,1.5

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv28555/hibernate/engine

Modified Files:
	Key.java 
Log Message:
added some new logging

Index: Key.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/engine/Key.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Key.java	25 Dec 2002 01:02:16 -0000	1.4
--- Key.java	20 Mar 2003 13:58:45 -0000	1.5
***************
*** 49,51 ****
--- 49,55 ----
  
  	public int hashCode() { return id.hashCode(); }
+ 	
+ 	public String toString() {
+ 		return id.toString();
+ 	}
  }

[Hibernate-commits] Hibernate/cirrus/hibernate/impl SessionImpl.java,1.164,1.165

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl
In directory sc8-pr-cvs1:/tmp/cvs-serv28555/hibernate/impl

Modified Files:
	SessionImpl.java 
Log Message:
added some new logging

Index: SessionImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl/SessionImpl.java,v
retrieving revision 1.164
retrieving revision 1.165
diff -C2 -d -r1.164 -r1.165
*** SessionImpl.java	6 Mar 2003 10:55:09 -0000	1.164
--- SessionImpl.java	20 Mar 2003 13:58:45 -0000	1.165
***************
*** 1569,1572 ****
--- 1569,1574 ----
  		Object[] hydratedState = e.loadedState;
  		Type[] types = persister.getPropertyTypes();
+ 		
+ 		if ( log.isDebugEnabled() ) log.debug( "resolving associations for: " + infoString(persister, id) );
  
  		interceptor.onLoad( object, id, hydratedState, persister.getPropertyNames(), types );

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/test Bar.java,1.3,1.4 Child.java,1.3,1.4 Detail.java,1.3,1.4 Fo.hbm.xml,1.2,1.3 Fo.java,1.4,1.5 Foo.java,1.4,1.5 FooBar.hbm.xml,1.8,1.9 FooBarTest.java,1.42,1.43 Glarch.hbm.xml,1.6,1.7 Glarch.java,1.7,1.8 Many.hbm.xml,1.4,1.5 Many.java,1.3,1.4 Master.java,1.3,1.4 MasterDetail.hbm.xml,1.4,1.5 One.hbm.xml,1.4,1.5 One.java,1.3,1.4 Parent.java,1.4,1.5 ParentChild.hbm.xml,1.4,1.5

[<one...@us...>]

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_"/>

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/util StringHelper.java,1.11,1.12

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/util
In directory sc8-pr-cvs1:/tmp/cvs-serv28341/hibernate/util

Modified Files:
	StringHelper.java 
Log Message:
added some new logging
support SQL-style escapes in HQL strings

Index: StringHelper.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/util/StringHelper.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** StringHelper.java	15 Mar 2003 04:38:18 -0000	1.11
--- StringHelper.java	20 Mar 2003 13:59:10 -0000	1.12
***************
*** 142,145 ****
--- 142,146 ----
  	public static String toString(Object[] array) {
  		int len = array.length;
+ 		if (len==0) return StringHelper.EMPTY_STRING;
  		StringBuffer buf = new StringBuffer(len * 12);
  		for ( int i=0; i<len-1; i++ ) {

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/loader Loader.java,1.14,1.15

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader
In directory sc8-pr-cvs1:/tmp/cvs-serv28341/hibernate/loader

Modified Files:
	Loader.java 
Log Message:
added some new logging
support SQL-style escapes in HQL strings

Index: Loader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/loader/Loader.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Loader.java	15 Mar 2003 04:38:17 -0000	1.14
--- Loader.java	20 Mar 2003 13:59:09 -0000	1.15
***************
*** 225,228 ****
--- 225,230 ----
  		int cols = persisters.length;
  		
+ 		if ( log.isDebugEnabled() ) log.debug( "result row: " + StringHelper.toString(keys) );
+ 		
  		Object[] rowResults = new Object[cols];
  		

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/sql QuerySelect.java,1.3,1.4

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/sql
In directory sc8-pr-cvs1:/tmp/cvs-serv28341/hibernate/sql

Modified Files:
	QuerySelect.java 
Log Message:
added some new logging
support SQL-style escapes in HQL strings

Index: QuerySelect.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/sql/QuerySelect.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** QuerySelect.java	12 Mar 2003 08:24:23 -0000	1.3
--- QuerySelect.java	20 Mar 2003 13:59:09 -0000	1.4
***************
*** 116,125 ****
  	private void appendTokens(StringBuffer buf, Iterator iter) {
  		boolean lastSpaceable=true;
  		while ( iter.hasNext() ) {
  			String token = (String) iter.next();
  			boolean spaceable = !dontSpace.contains(token);
! 			if (spaceable && lastSpaceable) buf.append(' ');
  			lastSpaceable = spaceable;
  			buf.append(token);
  		}
  	}
--- 116,130 ----
  	private void appendTokens(StringBuffer buf, Iterator iter) {
  		boolean lastSpaceable=true;
+ 		boolean lastQuoted=false;
  		while ( iter.hasNext() ) {
  			String token = (String) iter.next();
  			boolean spaceable = !dontSpace.contains(token);
! 			boolean quoted = token.startsWith("'");
! 			if (spaceable && lastSpaceable) {
! 				if ( !quoted || !lastQuoted ) buf.append(' ');
! 			}
  			lastSpaceable = spaceable;
  			buf.append(token);
+ 			lastQuoted = token.endsWith("'");
  		}
  	}

[Hibernate-commits] Hibernate/cirrus/hibernate/test Child.java,1.1,1.2 Detail.java,1.4,1.5 Foo.java,1.38,1.39 FooBar.hbm.xml,1.19,1.20 Glarch.hbm.xml,1.5,1.6 Glarch.java,1.19,1.20 Many.hbm.xml,1.1,1.2 Many.java,1.1,1.2 Master.java,1.9,1.10 MasterDetail.hbm.xml,1.9,1.10 One.hbm.xml,1.2,1.3 One.java,1.2,1.3 Parent.java,1.1,1.2 ParentChild.hbm.xml,1.4,1.5

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/test
In directory sc8-pr-cvs1:/tmp/cvs-serv28555/hibernate/test

Modified Files:
	Child.java Detail.java Foo.java FooBar.hbm.xml 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

Index: Child.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Child.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Child.java	15 Jun 2002 05:05:00 -0000	1.1
--- Child.java	20 Mar 2003 13:58:48 -0000	1.2
***************
*** 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/Hibernate/cirrus/hibernate/test/Detail.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Detail.java	24 Sep 2002 16:43:26 -0000	1.4
--- Detail.java	20 Mar 2003 13:58:48 -0000	1.5
***************
*** 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: Foo.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Foo.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Foo.java	26 Dec 2002 03:35:08 -0000	1.38
--- Foo.java	20 Mar 2003 13:58:48 -0000	1.39
***************
*** 61,64 ****
--- 61,72 ----
      private int version;
      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 {

Index: FooBar.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/FooBar.hbm.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** FooBar.hbm.xml	27 Dec 2002 11:54:47 -0000	1.19
--- FooBar.hbm.xml	20 Mar 2003 13:58:49 -0000	1.20
***************
*** 52,55 ****
--- 52,56 ----
          <column name="float_" unique-key="abc" not-null="true"/>
      </property>
+     <property name="x"/>
      <property name="double" column="double_"/>
      <collection name="bytes" role="foo_bytes"/>

Index: Glarch.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Glarch.hbm.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Glarch.hbm.xml	5 Oct 2002 09:33:42 -0000	1.5
--- Glarch.hbm.xml	20 Mar 2003 13:58:49 -0000	1.6
***************
*** 25,28 ****
--- 25,29 ----
          <version name="version"/>
          <property name="name"/>
+         <property name="x"/>
          <!-- <property name="currency"/> -->
          <many-to-one name="next" column="next_" class="cirrus.hibernate.test.Glarch"/>

Index: Glarch.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Glarch.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Glarch.java	7 Dec 2002 08:10:24 -0000	1.19
--- Glarch.java	20 Mar 2003 13:58:49 -0000	1.20
***************
*** 21,26 ****
  	private GlarchProxy[] proxyArray;
  	private Set proxySet;
! 	//private Currency currency = Currency.getInstance( Locale.getDefault() );
  
  	public int getVersion() {
  		return version;
--- 21,32 ----
  	private GlarchProxy[] proxyArray;
  	private Set proxySet;
! 	private int x;
  
+ 	public int getX() {
+ 		return x;
+ 	}
+ 	public void setX(int x) {
+ 		this.x = x;
+ 	}
  	public int getVersion() {
  		return version;
***************
*** 117,120 ****
--- 123,127 ----
  		this.currency = currency;
  	}*/
+ 
  
  }

Index: Many.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Many.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Many.hbm.xml	4 Aug 2002 10:56:05 -0000	1.1
--- Many.hbm.xml	20 Mar 2003 13:58:49 -0000	1.2
***************
*** 8,11 ****
--- 8,12 ----
        <generator class="hilo.long" />
      </id>
+     <property name="x"/>
      <many-to-one name="one" column="one_key" class="cirrus.hibernate.test.One"/>
    </class>

Index: Many.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Many.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Many.java	5 Mar 2002 15:09:13 -0000	1.1
--- Many.java	20 Mar 2003 13:58:49 -0000	1.2
***************
*** 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/Hibernate/cirrus/hibernate/test/Master.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Master.java	9 Jan 2003 09:40:20 -0000	1.9
--- Master.java	20 Mar 2003 13:58:49 -0000	1.10
***************
*** 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/Hibernate/cirrus/hibernate/test/MasterDetail.hbm.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MasterDetail.hbm.xml	24 Oct 2002 05:20:33 -0000	1.9
--- MasterDetail.hbm.xml	20 Mar 2003 13:58:49 -0000	1.10
***************
*** 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)"/>
***************
*** 36,39 ****
--- 37,41 ----
  		</id>
  		<property name="i"/>
+ 		<property name="x"/>
  		<many-to-one name="master" column="master_key"/> <!--not-null="true"-->
  		<!-- <cache timeout="10000" type="readwrite"/> -->

Index: One.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/One.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** One.hbm.xml	22 Jan 2003 13:06:39 -0000	1.2
--- One.hbm.xml	20 Mar 2003 13:58:49 -0000	1.3
***************
*** 8,11 ****
--- 8,12 ----
  			<generator class="hilo.long" />
  		</id>
+ 		<property name="x"/>
  		<property column="one_value" name="value"/>
  		<set role="manies" readonly="true" lazy="true">

Index: One.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/One.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** One.java	30 Jul 2002 14:43:17 -0000	1.2
--- One.java	20 Mar 2003 13:58:49 -0000	1.3
***************
*** 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/Hibernate/cirrus/hibernate/test/Parent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Parent.java	15 Jun 2002 05:05:00 -0000	1.1
--- Parent.java	20 Mar 2003 13:58:49 -0000	1.2
***************
*** 6,9 ****
--- 6,17 ----
  	private int count;
  	private Child child;
+ 	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/Hibernate/cirrus/hibernate/test/ParentChild.hbm.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ParentChild.hbm.xml	31 Aug 2002 09:34:09 -0000	1.4
--- ParentChild.hbm.xml	20 Mar 2003 13:58:49 -0000	1.5
***************
*** 11,14 ****
--- 11,15 ----
  		<property name="count" column="count_"/>
  		<one-to-one name="child"/>
+ 		<property name="x"/>
  	</class>
  	
***************
*** 19,22 ****
--- 20,24 ----
  		<one-to-one name="parent" class="cirrus.hibernate.test.Parent" constrained="true"/>
  		<property name="count" column="count_"/>
+ 		<property name="x"/>
  	</class>
  

[Hibernate-commits] Hibernate2/doc/reference/src transactions.xml,1.4,1.5

[<tu...@us...>]

Update of /cvsroot/hibernate/Hibernate2/doc/reference/src
In directory sc8-pr-cvs1:/tmp/cvs-serv6389

Modified Files:
	transactions.xml 
Log Message:
Fixed example code

Index: transactions.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/doc/reference/src/transactions.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** transactions.xml	3 Mar 2003 01:07:03 -0000	1.4
--- transactions.xml	18 Mar 2003 09:55:27 -0000	1.5
***************
*** 228,232 ****
  Transaction tx = null;
  try {
!     tx = sessions.beginTransaction();
  
      fooList = s.find(
--- 228,232 ----
  Transaction tx = null;
  try {
!     tx = s.beginTransaction();
  
      fooList = s.find(

[Hibernate-commits] Hibernate2 changelog.txt,1.12,1.13

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2
In directory sc8-pr-cvs1:/tmp/cvs-serv4824

Modified Files:
	changelog.txt 
Log Message:
made name attibute of <session-factory> optional

Index: changelog.txt
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/changelog.txt,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** changelog.txt	13 Mar 2003 03:20:46 -0000	1.12
--- changelog.txt	17 Mar 2003 07:25:12 -0000	1.13
***************
*** 25,28 ****
--- 25,31 ----
  * added Hibernate.refresh(Object, LockMode)
  * update(), saveOrUpdate() no longer initialize a proxy
+ * fixed problems with Sybase
+ * added force attribute to <discriminator>
+ * improved handling of null discriminator-value
  
  Changes in version 2.0 beta 3 (24.2.2003)

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/cfg Configuration.java,1.16,1.17

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/cfg
In directory sc8-pr-cvs1:/tmp/cvs-serv4505/hibernate/cfg

Modified Files:
	Configuration.java 
Log Message:
made name attibute of <session-factory> optional

Index: Configuration.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/cfg/Configuration.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Configuration.java	22 Feb 2003 06:42:06 -0000	1.16
--- Configuration.java	17 Mar 2003 07:24:20 -0000	1.17
***************
*** 684,688 ****
  		Element sfNode = doc.getRootElement().element("session-factory");
  		String name = sfNode.attributeValue("name");
! 		properties.setProperty(Environment.SESSION_FACTORY_NAME, name);
  		addProperties(sfNode);
  		
--- 684,688 ----
  		Element sfNode = doc.getRootElement().element("session-factory");
  		String name = sfNode.attributeValue("name");
! 		if (name!=null) properties.setProperty(Environment.SESSION_FACTORY_NAME, name);
  		addProperties(sfNode);
  		

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/test Multi.hbm.xml,1.5,1.6

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test
In directory sc8-pr-cvs1:/tmp/cvs-serv4505/hibernate/test

Modified Files:
	Multi.hbm.xml 
Log Message:
made name attibute of <session-factory> optional

Index: Multi.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Multi.hbm.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Multi.hbm.xml	16 Mar 2003 03:37:01 -0000	1.5
--- Multi.hbm.xml	17 Mar 2003 07:24:20 -0000	1.6
***************
*** 3,7 ****
  <hibernate-mapping>
  
!     <class name="net.sf.hibernate.test.Simple" table="rootclass">
          <jcs-cache usage="read-write"/>
          <id type="long" column="id_" >
--- 3,7 ----
  <hibernate-mapping>
  
!     <class name="net.sf.hibernate.test.Simple" table="rootclass" dynamic-update="true">
          <jcs-cache usage="read-write"/>
          <id type="long" column="id_" >

[Hibernate-commits] Hibernate2/src/net/sf/hibernate hibernate-configuration-2.0.dtd,1.4,1.5

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate
In directory sc8-pr-cvs1:/tmp/cvs-serv4505/hibernate

Modified Files:
	hibernate-configuration-2.0.dtd 
Log Message:
made name attibute of <session-factory> optional

Index: hibernate-configuration-2.0.dtd
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hibernate-configuration-2.0.dtd,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** hibernate-configuration-2.0.dtd	3 Mar 2003 09:30:56 -0000	1.4
--- hibernate-configuration-2.0.dtd	17 Mar 2003 07:24:19 -0000	1.5
***************
*** 14,18 ****
  
  <!ELEMENT property (#PCDATA)>
! <!ATTLIST property name CDATA #IMPLIED>
  
  <!ELEMENT mapping EMPTY> <!-- reference to a mapping file -->
--- 14,18 ----
  
  <!ELEMENT property (#PCDATA)>
! <!ATTLIST property name CDATA #REQUIRED>
  
  <!ELEMENT mapping EMPTY> <!-- reference to a mapping file -->
***************
*** 32,34 ****
  
  <!ELEMENT session-factory (property*, mapping+, (jcs-class-cache|jcs-collection-cache)*)>
! <!ATTLIST session-factory name CDATA #REQUIRED> <!-- the JNDI name -->
--- 32,34 ----
  
  <!ELEMENT session-factory (property*, mapping+, (jcs-class-cache|jcs-collection-cache)*)>
! <!ATTLIST session-factory name CDATA #IMPLIED> <!-- the JNDI name -->

[Hibernate-commits] Hibernate/cirrus/hibernate/loader CollectionLoader.java,1.9,1.10 OneToManyLoader.java,1.16,1.17 OuterJoinLoader.java,1.17,1.18

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader
In directory sc8-pr-cvs1:/tmp/cvs-serv28144/hibernate/loader

Modified Files:
	CollectionLoader.java OneToManyLoader.java 
	OuterJoinLoader.java 
Log Message:
fixed problems with Sybase where many-to-one id columns appeared more than once

Index: CollectionLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader/CollectionLoader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CollectionLoader.java	1 Feb 2003 00:16:31 -0000	1.9
--- CollectionLoader.java	16 Mar 2003 05:59:11 -0000	1.10
***************
*** 42,46 ****
  		sql = sqlSelect(
  			// SELECT CLAUSE
! 			selectCollectionString(persister, alias) +
  			( joins==0 ? "" : ", " + selectString(associations) ),
  			// FROM CLAUSE
--- 42,46 ----
  		sql = sqlSelect(
  			// SELECT CLAUSE
! 			selectCollectionString(persister, alias, true) +
  			( joins==0 ? "" : ", " + selectString(associations) ),
  			// FROM CLAUSE

Index: OneToManyLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader/OneToManyLoader.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** OneToManyLoader.java	1 Feb 2003 00:16:31 -0000	1.16
--- OneToManyLoader.java	16 Mar 2003 05:59:11 -0000	1.17
***************
*** 50,56 ****
  		sql = sqlSelect(
  			// SELECT CLAUSE
! 			selectCollectionString(collPersister, collAlias) +
! 			( joins==0 ? "" : ", " + selectString(associations) )
! 			+ ", " +
  			selectString( persister, alias, suffixes[joins] ),
  			// FROM CLAUSE
--- 50,56 ----
  		sql = sqlSelect(
  			// SELECT CLAUSE
! 			selectCollectionString(collPersister, collAlias, joins>0) +
! 			( ( collPersister.hasIndex() || joins>0 ) ? ", " : "" ) +
! 			( joins==0 ? "" : selectString(associations) + ", " ) +
  			selectString( persister, alias, suffixes[joins] ),
  			// FROM CLAUSE

Index: OuterJoinLoader.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/loader/OuterJoinLoader.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** OuterJoinLoader.java	18 Jan 2003 09:01:10 -0000	1.17
--- OuterJoinLoader.java	16 Mar 2003 05:59:11 -0000	1.18
***************
*** 254,271 ****
  	 * Generate a list of collection index and element columns
  	 */
! 	protected static final String selectCollectionString(CollectionPersister persister, String alias) {
  		StringBuffer buf = new StringBuffer(20);
! 		String[] selectCols = persister.getElementColumnNames();
! 		for ( int i=0; i<selectCols.length; i++ ) {
! 			buf.append(alias)
! 				.append('.')
! 				.append( selectCols[i] );
! 			if (i!=selectCols.length-1) buf.append(", ");
  		}
  		if ( persister.hasIndex() ) {
  			String[] indexCols = persister.getIndexColumnNames();
  			for ( int i=0; i<indexCols.length; i++ ) {
! 				buf.append(", ")
! 					.append(alias)
  					.append('.')
  					.append( indexCols[i] );
--- 254,273 ----
  	 * Generate a list of collection index and element columns
  	 */
! 	protected static final String selectCollectionString(CollectionPersister persister, String alias, boolean includeElements) {
  		StringBuffer buf = new StringBuffer(20);
! 		if (includeElements) {
! 			String[] selectCols = persister.getElementColumnNames();
! 			for ( int i=0; i<selectCols.length; i++ ) {
! 				buf.append(alias)
! 					.append('.')
! 					.append( selectCols[i] );
! 				if (i!=selectCols.length-1) buf.append(", ");
! 			}
  		}
  		if ( persister.hasIndex() ) {
  			String[] indexCols = persister.getIndexColumnNames();
  			for ( int i=0; i<indexCols.length; i++ ) {
! 				if (i>0 || includeElements) buf.append(", ");
! 				buf.append(alias)
  					.append('.')
  					.append( indexCols[i] );

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/tool/hbm2ddl SchemaExport.java,1.8,1.9 SchemaUpdate.java,1.6,1.7

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/hbm2ddl
In directory sc8-pr-cvs1:/tmp/cvs-serv25546/sf/hibernate/tool/hbm2ddl

Modified Files:
	SchemaExport.java SchemaUpdate.java 
Log Message:
use properties from Configuration in SchemaExport + SchemaUpdate

Index: SchemaExport.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/hbm2ddl/SchemaExport.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SchemaExport.java	22 Feb 2003 06:42:07 -0000	1.8
--- SchemaExport.java	16 Mar 2003 03:56:02 -0000	1.9
***************
*** 13,17 ****
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.cfg.Configuration;
- import net.sf.hibernate.cfg.Environment;
  import net.sf.hibernate.connection.ConnectionProvider;
  import net.sf.hibernate.connection.ConnectionProviderFactory;
--- 13,16 ----
***************
*** 30,42 ****
  	private Properties connectionProperties;
  	private String outputFile = null;
  	
  	/**
  	 * Create a schema exporter for the given Configuration
  	 */
! 	public SchemaExport(Configuration ds) throws HibernateException {
! 		connectionProperties = Environment.getProperties();
! 		Dialect dialect = Dialect.getDialect();
! 		dropSQL = ds.generateDropSchemaScript(dialect);
! 		createSQL = ds.generateSchemaCreationScript(dialect);
  	}
  	
--- 29,39 ----
  	private Properties connectionProperties;
  	private String outputFile = null;
+ 	private Dialect dialect;
  	
  	/**
  	 * Create a schema exporter for the given Configuration
  	 */
! 	public SchemaExport(Configuration cfg) throws HibernateException {
! 		this( cfg, cfg.getProperties() );
  	}
  	
***************
*** 45,53 ****
  	 * database connection properties.
  	 */
! 	public SchemaExport(Configuration ds, Properties connectionProperties) throws HibernateException {
  		this.connectionProperties = connectionProperties;
! 		Dialect dialect = Dialect.getDialect(connectionProperties);
! 		dropSQL = ds.generateDropSchemaScript(dialect);
! 		createSQL = ds.generateSchemaCreationScript(dialect);
  	}
  	
--- 42,50 ----
  	 * database connection properties.
  	 */
! 	public SchemaExport(Configuration cfg, Properties connectionProperties) throws HibernateException {
  		this.connectionProperties = connectionProperties;
! 		dialect = Dialect.getDialect(connectionProperties);
! 		dropSQL = cfg.generateDropSchemaScript(dialect);
! 		createSQL = cfg.generateSchemaCreationScript(dialect);
  	}
  	
***************
*** 86,93 ****
  		Statement statement = null;
  		
! 		Properties givenProps = (connectionProperties==null) ? Environment.getProperties() : connectionProperties;
  		Properties props = new Properties();
! 		props.putAll( Dialect.getDialect(givenProps).getDefaultProperties() );
! 		props.putAll(givenProps);
  		boolean jdbc2 = false;
  		
--- 83,90 ----
  		Statement statement = null;
  		
! 		//Properties givenProps = (connectionProperties==null) ? Environment.getProperties() : connectionProperties;
  		Properties props = new Properties();
! 		props.putAll( dialect.getDefaultProperties() );
! 		props.putAll(connectionProperties);
  		boolean jdbc2 = false;
  		

Index: SchemaUpdate.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/hbm2ddl/SchemaUpdate.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SchemaUpdate.java	9 Feb 2003 06:28:16 -0000	1.6
--- SchemaUpdate.java	16 Mar 2003 03:56:02 -0000	1.7
***************
*** 27,43 ****
  	Log log = LogFactory.getLog( getClass() );
  	private ConnectionProvider cp;
! 	Configuration store;
  	Dialect dialect;
  
! 	public SchemaUpdate(Configuration store) throws HibernateException, SQLException {
! 		this.store = store;
! 		dialect = Dialect.getDialect();
! 		cp = ConnectionProviderFactory.newConnectionProvider();
  	}
  
  	public SchemaUpdate(Configuration store, Properties connectionProperties) throws HibernateException {
! 		this.store = store;
  		dialect = Dialect.getDialect(connectionProperties);
! 		cp = ConnectionProviderFactory.newConnectionProvider(connectionProperties);
  	}
  
--- 27,44 ----
  	Log log = LogFactory.getLog( getClass() );
  	private ConnectionProvider cp;
! 	Configuration cfg;
  	Dialect dialect;
  
! 	public SchemaUpdate(Configuration cfg) throws HibernateException, SQLException {
! 		this( cfg, cfg.getProperties() );
  	}
  
  	public SchemaUpdate(Configuration store, Properties connectionProperties) throws HibernateException {
! 		this.cfg = store;
  		dialect = Dialect.getDialect(connectionProperties);
! 		Properties props = new Properties();
! 		props.putAll( dialect.getDefaultProperties() );
! 		props.putAll(connectionProperties);
! 		cp = ConnectionProviderFactory.newConnectionProvider(props);
  	}
  
***************
*** 90,94 ****
  
  		String[] createSQL;
! 		createSQL = store.generateSchemaUpdateScript(dialect, info);
  		for (int j = 0; j < createSQL.length; j++) {
  
--- 91,95 ----
  
  		String[] createSQL;
! 		createSQL = cfg.generateSchemaUpdateScript(dialect, info);
  		for (int j = 0; j < createSQL.length; j++) {
  

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/test Mono.java,NONE,1.1 Multi.hbm.xml,1.4,1.5 MultiTableTest.java,1.10,1.11

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test
In directory sc8-pr-cvs1:/tmp/cvs-serv19750/sf/hibernate/test

Modified Files:
	Multi.hbm.xml MultiTableTest.java 
Added Files:
	Mono.java 
Log Message:
added a new test

--- NEW FILE: Mono.java ---
package net.sf.hibernate.test;

import java.util.Set;

/**
 * @author Administrator
 *
 * To change this generated comment edit the template variable "typecomment":
 * Window>Preferences>Java>Templates.
 * To enable and disable the creation of type comments go to
 * Window>Preferences>Java>Code Generation.
 */
public class Mono extends Simple {
	
	private Set strings;

	/**
	 * Constructor for Mono.
	 * @param c
	 */
	public Mono(int c) {
		super(c);
	}

	/**
	 * Constructor for Mono.
	 */
	public Mono() {
		super();
	}

	/**
	 * Returns the strings.
	 * @return Set
	 */
	public Set getStrings() {
		return strings;
	}

	/**
	 * Sets the strings.
	 * @param strings The strings to set
	 */
	public void setStrings(Set strings) {
		this.strings = strings;
	}

}

Index: Multi.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Multi.hbm.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Multi.hbm.xml	27 Jan 2003 12:12:41 -0000	1.4
--- Multi.hbm.xml	16 Mar 2003 03:37:01 -0000	1.5
***************
*** 13,16 ****
--- 13,24 ----
          <property name="date" column="date_"/>
          
+         <joined-subclass name="net.sf.hibernate.test.Mono" table="mono">
+         	<key column="superid"/>
+         	<set name="strings" table="monostrings">
+         		<key column="monoid"/>
+         		<element type="string" column="str_"/>
+         	</set>
+         </joined-subclass>
+         
          <joined-subclass name="net.sf.hibernate.test.TrivialClass">
          	<key column="tcid"/>

Index: MultiTableTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/MultiTableTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MultiTableTest.java	9 Mar 2003 04:04:09 -0000	1.10
--- MultiTableTest.java	16 Mar 2003 03:37:01 -0000	1.11
***************
*** 34,37 ****
--- 34,55 ----
  	}
  	
+ 	public void testCollectionOnly() throws Exception {
+ 		Session s = sessions.openSession();
+ 		Transaction t = s.beginTransaction();
+ 		Mono m = new Mono();
+ 		Long id = (Long) s.save(m);
+ 		t.commit();
+ 		s.close();
+ 		s = sessions.openSession();
+ 		t = s.beginTransaction();
+ 		s.update(m, id);
+ 		s.flush();
+ 		m.setAddress("foo bar");
+ 		s.flush();
+ 		s.delete(m);
+ 		t.commit();
+ 		s.close();	
+ 	}
+ 	
  	public void testQueries() throws Exception {
  

[Hibernate-commits] Hibernate/cirrus/hibernate/test Mono.java,NONE,1.1 Multi.hbm.xml,1.19,1.20 MultiTableTest.java,1.23,1.24

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/test
In directory sc8-pr-cvs1:/tmp/cvs-serv19454/hibernate/test

Modified Files:
	Multi.hbm.xml MultiTableTest.java 
Added Files:
	Mono.java 
Log Message:
added a new test

--- NEW FILE: Mono.java ---
package cirrus.hibernate.test;

import java.util.Set;

/**
 * @author Administrator
 *
 * To change this generated comment edit the template variable "typecomment":
 * Window>Preferences>Java>Templates.
 * To enable and disable the creation of type comments go to
 * Window>Preferences>Java>Code Generation.
 */
public class Mono extends Simple {
	
	private Set strings;

	/**
	 * Constructor for Mono.
	 */
	public Mono() {
		super();
	}

	/**
	 * Returns the strings.
	 * @return Set
	 */
	public Set getStrings() {
		return strings;
	}

	/**
	 * Sets the strings.
	 * @param strings The strings to set
	 */
	public void setStrings(Set strings) {
		this.strings = strings;
	}

}

Index: Multi.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Multi.hbm.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Multi.hbm.xml	25 Dec 2002 01:02:16 -0000	1.19
--- Multi.hbm.xml	16 Mar 2003 03:36:04 -0000	1.20
***************
*** 13,16 ****
--- 13,24 ----
          <property name="date" column="date_"/>
          
+         <joined-subclass name="cirrus.hibernate.test.Mono" table="mono">
+         	<key column="superid"/>
+         	<set role="strings" table="monostrings">
+         		<key column="monoid"/>
+         		<element type="string" column="str_"/>
+         	</set>
+         </joined-subclass>
+         
  	    <joined-subclass name="cirrus.hibernate.test.LessSimple" table="leafsubclass">
  	        <key column="id__"/>

Index: MultiTableTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/MultiTableTest.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** MultiTableTest.java	6 Mar 2003 10:55:09 -0000	1.23
--- MultiTableTest.java	16 Mar 2003 03:36:04 -0000	1.24
***************
*** 11,14 ****
--- 11,15 ----
  
  import cirrus.hibernate.*;
+ import cirrus.hibernate.sql.SybaseDialect;
  
  import junit.framework.Test;
***************
*** 21,24 ****
--- 22,43 ----
  	}
  
+ 	public void testCollectionOnly() throws Exception {
+ 		Session s = sessions.openSession();
+ 		Transaction t = s.beginTransaction();
+ 		Mono m = new Mono();
+ 		Long id = (Long) s.save(m);
+ 		t.commit();
+ 		s.close();
+ 		s = sessions.openSession();
+ 		t = s.beginTransaction();
+ 		s.update(m, id);
+ 		s.flush();
+ 		m.setAddress("foo bar");
+ 		s.flush();
+ 		s.delete(m);
+ 		t.commit();
+ 		s.close();	
+ 	}
+ 	
  	public void testConstraints() throws Exception {
  		Session s = sessions.openSession();
***************
*** 26,30 ****
  		SubMulti sm = new SubMulti();
  		sm.setAmount(66.5f);
! 		s.save( sm, new Long(2) );
  		t.commit();
  		s.close();
--- 45,54 ----
  		SubMulti sm = new SubMulti();
  		sm.setAmount(66.5f);
! 		if ( dialect instanceof SybaseDialect ) {
! 			s.save(sm);
! 		}
! 		else {
! 			s.save( sm, new Long(2) );
! 		}
  		t.commit();
  		s.close();
***************
*** 37,40 ****
--- 61,67 ----
  	
  	public void testMultiTable() throws Exception {
+ 		
+ 		if (dialect instanceof SybaseDialect) return;
+ 		
  		Session s = sessions.openSession();
  		Transaction t = s.beginTransaction();
***************
*** 154,157 ****
--- 181,187 ----
  	
  	public void testMultiTableCollections() throws Exception {
+ 		
+ 		if (dialect instanceof SybaseDialect) return;
+ 		
  		Session s = sessions.openSession();
  		Transaction t = s.beginTransaction();

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/sql Alias.java,NONE,1.1

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/sql
In directory sc8-pr-cvs1:/tmp/cvs-serv22983/src/net/sf/hibernate/sql

Added Files:
	Alias.java 
Log Message:
added missing file

--- NEW FILE: Alias.java ---
//$Id: Alias.java,v 1.1 2003/03/16 01:47:52 oneovthafew Exp $
package net.sf.hibernate.sql;

import net.sf.hibernate.dialect.Dialect;

/**
 * @author Administrator
 *
 */
public final class Alias {
	
	private final int length;
	private final String suffix;

	/**
	 * Constructor for Alias.
	 */
	public Alias(int length, String suffix) {
		super();
		this.length = (suffix==null) ? length : length - suffix.length();
		this.suffix = suffix;
	}
	
	/**
	 * Constructor for Alias.
	 */
	public Alias(String suffix) {
		super();
		this.length = Integer.MAX_VALUE;
		this.suffix = suffix;
	}
	
	public String toAliasString(String sqlIdentifier) {
		
		char begin = sqlIdentifier.charAt(0);
		int quoteType = Dialect.QUOTE.indexOf(begin);
		String unquoted;
		if ( quoteType>=0 ) {
			unquoted = sqlIdentifier.substring(1, sqlIdentifier.length()-1 );
		}
		else {
			unquoted = sqlIdentifier;
		}
		;
		if ( unquoted.length() > length ) {
			unquoted = unquoted.substring(0, length);
		}
		
		if (suffix!=null) unquoted += suffix;
		
		if ( quoteType >= 0 ) {
			char endQuote = Dialect.CLOSED_QUOTE.charAt(quoteType);
			return endQuote + unquoted + endQuote;
		}
		else {
			return unquoted;
		}
		
	}
	
	public String[] toAliasStrings(String[] sqlIdentifiers) {
		String[] aliases = new String[ sqlIdentifiers.length ];
		for ( int i=0; i<sqlIdentifiers.length; i++ ) {
			aliases[i] = toAliasString(sqlIdentifiers[i]);
		}
		return aliases;
	}

}