- Add conversion of integers and doubles

- Add getDriver for QIROperators

src/qir/ast/QIRNode.java

 package qir.ast;
 
+import qir.driver.DBDriver;
 import qir.util.IQIRVisitor;
+import qir.util.QIRException;
 
 import com.oracle.truffle.api.source.*;
 
@@ -21,6 +23,10 @@ public abstract class QIRNode {
         return source;
     }
 
+    public DBDriver getDriver() {
+        throw new QIRException("No driver found.");
+    }
+
     /**
      * Allows a class implementing {@link IQIRVisitor} to access the node.
      *

src/qir/ast/data/QIRTable.java

@@ -23,6 +23,7 @@ public final class QIRTable extends QIRNode {
         return tableName;
     }
 
+    @Override
     public final DBDriver getDriver() {
         return driver;
     }

src/qir/ast/operator/QIRGroup.java

@@ -3,6 +3,7 @@ package qir.ast.operator;
 import com.oracle.truffle.api.source.SourceSection;
 
 import qir.ast.QIRNode;
+import qir.driver.DBDriver;
 import qir.util.IQIRVisitor;
 
 /**
@@ -42,6 +43,11 @@ public final class QIRGroup extends QIROperator {
         return child;
     }
 
+    @Override
+    public DBDriver getDriver() {
+        return child.getDriver();
+    }
+
     @Override
     public final <T> T accept(final IQIRVisitor<T> visitor) {
         return visitor.visit(this);

src/qir/ast/operator/QIRJoin.java

@@ -3,6 +3,7 @@ package qir.ast.operator;
 import com.oracle.truffle.api.source.SourceSection;
 
 import qir.ast.QIRNode;
+import qir.driver.DBDriver;
 import qir.util.IQIRVisitor;
 
 /**
@@ -38,6 +39,11 @@ public final class QIRJoin extends QIROperator {
         return right;
     }
 
+    @Override
+    public DBDriver getDriver() {
+        return left.getDriver(); // TODO: That is arbitrary.
+    }
+
     @Override
     public final <T> T accept(IQIRVisitor<T> visitor) {
         return visitor.visit(this);

src/qir/ast/operator/QIRLimit.java

@@ -3,6 +3,7 @@ package qir.ast.operator;
 import com.oracle.truffle.api.source.SourceSection;
 
 import qir.ast.QIRNode;
+import qir.driver.DBDriver;
 import qir.util.IQIRVisitor;
 
 /**
@@ -32,6 +33,11 @@ public final class QIRLimit extends QIROperator {
         return child;
     }
 
+    @Override
+    public DBDriver getDriver() {
+        return child.getDriver();
+    }
+
     @Override
     public final <T> T accept(final IQIRVisitor<T> visitor) {
         return visitor.visit(this);

src/qir/ast/operator/QIROperator.java

@@ -3,6 +3,7 @@ package qir.ast.operator;
 import com.oracle.truffle.api.source.SourceSection;
 
 import qir.ast.QIRNode;
+import qir.driver.DBDriver;
 import qir.util.IQIRVisitor;
 
 /**
@@ -13,6 +14,11 @@ public abstract class QIROperator extends QIRNode {
         super(source);
     }
 
+    @Override
+    public DBDriver getDriver() {
+        return super.getDriver();
+    }
+
     @Override
     public <T> T accept(final IQIRVisitor<T> visitor) {
         return visitor.visit(this);

src/qir/ast/operator/QIROrder.java

@@ -3,6 +3,7 @@ package qir.ast.operator;
 import com.oracle.truffle.api.source.SourceSection;
 
 import qir.ast.QIRNode;
+import qir.driver.DBDriver;
 import qir.util.IQIRVisitor;
 
 /**
@@ -33,6 +34,11 @@ public final class QIROrder extends QIROperator {
         return child;
     }
 
+    @Override
+    public DBDriver getDriver() {
+        return child.getDriver();
+    }
+
     @Override
     public final <T> T accept(final IQIRVisitor<T> visitor) {
         return visitor.visit(this);

src/qir/ast/operator/QIRProject.java

@@ -3,6 +3,7 @@ package qir.ast.operator;
 import com.oracle.truffle.api.source.SourceSection;
 
 import qir.ast.QIRNode;
+import qir.driver.DBDriver;
 import qir.util.IQIRVisitor;
 
 /**
@@ -33,6 +34,11 @@ public final class QIRProject extends QIROperator {
         return child;
     }
 
+    @Override
+    public DBDriver getDriver() {
+        return child.getDriver();
+    }
+
     @Override
     public <T> T accept(final IQIRVisitor<T> visitor) {
         return visitor.visit(this);

src/qir/ast/operator/QIRScan.java

@@ -3,6 +3,7 @@ package qir.ast.operator;
 import com.oracle.truffle.api.source.SourceSection;
 
 import qir.ast.QIRNode;
+import qir.driver.DBDriver;
 import qir.util.IQIRVisitor;
 
 /**
@@ -23,6 +24,11 @@ public final class QIRScan extends QIROperator {
         return table;
     }
 
+    @Override
+    public DBDriver getDriver() {
+        return table.getDriver();
+    }
+
     @Override
     public final <T> T accept(final IQIRVisitor<T> visitor) {
         return visitor.visit(this);

src/qir/ast/operator/QIRSelect.java

@@ -3,6 +3,7 @@ package qir.ast.operator;
 import com.oracle.truffle.api.source.SourceSection;
 
 import qir.ast.QIRNode;
+import qir.driver.DBDriver;
 import qir.util.IQIRVisitor;
 
 /**
@@ -33,6 +34,11 @@ public final class QIRSelect extends QIROperator {
         return child;
     }
 
+    @Override
+    public DBDriver getDriver() {
+        return child.getDriver();
+    }
+
     @Override
     public final <T> T accept(final IQIRVisitor<T> visitor) {
         return visitor.visit(this);

src/qir/driver/SQLDriver.java

@@ -56,17 +56,18 @@ public abstract class SQLDriver extends DBDriver {
             while (rs.next()) {
                 QIRTuple newTuple = QIRTnil.getInstance();
                 for (int i = rs.getMetaData().getColumnCount(); i >= 1; i--) {
-                    switch (rs.getMetaData().getColumnType(i)) {
-                        case Types.NUMERIC: {
+                    int type = rs.getMetaData().getColumnType(i);
+                    switch (type) {
+                        case Types.NUMERIC:
+                        case Types.INTEGER:
+                        case Types.DOUBLE:
                             // TODO: Handle overflow
                             data = new QIRNumber(SourceSection.createUnavailable("QIRNode", "QIRNumber"), rs.getLong(i));
                             break;
-                        }
-                        default: {
+                        default:
                             data = new QIRString(SourceSection.createUnavailable("QIRNode", "QIRString"), rs.getString(i));
                             break;
                     }
-                    }
                     newTuple = new QIRTcons(SourceSection.createUnavailable("QIRNode", "QIRTcons"), rs.getMetaData().getColumnLabel(i), data, newTuple);
                 }
                 tmp.push(newTuple);