SimpleResultSet: updating a result set is now supported.

h2/src/main/org/h2/tools/SimpleResultSet.java

@@ -348,334 +348,274 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
     }
 
     /**
-     * Returns the value as a byte.
+     * Searches for a specific column in the result set. A case-insensitive
+     * search is made.
      *
-     * @param columnIndex (1,2,...)
-     * @return the value
+     * @param columnLabel the column label
+     * @return the column index (1,2,...)
+     * @throws SQLException if the column is not found or if the result set is
+     *             closed
      */
-    public byte getByte(int columnIndex) throws SQLException {
-        Object o = get(columnIndex);
-        if (o != null && !(o instanceof Number)) {
-            o = Byte.decode(o.toString());
+    public int findColumn(String columnLabel) throws SQLException {
+        if (columnLabel != null && columns != null) {
+            for (int i = 0, size = columns.size(); i < size; i++) {
+                if (columnLabel.equalsIgnoreCase(getColumn(i).name)) {
+                    return i + 1;
+                }
+            }
         }
-        return o == null ? 0 : ((Number) o).byteValue();
+        throw DbException.get(ErrorCode.COLUMN_NOT_FOUND_1, columnLabel).getSQLException();
     }
 
     /**
-     * Returns the value as an double.
+     * Returns a reference to itself.
      *
-     * @param columnIndex (1,2,...)
-     * @return the value
+     * @return this
      */
-    public double getDouble(int columnIndex) throws SQLException {
-        Object o = get(columnIndex);
-        if (o != null && !(o instanceof Number)) {
-            return Double.parseDouble(o.toString());
-        }
-        return o == null ? 0 : ((Number) o).doubleValue();
+    public ResultSetMetaData getMetaData() {
+        return this;
     }
 
     /**
-     * Returns the value as a float.
+     * Returns null.
      *
-     * @param columnIndex (1,2,...)
-     * @return the value
+     * @return null
      */
-    public float getFloat(int columnIndex) throws SQLException {
-        Object o = get(columnIndex);
-        if (o != null && !(o instanceof Number)) {
-            return Float.parseFloat(o.toString());
-        }
-        return o == null ? 0 : ((Number) o).floatValue();
+    public SQLWarning getWarnings() {
+        return null;
     }
 
     /**
-     * Returns the value as an int.
+     * Returns null.
      *
-     * @param columnIndex (1,2,...)
-     * @return the value
+     * @return null
      */
-    public int getInt(int columnIndex) throws SQLException {
-        Object o = get(columnIndex);
-        if (o != null && !(o instanceof Number)) {
-            o = Integer.decode(o.toString());
-        }
-        return o == null ? 0 : ((Number) o).intValue();
+    public Statement getStatement() {
+        return null;
     }
 
     /**
-     * Returns the value as a long.
-     *
-     * @param columnIndex (1,2,...)
-     * @return the value
+     * INTERNAL
      */
-    public long getLong(int columnIndex) throws SQLException {
-        Object o = get(columnIndex);
-        if (o != null && !(o instanceof Number)) {
-            o = Long.decode(o.toString());
-        }
-        return o == null ? 0 : ((Number) o).longValue();
+    public void clearWarnings() {
+        // nothing to do
     }
 
+    // ---- get ---------------------------------------------
+
     /**
-     * Returns the value as a short.
+     * Returns the value as a java.sql.Array.
      *
      * @param columnIndex (1,2,...)
      * @return the value
      */
-    public short getShort(int columnIndex) throws SQLException {
-        Object o = get(columnIndex);
-        if (o != null && !(o instanceof Number)) {
-            o = Short.decode(o.toString());
-        }
-        return o == null ? 0 : ((Number) o).shortValue();
+    public Array getArray(int columnIndex) throws SQLException {
+        Object[] o = (Object[]) get(columnIndex);
+        return o == null ? null : new SimpleArray(o);
     }
 
     /**
-     * Returns the value as a boolean.
+     * Returns the value as a java.sql.Array.
      *
-     * @param columnIndex (1,2,...)
+     * @param columnLabel the column label
      * @return the value
      */
-    public boolean getBoolean(int columnIndex) throws SQLException {
-        Object o = get(columnIndex);
-        if (o != null && !(o instanceof Boolean)) {
-            o = Boolean.valueOf(o.toString());
-        }
-        return o == null ? false : ((Boolean) o).booleanValue();
+    public Array getArray(String columnLabel) throws SQLException {
+        return getArray(findColumn(columnLabel));
     }
 
     /**
-     * Returns the value as a byte array.
-     *
-     * @param columnIndex (1,2,...)
-     * @return the value
+     * INTERNAL
      */
-    public byte[] getBytes(int columnIndex) throws SQLException {
-        return (byte[]) get(columnIndex);
+    public InputStream getAsciiStream(int columnIndex) throws SQLException {
+        throw getUnsupportedException();
     }
 
     /**
-     * Returns the value as an Object.
-     *
-     * @param columnIndex (1,2,...)
-     * @return the value
+     * INTERNAL
      */
-    public Object getObject(int columnIndex) throws SQLException {
-        return get(columnIndex);
+    public InputStream getAsciiStream(String columnLabel) throws SQLException {
+        throw getUnsupportedException();
     }
 
     /**
-     * Returns the value as a String.
+     * Returns the value as a java.math.BigDecimal.
      *
      * @param columnIndex (1,2,...)
      * @return the value
      */
-    public String getString(int columnIndex) throws SQLException {
+    public BigDecimal getBigDecimal(int columnIndex) throws SQLException {
         Object o = get(columnIndex);
-        if (o == null) {
-            return null;
-        }
-        switch (columns.get(columnIndex - 1).sqlType) {
-        case Types.CLOB:
-            Clob c = (Clob) o;
-            return c.getSubString(1, MathUtils.convertLongToInt(c.length()));
+        if (o != null && !(o instanceof BigDecimal)) {
+            o = new BigDecimal(o.toString());
         }
-        return o.toString();
+        return (BigDecimal) o;
     }
 
     /**
-     * Returns the value as a byte.
+     * Returns the value as a java.math.BigDecimal.
      *
      * @param columnLabel the column label
      * @return the value
      */
-    public byte getByte(String columnLabel) throws SQLException {
-        return getByte(findColumn(columnLabel));
+    public BigDecimal getBigDecimal(String columnLabel) throws SQLException {
+        return getBigDecimal(findColumn(columnLabel));
     }
 
     /**
-     * Returns the value as a double.
-     *
-     * @param columnLabel the column label
-     * @return the value
+     * @deprecated INTERNAL
      */
-    public double getDouble(String columnLabel) throws SQLException {
-        return getDouble(findColumn(columnLabel));
+    public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
+        throw getUnsupportedException();
     }
 
     /**
-     * Returns the value as a float.
-     *
-     * @param columnLabel the column label
-     * @return the value
+     * @deprecated INTERNAL
      */
-    public float getFloat(String columnLabel) throws SQLException {
-        return getFloat(findColumn(columnLabel));
+    public BigDecimal getBigDecimal(String columnLabel, int scale) throws SQLException {
+        throw getUnsupportedException();
     }
 
     /**
-     * Searches for a specific column in the result set. A case-insensitive
-     * search is made.
+     * Returns the value as a java.io.InputStream.
+     * This is only supported if the
+     * result set was created using a Blob object.
      *
-     * @param columnLabel the column label
-     * @return the column index (1,2,...)
-     * @throws SQLException if the column is not found or if the result set is
-     *             closed
+     * @param columnIndex (1,2,...)
+     * @return the value
      */
-    public int findColumn(String columnLabel) throws SQLException {
-        if (columnLabel != null && columns != null) {
-            for (int i = 0, size = columns.size(); i < size; i++) {
-                if (columnLabel.equalsIgnoreCase(getColumn(i).name)) {
-                    return i + 1;
-                }
-            }
-        }
-        throw DbException.get(ErrorCode.COLUMN_NOT_FOUND_1, columnLabel).getSQLException();
+    public InputStream getBinaryStream(int columnIndex) throws SQLException {
+        Blob b = (Blob) get(columnIndex);
+        return b == null ? null : b.getBinaryStream();
     }
 
     /**
-     * Returns the value as an int.
+     * Returns the value as a java.io.InputStream.
+     * This is only supported if the
+     * result set was created using a Blob object.
      *
      * @param columnLabel the column label
      * @return the value
      */
-    public int getInt(String columnLabel) throws SQLException {
-        return getInt(findColumn(columnLabel));
+    public InputStream getBinaryStream(String columnLabel) throws SQLException {
+        return getBinaryStream(findColumn(columnLabel));
     }
 
     /**
-     * Returns the value as a long.
+     * Returns the value as a java.sql.Blob.
+     * This is only supported if the
+     * result set was created using a Blob object.
      *
-     * @param columnLabel the column label
+     * @param columnIndex (1,2,...)
      * @return the value
      */
-    public long getLong(String columnLabel) throws SQLException {
-        return getLong(findColumn(columnLabel));
+    public Blob getBlob(int columnIndex) throws SQLException {
+        Blob b = (Blob) get(columnIndex);
+        return b == null ? null : b;
     }
 
     /**
-     * Returns the value as a short.
+     * Returns the value as a java.sql.Blob.
+     * This is only supported if the
+     * result set was created using a Blob object.
      *
      * @param columnLabel the column label
      * @return the value
      */
-    public short getShort(String columnLabel) throws SQLException {
-        return getShort(findColumn(columnLabel));
+    public Blob getBlob(String columnLabel) throws SQLException {
+        return getBlob(findColumn(columnLabel));
     }
 
     /**
      * Returns the value as a boolean.
      *
-     * @param columnLabel the column label
+     * @param columnIndex (1,2,...)
      * @return the value
      */
-    public boolean getBoolean(String columnLabel) throws SQLException {
-        return getBoolean(findColumn(columnLabel));
+    public boolean getBoolean(int columnIndex) throws SQLException {
+        Object o = get(columnIndex);
+        if (o != null && !(o instanceof Boolean)) {
+            o = Boolean.valueOf(o.toString());
+        }
+        return o == null ? false : ((Boolean) o).booleanValue();
     }
 
     /**
-     * Returns the value as a byte array.
+     * Returns the value as a boolean.
      *
      * @param columnLabel the column label
      * @return the value
      */
-    public byte[] getBytes(String columnLabel) throws SQLException {
-        return getBytes(findColumn(columnLabel));
+    public boolean getBoolean(String columnLabel) throws SQLException {
+        return getBoolean(findColumn(columnLabel));
     }
 
     /**
-     * Returns the value as a java.math.BigDecimal.
+     * Returns the value as a byte.
      *
      * @param columnIndex (1,2,...)
      * @return the value
      */
-    public BigDecimal getBigDecimal(int columnIndex) throws SQLException {
+    public byte getByte(int columnIndex) throws SQLException {
         Object o = get(columnIndex);
-        if (o != null && !(o instanceof BigDecimal)) {
-            o = new BigDecimal(o.toString());
+        if (o != null && !(o instanceof Number)) {
+            o = Byte.decode(o.toString());
         }
-        return (BigDecimal) o;
+        return o == null ? 0 : ((Number) o).byteValue();
     }
 
     /**
-     * Returns the value as an java.sql.Date.
+     * Returns the value as a byte.
      *
-     * @param columnIndex (1,2,...)
+     * @param columnLabel the column label
      * @return the value
      */
-    public Date getDate(int columnIndex) throws SQLException {
-        return (Date) get(columnIndex);
+    public byte getByte(String columnLabel) throws SQLException {
+        return getByte(findColumn(columnLabel));
     }
 
     /**
-     * Returns a reference to itself.
+     * Returns the value as a byte array.
      *
-     * @return this
+     * @param columnIndex (1,2,...)
+     * @return the value
      */
-    public ResultSetMetaData getMetaData() {
-        return this;
+    public byte[] getBytes(int columnIndex) throws SQLException {
+        return (byte[]) get(columnIndex);
     }
 
     /**
-     * Returns null.
+     * Returns the value as a byte array.
      *
-     * @return null
+     * @param columnLabel the column label
+     * @return the value
      */
-    public SQLWarning getWarnings() {
-        return null;
+    public byte[] getBytes(String columnLabel) throws SQLException {
+        return getBytes(findColumn(columnLabel));
     }
 
     /**
-     * Returns null.
-     *
-     * @return null
-     */
-    public Statement getStatement() {
-        return null;
-    }
-
-    /**
-     * Returns the value as an java.sql.Time.
-     *
-     * @param columnIndex (1,2,...)
-     * @return the value
-     */
-    public Time getTime(int columnIndex) throws SQLException {
-        return (Time) get(columnIndex);
-    }
-
-    /**
-     * Returns the value as an java.sql.Timestamp.
-     *
-     * @param columnIndex (1,2,...)
-     * @return the value
-     */
-    public Timestamp getTimestamp(int columnIndex) throws SQLException {
-        return (Timestamp) get(columnIndex);
-    }
-
-    /**
-     * Returns the value as a java.sql.Array.
+     * Returns the value as a java.io.Reader.
+     * This is only supported for CLOB data.
      *
      * @param columnIndex (1,2,...)
      * @return the value
      */
-    public Array getArray(int columnIndex) throws SQLException {
-        Object[] o = (Object[]) get(columnIndex);
-        return o == null ? null : new SimpleArray(o);
+    public Reader getCharacterStream(int columnIndex) throws SQLException {
+        Clob c = (Clob) get(columnIndex);
+        return c == null ? null : c.getCharacterStream();
     }
 
     /**
      * Returns the value as a java.io.Reader.
-     * This is only supported for CLOB data.
+     * This is only supported if the
+     * result set was created using a Clob object.
      *
-     * @param columnIndex (1,2,...)
+     * @param columnLabel the column label
      * @return the value
      */
-    public Reader getCharacterStream(int columnIndex) throws SQLException {
-        Clob c = (Clob) get(columnIndex);
-        return c == null ? null : c.getCharacterStream();
+    public Reader getCharacterStream(String columnLabel) throws SQLException {
+        return getCharacterStream(findColumn(columnLabel));
     }
 
     /**
@@ -692,455 +632,480 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
     }
 
     /**
-     * Returns the value as a java.sql.Blob.
+     * Returns the value as a java.sql.Clob.
      * This is only supported if the
-     * result set was created using a Blob object.
+     * result set was created using a Clob object.
      *
-     * @param columnIndex (1,2,...)
+     * @param columnLabel the column label
      * @return the value
      */
-    public Blob getBlob(int columnIndex) throws SQLException {
-        Blob b = (Blob) get(columnIndex);
-        return b == null ? null : b;
+    public Clob getClob(String columnLabel) throws SQLException {
+        return getClob(findColumn(columnLabel));
     }
 
     /**
-     * Returns the value as a java.io.InputStream.
-     * This is only supported if the
-     * result set was created using a Blob object.
+     * Returns the value as an java.sql.Date.
      *
      * @param columnIndex (1,2,...)
      * @return the value
      */
-    public InputStream getBinaryStream(int columnIndex) throws SQLException {
-        Blob b = (Blob) get(columnIndex);
-        return b == null ? null : b.getBinaryStream();
+    public Date getDate(int columnIndex) throws SQLException {
+        return (Date) get(columnIndex);
     }
 
     /**
-     * Returns the value as an Object.
+     * Returns the value as a java.sql.Date.
      *
      * @param columnLabel the column label
      * @return the value
      */
-    public Object getObject(String columnLabel) throws SQLException {
-        return getObject(findColumn(columnLabel));
+    public Date getDate(String columnLabel) throws SQLException {
+        return getDate(findColumn(columnLabel));
     }
 
     /**
-     * Returns the value as a String.
-     *
-     * @param columnLabel the column label
-     * @return the value
+     * INTERNAL
      */
-    public String getString(String columnLabel) throws SQLException {
-        return getString(findColumn(columnLabel));
+    public Date getDate(int columnIndex, Calendar cal) throws SQLException {
+        throw getUnsupportedException();
     }
 
     /**
-     * Returns the value as a java.math.BigDecimal.
+     * INTERNAL
+     */
+    public Date getDate(String columnLabel, Calendar cal) throws SQLException {
+        throw getUnsupportedException();
+    }
+
+    /**
+     * Returns the value as an double.
      *
-     * @param columnLabel the column label
+     * @param columnIndex (1,2,...)
      * @return the value
      */
-    public BigDecimal getBigDecimal(String columnLabel) throws SQLException {
-        return getBigDecimal(findColumn(columnLabel));
+    public double getDouble(int columnIndex) throws SQLException {
+        Object o = get(columnIndex);
+        if (o != null && !(o instanceof Number)) {
+            return Double.parseDouble(o.toString());
+        }
+        return o == null ? 0 : ((Number) o).doubleValue();
     }
 
     /**
-     * Returns the value as a java.sql.Date.
+     * Returns the value as a double.
      *
      * @param columnLabel the column label
      * @return the value
      */
-    public Date getDate(String columnLabel) throws SQLException {
-        return getDate(findColumn(columnLabel));
+    public double getDouble(String columnLabel) throws SQLException {
+        return getDouble(findColumn(columnLabel));
     }
 
     /**
-     * Returns the value as a java.sql.Time.
+     * Returns the value as a float.
      *
-     * @param columnLabel the column label
+     * @param columnIndex (1,2,...)
      * @return the value
      */
-    public Time getTime(String columnLabel) throws SQLException {
-        return getTime(findColumn(columnLabel));
+    public float getFloat(int columnIndex) throws SQLException {
+        Object o = get(columnIndex);
+        if (o != null && !(o instanceof Number)) {
+            return Float.parseFloat(o.toString());
+        }
+        return o == null ? 0 : ((Number) o).floatValue();
     }
 
     /**
-     * Returns the value as a java.sql.Timestamp.
+     * Returns the value as a float.
      *
      * @param columnLabel the column label
      * @return the value
      */
-    public Timestamp getTimestamp(String columnLabel) throws SQLException {
-        return getTimestamp(findColumn(columnLabel));
+    public float getFloat(String columnLabel) throws SQLException {
+        return getFloat(findColumn(columnLabel));
     }
 
     /**
-     * Returns the value as a java.io.Reader.
-     * This is only supported if the
-     * result set was created using a Clob object.
+     * Returns the value as an int.
      *
-     * @param columnLabel the column label
+     * @param columnIndex (1,2,...)
      * @return the value
      */
-    public Reader getCharacterStream(String columnLabel) throws SQLException {
-        return getCharacterStream(findColumn(columnLabel));
+    public int getInt(int columnIndex) throws SQLException {
+        Object o = get(columnIndex);
+        if (o != null && !(o instanceof Number)) {
+            o = Integer.decode(o.toString());
+        }
+        return o == null ? 0 : ((Number) o).intValue();
     }
 
     /**
-     * Returns the value as a java.sql.Clob.
-     * This is only supported if the
-     * result set was created using a Clob object.
+     * Returns the value as an int.
      *
      * @param columnLabel the column label
      * @return the value
      */
-    public Clob getClob(String columnLabel) throws SQLException {
-        return getClob(findColumn(columnLabel));
+    public int getInt(String columnLabel) throws SQLException {
+        return getInt(findColumn(columnLabel));
     }
 
     /**
-     * Returns the value as a java.sql.Blob.
-     * This is only supported if the
-     * result set was created using a Blob object.
+     * Returns the value as a long.
      *
-     * @param columnLabel the column label
+     * @param columnIndex (1,2,...)
      * @return the value
      */
-    public Blob getBlob(String columnLabel) throws SQLException {
-        return getBlob(findColumn(columnLabel));
+    public long getLong(int columnIndex) throws SQLException {
+        Object o = get(columnIndex);
+        if (o != null && !(o instanceof Number)) {
+            o = Long.decode(o.toString());
+        }
+        return o == null ? 0 : ((Number) o).longValue();
     }
 
     /**
-     * Returns the value as a java.io.InputStream.
-     * This is only supported if the
-     * result set was created using a Blob object.
+     * Returns the value as a long.
      *
      * @param columnLabel the column label
      * @return the value
      */
-    public InputStream getBinaryStream(String columnLabel) throws SQLException {
-        return getBinaryStream(findColumn(columnLabel));
+    public long getLong(String columnLabel) throws SQLException {
+        return getLong(findColumn(columnLabel));
     }
 
-    // ---- result set meta data ---------------------------------------------
-
     /**
-     * Returns the column count.
-     *
-     * @return the column count
+     * INTERNAL
      */
-    public int getColumnCount() {
-        return columns.size();
+//## Java 1.6 ##
+    public Reader getNCharacterStream(int columnIndex) throws SQLException {
+        throw getUnsupportedException();
     }
+//*/
 
     /**
-     * Returns 15.
-     *
-     * @param columnIndex (1,2,...)
-     * @return 15
+     * INTERNAL
      */
-    public int getColumnDisplaySize(int columnIndex) {
-        return 15;
+//## Java 1.6 ##
+    public Reader getNCharacterStream(String columnLabel) throws SQLException {
+        throw getUnsupportedException();
     }
+//*/
 
     /**
-     * Returns the SQL type.
-     *
-     * @param columnIndex (1,2,...)
-     * @return the SQL type
+     * INTERNAL
      */
-    public int getColumnType(int columnIndex) throws SQLException {
-        return getColumn(columnIndex - 1).sqlType;
+//## Java 1.6 ##
+    public NClob getNClob(int columnIndex) throws SQLException {
+        throw getUnsupportedException();
     }
+//*/
 
     /**
-     * Returns the precision.
-     *
-     * @param columnIndex (1,2,...)
-     * @return the precision
+     * INTERNAL
      */
-    public int getPrecision(int columnIndex) throws SQLException {
-        return getColumn(columnIndex - 1).precision;
+//## Java 1.6 ##
+    public NClob getNClob(String columnLabel) throws SQLException {
+        throw getUnsupportedException();
     }
+//*/
 
     /**
-     * Returns the scale.
-     *
-     * @param columnIndex (1,2,...)
-     * @return the scale
+     * INTERNAL
      */
-    public int getScale(int columnIndex) throws SQLException {
-        return getColumn(columnIndex - 1).scale;
+//## Java 1.6 ##
+    public String getNString(int columnIndex) throws SQLException {
+        return getString(columnIndex);
     }
+//*/
 
     /**
-     * Returns ResultSetMetaData.columnNullableUnknown.
-     *
-     * @param columnIndex (1,2,...)
-     * @return columnNullableUnknown
+     * INTERNAL
      */
-    public int isNullable(int columnIndex) {
-        return ResultSetMetaData.columnNullableUnknown;
+//## Java 1.6 ##
+    public String getNString(String columnLabel) throws SQLException {
+        return getString(columnLabel);
     }
+//*/
 
     /**
-     * Returns false.
+     * Returns the value as an Object.
      *
      * @param columnIndex (1,2,...)
-     * @return false
+     * @return the value
      */
-    public boolean isAutoIncrement(int columnIndex) {
-        return false;
+    public Object getObject(int columnIndex) throws SQLException {
+        return get(columnIndex);
     }
 
     /**
-     * Returns true.
+     * Returns the value as an Object.
      *
-     * @param columnIndex (1,2,...)
-     * @return true
+     * @param columnLabel the column label
+     * @return the value
      */
-    public boolean isCaseSensitive(int columnIndex) {
-        return true;
+    public Object getObject(String columnLabel) throws SQLException {
+        return getObject(findColumn(columnLabel));
     }
 
     /**
-     * Returns false.
+     * INTERNAL
      *
-     * @param columnIndex (1,2,...)
-     * @return false
+     * @param columnIndex the column index (1, 2, ...)
+     * @param type the class of the returned value
      */
-    public boolean isCurrency(int columnIndex) {
-        return false;
+/*## Java 1.7 ##
+    public <T> T getObject(int columnIndex, Class<T> type) {
+        return null;
     }
+//*/
 
     /**
-     * Returns false.
+     * INTERNAL
      *
-     * @param columnIndex (1,2,...)
-     * @return false
+     * @param columnName the column name
+     * @param type the class of the returned value
      */
-    public boolean isDefinitelyWritable(int columnIndex) {
-        return false;
+/*## Java 1.7 ##
+    public <T> T getObject(String columnName, Class<T> type) {
+        return null;
     }
+//*/
 
     /**
-     * Returns true.
-     *
-     * @param columnIndex (1,2,...)
-     * @return true
+     * INTERNAL
      */
-    public boolean isReadOnly(int columnIndex) {
-        return true;
+    public Object getObject(int columnIndex, Map<String, Class<?>> map) throws SQLException {
+        throw getUnsupportedException();
     }
 
     /**
-     * Returns true.
-     *
-     * @param columnIndex (1,2,...)
-     * @return true
+     * INTERNAL
      */
-    public boolean isSearchable(int columnIndex) {
-        return true;
+    public Object getObject(String columnLabel, Map<String, Class<?>> map) throws SQLException {
+        throw getUnsupportedException();
     }
 
     /**
-     * Returns true.
-     *
-     * @param columnIndex (1,2,...)
-     * @return true
+     * INTERNAL
      */
-    public boolean isSigned(int columnIndex) {
-        return true;
+    public Ref getRef(int columnIndex) throws SQLException {
+        throw getUnsupportedException();
     }
 
     /**
-     * Returns false.
-     *
-     * @param columnIndex (1,2,...)
-     * @return false
+     * INTERNAL
      */
-    public boolean isWritable(int columnIndex) {
-        return false;
+    public Ref getRef(String columnLabel) throws SQLException {
+        throw getUnsupportedException();
     }
 
     /**
-     * Returns null.
-     *
-     * @param columnIndex (1,2,...)
-     * @return null
+     * INTERNAL
      */
-    public String getCatalogName(int columnIndex) {
-        return null;
+//## Java 1.6 ##
+    public RowId getRowId(int columnIndex) throws SQLException {
+        throw getUnsupportedException();
     }
+//*/
 
     /**
-     * Returns the Java class name if this column.
+     * INTERNAL
+     */
+//## Java 1.6 ##
+    public RowId getRowId(String columnLabel) throws SQLException {
+        throw getUnsupportedException();
+    }
+//*/
+
+    /**
+     * Returns the value as a short.
      *
      * @param columnIndex (1,2,...)
-     * @return the class name
+     * @return the value
      */
-    public String getColumnClassName(int columnIndex) throws SQLException {
-        int sqlType = getColumn(columnIndex - 1).sqlType;
-        int type = DataType.convertSQLTypeToValueType(sqlType);
-        return DataType.getTypeClassName(type);
+    public short getShort(int columnIndex) throws SQLException {
+        Object o = get(columnIndex);
+        if (o != null && !(o instanceof Number)) {
+            o = Short.decode(o.toString());
+        }
+        return o == null ? 0 : ((Number) o).shortValue();
     }
 
     /**
-     * Returns the column label.
+     * Returns the value as a short.
      *
-     * @param columnIndex (1,2,...)
-     * @return the column label
+     * @param columnLabel the column label
+     * @return the value
      */
-    public String getColumnLabel(int columnIndex) throws SQLException {
-        return getColumn(columnIndex - 1).name;
+    public short getShort(String columnLabel) throws SQLException {
+        return getShort(findColumn(columnLabel));
     }
 
     /**
-     * Returns the column name.
+     * INTERNAL
+     */
+//## Java 1.6 ##
+    public SQLXML getSQLXML(int columnIndex) throws SQLException {
+        throw getUnsupportedException();
+    }
+//*/
+
+    /**
+     * INTERNAL
+     */
+//## Java 1.6 ##
+    public SQLXML getSQLXML(String columnLabel) throws SQLException {
+        throw getUnsupportedException();
+    }
+//*/
+
+    /**
+     * Returns the value as a String.
      *
      * @param columnIndex (1,2,...)
-     * @return the column name
+     * @return the value
      */
-    public String getColumnName(int columnIndex) throws SQLException {
-        return getColumnLabel(columnIndex);
+    public String getString(int columnIndex) throws SQLException {
+        Object o = get(columnIndex);
+        if (o == null) {
+            return null;
+        }
+        switch (columns.get(columnIndex - 1).sqlType) {
+        case Types.CLOB:
+            Clob c = (Clob) o;
+            return c.getSubString(1, MathUtils.convertLongToInt(c.length()));
+        }
+        return o.toString();
     }
 
     /**
-     * Returns the data type name of a column.
+     * Returns the value as a String.
      *
-     * @param columnIndex (1,2,...)
-     * @return the type name
+     * @param columnLabel the column label
+     * @return the value
      */
-    public String getColumnTypeName(int columnIndex) throws SQLException {
-        int sqlType = getColumn(columnIndex - 1).sqlType;
-        int type = DataType.convertSQLTypeToValueType(sqlType);
-        return DataType.getDataType(type).name;
+    public String getString(String columnLabel) throws SQLException {
+        return getString(findColumn(columnLabel));
     }
 
     /**
-     * Returns null.
+     * Returns the value as an java.sql.Time.
      *
      * @param columnIndex (1,2,...)
-     * @return null
+     * @return the value
      */
-    public String getSchemaName(int columnIndex) {
-        return null;
+    public Time getTime(int columnIndex) throws SQLException {
+        return (Time) get(columnIndex);
     }
 
     /**
-     * Returns null.
+     * Returns the value as a java.sql.Time.
      *
-     * @param columnIndex (1,2,...)
-     * @return null
+     * @param columnLabel the column label
+     * @return the value
      */
-    public String getTableName(int columnIndex) {
-        return null;
+    public Time getTime(String columnLabel) throws SQLException {
+        return getTime(findColumn(columnLabel));
     }
 
     /**
      * INTERNAL
      */
-    public void clearWarnings() {
-        // nothing to do
+    public Time getTime(int columnIndex, Calendar cal) throws SQLException {
+        throw getUnsupportedException();
     }
 
-    // ---- unsupported / result set ---------------------------------------------
-
     /**
      * INTERNAL
      */
-    public void updateArray(int columnIndex, Array x) throws SQLException {
+    public Time getTime(String columnLabel, Calendar cal) throws SQLException {
         throw getUnsupportedException();
     }
 
     /**
-     * Returns the value as a java.sql.Array.
+     * Returns the value as an java.sql.Timestamp.
+     *
+     * @param columnIndex (1,2,...)
+     * @return the value
+     */
+    public Timestamp getTimestamp(int columnIndex) throws SQLException {
+        return (Timestamp) get(columnIndex);
+    }
+
+    /**
+     * Returns the value as a java.sql.Timestamp.
      *
      * @param columnLabel the column label
      * @return the value
      */
-    public Array getArray(String columnLabel) throws SQLException {
-        return getArray(findColumn(columnLabel));
+    public Timestamp getTimestamp(String columnLabel) throws SQLException {
+        return getTimestamp(findColumn(columnLabel));
     }
 
     /**
      * INTERNAL
      */
-//## Java 1.6 ##
-    public void updateAsciiStream(int columnIndex, InputStream x)
-            throws SQLException {
+    public Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException {
         throw getUnsupportedException();
     }
-//*/
 
     /**
      * INTERNAL
      */
-//## Java 1.6 ##
-    public void updateAsciiStream(String columnLabel, InputStream x)
-            throws SQLException {
+    public Timestamp getTimestamp(String columnLabel, Calendar cal) throws SQLException {
         throw getUnsupportedException();
     }
-//*/
 
     /**
-     * INTERNAL
+     * @deprecated INTERNAL
      */
-    public void updateAsciiStream(int columnIndex, InputStream x, int length) throws SQLException {
+    public InputStream getUnicodeStream(int columnIndex) throws SQLException {
         throw getUnsupportedException();
     }
 
     /**
-     * INTERNAL
+     * @deprecated INTERNAL
      */
-    public void updateAsciiStream(String columnLabel, InputStream x, int length) throws SQLException {
+    public InputStream getUnicodeStream(String columnLabel) throws SQLException {
         throw getUnsupportedException();
     }
 
     /**
      * INTERNAL
      */
-//## Java 1.6 ##
-    public void updateAsciiStream(int columnIndex, InputStream x, long length)
-            throws SQLException {
+    public URL getURL(int columnIndex) throws SQLException {
         throw getUnsupportedException();
     }
-//*/
 
     /**
      * INTERNAL
      */
-//## Java 1.6 ##
-    public void updateAsciiStream(String columnLabel, InputStream x, long length)
-            throws SQLException {
+    public URL getURL(String columnLabel) throws SQLException {
         throw getUnsupportedException();
     }
-//*/
+
+    // ---- update ---------------------------------------------
 
     /**
      * INTERNAL
      */
-    public void updateBigDecimal(int columnIndex, BigDecimal x) throws SQLException {
-        throw getUnsupportedException();
+    public void updateArray(int columnIndex, Array x) throws SQLException {
+        update(columnIndex, x);
     }
 
     /**
      * INTERNAL
      */
-    public void updateBigDecimal(String columnLabel, BigDecimal x) throws SQLException {
-        throw getUnsupportedException();
+    public void updateArray(String columnLabel, Array x) throws SQLException {
+        update(columnLabel, x);
     }
 
     /**
      * INTERNAL
      */
 //## Java 1.6 ##
-    public void updateBinaryStream(int columnLabel, InputStream x)
-            throws SQLException {
-        throw getUnsupportedException();
+    public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {
+        update(columnIndex, x);
     }
 //*/
 
@@ -1148,33 +1113,32 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
      * INTERNAL
      */
 //## Java 1.6 ##
-    public void updateBinaryStream(String columnLabel, InputStream x)
-            throws SQLException {
-        throw getUnsupportedException();
+    public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException {
+        update(columnLabel, x);
     }
 //*/
 
     /**
      * INTERNAL
      */
-    public void updateBinaryStream(int columnIndex, InputStream x, int length) throws SQLException {
-        throw getUnsupportedException();
+    public void updateAsciiStream(int columnIndex, InputStream x, int length) throws SQLException {
+        update(columnIndex, x);
     }
 
     /**
      * INTERNAL
      */
-    public void updateBinaryStream(String columnLabel, InputStream x, int length) throws SQLException {
-        throw getUnsupportedException();
+    public void updateAsciiStream(String columnLabel, InputStream x, int length) throws SQLException {
+        update(columnLabel, x);
     }
 
     /**
      * INTERNAL
      */
 //## Java 1.6 ##
-    public void updateBinaryStream(int columnIndex, InputStream x, long length)
+    public void updateAsciiStream(int columnIndex, InputStream x, long length)
             throws SQLException {
-        throw getUnsupportedException();
+        update(columnIndex, x);
     }
 //*/
 
@@ -1182,570 +1146,822 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
      * INTERNAL
      */
 //## Java 1.6 ##
-    public void updateBinaryStream(String columnLabel, InputStream x, long length)
+    public void updateAsciiStream(String columnLabel, InputStream x, long length)
             throws SQLException {
-        throw getUnsupportedException();
+        update(columnLabel, x);
     }
 //*/
 
     /**
      * INTERNAL
      */
-    public void updateBlob(int columnIndex, Blob x) throws SQLException {
-        throw getUnsupportedException();
+    public void updateBigDecimal(int columnIndex, BigDecimal x) throws SQLException {
+        update(columnIndex, x);
     }
 
     /**
      * INTERNAL
      */
-    public void updateBlob(String columnLabel, Blob x) throws SQLException {
-        throw getUnsupportedException();
+    public void updateBigDecimal(String columnLabel, BigDecimal x) throws SQLException {
+        update(columnLabel, x);
     }
 
     /**
      * INTERNAL
      */
-    public void updateBoolean(int columnIndex, boolean x) throws SQLException {
-        throw getUnsupportedException();
+//## Java 1.6 ##
+    public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException {
+        update(columnIndex, x);
     }
+//*/
 
     /**
      * INTERNAL
      */
-    public void updateBoolean(String columnLabel, boolean x) throws SQLException {
-        throw getUnsupportedException();
+//## Java 1.6 ##
+    public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException {
+        update(columnLabel, x);
     }
+//*/
 
     /**
      * INTERNAL
      */
-    public void updateNull(int columnIndex) throws SQLException {
-        throw getUnsupportedException();
+    public void updateBinaryStream(int columnIndex, InputStream x, int length) throws SQLException {
+        update(columnIndex, x);
     }
 
     /**
      * INTERNAL
      */
-    public void updateNull(String columnLabel) throws SQLException {
-        throw getUnsupportedException();
+    public void updateBinaryStream(String columnLabel, InputStream x, int length) throws SQLException {
+        update(columnLabel, x);
     }
 
     /**
      * INTERNAL
      */
-    public void updateByte(int columnIndex, byte x) throws SQLException {
-        throw getUnsupportedException();
+//## Java 1.6 ##
+    public void updateBinaryStream(int columnIndex, InputStream x, long length)
+            throws SQLException {
+        update(columnIndex, x);
     }
+//*/
 
     /**
      * INTERNAL
      */
-    public void updateByte(String columnLabel, byte x) throws SQLException {
-        throw getUnsupportedException();
+//## Java 1.6 ##
+    public void updateBinaryStream(String columnLabel, InputStream x, long length)
+            throws SQLException {
+        update(columnLabel, x);
     }
+//*/
 
     /**
      * INTERNAL
      */
-    public void updateShort(int columnIndex, short x) throws SQLException {
-        throw getUnsupportedException();
+    public void updateBlob(int columnIndex, Blob x) throws SQLException {
+        update(columnIndex, x);
     }
 
     /**
      * INTERNAL
      */
-    public void updateShort(String columnLabel, short x) throws SQLException {
-        throw getUnsupportedException();
+    public void updateBlob(String columnLabel, Blob x) throws SQLException {
+        update(columnLabel, x);
     }
 
     /**
      * INTERNAL
      */
-    public void updateInt(int columnIndex, int x) throws SQLException {
-        throw getUnsupportedException();
+//## Java 1.6 ##
+    public void updateBlob(int columnIndex, InputStream x) throws SQLException {
+        update(columnIndex, x);
     }
+//*/
 
     /**
      * INTERNAL
      */
-    public void updateInt(String columnLabel, int x) throws SQLException {
-        throw getUnsupportedException();
+//## Java 1.6 ##
+    public void updateBlob(String columnLabel, InputStream x) throws SQLException {
+        update(columnLabel, x);
     }
+//*/
 
     /**
      * INTERNAL
      */
-    public void updateLong(int columnIndex, long x) throws SQLException {
-        throw getUnsupportedException();
+//## Java 1.6 ##
+    public void updateBlob(int columnIndex, InputStream x, long length)
+            throws SQLException {
+        update(columnIndex, x);
     }
+//*/
 
     /**
      * INTERNAL
      */
-    public void updateLong(String columnLabel, long x) throws SQLException {
-        throw getUnsupportedException();
+//## Java 1.6 ##
+    public void updateBlob(String columnLabel, InputStream x, long length)
+            throws SQLException {
+        update(columnLabel, x);
     }
+//*/
 
     /**
      * INTERNAL
      */
-    public void updateFloat(int columnIndex, float x) throws SQLException {
-        throw getUnsupportedException();
+    public void updateBoolean(int columnIndex, boolean x) throws SQLException {
+        update(columnIndex, x);
     }
 
     /**
      * INTERNAL
      */
-    public void updateFloat(String columnLabel, float x) throws SQLException {
-        throw getUnsupportedException();
+    public void updateBoolean(String columnLabel, boolean x) throws SQLException {
+        update(columnLabel, x);
     }
 
     /**
      * INTERNAL
      */
-    public void updateDouble(int columnIndex, double x) throws SQLException {
-        throw getUnsupportedException();
+    public void updateByte(int columnIndex, byte x) throws SQLException {
+        update(columnIndex, x);
     }
 
     /**
      * INTERNAL
      */
-    public void updateDouble(String columnLabel, double x) throws SQLException {
-        throw getUnsupportedException();
+    public void updateByte(String columnLabel, byte x) throws SQLException {
+        update(columnLabel, x);
     }
 
     /**
      * INTERNAL
      */
-    public void updateString(int columnIndex, String x) throws SQLException {
-        throw getUnsupportedException();
+    public void updateBytes(int columnIndex, byte[] x) throws SQLException {
+        update(columnIndex, x);
     }
 
     /**
      * INTERNAL
      */
-    public void updateString(String columnLabel, String x) throws SQLException {
-        throw getUnsupportedException();
+    public void updateBytes(String columnLabel, byte[] x) throws SQLException {
+        update(columnLabel, x);
     }
 
     /**
      * INTERNAL
      */
-    public void updateDate(int columnIndex, Date x) throws SQLException {
-        throw getUnsupportedException();
+//## Java 1.6 ##
+    public void updateCharacterStream(int columnIndex, Reader x) throws SQLException {
+        update(columnIndex, x);
     }
+//*/
 
     /**
      * INTERNAL
      */
-    public void updateDate(String columnLabel, Date x) throws SQLException {
-        throw getUnsupportedException();
+//## Java 1.6 ##
+    public void updateCharacterStream(String columnLabel, Reader x) throws SQLException {
+        update(columnLabel, x);
     }
+//*/
 
     /**
      * INTERNAL
      */
-    public void updateTime(int columnIndex, Time x) throws SQLException {
-        throw getUnsupportedException();
+    public void updateCharacterStream(int columnIndex, Reader x, int length) throws SQLException {
+        update(columnIndex, x);
     }
 
     /**
      * INTERNAL
      */
-    public void updateTime(String columnLabel, Time x) throws SQLException {
-        throw getUnsupportedException();
+    public void updateCharacterStream(String columnLabel, Reader x, int length) throws SQLException {
+        update(columnLabel, x);
     }
 
     /**
      * INTERNAL
      */
-    public void updateTimestamp(int columnIndex, Timestamp x) throws SQLException {
-        throw getUnsupportedException();
+//## Java 1.6 ##
+    public void updateCharacterStream(int columnIndex, Reader x, long length)
+            throws SQLException {
+        update(columnIndex, x);
     }
+//*/
 
     /**
      * INTERNAL
      */
-    public void updateTimestamp(String columnLabel, Timestamp x) throws SQLException {
-        throw getUnsupportedException();
+//## Java 1.6 ##
+    public void updateCharacterStream(String columnLabel, Reader x, long length)
+            throws SQLException {
+        update(columnLabel, x);
     }
+//*/
 
     /**
      * INTERNAL
      */
-    public void updateObject(int columnIndex, Object x) throws SQLException {
-        throw getUnsupportedException();
+    public void updateClob(int columnIndex, Clob x) throws SQLException {
+        update(columnIndex, x);
     }
 
     /**
      * INTERNAL
      */
-    public void updateObject(String columnLabel, Object x) throws SQLException {
-        throw getUnsupportedException();
+    public void updateClob(String columnLabel, Clob x) throws SQLException {
+        update(columnLabel, x);
     }
 
     /**
      * INTERNAL
      */
-    public void updateObject(int columnIndex, Object x, int scale) throws SQLException {
-        throw getUnsupportedException();
+//## Java 1.6 ##
+    public void updateClob(int columnIndex, Reader x) throws SQLException {
+        update(columnIndex, x);
     }
+//*/
 
     /**
      * INTERNAL
      */
-    public void updateObject(String columnLabel, Object x, int scale) throws SQLException {
-        throw getUnsupportedException();
+//## Java 1.6 ##
+    public void updateClob(String columnLabel, Reader x) throws SQLException {
+        update(columnLabel, x);
     }
+//*/
 
     /**
      * INTERNAL
      */
-    public void updateBytes(int columnIndex, byte[] x) throws SQLException {
-        throw getUnsupportedException();
+//## Java 1.6 ##
+    public void updateClob(int columnIndex, Reader x, long length)
+            throws SQLException {
+        update(columnIndex, x);
     }
+//*/
 
     /**
      * INTERNAL
      */
-    public void updateBytes(String columnLabel, byte[] x) throws SQLException {
-        throw getUnsupportedException();
+//## Java 1.6 ##
+    public void updateClob(String columnLabel, Reader x, long length)
+            throws SQLException {
+        update(columnLabel, x);
     }
+//*/
 
     /**
      * INTERNAL
      */
-    public void updateCharacterStream(int columnIndex, Reader x, int length) throws SQLException {
-        throw getUnsupportedException();
+    public void updateDate(int columnIndex, Date x) throws SQLException {
+        update(columnIndex, x);
     }
 
     /**
-    * INTERNAL
-    */
-    public URL getURL(int columnIndex) throws SQLException {
-        throw getUnsupportedException();
+     * INTERNAL
+     */
+    public void updateDate(String columnLabel, Date x) throws SQLException {
+        update(columnLabel, x);
     }
 
     /**
-    * INTERNAL
-    */
-    public void updateClob(int columnIndex, Clob x) throws SQLException {
-        throw getUnsupportedException();
+     * INTERNAL
+     */
+    public void updateDouble(int columnIndex, double x) throws SQLException {
+        update(columnIndex, x);
     }
 
     /**
-    * INTERNAL
-    */
-    public void updateRef(int columnIndex, Ref x) throws SQLException {
-        throw getUnsupportedException();
+     * INTERNAL
+     */
+    public void updateDouble(String columnLabel, double x) throws SQLException {
+        update(columnLabel, x);
     }
 
     /**
-    * INTERNAL
-    */
-    public void updateRef(String columnLabel, Ref x) throws SQLException {
-        throw getUnsupportedException();
+     * INTERNAL
+     */
+    public void updateFloat(int columnIndex, float x) throws SQLException {
+        update(columnIndex, x);
     }
 
     /**
-    * INTERNAL
-    */
-    public void updateCharacterStream(String columnLabel, Reader reader, int length) throws SQLException {
-        throw getUnsupportedException();
+     * INTERNAL
+     */
+    public void updateFloat(String columnLabel, float x) throws SQLException {
+        update(columnLabel, x);
     }
 
     /**
-    * INTERNAL
-    */
-    public void updateArray(String columnLabel, Array x) throws SQLException {
-        throw getUnsupportedException();
+     * INTERNAL
+     */
+    public void updateInt(int columnIndex, int x) throws SQLException {
+        update(columnIndex, x);
     }
 
     /**
-    * INTERNAL
-    */
-    public void updateClob(String columnLabel, Clob x) throws SQLException {
-        throw getUnsupportedException();
+     * INTERNAL
+     */
+    public void updateInt(String columnLabel, int x) throws SQLException {
+        update(columnLabel, x);
     }
 
     /**
-    * INTERNAL
-    */
-//## Java 1.6 ##
-    public void updateRowId(int columnIndex, RowId x) throws SQLException {
-        throw getUnsupportedException();
+     * INTERNAL
+     */
+    public void updateLong(int columnIndex, long x) throws SQLException {
+        update(columnIndex, x);
     }
-//*/
 
     /**
-    * INTERNAL
-    */
-//## Java 1.6 ##
-    public void updateRowId(String columnLabel, RowId x) throws SQLException {
-        throw getUnsupportedException();
+     * INTERNAL
+     */
+    public void updateLong(String columnLabel, long x) throws SQLException {
+        update(columnLabel, x);
     }
-//*/
 
     /**
-    * INTERNAL
-    */
+     * INTERNAL
+     */
 //## Java 1.6 ##
-    public void updateNString(int columnIndex, String nString)
-            throws SQLException {
-        throw getUnsupportedException();
+    public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException {
+        update(columnIndex, x);
     }
 //*/
 
     /**
-    * INTERNAL
-    */
+     * INTERNAL
+     */
 //## Java 1.6 ##
-    public void updateNString(String columnLabel, String nString)
-            throws SQLException {
-        throw getUnsupportedException();
+    public void updateNCharacterStream(String columnLabel, Reader x) throws SQLException {
+        update(columnLabel, x);
     }
 //*/
 
     /**
-    * INTERNAL
-    */
+     * INTERNAL
+     */
 //## Java 1.6 ##
-    public void updateNClob(int columnIndex, NClob nClob)
+    public void updateNCharacterStream(int columnIndex, Reader x, long length)
             throws SQLException {
-        throw getUnsupportedException();
+        update(columnIndex, x);
     }
 //*/
 
     /**
-    * INTERNAL
-    */
+     * INTERNAL
+     */
 //## Java 1.6 ##
-    public void updateNClob(String columnLabel, NClob nClob)
+    public void updateNCharacterStream(String columnLabel, Reader x, long length)
             throws SQLException {
-        throw getUnsupportedException();
+        update(columnLabel, x);
     }
 //*/
 
     /**
-    * INTERNAL
-    */
+     * INTERNAL
+     */
 //## Java 1.6 ##
-    public void updateSQLXML(int columnIndex, SQLXML xmlObject)
-            throws SQLException {
-        throw getUnsupportedException();
+    public void updateNClob(int columnIndex, NClob x) throws SQLException {
+        update(columnIndex, x);
     }
 //*/
 
     /**
-    * INTERNAL
-    */
+     * INTERNAL
+     */
 //## Java 1.6 ##
-    public void updateSQLXML(String columnLabel, SQLXML xmlObject)
-            throws SQLException {
-        throw getUnsupportedException();
+    public void updateNClob(String columnLabel, NClob x) throws SQLException {
+        update(columnLabel, x);
     }
 //*/
 
     /**
-    * INTERNAL
-    */
+     * INTERNAL
+     */
 //## Java 1.6 ##
-    public void updateBlob(int columnIndex, InputStream x) throws SQLException {
-        throw getUnsupportedException();
+    public void updateNClob(int columnIndex, Reader x) throws SQLException {
+        update(columnIndex, x);
     }
 //*/
 
     /**
-    * INTERNAL
-    */
+     * INTERNAL
+     */
 //## Java 1.6 ##
-    public void updateBlob(String columnLabel, InputStream x) throws SQLException {
-        throw getUnsupportedException();
+    public void updateNClob(String columnLabel, Reader x) throws SQLException {
+        update(columnLabel, x);
     }
 //*/
 
     /**
-    * INTERNAL
-    */
+     * INTERNAL
+     */
 //## Java 1.6 ##
-    public void updateBlob(int columnIndex, InputStream x, long length)
+    public void updateNClob(int columnIndex, Reader x, long length)
             throws SQLException {
-        throw getUnsupportedException();
+        update(columnIndex, x);
     }
 //*/
 
     /**
-    * INTERNAL
-    */
+     * INTERNAL
+     */
 //## Java 1.6 ##
-    public void updateBlob(String columnLabel, InputStream x, long length)
+    public void updateNClob(String columnLabel, Reader x, long length)
             throws SQLException {
-        throw getUnsupportedException();
+        update(columnLabel, x);
     }
 //*/
 
     /**
-    * INTERNAL
-    */
+     * INTERNAL
+     */
 //## Java 1.6 ##
-    public void updateCharacterStream(int columnIndex, Reader x)
-            throws SQLException {
-        throw getUnsupportedException();
+    public void updateNString(int columnIndex, String x) throws SQLException {
+        update(columnIndex, x);
     }
 //*/
 
     /**
-    * INTERNAL
-    */
+     * INTERNAL
+     */
 //## Java 1.6 ##
-    public void updateCharacterStream(String columnLabel, Reader x)
-            throws SQLException {
-        throw getUnsupportedException();
+    public void updateNString(String columnLabel, String x) throws SQLException {
+        update(columnLabel, x);
     }
 //*/
 
     /**
-    * INTERNAL
-    */
-//## Java 1.6 ##
-    public void updateCharacterStream(int columnIndex, Reader x, long length)
-            throws SQLException {
-        throw getUnsupportedException();
+     * INTERNAL
+     */
+    public void updateNull(int columnIndex) throws SQLException {
+        update(columnIndex, null);
     }
-//*/
 
     /**
-    * INTERNAL
-    */
-//## Java 1.6 ##
-    public void updateCharacterStream(String columnLabel, Reader x, long length)
-            throws SQLException {
-        throw getUnsupportedException();
+     * INTERNAL
+     */
+    public void updateNull(String columnLabel) throws SQLException {
+        update(columnLabel, null);
     }
-//*/
 
     /**
-    * INTERNAL
-    */
-//## Java 1.6 ##
-    public void updateClob(int columnIndex, Reader x) throws SQLException {
-        throw getUnsupportedException();
+     * INTERNAL
+     */
+    public void updateObject(int columnIndex, Object x) throws SQLException {
+        update(columnIndex, x);
     }
-//*/
 
     /**
-    * INTERNAL
-    */
-//## Java 1.6 ##
-    public void updateClob(String columnLabel, Reader x) throws SQLException {
-        throw getUnsupportedException();
+     * INTERNAL
+     */
+    public void updateObject(String columnLabel, Object x) throws SQLException {
+        update(columnLabel, x);
     }
-//*/
 
     /**
-    * INTERNAL
-    */
-//## Java 1.6 ##
-    public void updateClob(int columnIndex, Reader x, long length)
-            throws SQLException {
-        throw getUnsupportedException();
+     * INTERNAL
+     */
+    public void updateObject(int columnIndex, Object x, int scale) throws SQLException {
+        update(columnIndex, x);
     }
-//*/
 
     /**
-    * INTERNAL
-    */
-//## Java 1.6 ##
-    public void updateClob(String columnLabel, Reader x, long length)
-            throws SQLException {
-        throw getUnsupportedException();
+     * INTERNAL
+     */
+    public void updateObject(String columnLabel, Object x, int scale) throws SQLException {
+        update(columnLabel, x);
     }
-//*/
 
     /**
-    * INTERNAL
-    */
-//## Java 1.6 ##
-    public void updateNCharacterStream(int columnIndex, Reader x)
-            throws SQLException {
-        throw getUnsupportedException();
+     * INTERNAL
+     */
+    public void updateRef(int columnIndex, Ref x) throws SQLException {
+        update(columnIndex, x);
+    }
+
+    /**
+     * INTERNAL
+     */
+    public void updateRef(String columnLabel, Ref x) throws SQLException {
+        update(columnLabel, x);
     }
-//*/
 
     /**
-    * INTERNAL
-    */
+     * INTERNAL
+     */
 //## Java 1.6 ##
-    public void updateNCharacterStream(String columnLabel, Reader x)
-            throws SQLException {
-        throw getUnsupportedException();
+    public void updateRowId(int columnIndex, RowId x) throws SQLException {
+        update(columnIndex, x);
     }
 //*/
 
     /**
-    * INTERNAL
-    */
+     * INTERNAL
+     */
 //## Java 1.6 ##
-    public void updateNCharacterStream(int columnIndex, Reader x, long length)
-            throws SQLException {
-        throw getUnsupportedException();
+    public void updateRowId(String columnLabel, RowId x) throws SQLException {
+        update(columnLabel, x);
     }
 //*/
 
     /**
-    * INTERNAL
-    */
+     * INTERNAL
+     */
+    public void updateShort(int columnIndex, short x) throws SQLException {
+        update(columnIndex, x);
+    }
+
+    /**
+     * INTERNAL
+     */
+    public void updateShort(String columnLabel, short x) throws SQLException {
+        update(columnLabel, x);
+    }
+
+    /**
+     * INTERNAL
+     */
 //## Java 1.6 ##
-    public void updateNCharacterStream(String columnLabel, Reader x, long length)
-            throws SQLException {
-        throw getUnsupportedException();
+    public void updateSQLXML(int columnIndex, SQLXML x) throws SQLException {
+        update(columnIndex, x);
     }
 //*/
 
     /**
-    * INTERNAL
-    */
+     * INTERNAL
+     */
 //## Java 1.6 ##
-    public void updateNClob(int columnIndex, Reader x) throws SQLException {
-        throw getUnsupportedException();
+    public void updateSQLXML(String columnLabel, SQLXML x) throws SQLException {
+        update(columnLabel, x);
     }
 //*/
 
     /**
-    * INTERNAL
-    */
-//## Java 1.6 ##
-    public void updateNClob(String columnLabel, Reader x) throws SQLException {
-        throw getUnsupportedException();
+     * INTERNAL
+     */
+    public void updateString(int columnIndex, String x) throws SQLException {
+        update(columnIndex, x);
+    }
+
+    /**
+     * INTERNAL
+     */
+    public void updateString(String columnLabel, String x) throws SQLException {
+        update(columnLabel, x);
+    }
+
+    /**
+     * INTERNAL
+     */
+    public void updateTime(int columnIndex, Time x) throws SQLException {
+        update(columnIndex, x);
+    }
+
+    /**
+     * INTERNAL
+     */
+    public void updateTime(String columnLabel, Time x) throws SQLException {
+        update(columnLabel, x);
+    }
+
+    /**
+     * INTERNAL
+     */
+    public void updateTimestamp(int columnIndex, Timestamp x) throws SQLException {
+        update(columnIndex, x);
+    }
+
+    /**
+     * INTERNAL
+     */
+    public void updateTimestamp(String columnLabel, Timestamp x) throws SQLException {
+        update(columnLabel, x);
+    }
+
+    // ---- result set meta data ---------------------------------------------
+
+    /**
+     * Returns the column count.
+     *
+     * @return the column count
+     */
+    public int getColumnCount() {
+        return columns.size();
+    }
+
+    /**
+     * Returns 15.
+     *
+     * @param columnIndex (1,2,...)
+     * @return 15
+     */
+    public int getColumnDisplaySize(int columnIndex) {
+        return 15;
+    }
+
+    /**
+     * Returns the SQL type.
+     *
+     * @param columnIndex (1,2,...)
+     * @return the SQL type
+     */
+    public int getColumnType(int columnIndex) throws SQLException {
+        return getColumn(columnIndex - 1).sqlType;
+    }
+
+    /**
+     * Returns the precision.
+     *
+     * @param columnIndex (1,2,...)
+     * @return the precision
+     */
+    public int getPrecision(int columnIndex) throws SQLException {
+        return getColumn(columnIndex - 1).precision;
+    }
+
+    /**
+     * Returns the scale.
+     *
+     * @param columnIndex (1,2,...)
+     * @return the scale
+     */
+    public int getScale(int columnIndex) throws SQLException {
+        return getColumn(columnIndex - 1).scale;
+    }
+
+    /**
+     * Returns ResultSetMetaData.columnNullableUnknown.
+     *
+     * @param columnIndex (1,2,...)
+     * @return columnNullableUnknown
+     */
+    public int isNullable(int columnIndex) {
+        return ResultSetMetaData.columnNullableUnknown;
+    }
+
+    /**
+     * Returns false.
+     *
+     * @param columnIndex (1,2,...)
+     * @return false
+     */
+    public boolean isAutoIncrement(int columnIndex) {
+        return false;
+    }
+
+    /**
+     * Returns true.
+     *
+     * @param columnIndex (1,2,...)
+     * @return true
+     */
+    public boolean isCaseSensitive(int columnIndex) {
+        return true;
+    }
+
+    /**
+     * Returns false.
+     *
+     * @param columnIndex (1,2,...)
+     * @return false
+     */
+    public boolean isCurrency(int columnIndex) {
+        return false;
+    }
+
+    /**
+     * Returns false.
+     *
+     * @param columnIndex (1,2,...)
+     * @return false
+     */
+    public boolean isDefinitelyWritable(int columnIndex) {
+        return false;
+    }
+
+    /**
+     * Returns true.
+     *
+     * @param columnIndex (1,2,...)
+     * @return true
+     */
+    public boolean isReadOnly(int columnIndex) {
+        return true;
+    }
+
+    /**
+     * Returns true.
+     *
+     * @param columnIndex (1,2,...)
+     * @return true
+     */
+    public boolean isSearchable(int columnIndex) {
+        return true;
+    }
+
+    /**
+     * Returns true.
+     *
+     * @param columnIndex (1,2,...)
+     * @return true
+     */
+    public boolean isSigned(int columnIndex) {
+        return true;
+    }
+
+    /**
+     * Returns false.
+     *
+     * @param columnIndex (1,2,...)
+     * @return false
+     */
+    public boolean isWritable(int columnIndex) {
+        return false;
+    }
+
+    /**
+     * Returns null.
+     *
+     * @param columnIndex (1,2,...)
+     * @return null
+     */
+    public String getCatalogName(int columnIndex) {
+        return null;
+    }
+
+    /**
+     * Returns the Java class name if this column.
+     *
+     * @param columnIndex (1,2,...)
+     * @return the class name
+     */
+    public String getColumnClassName(int columnIndex) throws SQLException {
+        int sqlType = getColumn(columnIndex - 1).sqlType;
+        int type = DataType.convertSQLTypeToValueType(sqlType);
+        return DataType.getTypeClassName(type);
+    }
+
+    /**
+     * Returns the column label.
+     *
+     * @param columnIndex (1,2,...)
+     * @return the column label
+     */
+    public String getColumnLabel(int columnIndex) throws SQLException {
+        return getColumn(columnIndex - 1).name;
+    }
+
+    /**
+     * Returns the column name.
+     *
+     * @param columnIndex (1,2,...)
+     * @return the column name
+     */
+    public String getColumnName(int columnIndex) throws SQLException {
+        return getColumnLabel(columnIndex);
+    }
+
+    /**
+     * Returns the data type name of a column.
+     *
+     * @param columnIndex (1,2,...)
+     * @return the type name
+     */
+    public String getColumnTypeName(int columnIndex) throws SQLException {
+        int sqlType = getColumn(columnIndex - 1).sqlType;
+        int type = DataType.convertSQLTypeToValueType(sqlType);
+        return DataType.getDataType(type).name;
     }
-//*/
 
     /**
-    * INTERNAL
-    */
-//## Java 1.6 ##
-    public void updateNClob(int columnIndex, Reader x, long length)
-            throws SQLException {
-        throw getUnsupportedException();
+     * Returns null.
+     *
+     * @param columnIndex (1,2,...)
+     * @return null
+     */
+    public String getSchemaName(int columnIndex) {
+        return null;
     }
-//*/
 
     /**
-    * INTERNAL
-    */
-//## Java 1.6 ##
-    public void updateNClob(String columnLabel, Reader x, long length)
-            throws SQLException {
-        throw getUnsupportedException();
+     * Returns null.
+     *
+     * @param columnIndex (1,2,...)
+     * @return null
+     */
+    public String getTableName(int columnIndex) {
+        return null;
     }
-//*/
 
-    /**
-    * INTERNAL
-    */
-    public Time getTime(int columnIndex, Calendar cal) throws SQLException {
-        throw getUnsupportedException();
-    }
+    // ---- unsupported / result set ---------------------------------------------
 
     /**
      * INTERNAL
@@ -1901,20 +2117,6 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
         throw getUnsupportedException();
     }
 
-    /**
-     * INTERNAL
-     */
-    public InputStream getAsciiStream(int columnIndex) {
-        return null;
-    }
-
-    /**
-     * @deprecated INTERNAL
-     */
-    public InputStream getUnicodeStream(int columnIndex) {
-        return null;
-    }
-
     /**
      * INTERNAL
      */
@@ -1922,106 +2124,17 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
         throw getUnsupportedException();
     }
 
-    /**
-     * @deprecated INTERNAL
-     */
-    public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
-        throw getUnsupportedException();
-    }
-
-    /**
-     * INTERNAL
-     */
-    public Ref getRef(int columnIndex) throws SQLException {
-        throw getUnsupportedException();
-    }
-
-    /**
-     * INTERNAL
-     */
-    public InputStream getAsciiStream(String columnLabel) throws SQLException {
-        throw getUnsupportedException();
-    }
-
-    /**
-     * @deprecated INTERNAL
-     */
-    public InputStream getUnicodeStream(String columnLabel) throws SQLException {
-        throw getUnsupportedException();
-    }
-
-    /**
-     * INTERNAL
-     */
-    public Object getObject(int columnIndex, Map<String, Class<?>> map) throws SQLException {
-        throw getUnsupportedException();
-    }
-
-    /**
-     * @deprecated INTERNAL
-     */
-    public BigDecimal getBigDecimal(String columnLabel, int scale) throws SQLException {
-        throw getUnsupportedException();
-    }
-
-    /**
-     * INTERNAL
-     */
-    public URL getURL(String columnLabel) throws SQLException {
-        throw getUnsupportedException();
-    }
-
-    /**
-     * INTERNAL
-     */
-    public Date getDate(int columnIndex, Calendar cal) throws SQLException {
-        throw getUnsupportedException();
-    }
-
-    /**
-     * INTERNAL
-     */
-    public Ref getRef(String colName) throws SQLException {
-        throw getUnsupportedException();
-    }
-
-    /**
-     * INTERNAL
-     */
-    public Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException {
-        throw getUnsupportedException();
-    }
-
-    /**
-     * INTERNAL
-     */
-    public Object getObject(String colName, Map<String, Class<?>> map) throws SQLException {
-        throw getUnsupportedException();
-    }
-
-    /**
-     * INTERNAL
-     */
-    public Date getDate(String columnLabel, Calendar cal) throws SQLException {
-        throw getUnsupportedException();
-    }
+    // --- private -----------------------------
 
-    /**
-     * INTERNAL
-     */
-    public Time getTime(String columnLabel, Calendar cal) throws SQLException {
-        throw getUnsupportedException();
+    private void update(int columnIndex, Object obj) throws SQLException {
+        checkColumnIndex(columnIndex);
+        this.currentRow[columnIndex - 1] = obj;
     }
 
-    /**
-     * INTERNAL
-     */
-    public Timestamp getTimestamp(String columnLabel, Calendar cal) throws SQLException {
-        throw getUnsupportedException();
+    private void update(String columnLabel, Object obj) throws SQLException {
+        this.currentRow[findColumn(columnLabel) - 1] = obj;
     }
 
-    // --- private -----------------------------
-
     /**
      * INTERNAL
      */
@@ -2030,8 +2143,8 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
     }
 
     private void checkColumnIndex(int columnIndex) throws SQLException {
-        if (columnIndex < 0 || columnIndex >= columns.size()) {
-            throw DbException.getInvalidValueException("columnIndex", columnIndex + 1).getSQLException();
+        if (columnIndex < 1 || columnIndex > columns.size()) {
+            throw DbException.getInvalidValueException("columnIndex", columnIndex).getSQLException();
         }
     }
 
@@ -2039,36 +2152,18 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
         if (currentRow == null) {
             throw DbException.get(ErrorCode.NO_DATA_AVAILABLE).getSQLException();
         }
-        columnIndex--;
         checkColumnIndex(columnIndex);
+        columnIndex--;
         Object o = columnIndex < currentRow.length ? currentRow[columnIndex] : null;
         wasNull = o == null;
         return o;
     }
 
     private Column getColumn(int i) throws SQLException {
-        checkColumnIndex(i);
+        checkColumnIndex(i + 1);
         return columns.get(i);
     }
 
-    /**
-     * INTERNAL
-     */
-//## Java 1.6 ##
-    public RowId getRowId(int columnIndex) throws SQLException {
-        throw getUnsupportedException();
-    }
-//*/
-
-    /**
-     * INTERNAL
-     */
-//## Java 1.6 ##
-    public RowId getRowId(String columnLabel) throws SQLException {
-        throw getUnsupportedException();
-    }
-//*/
-
     /**
      * Returns the current result set holdability.
      *
@@ -2087,79 +2182,6 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
         return rows == null;
     }
 
-    /**
-     * INTERNAL
-     */
-//## Java 1.6 ##
-    public NClob getNClob(int columnIndex) throws SQLException {
-        throw getUnsupportedException();
-    }
-//*/
-
-    /**
-     * INTERNAL
-     */
-//## Java 1.6 ##
-    public NClob getNClob(String columnLabel) throws SQLException {
-        throw getUnsupportedException();
-    }
-//*/
-
-    /**
-     * INTERNAL
-     */
-//## Java 1.6 ##
-    public SQLXML getSQLXML(int columnIndex) throws SQLException {
-        throw getUnsupportedException();
-    }
-//*/
-
-    /**
-     * INTERNAL
-     */
-//## Java 1.6 ##
-    public SQLXML getSQLXML(String columnLabel) throws SQLException {
-        throw getUnsupportedException();
-    }
-//*/
-
-    /**
-     * INTERNAL
-     */
-//## Java 1.6 ##
-    public String getNString(int columnIndex) throws SQLException {
-        return getString(columnIndex);
-    }
-//*/
-
-    /**
-     * INTERNAL
-     */
-//## Java 1.6 ##
-    public String getNString(String columnLabel) throws SQLException {
-        return getString(columnLabel);
-    }
-//*/
-
-    /**
-     * INTERNAL
-     */
-//## Java 1.6 ##
-    public Reader getNCharacterStream(int columnIndex) throws SQLException {
-        throw getUnsupportedException();
-    }
-//*/
-
-    /**
-     * INTERNAL
-     */
-//## Java 1.6 ##
-    public Reader getNCharacterStream(String columnLabel)
-            throws SQLException {
-        throw getUnsupportedException();
-    }
-//*/
-
     /**
      * INTERNAL
      */
@@ -2178,30 +2200,6 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
     }
 //*/
 
-    /**
-     * INTERNAL
-     *
-     * @param columnIndex the column index (1, 2, ...)
-     * @param type the class of the returned value
-     */
-/*## Java 1.7 ##
-    public <T> T getObject(int columnIndex, Class<T> type) {
-        return null;
-    }
-//*/
-
-    /**
-     * INTERNAL
-     *
-     * @param columnName the column name
-     * @param type the class of the returned value
-     */
-/*## Java 1.7 ##
-    public <T> T getObject(String columnName, Class<T> type) {
-        return null;
-    }
-//*/
-
     /**
      * Set the auto-close behavior. If enabled (the default), the result set is
      * closed after reading the last row.

h2/src/test/org/h2/test/unit/TestTools.java

@@ -339,37 +339,78 @@ public class TestTools extends TestBase {
         assertNull(rs.getBinaryStream(12));
         assertTrue(rs.wasNull());
 
-        // all 'updateX' methods are not supported
+        // all updateX methods
         for (Method m: rs.getClass().getMethods()) {
             if (m.getName().startsWith("update")) {
+                if (m.getName().equals("updateRow")) {
+                    continue;
+                }
                 int len = m.getParameterTypes().length;
                 Object[] params = new Object[len];
                 int i = 0;
+                String expectedValue = null;
                 for (Class<?> type : m.getParameterTypes()) {
-                    Object o = null;
+                    Object o;
+                    String e = null;
                     if (type == int.class) {
                         o = 1;
+                        e = "1";
                     } else if (type == byte.class) {
-                        o = (byte) 1;
+                        o = (byte) 2;
+                        e = "2";
                     } else if (type == double.class) {
-                        o = (double) 1;
+                        o = (double) 3;
+                        e = "3.0";
                     } else if (type == float.class) {
-                        o = (float) 1;
+                        o = (float) 4;
+                        e = "4.0";
                     } else if (type == long.class) {
-                        o = (long) 1;
+                        o = (long) 5;
+                        e = "5";
                     } else if (type == short.class) {
-                        o = (short) 1;
+                        o = (short) 6;
+                        e = "6";
                     } else if (type == boolean.class) {
                         o = false;
+                        e = "false";
+                    } else if (type == String.class) {
+                        // columnName or value
+                        o = "a";
+                        e = "a";
+                    } else {
+                        o = null;
+                    }
+                    if (i == 1) {
+                        expectedValue = e;
                     }
                     params[i] = o;
                     i++;
                 }
+                m.invoke(rs, params);
+                if (params.length == 1) {
+                    // updateNull
+                    assertEquals(null, rs.getString(1));
+                } else {
+                    assertEquals(expectedValue, rs.getString(1));
+                }
+                // invalid column name / index
+                Object invalidColumn;
+                if (m.getParameterTypes()[0] == String.class) {
+                    invalidColumn = "x";
+                } else {
+                    invalidColumn = 0;
+                }
+                params[0] = invalidColumn;
                 try {
                     m.invoke(rs, params);
+                    fail();
                 } catch (InvocationTargetException e) {
                     SQLException e2 = (SQLException) e.getTargetException();
-                    assertEquals(ErrorCode.FEATURE_NOT_SUPPORTED_1, e2.getErrorCode());
+                    if (invalidColumn instanceof String) {
+                        assertEquals(ErrorCode.COLUMN_NOT_FOUND_1, e2.getErrorCode());
+                    } else {
+                        assertEquals(ErrorCode.INVALID_VALUE_2, e2.getErrorCode());
+                    }
                 }
             }
         }