Small tweaks

Author: wickwirew

Sources/Compiler/Gen/SwiftLanguage.swift

@@ -215,8 +215,8 @@ public struct SwiftLanguage: Language {
 
         for query in queries {
             let associatedType = query.name.capitalizedFirst
-            writer.write(line: "associatedtype ", associatedType, ": ", query.typealiasName)
-            writer.write(line: "var ", query.variableName, ": ", associatedType, " { get }")
+            writer.write(line: "associatedtype _", associatedType, ": ", query.typealiasName)
+            writer.write(line: "var ", query.variableName, ": _", associatedType, " { get }")
         }
 
         writer.unindent()
@@ -312,14 +312,8 @@ public struct SwiftLanguage: Language {
 
         writer.write(line: ") { input, tx in")
         writer.indent()
-        
-        if query.input == .void {
-            writer.write(line: "let")
-        } else {
-            writer.write(line: "var")
-        }
-        
-        writer.write(" statement = try Otter.Statement(")
+
+        writer.write(line: "let statement = try Otter.Statement(")
         writer.indent()
         multilineStringLiteral(of: query.sourceSql)
         writer.write(",")

Sources/Compiler/Parse/Parsers.swift

@@ -1148,7 +1148,7 @@ enum Parsers {
                 kind = .table(table)
             }
         case .openParen:
-            if state.peek.kind == .select {
+            if state.peek.kind == .select || state.peek.kind == .values {
                 let subquery = try parens(state: &state, value: selectStmt)
                 let alias = maybeAlias(state: &state, asRequired: false)
                 kind = .subquery(subquery, alias: alias)

Sources/Otter/QueryObservation.swift

@@ -113,5 +113,3 @@ extension QueryObservation {
         }
     }
 }
-
-public final class QueryObservation2 {}

Tests/CompilerTests/Compiler/CompileSimpleSelects.sql

@@ -257,3 +257,28 @@ LIMIT ?;
 -- CHECK:   TABLES
 -- CHECK:     foo
 SELECT id = 1 AS isOne FROM foo;
+
+-- CHECK: SIGNATURE
+-- CHECK:   OUTPUT_CHUNKS
+-- CHECK:     CHUNK
+-- CHECK:       OUTPUT
+-- CHECK:         b INTEGER
+-- CHECK:         c INTEGER
+WITH a AS (
+    SELECT column1 AS b, column2 AS c FROM (VALUES (1, 2))
+)
+SELECT a.b, a.c FROM a;
+
+-- CHECK: SIGNATURE
+-- CHECK:   OUTPUT_CHUNKS
+-- CHECK:     CHUNK
+-- CHECK:       OUTPUT
+-- CHECK:         b INTEGER
+-- CHECK:         e INTEGER
+WITH a AS (
+    SELECT column1 AS b, column2 AS c FROM (VALUES (1, 2))
+),
+d AS (
+    SELECT column1 AS e, column2 AS f FROM (VALUES (1, 2))
+)
+SELECT a.b, d.e FROM a INNER JOIN d ON a.b = d.e;