[do_jdbc] Revert "Added support for subclasses of supported types"

* Will use alternative solution (recursive RubyType#getRubyType) added in 67e3ef9. This reverts commit 59923d1. [#1123] Signed-off-by: Alex Coles <alex@alexcolesportfolio.com>
datamapper · Nov 16, 2009 · 8e64ca1 · 8e64ca1
1 parent 67e3ef9
commit 8e64ca1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 47 deletions.
diff --git a/do_jdbc/src/main/java/data_objects/RubyType.java b/do_jdbc/src/main/java/data_objects/RubyType.java
@@ -1,7 +1,5 @@
 package data_objects;
 
-import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.*;
 import java.sql.Types;
 import java.util.HashMap;
 import java.util.Map;
@@ -125,47 +123,4 @@ public static RubyType jdbcTypeToRubyType(int type, int scale) {
         return primitiveType;
     }
 
-    public static RubyType inferRubyType(IRubyObject obj){
-        RubyType primitiveType = null;
-        Ruby runtime = obj.getRuntime();
-
-        //XXX Remember that types must by correctly ordered
-        // RubyObject must be last, Extlib::ByteArray must be before String, etc (inheritance)
-        if(obj instanceof RubyFixnum){
-            primitiveType = RubyType.FIXNUM;
-        }else if(obj instanceof RubyBignum){
-            primitiveType = RubyType.BIGNUM;
-        }else if(obj instanceof RubyInteger){
-            primitiveType = RubyType.INTEGER;
-        }else if(obj instanceof RubyFloat){
-            primitiveType = RubyType.FLOAT;
-        }else if(obj instanceof RubyBigDecimal){
-            primitiveType = RubyType.BIG_DECIMAL;
-        }else if(obj.getMetaClass().hasModuleInHierarchy(runtime.fastGetModule("Extlib").fastGetClass("ByteArray"))){
-            primitiveType = RubyType.BYTE_ARRAY;
-        }else if(obj instanceof RubyString){
-            primitiveType = RubyType.STRING;
-        }else if(obj instanceof RubyTime){
-            primitiveType = RubyType.TIME;
-        }else if(obj.getMetaClass().hasModuleInHierarchy(runtime.fastGetClass("DateTime"))){
-            primitiveType = RubyType.DATE_TIME;
-        }else if(obj.getMetaClass().hasModuleInHierarchy(runtime.fastGetClass("Date"))){
-            primitiveType = RubyType.DATE;
-        }else if(obj instanceof RubyNil){
-            primitiveType = RubyType.NIL;
-        }else if(obj.getMetaClass().hasModuleInHierarchy(runtime.fastGetClass("TrueClass"))){
-            primitiveType = RubyType.TRUE_CLASS;
-        }else if(obj.getMetaClass().hasModuleInHierarchy(runtime.fastGetClass("FalseClass"))){
-            primitiveType = RubyType.FALSE_CLASS;
-        }else if(obj instanceof RubyRational){
-            primitiveType = RubyType.RATIONAL;
-        }else if(obj instanceof RubyRegexp){
-            primitiveType = RubyType.REGEXP;
-        }else if(obj instanceof RubyClass){
-            primitiveType = RubyType.CLASS;
-        }else{
-            primitiveType = RubyType.OBJECT;
-        }
-        return primitiveType;
-    }
 }
diff --git a/do_jdbc/src/main/java/data_objects/drivers/AbstractDriverDefinition.java b/do_jdbc/src/main/java/data_objects/drivers/AbstractDriverDefinition.java
@@ -475,8 +475,7 @@ public IRubyObject getTypecastResultSetValue(Ruby runtime,
      */
     public void setPreparedStatementParam(PreparedStatement ps,
             IRubyObject arg, int idx) throws SQLException {
-        //switch (RubyType.getRubyType(arg.getType().getName())) {
-        switch (RubyType.inferRubyType(arg)) {
+        switch (RubyType.getRubyType(arg.getType().getName())) {
         case FIXNUM:
             ps.setInt(idx, Integer.parseInt(arg.toString()));
             break;