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

[g. g. <gw...@us...>]

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

Modified Files:
	ResultSetReader.java 
Log Message:
move BLOB to use new DataType handlers


Index: ResultSetReader.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql/ResultSetReader.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ResultSetReader.java	4 Feb 2004 20:54:05 -0000	1.13
--- ResultSetReader.java	7 Apr 2004 02:30:26 -0000	1.14
***************
*** 453,493 ****
  					case Types.NULL:
  						row[i] = null;
! 						break;
! 
! 
! 
! // the following are not yet converted to new DataType mechanism
! 					case Types.BLOB:
! 						if (_largeObjInfo.getReadBlobs())
! 						{
! 							row[i] = null;
! 							Blob blob = _rs.getBlob(idx);
! 							if (blob != null)
! 							{
! 								int len = (int)blob.length();
! 								if (len > 0)
! 								{
! 									int bytesToRead = len;
! 									if (!_largeObjInfo.getReadCompleteBlobs())
! 									{
! 										bytesToRead = _largeObjInfo.getReadBlobsSize();
! 									}
! 									if (bytesToRead > len)
! 									{
! 										bytesToRead = len;
! 									}
! 									row[i] = new String(blob.getBytes(1, bytesToRead));
! 								}
! 							}
! 						}
! 						else
! 						{
! 							row[i] = s_stringMgr.getString("ResultSetReader.blob");
! 						}
! 						break;
! 						
! 						
! 
! // all of the following have been converted to use the new DataType object reader
  					// TODO: When JDK1.4 is the earliest JDK supported
  					// by Squirrel then remove the hardcoding of the
--- 453,459 ----
  					case Types.NULL:
  						row[i] = null;
! 						break;					
! 					
! 					// all of the following have been converted to use the DataType objects
  					// TODO: When JDK1.4 is the earliest JDK supported
  					// by Squirrel then remove the hardcoding of the
***************
*** 529,538 ****
  					
  					case Types.CLOB:
! 					
! 					
  					case Types.OTHER:
  
  					default:
! row[i] = CellComponentFactory.readResultSet(colDefs[i], _rs, idx, _largeObjInfo);
  
  						break;
--- 495,505 ----
  					
  					case Types.CLOB:
! 					case Types.BLOB:
! 									
  					case Types.OTHER:
  
  					default:
! 						row[i] = CellComponentFactory.readResultSet(
! 								colDefs[i], _rs, idx, _largeObjInfo);
  
  						break;