Fixed cardinality inferrer using schema and not env

Author: wickwirew

Sources/Compiler/Compiler.swift

@@ -111,7 +111,8 @@ fileprivate struct CompilerWithSource {
         var typeChecker = StmtTypeChecker(schema: schema, pragmas: pragmas.featherPragmas)
         let (parameters, type) = typeChecker.signature(for: stmt)
 
-        var cardinalityInferer = CardinalityInferrer(schema: schema)
+        // Note: Make sure to pass env from type checker to make sure all is imported
+        var cardinalityInferer = CardinalityInferrer(env: typeChecker.env)
         let cardinality = cardinalityInferer.cardinality(for: stmt)
 
         let uniqueParameters = uniquify(parameters: parameters)

Sources/Compiler/Environment.swift

@@ -110,7 +110,7 @@ struct Environment {
         return detachedValues[named].count > 0
     }
 
-    subscript(function name: Substring, argCount argCount: Int) -> TypeScheme? {
+    func resolve(function name: Substring, argCount: Int) -> TypeScheme? {
         // TODO: Move this out of the env
         guard let scheme = Builtins.functions[name],
               case let .fn(params, ret) = scheme.type else { return nil }
@@ -132,7 +132,7 @@ struct Environment {
         )
     }
 
-    subscript(prefix op: Operator) -> TypeScheme? {
+    func resolve(prefix op: Operator) -> TypeScheme? {
         return switch op {
         case .plus: Builtins.pos
         case .minus: Builtins.negate
@@ -141,7 +141,7 @@ struct Environment {
         }
     }
 
-    subscript(infix op: Operator) -> TypeScheme? {
+    func resolve(infix op: Operator) -> TypeScheme? {
         return switch op {
         case .in, .not(.in): Builtins.in
         case .plus, .minus, .multiply, .divide, .bitwuseOr,
@@ -161,7 +161,7 @@ struct Environment {
         }
     }
 
-    subscript(postfix op: Operator) -> TypeScheme? {
+    func resolve(postfix op: Operator) -> TypeScheme? {
         return switch op {
         case .collate: Builtins.concatOp
         case .escape: Builtins.escape

Sources/Compiler/QualifiedName.swift

@@ -20,12 +20,6 @@ public struct QualifiedName: Hashable, Sendable, CustomStringConvertible {
         self.schema = schema
     }
 
-    @_disfavoredOverload
-    public init(name: Substring, schema: Substring?) {
-        self.name = name
-        self.schema = schema.map(SchemaName.init) ?? nil
-    }
-    
     public var description: String {
         return if let schema {
             "\(schema).\(name)"

Sources/Compiler/Sema/CardinalityInferrer.swift

@@ -15,7 +15,7 @@ public enum Cardinality: String {
 /// This allows the generation to be smart and set the
 /// return type to an Array only if needed.
 struct CardinalityInferrer {
-    let schema: Schema
+    let env: Environment
 
     mutating func cardinality<S: StmtSyntax>(for syntax: borrowing S) -> Cardinality {
         return syntax.accept(visitor: &self)
@@ -31,13 +31,6 @@ struct CardinalityInferrer {
         let didFilterByPrimaryKey = !table.primaryKey.contains{ !filteredPrimaryKeys.contains($0) }
         return didFilterByPrimaryKey ? .single : .many
     }
-    
-    private func qualifiedName(
-        for name: IdentifierSyntax,
-        in schema: IdentifierSyntax?
-    ) -> QualifiedName {
-        return QualifiedName(name: name.value, schema: schema?.value)
-    }
 }
 
 /// Returns `true` if the query/statement will only return one value.
@@ -56,9 +49,10 @@ extension CardinalityInferrer: StmtSyntaxVisitor {
         // No filtering, update is to full table
         guard let whereExpr = stmt.whereExpr else { return .many }
 
-        let tableName = qualifiedName(for: stmt.tableName.tableName.name, in: stmt.tableName.tableName.schema)
-        
-        guard let table = schema[tableName] else {
+        guard let table = env.resolve(
+            table: stmt.tableName.tableName.name.value,
+            schema: stmt.tableName.tableName.schema?.value
+        ).value else {
             // Upstream will have emitted diag
             return .many
         }
@@ -95,11 +89,12 @@ extension CardinalityInferrer: StmtSyntaxVisitor {
                 // If its not against a table we cannot infer it.
                 guard case let .table(table) = join.tableOrSubquery.kind else { return .many }
 
-                let tableName = qualifiedName(for: table.name, in: table.schema)
-                
                 // If we cannot find the table something upstream will have already emitted
                 // diagnositic so just exit
-                guard let t = schema[tableName] else { return .many }
+                guard let t = env.resolve(
+                    table: table.name.value,
+                    schema: table.schema?.value
+                ).value else { return .many }
 
                 // If they had filtering on all primary keys we can assume a single
                 // result will be returned.
@@ -124,9 +119,10 @@ extension CardinalityInferrer: StmtSyntaxVisitor {
     mutating func visit(_ stmt: borrowing DeleteStmtSyntax) -> Cardinality {
         guard let filter = stmt.whereExpr else { return .many }
 
-        let tableName = qualifiedName(for: stmt.table.tableName.name, in: stmt.table.tableName.schema)
-        
-        guard let table = schema[tableName] else {
+        guard let table = env.resolve(
+            table: stmt.table.tableName.name.value,
+            schema: stmt.table.tableName.schema?.value
+        ).value else {
             // Upstream will have emitted diag
             return .many
         }

Sources/Compiler/Sema/ExprTypeChecker.swift

@@ -151,7 +151,7 @@ extension ExprTypeChecker: ExprSyntaxVisitor {
     mutating func visit(_ expr: borrowing PrefixExprSyntax) -> Type {
         let rhs = expr.rhs.accept(visitor: &self)
 
-        guard let scheme = env[prefix: expr.operator.operator] else {
+        guard let scheme = env.resolve(prefix: expr.operator.operator) else {
             diagnostics.add(.init(
                 "'\(expr.operator.operator)' is not a valid prefix operator",
                 at: expr.operator.location
@@ -169,7 +169,7 @@ extension ExprTypeChecker: ExprSyntaxVisitor {
         let lTy = expr.lhs.accept(visitor: &self)
         let rTy = expr.rhs.accept(visitor: &self)
 
-        guard let scheme = env[infix: expr.operator.operator] else {
+        guard let scheme = env.resolve(infix: expr.operator.operator) else {
             diagnostics.add(.init(
                 "'\(expr.operator.operator)' is not a valid infix operator",
                 at: expr.operator.location
@@ -190,7 +190,7 @@ extension ExprTypeChecker: ExprSyntaxVisitor {
     mutating func visit(_ expr: borrowing PostfixExprSyntax) -> Type {
         let lhs = expr.lhs.accept(visitor: &self)
 
-        guard let scheme = env[postfix: expr.operator.operator] else {
+        guard let scheme = env.resolve(postfix: expr.operator.operator) else {
             diagnostics.add(.init(
                 "'\(expr.operator.operator)' is not a valid postfix operator",
                 at: expr.operator.location
@@ -220,7 +220,7 @@ extension ExprTypeChecker: ExprSyntaxVisitor {
     mutating func visit(_ expr: borrowing FunctionExprSyntax) -> Type {
         let argTys = typeCheck(expr.args)
 
-        guard let scheme = env[function: expr.name.value, argCount: argTys.count] else {
+        guard let scheme = env.resolve(function: expr.name.value, argCount: argTys.count) else {
             diagnostics.add(.init("No such function '\(expr.name)' exits", at: expr.location))
             return .error
         }