[Squirrel-sql-commits] sql12/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/commands AddLookupTableCommand.java, 1.5, 1.6 ModifyColumnCommand.java, 1.16, 1.17 AddUniqueConstraintCommand.java, 1.3, 1.4

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

Update of /cvsroot/squirrel-sql/sql12/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/commands
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv20290/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/commands

Modified Files:
	AddLookupTableCommand.java ModifyColumnCommand.java 
	AddUniqueConstraintCommand.java 
Log Message:
Implemented some of the new refactorings for DB2 dialect.

Index: AddLookupTableCommand.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddLookupTableCommand.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AddLookupTableCommand.java	10 Jan 2008 03:16:11 -0000	1.5
--- AddLookupTableCommand.java	12 Jan 2008 22:33:57 -0000	1.6
***************
*** 348,352 ****
  												"NO",
  												md);
! 				results.add(_dialect.getColumnNullableAlterSQL(newColumnNotNull));
  			}
  
--- 348,352 ----
  												"NO",
  												md);
! 				results.add(_dialect.getColumnNullableAlterSQL(newColumnNotNull, qualifier, _sqlPrefs));
  			}
  

Index: ModifyColumnCommand.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/commands/ModifyColumnCommand.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ModifyColumnCommand.java	10 Jan 2008 03:16:11 -0000	1.16
--- ModifyColumnCommand.java	12 Jan 2008 22:33:57 -0000	1.17
***************
*** 30,33 ****
--- 30,34 ----
  import net.sourceforge.squirrel_sql.client.session.ISession;
  import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+ import net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier;
  import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
  import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
***************
*** 152,158 ****
  		_dialect = DialectFactory.getDialect(dbName);
  
  		try
  		{
! 			result = DBUtil.getAlterSQLForColumnChange(columnToModify, to, _dialect);
  
  			for (int i = 0; i < result.length; i++)
--- 153,162 ----
  		_dialect = DialectFactory.getDialect(dbName);
  
+ 		DatabaseObjectQualifier qualifier =
+ 			new DatabaseObjectQualifier(_info[0].getCatalogName(), _info[0].getSchemaName());
+ 		
  		try
  		{
! 			result = DBUtil.getAlterSQLForColumnChange(columnToModify, to, _dialect, qualifier, _sqlPrefs);
  
  			for (int i = 0; i < result.length; i++)

Index: AddUniqueConstraintCommand.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/refactoring/src/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddUniqueConstraintCommand.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AddUniqueConstraintCommand.java	10 Jan 2008 03:16:11 -0000	1.3
--- AddUniqueConstraintCommand.java	12 Jan 2008 22:33:57 -0000	1.4
***************
*** 21,24 ****
--- 21,27 ----
  
  import java.sql.SQLException;
+ import java.util.ArrayList;
+ import java.util.HashMap;
+ import java.util.List;
  import java.util.TreeSet;
  
***************
*** 59,62 ****
--- 62,67 ----
  	protected AddUniqueConstraintDialog customDialog;
  
+ 	private HashMap<String, TableColumnInfo> columnMap = new HashMap<String, TableColumnInfo>();
+ 	
  	public AddUniqueConstraintCommand(ISession session, IDatabaseObjectInfo[] info)
  	{
***************
*** 80,87 ****
  		ITableInfo selectedTable = (ITableInfo) _info[0];
  		TableColumnInfo[] tableColumnInfos = _session.getMetaData().getColumnInfo(selectedTable);
  		TreeSet<String> localColumns = new TreeSet<String>();
! 		for (TableColumnInfo columns : tableColumnInfos)
  		{
! 			localColumns.add(columns.getColumnName());
  		}
  
--- 85,98 ----
  		ITableInfo selectedTable = (ITableInfo) _info[0];
  		TableColumnInfo[] tableColumnInfos = _session.getMetaData().getColumnInfo(selectedTable);
+ 		
  		TreeSet<String> localColumns = new TreeSet<String>();
! 		for (TableColumnInfo column : tableColumnInfos)
  		{
! 			// A Map for quick lookup later - we want to pass TableColumnInfos to the dialect, not merely column
! 			// names.
! 			columnMap.put(column.getColumnName(), column);
! 			
! 			// Add column name to the list
! 			localColumns.add(column.getColumnName());
  		}
  
***************
*** 105,116 ****
  			new DatabaseObjectQualifier(_info[0].getCatalogName(), _info[0].getSchemaName());
  
! 		String result =
  			_dialect.getAddUniqueConstraintSQL(_info[0].getSimpleName(),
  				customDialog.getConstraintName(),
! 				customDialog.getUniqueColumns().toArray(new String[] {}),
  				qualifier,
  				_sqlPrefs);
  
! 		return new String[] { result };
  	}
  
--- 116,133 ----
  			new DatabaseObjectQualifier(_info[0].getCatalogName(), _info[0].getSchemaName());
  
! 		List<String> columnNames = customDialog.getUniqueColumns();
! 		ArrayList<TableColumnInfo> columns = new ArrayList<TableColumnInfo>();
! 		for (String columnName : columnNames) {
! 			columns.add(columnMap.get(columnName));
! 		}
! 		
! 		String[] result =
  			_dialect.getAddUniqueConstraintSQL(_info[0].getSimpleName(),
  				customDialog.getConstraintName(),
! 				columns.toArray(new TableColumnInfo[] {}),
  				qualifier,
  				_sqlPrefs);
  
! 		return result;
  	}
  
***************
*** 155,157 ****
--- 172,175 ----
  		return dialect.supportsAddUniqueConstraint();
  	}
+ 	
  }