Clean up sql builders a little

src/server/sql/insert_builder.coffee

@@ -6,22 +6,22 @@ QueryBuilder = require "./query_builder"
 class InsertBuilder extends QueryBuilder
   visit_Relations_Table: (table, hashes) ->
     hashes = [hashes] unless _.isArray(hashes)
-    columnNames = _.union((_.keys(hash) for hash in hashes)...)
-    valueLists = for hash in hashes
-      for columnName in columnNames
-        hash[columnName] ? null
+    table = @buildTableNode(table)
+    columnNames = getColumnNames(hashes)
+    columns = buildColumns(columnNames)
+    valueLists = buildValueLists(this, hashes, columnNames)
+    new Nodes.Insert(table, columns, valueLists)
+
+  getColumnNames = (hashes) ->
+    _.union((_.keys(hash) for hash in hashes)...)
 
-    new Nodes.Insert(
-      @buildTableNode(table)
-      buildColumns(columnNames),
-      visitValueLists.call(this, valueLists))
+  buildValueLists = (self, hashes, columnNames) ->
+    for hash in hashes
+      for columnName in columnNames
+        self.visit(hash[columnName] ? null)
 
   buildColumns = (columnNames) ->
     for name in columnNames
       new Nodes.Column(underscore(name))
 
-  visitValueLists = (valueLists) ->
-    for list in valueLists
-      @visit(value) for value in list
-
 module.exports = InsertBuilder

src/server/sql/select_builder.coffee

@@ -7,7 +7,7 @@ class SelectBuilder extends QueryBuilder
     @subqueryIndex = 0
 
   visit_Relations_Table: (r) ->
-    table = new Nodes.Table(r.resourceName())
+    table = @buildTableNode(r)
     columns = (@visit(column, table) for column in r.columns())
     new Nodes.Select(table, columns)
 
@@ -55,8 +55,8 @@ class SelectBuilder extends QueryBuilder
       @visit(e.column, table),
       e.directionCoefficient)
 
-  wrapQuery = (builder, query) ->
-    subquery = new Nodes.Subquery(query, "t#{++builder.subqueryIndex}")
+  wrapQuery = (self, query) ->
+    subquery = new Nodes.Subquery(query, "t#{++self.subqueryIndex}")
     new Nodes.Select(subquery, subquery.columns())
 
 module.exports = SelectBuilder