[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects OracleDialectExt.java, 1.6, 1.7 PostgreSQLDialectExt.java, 1.7, 1.8 DialectUtils.java, 1.58, 1.59

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30214/fw/src/net/sourceforge/squirrel_sql/fw/dialects

Modified Files:
	OracleDialectExt.java PostgreSQLDialectExt.java 
	DialectUtils.java 
Log Message:
Fixed tests that were failing due to over-aggressive column and constraint quoting.

Index: PostgreSQLDialectExt.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/PostgreSQLDialectExt.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PostgreSQLDialectExt.java	28 Jan 2009 13:43:28 -0000	1.7
--- PostgreSQLDialectExt.java	9 Feb 2009 00:01:02 -0000	1.8
***************
*** 327,330 ****
--- 327,331 ----
  	public String getColumnCommentAlterSQL(TableColumnInfo info, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) throws UnsupportedOperationException
  	{
+ 		prefs.setQuoteColumnNames(false);
  		return DialectUtils.getColumnCommentAlterSQL(info.getTableName(),
  			info.getColumnName(),
***************
*** 456,460 ****
  		result.append(DialectUtils.shapeQualifiableIdentifier(info.getTableName(), qualifier, prefs, this));
  		result.append(" ALTER COLUMN ");
! 		result.append(DialectUtils.shapeIdentifier(info.getColumnName(), prefs, this));
  		String defVal = info.getDefaultValue();
  		if (defVal == null || "".equals(defVal))
--- 457,461 ----
  		result.append(DialectUtils.shapeQualifiableIdentifier(info.getTableName(), qualifier, prefs, this));
  		result.append(" ALTER COLUMN ");
! 		result.append(info.getColumnName());
  		String defVal = info.getDefaultValue();
  		if (defVal == null || "".equals(defVal))

Index: DialectUtils.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/DialectUtils.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** DialectUtils.java	7 Feb 2009 20:51:29 -0000	1.58
--- DialectUtils.java	9 Feb 2009 00:01:02 -0000	1.59
***************
*** 310,314 ****
  		result.append(shapeQualifiableIdentifier(tableName, qualifier, prefs, dialect));
  		result.append(".");
! 		result.append(shapeIdentifier(columnName, prefs, dialect));
  		result.append(" IS '");
  		if (comment != null && !"".equals(comment))
--- 310,318 ----
  		result.append(shapeQualifiableIdentifier(tableName, qualifier, prefs, dialect));
  		result.append(".");
! 		if (prefs.isQuoteColumnNames()) {
! 			result.append(shapeIdentifier(columnName, prefs, dialect));
! 		} else {
! 			result.append(columnName);
! 		}
  		result.append(" IS '");
  		if (comment != null && !"".equals(comment))
***************
*** 831,835 ****
  		sql.append(DialectUtils.ADD_CONSTRAINT_CLAUSE);
  		sql.append(" ");
! 		sql.append(DialectUtils.shapeIdentifier(constraintName, prefs, dialect));
  
  		sql.append(" ");
--- 835,843 ----
  		sql.append(DialectUtils.ADD_CONSTRAINT_CLAUSE);
  		sql.append(" ");
! 		if (prefs.isQuoteConstraintNames()) {
! 			sql.append(DialectUtils.shapeIdentifier(constraintName, prefs, dialect));
! 		} else {
! 			sql.append(constraintName);
! 		}
  
  		sql.append(" ");
***************
*** 838,842 ****
  		for (TableColumnInfo column : columns)
  		{
! 			sql.append(DialectUtils.shapeIdentifier(column.getColumnName(), prefs, dialect));
  			sql.append(", ");
  		}
--- 846,854 ----
  		for (TableColumnInfo column : columns)
  		{
! 			if (prefs.isQuoteColumnNames()) {
! 				sql.append(DialectUtils.shapeIdentifier(column.getColumnName(), prefs, dialect));
! 			} else {
! 				sql.append(column.getColumnName());
! 			}
  			sql.append(", ");
  		}
***************
*** 923,928 ****
  	{
  		String shapedTable = shapeQualifiableIdentifier(from.getTableName(), qualifier, prefs, dialect);
! 		String shapedFromColumn = shapeIdentifier(from.getColumnName(), prefs, dialect);
! 		String shapedToColumn = shapeIdentifier(to.getColumnName(), prefs, dialect);
  
  		StringBuilder result = new StringBuilder();
--- 935,946 ----
  	{
  		String shapedTable = shapeQualifiableIdentifier(from.getTableName(), qualifier, prefs, dialect);
! 		String shapedFromColumn = from.getColumnName();
! 		if (prefs.isQuoteColumnNames()) {
! 			shapedFromColumn = shapeIdentifier(from.getColumnName(), prefs, dialect);
! 		}
! 		String shapedToColumn = to.getColumnName();
! 		if (prefs.isQuoteColumnNames()) {
! 			shapedToColumn = shapeIdentifier(to.getColumnName(), prefs, dialect);
! 		}
  
  		StringBuilder result = new StringBuilder();

Index: OracleDialectExt.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/OracleDialectExt.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** OracleDialectExt.java	6 Feb 2009 02:38:35 -0000	1.6
--- OracleDialectExt.java	9 Feb 2009 00:01:02 -0000	1.7
***************
*** 208,212 ****
  		result.append(DialectUtils.shapeQualifiableIdentifier(tableName, qualifier, prefs, this));
  		result.append(" DROP COLUMN ");
! 		result.append(DialectUtils.shapeIdentifier(columnName, prefs, this));
  		return result.toString();
  	}
--- 208,212 ----
  		result.append(DialectUtils.shapeQualifiableIdentifier(tableName, qualifier, prefs, this));
  		result.append(" DROP COLUMN ");
! 		result.append(columnName);
  		return result.toString();
  	}
***************
*** 257,262 ****
  		for (int i = 0; i < columns.length; i++)
  		{
! 			
! 			result.append(DialectUtils.shapeIdentifier(columns[i].getColumnName(), prefs, this));
  			if (i + 1 < columns.length)
  			{
--- 257,261 ----
  		for (int i = 0; i < columns.length; i++)
  		{
! 			result.append(columns[i].getColumnName());
  			if (i + 1 < columns.length)
  			{
***************
*** 321,327 ****
  				from.getTableName(),
  				ST_OLD_COLUMN_NAME_KEY,
! 				DialectUtils.shapeIdentifier(from.getColumnName(), prefs, this),
  				ST_NEW_COLUMN_NAME_KEY,
! 				DialectUtils.shapeIdentifier(to.getColumnName(), prefs, this));
  		
  		return DialectUtils.bindTemplateAttributes(this, st, valuesMap, qualifier, prefs);
--- 320,326 ----
  				from.getTableName(),
  				ST_OLD_COLUMN_NAME_KEY,
! 				from.getColumnName(),
  				ST_NEW_COLUMN_NAME_KEY,
! 				to.getColumnName());
  		
  		return DialectUtils.bindTemplateAttributes(this, st, valuesMap, qualifier, prefs);
***************
*** 434,438 ****
  		result.append(DialectUtils.shapeQualifiableIdentifier(info.getTableName(), qualifier, prefs, this));
  		result.append(" MODIFY ");
! 		result.append(DialectUtils.shapeIdentifier(info.getColumnName(), prefs, this));
  		result.append(" DEFAULT ");
  		if (JDBCTypeMapper.isNumberType(info.getDataType()))
--- 433,437 ----
  		result.append(DialectUtils.shapeQualifiableIdentifier(info.getTableName(), qualifier, prefs, this));
  		result.append(" MODIFY ");
! 		result.append(info.getColumnName());
  		result.append(" DEFAULT ");
  		if (JDBCTypeMapper.isNumberType(info.getDataType()))
***************
*** 574,577 ****
--- 573,578 ----
  		boolean addNullClause = true;
  
+ 		prefs.setQuoteColumnNames(false);
+ 		
  		String addColumnSql =
  			DialectUtils.getAddColumSQL(info,
***************
*** 638,641 ****
--- 639,645 ----
  		DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs)
  	{
+ 		prefs.setQuoteConstraintNames(false);
+ 		prefs.setQuoteColumnNames(false);
+ 		
  		return new String[] { DialectUtils.getAddUniqueConstraintSQL(tableName,
  			constraintName,