--- ../../n2/db.dataview/src/org/netbeans/modules/db/dataview/util/DBReadWriteHelper.java	2010-11-16 00:28:42.000000000 +0100
+++ src/org/netbeans/modules/db/dataview/util/DBReadWriteHelper.java	2010-12-16 22:25:29.000000000 +0100
@@ -157,30 +157,25 @@
                     return bddata;
                 }
             }
-            case Types.INTEGER: {
-                int idata = rs.getInt(index);
-                if (rs.wasNull()) {
-                    return null;
-                } else {
-                    return new Integer(idata);
-                }
-            }
-            case Types.SMALLINT: {
-                short sidata = rs.getShort(index);
-                if (rs.wasNull()) {
-                    return null;
-                } else {
-                    return new Short(sidata);
-                }
-            }
+            case Types.INTEGER: 
+            case Types.SMALLINT: 
             case Types.TINYINT: {
-                // byte primitive data type is not enough for UNSIGNED TINYINT
-                short tidata = rs.getShort(index);
-                if (rs.wasNull()) {
-                    return null;
-                } else {
-                    return new Short(tidata);
-                }
+		try {
+			int idata = rs.getInt(index);
+			if (rs.wasNull()) {
+			    return null;
+			} else {
+			    return new Integer(idata);
+			}
+		} catch (java.sql.SQLDataException ex) {
+			long ldata = rs.getLong(index);
+			if (rs.wasNull()) {
+			    return null;
+			} else {
+			    return new Long(ldata);
+			}
+			
+		}
             }
             // JDBC/ODBC bridge JDK1.4 brings back -9 for nvarchar columns in
             // MS SQL Server tables.