--- a/src/main/scala/RDB2RDFMain.scala	Thu Dec 10 14:15:16 2009 -0500
+++ b/src/main/scala/RDB2RDFMain.scala	Thu Dec 10 14:37:35 2009 -0500
@@ -11,18 +11,6 @@
 
 import MyParsers._
 
-// case class RDFTriple()
-
-// sealed abstract class RDFSubject()
-// case class RDFSubjectUri(uri:URI) extends RDFSubject
-// case class RDFSubjectBlankNode(debugName:String) extends RDFSubject
-
-// case class RDFPredicate(uri:URI)
-
-// sealed abstract class RDFObject()
-// case class RDFObjectUri(uri:URI) extends RDFObject
-// case class RDFObjectBlankNode(debugName:String) extends RDFObject
-// case class RDFLiteral(lexicalForm:Literal, datatype:URI)
 
 // case class RelationStemGraph(m:Map[String,String])
 // case class RelationMap(Map[(FQAttribute,Tuple),RDFTriple])

--- a/src/main/scala/RDF.scala	Thu Dec 10 14:15:16 2009 -0500
+++ b/src/main/scala/RDF.scala	Thu Dec 10 14:37:35 2009 -0500
@@ -2,7 +2,7 @@
 
 import java.net.URI
 
-case class RDFTriple()
+case class RDFTriple(s:RDFSubject, p:RDFPredicate, o:RDFObject)
 
 sealed abstract class RDFSubject()
 case class RDFSubjectUri(uri:URI) extends RDFSubject

--- a/src/main/scala/SQL.scala	Thu Dec 10 14:15:16 2009 -0500
+++ b/src/main/scala/SQL.scala	Thu Dec 10 14:37:35 2009 -0500
@@ -80,7 +80,7 @@
   def rvalue:Parser[RValue] = (
       fqattribute ^^ { RValueAttr(_) }
     | """[0-9]+""".r ^^ { x => RValueInt(Name(x)) }
-    | "\"[^\"]*\"".r  ^^ { x => RValueString(Name(x)) }
+    | "\"[^\"]*\"".r  ^^ { x => RValueString(Name(x.substring(1, x.size - 1))) }
   )
 
 }

--- a/src/test/scala/SQLTest.scala	Thu Dec 10 14:15:16 2009 -0500
+++ b/src/test/scala/SQLTest.scala	Thu Dec 10 14:37:35 2009 -0500
@@ -13,7 +13,8 @@
             INNER JOIN Employee AS manager ON manager.id=emp.manager
  WHERE emp.lastName IS NOT NULL AND manager.lastName IS NOT NULL
 """
-    println(a.parseAll(a.select, e))
+    val expected = Select(AttributeList(List(NamedAttribute(FQAttribute(Relation(Name("emp")),Attribute(Name("lastName"))),Attribute(Name("empName"))), NamedAttribute(FQAttribute(Relation(Name("manager")),Attribute(Name("lastName"))),Attribute(Name("managName"))))),TableList(TableAlias(Relation(Name("Employee")),Relation(Name("emp"))),List(Join(TableAlias(Relation(Name("Employee")),Relation(Name("manager"))),Expression(List(PrimaryExpressionEq(FQAttribute(Relation(Name("manager")),Attribute(Name("id"))),RValueAttr(FQAttribute(Relation(Name("emp")),Attribute(Name("manager")))))))))),Some(Expression(List(PrimaryExpressionNotNull(FQAttribute(Relation(Name("emp")),Attribute(Name("lastName")))), PrimaryExpressionNotNull(FQAttribute(Relation(Name("manager")),Attribute(Name("lastName"))))))))
+    assert(expected === (a.parseAll(a.select, e).get))
   }
 
   test("tup1") {
@@ -23,7 +24,8 @@
   FROM Employee AS emp
  WHERE emp.manager=18 AND emp.lastName IS NOT NULL
 """
-    println(a.parseAll(a.select, e))
+    val expected = Select(AttributeList(List(NamedAttribute(FQAttribute(Relation(Name("emp")),Attribute(Name("lastName"))),Attribute(Name("empName"))))),TableList(TableAlias(Relation(Name("Employee")),Relation(Name("emp"))),List()),Some(Expression(List(PrimaryExpressionEq(FQAttribute(Relation(Name("emp")),Attribute(Name("manager"))),RValueInt(Name("18"))), PrimaryExpressionNotNull(FQAttribute(Relation(Name("emp")),Attribute(Name("lastName"))))))))
+    assert(expected === (a.parseAll(a.select, e).get))
   }
 
   test("litConst1") {
@@ -35,7 +37,8 @@
                                        AND manager.lastName="Johnson"
 WHERE emp.lastName IS NOT NULL
 """
-    println(a.parseAll(a.select, e))
+    val expected = Select(AttributeList(List(NamedAttribute(FQAttribute(Relation(Name("emp")),Attribute(Name("lastName"))),Attribute(Name("empName"))))),TableList(TableAlias(Relation(Name("Employee")),Relation(Name("emp"))),List(Join(TableAlias(Relation(Name("Employee")),Relation(Name("manager"))),Expression(List(PrimaryExpressionEq(FQAttribute(Relation(Name("emp")),Attribute(Name("manager"))),RValueAttr(FQAttribute(Relation(Name("manager")),Attribute(Name("id"))))), PrimaryExpressionEq(FQAttribute(Relation(Name("manager")),Attribute(Name("lastName"))),RValueString(Name("Johnson")))))))),Some(Expression(List(PrimaryExpressionNotNull(FQAttribute(Relation(Name("emp")),Attribute(Name("lastName"))))))))
+    assert(expected === (a.parseAll(a.select, e).get))
   }
 
   test("filter1") {
@@ -51,7 +54,8 @@
                                          AND grandManager.birthday < manager.birthday
  WHERE emp.lastName IS NOT NULL AND grandManager.lastName IS NOT NULL
 """
-    println(a.parseAll(a.select, e))
+    val expected = Select(AttributeList(List(NamedAttribute(FQAttribute(Relation(Name("emp")),Attribute(Name("lastName"))),Attribute(Name("empName"))), NamedAttribute(FQAttribute(Relation(Name("grandManager")),Attribute(Name("lastName"))),Attribute(Name("grandManagName"))))),TableList(TableAlias(Relation(Name("Employee")),Relation(Name("emp"))),List(Join(TableAlias(Relation(Name("Manage")),Relation(Name("lower"))),Expression(List(PrimaryExpressionEq(FQAttribute(Relation(Name("lower")),Attribute(Name("manages"))),RValueAttr(FQAttribute(Relation(Name("emp")),Attribute(Name("id")))))))), Join(TableAlias(Relation(Name("Employee")),Relation(Name("manager"))),Expression(List(PrimaryExpressionEq(FQAttribute(Relation(Name("manager")),Attribute(Name("id"))),RValueAttr(FQAttribute(Relation(Name("lower")),Attribute(Name("manager"))))), PrimaryExpressionLt(FQAttribute(Relation(Name("manager")),Attribute(Name("birthday"))),RValueAttr(FQAttribute(Relation(Name("emp")),Attribute(Name("birthday")))))))), Join(TableAlias(Relation(Name("Manage")),Relation(Name("upper"))),Expression(List(PrimaryExpressionEq(FQAttribute(Relation(Name("upper")),Attribute(Name("manages"))),RValueAttr(FQAttribute(Relation(Name("manager")),Attribute(Name("id")))))))), Join(TableAlias(Relation(Name("Employee")),Relation(Name("grandManager"))),Expression(List(PrimaryExpressionEq(FQAttribute(Relation(Name("grandManager")),Attribute(Name("id"))),RValueAttr(FQAttribute(Relation(Name("upper")),Attribute(Name("manager"))))), PrimaryExpressionLt(FQAttribute(Relation(Name("grandManager")),Attribute(Name("birthday"))),RValueAttr(FQAttribute(Relation(Name("manager")),Attribute(Name("birthday")))))))))),Some(Expression(List(PrimaryExpressionNotNull(FQAttribute(Relation(Name("emp")),Attribute(Name("lastName")))), PrimaryExpressionNotNull(FQAttribute(Relation(Name("grandManager")),Attribute(Name("lastName"))))))))
+    assert(expected === (a.parseAll(a.select, e).get))
   }