Fixed name

wickwirew · wickwirew · commit 9cd0daa19407 · 2025-05-25T21:15:20.000-04:00
diff --git a/Sources/Compiler/Parse/Parsers.swift b/Sources/Compiler/Parse/Parsers.swift
@@ -1026,6 +1026,7 @@ enum Parsers {
         }
     }
     
+    /// https://www.sqlite.org/syntax/table-or-subquery.html
     static func tableOrSubquery(state: inout ParserState) throws -> TableOrSubquerySyntax {
         let start = state.location
         let kind: TableOrSubquerySyntax.Kind
@@ -1076,8 +1077,16 @@ enum Parsers {
                 case let .join(joinClause):
                     kind = .join(joinClause)
                 case let .tableOrSubqueries(table):
+                    // Note: The alias is not mentioned at all in the documentation.
+                    // I think this is a bug in the docs, since you can clearly add one
+                    // unless im misinterpreting the diagram which is more than possible.
+                    //
+                    // Valid SQL:
+                    // SELECT * FROM (foo, bar) AS baz;
+                    //
+                    // https://www.sqlite.org/syntax/table-or-subquery.html
                     let alias = maybeAlias(state: &state, asRequired: false)
-                    kind = .subTableOrSubqueries(table, alias: alias)
+                    kind = .tableOrSubqueries(table, alias: alias)
                 }
             }
         default:
diff --git a/Sources/Compiler/Sema/NameInferrer.swift b/Sources/Compiler/Sema/NameInferrer.swift
@@ -170,7 +170,7 @@ struct NameInferrer {
             return joinClauseSyntax.joins.reduce(.none) {
                 unify(names: $0, with: infer(tableOrSubquery: $1.tableOrSubquery))
             }
-        case .subTableOrSubqueries(let tableOrSubqueries, _):
+        case .tableOrSubqueries(let tableOrSubqueries, _):
             return tableOrSubqueries.reduce(.none) {
                 unify(names: $0, with: infer(tableOrSubquery: $1))
             }
diff --git a/Sources/Compiler/Sema/StmtTypeChecker.swift b/Sources/Compiler/Sema/StmtTypeChecker.swift
@@ -849,7 +849,7 @@ extension StmtTypeChecker {
                 selectedColumns: usedColumns
             )
         case .tableFunction:
-            fatalError()
+            fatalError("Not yet implemented")
         case let .subquery(selectStmt, alias):
             let resultColumns = inNewEnvironment { inferrer in
                 inferrer.typeCheck(select: selectStmt)
@@ -867,7 +867,7 @@ extension StmtTypeChecker {
             }
         case let .join(joinClause):
             typeCheck(joinClause: joinClause)
-        case .subTableOrSubqueries:
+        case .tableOrSubqueries:
             fatalError()
         }
     }
diff --git a/Sources/Compiler/Syntax/TableOrSubquerySyntax.swift b/Sources/Compiler/Syntax/TableOrSubquerySyntax.swift
@@ -15,7 +15,7 @@ struct TableOrSubquerySyntax: Syntax {
         case tableFunction(schema: IdentifierSyntax?, table: IdentifierSyntax, args: [ExpressionSyntax], alias: AliasSyntax?)
         case subquery(SelectStmtSyntax, alias: AliasSyntax?)
         indirect case join(JoinClauseSyntax)
-        case subTableOrSubqueries([TableOrSubquerySyntax], alias: AliasSyntax?)
+        case tableOrSubqueries([TableOrSubquerySyntax], alias: AliasSyntax?)
     }
 
     struct Table {
diff --git a/Tests/CompilerTests/Parser/ParseJoinClause.sql b/Tests/CompilerTests/Parser/ParseJoinClause.sql
@@ -86,7 +86,7 @@ foo INNER JOIN bar ON 1;
 -- CHECK:               NATURAL false
 -- CHECK:         TABLE_OR_SUBQUERY
 -- CHECK:           KIND
--- CHECK:             SUB_TABLE_OR_SUBQUERIES
+-- CHECK:             TABLE_OR_SUBQUERIES
 -- CHECK:                 TABLE_OR_SUBQUERY_SYNTAX
 -- CHECK:                   KIND
 -- CHECK:                     TABLE
diff --git a/Tests/CompilerTests/Parser/ParseTableOrSubquery.sql b/Tests/CompilerTests/Parser/ParseTableOrSubquery.sql
@@ -38,7 +38,7 @@ foo.bar AS baz NOT INDEXED;
 
 -- CHECK: TABLE_OR_SUBQUERY_SYNTAX
 -- CHECK:   KIND
--- CHECK:     SUB_TABLE_OR_SUBQUERIES
+-- CHECK:     TABLE_OR_SUBQUERIES
 -- CHECK:         TABLE_OR_SUBQUERY_SYNTAX
 -- CHECK:           KIND
 -- CHECK:             TABLE
@@ -51,7 +51,7 @@ foo.bar AS baz NOT INDEXED;
 
 -- CHECK: TABLE_OR_SUBQUERY_SYNTAX
 -- CHECK:   KIND
--- CHECK:     SUB_TABLE_OR_SUBQUERIES
+-- CHECK:     TABLE_OR_SUBQUERIES
 -- CHECK:         TABLE_OR_SUBQUERY_SYNTAX
 -- CHECK:           KIND
 -- CHECK:             TABLE
@@ -65,7 +65,7 @@ foo.bar AS baz NOT INDEXED;
 
 -- CHECK: TABLE_OR_SUBQUERY_SYNTAX
 -- CHECK:   KIND
--- CHECK:     SUB_TABLE_OR_SUBQUERIES
+-- CHECK:     TABLE_OR_SUBQUERIES
 -- CHECK:         TABLE_OR_SUBQUERY_SYNTAX
 -- CHECK:           KIND
 -- CHECK:             TABLE

Original file line number	Diff line number	Diff line change
`@@ -1026,6 +1026,7 @@ enum Parsers {`
`1026`	`1026`	`}`
`1027`	`1027`	`}`
`1028`	`1028`
	`1029`	`+ /// https://www.sqlite.org/syntax/table-or-subquery.html`
`1029`	`1030`	`static func tableOrSubquery(state: inout ParserState) throws -> TableOrSubquerySyntax {`
`1030`	`1031`	`let start = state.location`
`1031`	`1032`	`let kind: TableOrSubquerySyntax.Kind`
`@@ -1076,8 +1077,16 @@ enum Parsers {`
`1076`	`1077`	`case let .join(joinClause):`
`1077`	`1078`	`kind = .join(joinClause)`
`1078`	`1079`	`case let .tableOrSubqueries(table):`
	`1080`	`+ // Note: The alias is not mentioned at all in the documentation.`
	`1081`	`+ // I think this is a bug in the docs, since you can clearly add one`
	`1082`	`+ // unless im misinterpreting the diagram which is more than possible.`
	`1083`	`+ //`
	`1084`	`+ // Valid SQL:`
	`1085`	`+ // SELECT * FROM (foo, bar) AS baz;`
	`1086`	`+ //`
	`1087`	`+ // https://www.sqlite.org/syntax/table-or-subquery.html`
`1079`	`1088`	`let alias = maybeAlias(state: &state, asRequired: false)`
`1080`		`- kind = .subTableOrSubqueries(table, alias: alias)`
	`1089`	`+ kind = .tableOrSubqueries(table, alias: alias)`
`1081`	`1090`	`}`
`1082`	`1091`	`}`
`1083`	`1092`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ struct NameInferrer {`
`170`	`170`	`return joinClauseSyntax.joins.reduce(.none) {`
`171`	`171`	`unify(names: $0, with: infer(tableOrSubquery: $1.tableOrSubquery))`
`172`	`172`	`}`
`173`		`- case .subTableOrSubqueries(let tableOrSubqueries, _):`
	`173`	`+ case .tableOrSubqueries(let tableOrSubqueries, _):`
`174`	`174`	`return tableOrSubqueries.reduce(.none) {`
`175`	`175`	`unify(names: $0, with: infer(tableOrSubquery: $1))`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -849,7 +849,7 @@ extension StmtTypeChecker {`
`849`	`849`	`selectedColumns: usedColumns`
`850`	`850`	`)`
`851`	`851`	`case .tableFunction:`
`852`		`- fatalError()`
	`852`	`+ fatalError("Not yet implemented")`
`853`	`853`	`case let .subquery(selectStmt, alias):`
`854`	`854`	`let resultColumns = inNewEnvironment { inferrer in`
`855`	`855`	`inferrer.typeCheck(select: selectStmt)`
`@@ -867,7 +867,7 @@ extension StmtTypeChecker {`
`867`	`867`	`}`
`868`	`868`	`case let .join(joinClause):`
`869`	`869`	`typeCheck(joinClause: joinClause)`
`870`		`- case .subTableOrSubqueries:`
	`870`	`+ case .tableOrSubqueries:`
`871`	`871`	`fatalError()`
`872`	`872`	`}`
`873`	`873`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ struct TableOrSubquerySyntax: Syntax {`
`15`	`15`	`case tableFunction(schema: IdentifierSyntax?, table: IdentifierSyntax, args: [ExpressionSyntax], alias: AliasSyntax?)`
`16`	`16`	`case subquery(SelectStmtSyntax, alias: AliasSyntax?)`
`17`	`17`	`indirect case join(JoinClauseSyntax)`
`18`		`- case subTableOrSubqueries([TableOrSubquerySyntax], alias: AliasSyntax?)`
	`18`	`+ case tableOrSubqueries([TableOrSubquerySyntax], alias: AliasSyntax?)`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`struct Table {`