fix(editor): unquote backtick aliases and keep aliased CTE columns in autocomplete

Author: datlechin

TablePro/Core/Autocomplete/DerivedTableParser.swift

@@ -263,8 +263,8 @@ internal struct DerivedTableParser {
         let c = ns.character(at: index)
         if c == Self.backtick || c == Self.doubleQuote {
             let end = matchingQuote(in: ns, from: index, limit: limit, quote: c)
-            guard end > index + 1 else { return nil }
-            return ns.substring(with: NSRange(location: index + 1, length: end - index - 1))
+            guard end > index + 2 else { return nil }
+            return ns.substring(with: NSRange(location: index + 1, length: end - index - 2))
         }
         if c == Self.openBracket {
             var j = index + 1

TablePro/Core/Autocomplete/SQLContextAnalyzer.swift

@@ -790,8 +790,9 @@ final class SQLContextAnalyzer {
     }
 
     /// Attach derived-table columns to references and add any derived table or
-    /// CTE not already in scope. A derived alias wins over a plain reference of
-    /// the same identifier (e.g. a CTE used directly in a FROM clause).
+    /// CTE not already in scope. Columns attach to a matching reference (e.g. a
+    /// CTE aliased in a FROM clause), and the derived table or CTE is still
+    /// registered under its own name so it resolves by either identifier.
     private func mergeDerivedTables(
         _ derivedTables: [DerivedTable],
         cteNames: [String],
@@ -802,20 +803,18 @@ final class SQLContextAnalyzer {
             uniquingKeysWith: { first, _ in first }
         )
 
-        var consumed = Set<String>()
         for index in references.indices {
             let ref = references[index]
             for key in [ref.tableName.lowercased(), ref.identifier.lowercased()] {
                 guard let columns = derivedColumnsByAlias[key] else { continue }
-                consumed.insert(key)
                 references[index] = TableReference(
                     tableName: ref.tableName, alias: ref.alias, schema: ref.schema, derivedColumns: columns
                 )
                 break
             }
         }
 
-        var present = Set(references.map { $0.identifier.lowercased() }).union(consumed)
+        var present = Set(references.map { $0.identifier.lowercased() })
         for derived in derivedTables where present.insert(derived.alias.lowercased()).inserted {
             references.append(
                 TableReference(tableName: derived.alias, alias: derived.alias, derivedColumns: derived.columns)