cell values representing time and date will no longer be returned as strings, but as instances of their corresponding java types

Author: HardworkingMarek

src/com/inet/excel/ExcelDatabaseMetaData.java

@@ -33,7 +33,7 @@
  */
 public class ExcelDatabaseMetaData implements DatabaseMetaData {
 
-    public static final int VARCHAR_COLUMN_SIZE_IN_BYTES = 65535;
+    public static final int COLUMN_SIZE_IN_BYTES = 65535;
 
     public static final String PRODUCT_NAME = "inetexcel";
 
@@ -1104,18 +1104,18 @@ public ResultSet getProcedureColumns( String catalog, String schemaPattern, Stri
                     row.add( sheetName );
                     row.add( colName );
                     row.add( Integer.valueOf( DatabaseMetaData.procedureColumnResult ) );
-                    row.add( Integer.valueOf( Types.VARCHAR ) );
-                    row.add( "VARCHAR" );
+                    row.add( Integer.valueOf( Types.JAVA_OBJECT ) );
+                    row.add( "JAVA_OBJECT" );
                     row.add( Integer.valueOf( 0 ) );
-                    row.add( Integer.valueOf( VARCHAR_COLUMN_SIZE_IN_BYTES ) );
-                    row.add( Integer.valueOf( VARCHAR_COLUMN_SIZE_IN_BYTES ) );
+                    row.add( Integer.valueOf( COLUMN_SIZE_IN_BYTES ) );
+                    row.add( Integer.valueOf( COLUMN_SIZE_IN_BYTES ) );
                     row.add( null );
                     row.add( Integer.valueOf( DatabaseMetaData.procedureNoNulls ) );
                     row.add( "" );
                     row.add( "" );
                     row.add( null );
                     row.add( null );
-                    row.add( Integer.valueOf( VARCHAR_COLUMN_SIZE_IN_BYTES ) );
+                    row.add( Integer.valueOf( COLUMN_SIZE_IN_BYTES ) );
                     row.add( Integer.valueOf( colIndex ) );
                     row.add( "NO" );
                     row.add( sheetName );

src/com/inet/excel/ExcelDriver.java

@@ -35,7 +35,7 @@ public class ExcelDriver implements Driver {
     public static final String URL_PREFIX    = "jdbc:inetexcel:";
     public static final String DRIVER_NAME   = "inetexcel";
     public static final int    MAJOR_VERSION = 1;
-    public static final int    MINOR_VERSION = 1;
+    public static final int    MINOR_VERSION = 2;
 
     /** Throws exception indicating that requested operation is not supported.
      * @throws SQLException exception indicating that requested operation is not supported.

src/com/inet/excel/ExcelResultSet.java

@@ -269,7 +269,7 @@ public InputStream getBinaryStream( int columnIndex ) throws SQLException {
     @Override
     public String getString( String columnLabel ) throws SQLException {
         int columnIndex = findColumn( columnLabel );
-        return getValue( columnIndex );
+        return getString( columnIndex );
     }
 
     /**
@@ -278,7 +278,7 @@ public String getString( String columnLabel ) throws SQLException {
     @Override
     public boolean getBoolean( String columnLabel ) throws SQLException {
         int columnIndex = findColumn( columnLabel );
-        return getValue( columnIndex );
+        return getBoolean( columnIndex );
     }
 
     /**
@@ -287,7 +287,7 @@ public boolean getBoolean( String columnLabel ) throws SQLException {
     @Override
     public byte getByte( String columnLabel ) throws SQLException {
         int columnIndex = findColumn( columnLabel );
-        return getValue( columnIndex );
+        return getByte( columnIndex );
     }
 
     /**
@@ -296,7 +296,7 @@ public byte getByte( String columnLabel ) throws SQLException {
     @Override
     public short getShort( String columnLabel ) throws SQLException {
         int columnIndex = findColumn( columnLabel );
-        return getValue( columnIndex );
+        return getShort( columnIndex );
     }
 
     /**
@@ -305,7 +305,7 @@ public short getShort( String columnLabel ) throws SQLException {
     @Override
     public int getInt( String columnLabel ) throws SQLException {
         int columnIndex = findColumn( columnLabel );
-        return getValue( columnIndex );
+        return getInt( columnIndex );
     }
 
     /**
@@ -314,7 +314,7 @@ public int getInt( String columnLabel ) throws SQLException {
     @Override
     public long getLong( String columnLabel ) throws SQLException {
         int columnIndex = findColumn( columnLabel );
-        return getValue( columnIndex );
+        return getLong( columnIndex );
     }
 
     /**
@@ -323,7 +323,7 @@ public long getLong( String columnLabel ) throws SQLException {
     @Override
     public float getFloat( String columnLabel ) throws SQLException {
         int columnIndex = findColumn( columnLabel );
-        return getValue( columnIndex );
+        return getFloat( columnIndex );
     }
 
     /**
@@ -332,7 +332,7 @@ public float getFloat( String columnLabel ) throws SQLException {
     @Override
     public double getDouble( String columnLabel ) throws SQLException {
         int columnIndex = findColumn( columnLabel );
-        return getValue( columnIndex );
+        return getDouble( columnIndex );
     }
 
     /**
@@ -350,7 +350,7 @@ public BigDecimal getBigDecimal( String columnLabel, int scale ) throws SQLExcep
     @Override
     public byte[] getBytes( String columnLabel ) throws SQLException {
         int columnIndex = findColumn( columnLabel );
-        return getValue( columnIndex );
+        return getBytes( columnIndex );
     }
 
     /**
@@ -359,7 +359,7 @@ public byte[] getBytes( String columnLabel ) throws SQLException {
     @Override
     public Date getDate( String columnLabel ) throws SQLException {
         int columnIndex = findColumn( columnLabel );
-        return getValue( columnIndex );
+        return getDate( columnIndex );
     }
 
     /**
@@ -368,7 +368,7 @@ public Date getDate( String columnLabel ) throws SQLException {
     @Override
     public Time getTime( String columnLabel ) throws SQLException {
         int columnIndex = findColumn( columnLabel );
-        return getValue( columnIndex );
+        return getTime( columnIndex );
     }
 
     /**
@@ -377,7 +377,7 @@ public Time getTime( String columnLabel ) throws SQLException {
     @Override
     public Timestamp getTimestamp( String columnLabel ) throws SQLException {
         int columnIndex = findColumn( columnLabel );
-        return getValue( columnIndex );
+        return getTimestamp( columnIndex );
     }
 
     /**
@@ -443,7 +443,7 @@ public Object getObject( int columnIndex ) throws SQLException {
     @Override
     public Object getObject( String columnLabel ) throws SQLException {
         int columnIndex = findColumn( columnLabel );
-        return getValue( columnIndex );
+        return getObject( columnIndex );
     }
 
     /**
@@ -474,7 +474,7 @@ public Reader getCharacterStream( int columnIndex ) throws SQLException {
     @Override
     public Reader getCharacterStream( String columnLabel ) throws SQLException {
         int columnIndex = findColumn( columnLabel );
-        return getValue( columnIndex );
+        return getCharacterStream( columnIndex );
     }
 
     /**
@@ -491,7 +491,7 @@ public BigDecimal getBigDecimal( int columnIndex ) throws SQLException {
     @Override
     public BigDecimal getBigDecimal( String columnLabel ) throws SQLException {
         int columnIndex = findColumn( columnLabel );
-        return getValue( columnIndex );
+        return getBigDecimal( columnIndex );
     }
 
     /**

src/com/inet/excel/ExcelSheetResultSet.java

@@ -31,7 +31,7 @@ public class ExcelSheetResultSet extends ExcelResultSet {
     private final ResultSetMetaData metaData;
     private final int rowCount;
 
-    private List<List<String>> rowBatch;
+    private List<List<Object>> rowBatch;
     private int currentRowIndex;
     private int currentBatchIndex;
     private boolean closed;

src/com/inet/excel/ExcelSheetResultSetMetaData.java

@@ -160,7 +160,7 @@ public String getSchemaName( int column ) throws SQLException {
      */
     @Override
     public int getPrecision( int column ) throws SQLException {
-        return ExcelDatabaseMetaData.VARCHAR_COLUMN_SIZE_IN_BYTES;
+        return ExcelDatabaseMetaData.COLUMN_SIZE_IN_BYTES;
     }
 
     /**
@@ -192,15 +192,15 @@ public String getCatalogName( int column ) throws SQLException {
      */
     @Override
     public int getColumnType( int column ) throws SQLException {
-        return Types.VARCHAR;
+        return Types.JAVA_OBJECT;
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
     public String getColumnTypeName( int column ) throws SQLException {
-        return "VARCHAR";
+        return "JAVA_OBJECT";
     }
 
     /**
@@ -232,6 +232,6 @@ public boolean isDefinitelyWritable( int column ) throws SQLException {
      */
     @Override
     public String getColumnClassName( int column ) throws SQLException {
-        return String.class.getName();
+        return String.class.getName(); //TODO
     }
 }