working after merge
authorEric Prud'hommeaux <bertails@w3.org>
Sun, 13 Dec 2009 19:10:59 -0500
changeset 24 042a9ad7eee4
parent 23 86ed34331caa
child 25 6b68be2d0de6
working after merge
src/main/scala/RDB2RDFMain.scala
src/test/scala/RDB2RDFTest.scala
--- a/src/main/scala/RDB2RDFMain.scala	Sun Dec 13 17:44:40 2009 -0500
+++ b/src/main/scala/RDB2RDFMain.scala	Sun Dec 13 19:10:59 2009 -0500
@@ -63,7 +63,7 @@
 joins.insert(rel AS alias ON eqS)
   * 
  * */
-// object RDB2RDF {
+object RDB2RDF {
   case class R2RState(project:AttributeList, joins:List[Join], exprs:Expression, varmap:Map[Var, FQAttribute])
 
   def AliasFromS(s:S):Relation = {
@@ -160,8 +160,6 @@
     state
   }
 
-//   def apply (sparql:SparqlSelect, stem:StemURI, pk:PrimaryKey) : Select = {
-//     val SparqlSelect(attrs, triples) = sparql
   def apply (sparql:SparqlSelect, stem:StemURI, pk:PrimaryKey) : Select = {
     val SparqlSelect(attrs, triples) = sparql
     var r2rState = R2RState(
--- a/src/test/scala/RDB2RDFTest.scala	Sun Dec 13 17:44:40 2009 -0500
+++ b/src/test/scala/RDB2RDFTest.scala	Sun Dec 13 19:10:59 2009 -0500
@@ -22,8 +22,7 @@
             INNER JOIN Employee AS manager ON manager.id=emp.manager
  WHERE emp.lastName IS NOT NULL AND manager.lastName IS NOT NULL
 """).get
-    // assert(RDB2RDF(sparqlSelect, StemURI("http://hr.example/DB/"), PrimaryKey(Attribute(Name("id")))) === sqlSelect)
-    true
+    assert(RDB2RDF(sparqlSelect, StemURI("http://hr.example/DB/"), PrimaryKey(Attribute(Name("id")))) === sqlSelect)
   }