[Hibernate-commits] Hibernate2/src/net/sf/hibernate/dialect Dialect.java,1.4,1.5 MySQLDialect.java,1.3,1.4 OracleDialect.java,1.4,1.5 SAPDBDialect.java,1.4,1.5

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

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

Modified Files:
	Dialect.java MySQLDialect.java OracleDialect.java 
	SAPDBDialect.java 
Log Message:
major refactoring to create SQL Generation layer
more efficient queries against normalized mappings

Index: Dialect.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/dialect/Dialect.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Dialect.java	9 Jan 2003 12:24:50 -0000	1.4
--- Dialect.java	20 Jan 2003 12:48:09 -0000	1.5
***************
*** 7,10 ****
--- 7,12 ----
  import org.apache.commons.logging.LogFactory;
  
+ import net.sf.hibernate.sql.ANSIOuterJoinFragment;
+ import net.sf.hibernate.sql.OuterJoinFragment;
  import net.sf.hibernate.util.ReflectHelper;
  import net.sf.hibernate.util.StringHelper;
***************
*** 12,17 ****
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.MappingException;
- import net.sf.hibernate.loader.OuterJoinGenerator;
- import net.sf.hibernate.loader.AnsiOuterJoinGenerator;
  
  /**
--- 14,17 ----
***************
*** 41,45 ****
  	private final TypeNames typeNames = new TypeNames("$l");
  	private final Properties properties = new Properties();
- 	private final OuterJoinGenerator outerJoinGenerator = new AnsiOuterJoinGenerator();
  	
  	/**
--- 41,44 ----
***************
*** 164,168 ****
  		.append(constraintName)
  		.append(" foreign key (")
! 		.append( StringHelper.join(", ", foreignKey) )
  		.append(") references ")
  		.append(referencedTable)
--- 163,167 ----
  		.append(constraintName)
  		.append(" foreign key (")
! 		.append( StringHelper.join(StringHelper.COMMA_SPACE, foreignKey) )
  		.append(") references ")
  		.append(referencedTable)
***************
*** 183,187 ****
  	 */
  	public String getNullColumnString() {
! 		return "";
  	}
  	
--- 182,186 ----
  	 */
  	public String getNullColumnString() {
! 		return StringHelper.EMPTY_STRING;
  	}
  	
***************
*** 315,319 ****
  	 */
  	public String getCascadeConstraintsString() {
! 		return "";
  	}
  	
--- 314,318 ----
  	 */
  	public String getCascadeConstraintsString() {
! 		return StringHelper.EMPTY_STRING;
  	}
  	
***************
*** 322,327 ****
  	 * @return OuterJoinGenerator
  	 */
! 	public OuterJoinGenerator getOuterJoinGenerator() {
! 		return outerJoinGenerator;
  	}
  	
--- 321,326 ----
  	 * @return OuterJoinGenerator
  	 */
! 	public OuterJoinFragment createOuterJoinFragment() {
! 		return new ANSIOuterJoinFragment();
  	}
  	

Index: MySQLDialect.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/dialect/MySQLDialect.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MySQLDialect.java	5 Jan 2003 02:11:20 -0000	1.3
--- MySQLDialect.java	20 Jan 2003 12:48:09 -0000	1.4
***************
*** 66,70 ****
  	
  	public String getAddForeignKeyConstraintString(String constraintName, String[] foreignKey, String referencedTable, String[] primaryKey) {
! 		String cols = StringHelper.join(", ", foreignKey);
  		return new StringBuffer(30)
  		.append(" add index (")
--- 66,70 ----
  	
  	public String getAddForeignKeyConstraintString(String constraintName, String[] foreignKey, String referencedTable, String[] primaryKey) {
! 		String cols = StringHelper.join(StringHelper.COMMA_SPACE, foreignKey);
  		return new StringBuffer(30)
  		.append(" add index (")
***************
*** 77,81 ****
  		.append(referencedTable)
  		.append(" (")
! 		.append( StringHelper.join(", ", primaryKey) )
  		.append(')')
  		.toString();
--- 77,81 ----
  		.append(referencedTable)
  		.append(" (")
! 		.append( StringHelper.join(StringHelper.COMMA_SPACE, primaryKey) )
  		.append(')')
  		.toString();

Index: OracleDialect.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/dialect/OracleDialect.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** OracleDialect.java	9 Jan 2003 12:24:50 -0000	1.4
--- OracleDialect.java	20 Jan 2003 12:48:09 -0000	1.5
***************
*** 5,10 ****
  
  import net.sf.hibernate.Environment;
! import net.sf.hibernate.loader.OuterJoinGenerator;
! import net.sf.hibernate.loader.OracleOuterJoinGenerator;
  
  /**
--- 5,10 ----
  
  import net.sf.hibernate.Environment;
! import net.sf.hibernate.sql.OracleOuterJoinFragment;
! import net.sf.hibernate.sql.OuterJoinFragment;
  
  /**
***************
*** 14,19 ****
  public class OracleDialect extends Dialect {
  	
- 	private final OuterJoinGenerator outerJoinGenerator;
- 	
  	public OracleDialect() {
  		super();
--- 14,17 ----
***************
*** 35,40 ****
  		register( Types.CLOB, "CLOB" );
  		
- 		outerJoinGenerator = new OracleOuterJoinGenerator();
- 		
  		getDefaultProperties().setProperty(Environment.USE_STREAMS_FOR_BINARY, "true");
  		getDefaultProperties().setProperty(Environment.STATEMENT_BATCH_SIZE, DEFAULT_BATCH_SIZE);
--- 33,36 ----
***************
*** 60,65 ****
  	}
  	
! 	public OuterJoinGenerator getOuterJoinGenerator() {
! 		return outerJoinGenerator;
  	}
  	
--- 56,61 ----
  	}
  	
! 	public OuterJoinFragment createOuterJoinFragment() {
! 		return new OracleOuterJoinFragment();
  	}
  	

Index: SAPDBDialect.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/dialect/SAPDBDialect.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SAPDBDialect.java	9 Jan 2003 12:24:50 -0000	1.4
--- SAPDBDialect.java	20 Jan 2003 12:48:09 -0000	1.5
***************
*** 6,12 ****
  
  import net.sf.hibernate.Environment;
  import net.sf.hibernate.util.StringHelper;
- import net.sf.hibernate.loader.OracleOuterJoinGenerator;
- import net.sf.hibernate.loader.OuterJoinGenerator;
  
  /**
--- 6,12 ----
  
  import net.sf.hibernate.Environment;
+ import net.sf.hibernate.sql.OracleOuterJoinFragment;
+ import net.sf.hibernate.sql.OuterJoinFragment;
  import net.sf.hibernate.util.StringHelper;
  
  /**
***************
*** 15,20 ****
  public class SAPDBDialect extends Dialect {
  	
- 	private final OuterJoinGenerator outerJoinGenerator;
- 	
  	public SAPDBDialect() {
  		super();
--- 15,18 ----
***************
*** 36,41 ****
  		register( Types.BLOB, "LONG BYTE" );
  		
- 		outerJoinGenerator = new OracleOuterJoinGenerator();
- 		
  		getDefaultProperties().setProperty(Environment.OUTER_JOIN, "true");
  		getDefaultProperties().setProperty(Environment.STATEMENT_BATCH_SIZE, DEFAULT_BATCH_SIZE);
--- 34,37 ----
***************
*** 64,68 ****
  		.append(constraintName)
  		.append(" (")
! 		.append( StringHelper.join(", ", foreignKey) )
  		.append(") references ")
  		.append(referencedTable)
--- 60,64 ----
  		.append(constraintName)
  		.append(" (")
! 		.append( StringHelper.join(StringHelper.COMMA_SPACE, foreignKey) )
  		.append(") references ")
  		.append(referencedTable)
***************
*** 90,101 ****
  	}
  	
! 	public String getQuerySequencesString()
! 	{
  		return "select SEQUENCE_NAME from DOMAIN.SEQUENCES";
  	}
  	
! 	public OuterJoinGenerator getOuterJoinGenerator() {
! 		return outerJoinGenerator;
  	}
  	
  	public boolean supportsSequences() {
--- 86,97 ----
  	}
  	
! 	public String getQuerySequencesString() {
  		return "select SEQUENCE_NAME from DOMAIN.SEQUENCES";
  	}
  	
! 	public OuterJoinFragment createOuterJoinFragment() {
! 		return new OracleOuterJoinFragment();
  	}
+ 	
  	
  	public boolean supportsSequences() {