[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5594] trunk/sql12/fw/src/net/sourceforge/ squirrel_sql/fw/sql/ResultSetReader.java

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

Revision: 5594
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5594&view=rev
Author:   manningr
Date:     2010-04-24 19:22:59 +0000 (Sat, 24 Apr 2010)

Log Message:
-----------
2990527: nChar() is unknown field

Modified Paths:
--------------
    trunk/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql/ResultSetReader.java

Modified: trunk/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql/ResultSetReader.java
===================================================================
--- trunk/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql/ResultSetReader.java	2010-04-24 18:59:42 UTC (rev 5593)
+++ trunk/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql/ResultSetReader.java	2010-04-24 19:22:59 UTC (rev 5594)
@@ -309,16 +309,13 @@
                case Types.TINYINT:
                   row[i] = readInt(idx, columnTypeName);
                   break;
-
-               // TODO: Hard coded -. JDBC/ODBC bridge JDK1.4
-               // brings back -9 for nvarchar columns in
-               // MS SQL Server tables.
-               // -8 is ROWID in Oracle.
                case Types.CHAR:
+               case Types.NCHAR:
                case Types.VARCHAR:
+               case Types.NVARCHAR:
                case Types.LONGVARCHAR:
-               case -9:
-               case -8:
+               case Types.LONGNVARCHAR:
+               case Types.ROWID:
                   row[i] = _rs.getString(idx);
                   if (_rs.wasNull()) {
                      row[i] = null;
@@ -352,6 +349,13 @@
 
                   break;
 
+               // TODO: ResultSet has it's own NCLOB support (rs.getNClob(i)).  It is probably not valid to 
+               // call getClob on an NClob column ??  So, may need to implement new DataTypeNClob type 
+               // component (see below):  
+               // 
+               //case Types.NCLOB:
+               //  row[i] = DataTypeNClob.staticReadResultSet(_rs, idx);
+                  
                // Add begin
                case Types.JAVA_OBJECT:
                   row[i] = readObject(idx);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.