Makes the generated SQL for a query use a sensible column name

than just column_0 and _1, etc.
HazyResearch · Jan 31, 2016 · 97d6603 · 97d6603
1 parent 0e1d839
commit 97d6603
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/main/scala/org/deepdive/ddlog/DeepDiveLogCompiler.scala b/src/main/scala/org/deepdive/ddlog/DeepDiveLogCompiler.scala
@@ -68,7 +68,7 @@ object AliasStyle extends Enumeration {
   type AliasStyle = Value
   // TableStyle: tableName.R{tableIndex}.columnName
   // ViewStyle: column_{columnIndex}
-  val ViewAlias, TableAlias, NoAlias = Value
+  val ViewAlias, TableAlias, NoAlias, UseVariableAsAlias = Value
 }
 import AliasStyle._
 
@@ -346,6 +346,7 @@ class QueryCompiler(cq : ConjunctiveQuery, ss: CompilationState) {
       case _ => s" AS column_${cq.headTerms indexOf e}"
     }
     case ViewAlias => s" AS column_${cq.headTerms indexOf e}"
+    case UseVariableAsAlias => s""" AS "${DeepDiveLogPrettyPrinter.print(e)}""""
   }
 
   // resolve an expression

diff --git a/src/main/scala/org/deepdive/ddlog/DeepDiveLogQueryCompiler.scala b/src/main/scala/org/deepdive/ddlog/DeepDiveLogQueryCompiler.scala
@@ -27,7 +27,7 @@ object DeepDiveLogQueryCompiler extends DeepDiveLogHandler {
           qc.generateSQL(AliasStyle.ViewAlias)}"""
     }) ++ List({
       // compile the query
-      s"""${new QueryCompiler(query, compilationState).generateSQL()}"""
+      s"""${new QueryCompiler(query, compilationState).generateSQL(AliasStyle.UseVariableAsAlias)}"""
     }) mkString(";\n\n")
     println(sql)
   }

diff --git a/test/query-test/spouse_example/count-has_spouse.ddlogq.expected b/test/query-test/spouse_example/count-has_spouse.ddlogq.expected
@@ -1,3 +1,3 @@
-SELECT COUNT(R0.relation_id) AS column_0
+SELECT COUNT(R0.relation_id) AS "COUNT(r)"
 FROM has_spouse R0