[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer ResultSetDataSet.java,1.17,1.18

[Gerd W. <ger...@us...>]

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv694/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer

Modified Files:
	ResultSetDataSet.java 
Log Message:
Matt Dahlman's fix for Teradata V2R05.00.00.11

Index: ResultSetDataSet.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/ResultSetDataSet.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ResultSetDataSet.java	2 Dec 2005 00:08:48 -0000	1.17
--- ResultSetDataSet.java	24 Mar 2006 19:37:43 -0000	1.18
***************
*** 271,287 ****
  			}
  
! 			columnDefs[i] =
!  					new ColumnDisplayDefinition(
!  					computeWidths ? colWidths[i] : md.getColumnDisplaySize(idx),
! 					fullTableName+":"+md.getColumnLabel(idx),
!  					md.getColumnLabel(idx),
!  					md.getColumnType(idx),
!  					md.getColumnTypeName(idx),
!  					isNullable,
!  					md.getColumnDisplaySize(idx),
!  					precis,
!  					md.getScale(idx),
!  					isSigned,
!  					md.isCurrency(idx));
  		}
  		return columnDefs;
--- 271,300 ----
  			}
  
!          boolean isCurrency = false;
! 
!          try
!          {
!             // Matt Dahlman: this causes problems with the JDBC driver delivered with Teradata V2R05.00.00.11
!             isCurrency = md.isCurrency(idx);
!          }
!          catch (SQLException e)
!          {
!             s_log.error("Failed to call ResultSetMetaData.isCurrency()", e);
!          }
! 
! 
!          columnDefs[i] =
!                 new ColumnDisplayDefinition(
!                 computeWidths ? colWidths[i] : md.getColumnDisplaySize(idx),
!                fullTableName+":"+md.getColumnLabel(idx),
!                 md.getColumnLabel(idx),
!                 md.getColumnType(idx),
!                 md.getColumnTypeName(idx),
!                 isNullable,
!                 md.getColumnDisplaySize(idx),
!                 precis,
!                 md.getScale(idx),
!                 isSigned,
!                 isCurrency);
  		}
  		return columnDefs;