Fixed issue #29

orientechnologies · Jul 20, 2015 · bce18cc · bce18cc
1 parent 63a2c4f
commit bce18cc
Showing 1 changed file with 26 additions and 33 deletions.
diff --git a/src/main/java/com/orientechnologies/orient/jdbc/OrientJdbcResultSetMetaData.java b/src/main/java/com/orientechnologies/orient/jdbc/OrientJdbcResultSetMetaData.java
@@ -74,11 +74,7 @@ public OrientJdbcResultSetMetaData(final OrientJdbcResultSet iResultSet) {
   }
 
   public int getColumnCount() throws SQLException {
-    ODocument currentRecord = this.resultSet.unwrap(ODocument.class);
-
-    if (currentRecord == null)
-      return 0;
-
+    final ODocument currentRecord = getCurrentRecord();
     return currentRecord.fields();
   }
 
@@ -103,15 +99,13 @@ public String getColumnLabel(final int column) throws SQLException {
   }
 
   public String getColumnName(final int column) throws SQLException {
-    final ODocument currentRecord = this.resultSet.unwrap(ODocument.class);
-    if (currentRecord == null)
-      return null;
-    else
-      return currentRecord.fieldNames()[column - 1];
+    final ODocument currentRecord = getCurrentRecord();
+    return currentRecord.fieldNames()[column - 1];
   }
 
   public int getColumnType(final int column) throws SQLException {
-    ODocument currentRecord = this.resultSet.unwrap(ODocument.class);
+    final ODocument currentRecord = getCurrentRecord();
+
     final String[] fieldNames = currentRecord.fieldNames();
 
     if (column > fieldNames.length)
@@ -182,6 +176,13 @@ else if (value instanceof ORecordLazyList) {
       return typesSqlTypes.get(otype);
   }
 
+  protected ODocument getCurrentRecord() throws SQLException {
+    final ODocument currentRecord = this.resultSet.unwrap(ODocument.class);
+    if (currentRecord == null)
+      throw new SQLException("No current record");
+    return currentRecord;
+  }
+
   private int getSQLTypeFromJavaClass(final Object value) {
     // START inferencing the OType from the Java class
     if (value instanceof Boolean)
@@ -208,15 +209,12 @@ else if (value instanceof String)
   }
 
   public String getColumnTypeName(final int column) throws SQLException {
-    ODocument currentRecord = this.resultSet.unwrap(ODocument.class);
-    if (currentRecord == null)
+    final ODocument currentRecord = getCurrentRecord();
+
+    OType columnType = currentRecord.fieldType(currentRecord.fieldNames()[column - 1]);
+    if (columnType == null)
       return null;
-    else {
-      OType columnType = currentRecord.fieldType(currentRecord.fieldNames()[column - 1]);
-      if (columnType == null)
-        return null;
-      return columnType.toString();
-    }
+    return columnType.toString();
   }
 
   public int getPrecision(final int column) throws SQLException {
@@ -228,7 +226,7 @@ public int getScale(final int column) throws SQLException {
   }
 
   public String getSchemaName(final int column) throws SQLException {
-    final ODocument currentRecord = this.resultSet.unwrap(ODocument.class);
+    final ODocument currentRecord = getCurrentRecord();
     if (currentRecord == null)
       return "";
     else
@@ -272,27 +270,24 @@ public boolean isSearchable(int column) throws SQLException {
     return true;
   }
 
-  public boolean isSigned(int column) throws SQLException {
-    ODocument currentRecord = this.resultSet.unwrap(ODocument.class);
-    if (currentRecord == null)
-      return false;
-    else
-      return this.isANumericColumn(currentRecord.fieldType(currentRecord.fieldNames()[column - 1]));
+  public boolean isSigned(final int column) throws SQLException {
+    final ODocument currentRecord = getCurrentRecord();
+    return this.isANumericColumn(currentRecord.fieldType(currentRecord.fieldNames()[column - 1]));
   }
 
-  public boolean isWritable(int column) throws SQLException {
+  public boolean isWritable(final int column) throws SQLException {
     return !isReadOnly(column);
   }
 
-  public boolean isWrapperFor(Class<?> iface) throws SQLException {
+  public boolean isWrapperFor(final Class<?> iface) throws SQLException {
     return false;
   }
 
-  public <T> T unwrap(Class<T> iface) throws SQLException {
+  public <T> T unwrap(final Class<T> iface) throws SQLException {
     return null;
   }
 
-  private boolean isANumericColumn(OType type) {
+  private boolean isANumericColumn(final OType type) {
     return type == OType.BYTE || type == OType.DOUBLE || type == OType.FLOAT || type == OType.INTEGER || type == OType.LONG
         || type == OType.SHORT;
   }
@@ -302,9 +297,7 @@ public static Integer getSqlType(final OType iType) {
   }
 
   protected OProperty getProperty(final int column) throws SQLException {
-    final ODocument currentRecord = this.resultSet.unwrap(ODocument.class);
-    if (currentRecord == null)
-      return null;
+    final ODocument currentRecord = getCurrentRecord();
 
     final OClass schemaClass = currentRecord.getSchemaClass();
     if (schemaClass != null) {