Removed Oracle specific code in SQLUtil. This might be a mistake...

ammolitor · May 15, 2015 · aa8b9b7 · aa8b9b7
1 parent 22bf02e
commit aa8b9b7
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/com/oltpbenchmark/util/SQLUtil.java b/src/com/oltpbenchmark/util/SQLUtil.java
@@ -120,13 +120,18 @@ public static Timestamp getTimestamp(Object obj) {
         else if (obj instanceof Date) {
             return new Timestamp(((Date)obj).getTime());
         }
-        else if (obj instanceof oracle.sql.TIMESTAMP) {
-            try {
-                return ((oracle.sql.TIMESTAMP)obj).timestampValue();
-            } catch (SQLException ex) {
-                throw new RuntimeException("Failed to get timestamp from '" + obj + "'", ex);
-            }
+        else {
+            LOG.error(String.format("Unexpected timestamp object type '%s': %s",
+                                    obj.getClass().getName(), obj));
         }
+        // FIXME: Not sure how to include this without including Oracle jars
+//        else if (obj instanceof oracle.sql.TIMESTAMP) {
+//            try {
+//                return ((oracle.sql.TIMESTAMP)obj).timestampValue();
+//            } catch (SQLException ex) {
+//                throw new RuntimeException("Failed to get timestamp from '" + obj + "'", ex);
+//            }
+//        }
 
         Long timestamp = SQLUtil.getLong(obj);
         return (timestamp != null ? new Timestamp(timestamp) : null);