[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql ResultSetReader.java, 1.21, 1.22

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

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

Modified Files:
	ResultSetReader.java 
Log Message:
1659412: (TIMESTAMP WITH TIME ZONE shows as <Unknown (-101)>) Treat -101 and -102 as timestamps for Oracle.

Index: ResultSetReader.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql/ResultSetReader.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ResultSetReader.java	25 Nov 2006 01:50:25 -0000	1.21
--- ResultSetReader.java	14 Feb 2007 14:16:56 -0000	1.22
***************
*** 225,228 ****
--- 225,230 ----
  
  					case Types.TIMESTAMP :
+                     case -101 : // Oracle's 'TIMESTAMP WITH TIME ZONE' == -101  
+                     case -102 : // Oracle's 'TIMESTAMP WITH LOCAL TIME ZONE' == -102
  						row[i] = _rs.getTimestamp(idx);
  						break;
***************
*** 344,377 ****
  						break;
  
!                   //Add begin
!                case Types.JAVA_OBJECT:
!                   row[i] = _rs.getObject(idx);
!                   if (_rs.wasNull())
!                   {
!                      row[i] = null;
!                   }
!                   break;
!                   //Add end
  
  
!                case Types.OTHER:
! 						// Since we are reading Meta-data, there really should never be
! 						// a field with SQL type Other (1111).
! 						// If there is, we REALLY do not know how to handle it,
! 						// so do not attempt to read.
! //??						if (_largeObjInfo.getReadSQLOther())
! //??						{
! //??							// Running getObject on a java class attempts
! //??							// to load the class in memory which we don't want.
! //??							// getString() just gets the value without loading
! //??							// the class (at least under PostgreSQL).
! //??							//row[i] = _rs.getObject(idx);
! //??							row[i] = _rs.getString(idx);
! //??						}
! //??						else
! //??						{
! 							row[i] = s_stringMgr.getString("ResultSetReader.other");
! //??						}
! 						break;
  
  					default:
--- 346,379 ----
  						break;
  
! 						//Add begin
! 					case Types.JAVA_OBJECT:
! 					    row[i] = _rs.getObject(idx);
! 					    if (_rs.wasNull())
! 					    {
! 					        row[i] = null;
! 					    }
! 					    break;
! 					    //Add end
  
  
! 					case Types.OTHER:
! 					    // Since we are reading Meta-data, there really should never be
! 					    // a field with SQL type Other (1111).
! 					    // If there is, we REALLY do not know how to handle it,
! 					    // so do not attempt to read.
! //					    ??						if (_largeObjInfo.getReadSQLOther())
! //					    ??						{
! //					    ??							// Running getObject on a java class attempts
! //					    ??							// to load the class in memory which we don't want.
! //					    ??							// getString() just gets the value without loading
! //					    ??							// the class (at least under PostgreSQL).
! //					    ??							//row[i] = _rs.getObject(idx);
! //					    ??							row[i] = _rs.getString(idx);
! //					    ??						}
! //					    ??						else
! //					    ??						{
! 					    row[i] = s_stringMgr.getString("ResultSetReader.other");
! //					    ??						}
! 					    break;
  
  					default: