@query-doctor/core 0.0.5 → 0.1.1

package/dist/index.js

@@ -269,11 +269,15 @@ var Walker = class _Walker {
         }
       }
       if (is2(node, "RangeVar") && node.RangeVar.relname) {
-        this.tableMappings.set(node.RangeVar.relname, {
+        const columnReference = {
           text: node.RangeVar.relname,
           start: node.RangeVar.location,
           quoted: false
-        });
+        };
+        if (node.RangeVar.schemaname) {
+          columnReference.schema = node.RangeVar.schemaname;
+        }
+        this.tableMappings.set(node.RangeVar.relname, columnReference);
         if (node.RangeVar.alias?.aliasname) {
           const aliasName = node.RangeVar.alias.aliasname;
           const existingMapping = this.tableMappings.get(aliasName);
@@ -286,9 +290,12 @@ var Walker = class _Walker {
             quoted: true,
             alias: aliasName
           };
+          if (node.RangeVar.schemaname) {
+            part.schema = node.RangeVar.schemaname;
+          }
           if (existingMapping) {
             console.warn(
-              `Ignoring alias ${aliasName} as it shadows an existing mapping. We currently do not support alias shadowing.`
+              `Ignoring alias ${aliasName} as it shadows an existing mapping for ${existingMapping.text}. We currently do not support alias shadowing.`
             );
             this.shadowedAliases.push(part);
             return;
@@ -524,7 +531,10 @@ var Analyzer = class {
     const referencedTables = [];
     for (const value of tableMappings.values()) {
       if (!value.alias) {
-        referencedTables.push(value.text);
+        referencedTables.push({
+          schema: value.schema,
+          table: value.text
+        });
       }
     }
     const { tags, queryWithoutTags } = this.extractSqlcommenter(query);
@@ -580,13 +590,14 @@ var Analyzer = class {
         }
       } else if (tableReference) {
         const [table, column] = colReference.parts;
+        const referencedSchema = table.schema;
         const referencedTable = this.normalize(table);
         const referencedColumn = this.normalize(column);
         const matchingTable = tables.find((table2) => {
           const hasMatchingColumn = table2.columns?.some((column2) => {
             return column2.columnName === referencedColumn;
           }) ?? false;
-          return table2.tableName === referencedTable && hasMatchingColumn;
+          return table2.schemaName === referencedSchema && table2.tableName === referencedTable && hasMatchingColumn;
         });
         if (matchingTable) {
           const index = {
@@ -811,6 +822,10 @@ var _PgIdentifier = class _PgIdentifier {
     this.value = value;
     this.quoted = quoted;
   }
+  /**
+   * Constructs an identifier from a single part (column or table name).
+   * When quoting identifiers like `select table.col` use {@link fromParts} instead
+   */
   static fromString(identifier) {
     const identifierRegex = /^[a-z_][a-zA-Z0-9_]*$/;
     const match = identifier.match(/^"(.+)"$/);
@@ -820,6 +835,18 @@ var _PgIdentifier = class _PgIdentifier {
     const quoted = !identifierRegex.test(identifier) || this.reservedKeywords.has(identifier.toLowerCase());
     return new _PgIdentifier(identifier, quoted);
   }
+  /**
+   * Quotes parts of an identifier like `select schema.table.col`.
+   * A separate function is necessary because postgres will treat
+   * `select "HELLO.WORLD"` as a column name. It has to be like
+   * `select "HELLO"."WORLD"` instead.
+   */
+  static fromParts(...identifiers) {
+    return new _PgIdentifier(
+      identifiers.map((identifier) => _PgIdentifier.fromString(identifier)).join("."),
+      false
+    );
+  }
   toString() {
     if (this.quoted) {
       return `"${this.value.replace(/"/g, '""')}"`;
@@ -827,36 +854,24 @@ var _PgIdentifier = class _PgIdentifier {
     return this.value;
   }
 };
+// Every keyword that's not explicitly marked as
+// unreserved in src/include/parser/kwlist.h
 __publicField(_PgIdentifier, "reservedKeywords", /* @__PURE__ */ new Set([
-  "abort",
-  "analyze",
-  "binary",
-  "cluster",
-  "constraint",
-  "copy",
-  "do",
-  "explain",
-  "extend",
-  "listen",
-  "load",
-  "lock",
-  "move",
-  "new",
-  "none",
-  "notify",
-  "offset",
-  "reset",
-  "setof",
-  "show",
-  "unlisten",
-  "until",
-  "vacuum",
-  "verbose",
   "all",
+  "analyse",
+  "analyze",
+  "and",
   "any",
+  "array",
+  "as",
   "asc",
+  "asymmetric",
+  "authorization",
   "between",
+  "bigint",
+  "binary",
   "bit",
+  "boolean",
   "both",
   "case",
   "cast",
@@ -865,76 +880,147 @@ __publicField(_PgIdentifier, "reservedKeywords", /* @__PURE__ */ new Set([
   "check",
   "coalesce",
   "collate",
+  "collation",
   "column",
+  "concurrently",
   "constraint",
+  "create",
   "cross",
-  "current",
+  "current_catalog",
   "current_date",
+  "current_role",
+  "current_schema",
   "current_time",
   "current_timestamp",
   "current_user",
   "dec",
   "decimal",
   "default",
+  "deferrable",
   "desc",
   "distinct",
+  "do",
   "else",
   "end",
   "except",
   "exists",
   "extract",
   "false",
+  "fetch",
   "float",
   "for",
   "foreign",
+  "freeze",
   "from",
   "full",
-  "global",
+  "grant",
+  "greatest",
   "group",
+  "grouping",
   "having",
+  "ilike",
   "in",
+  "initially",
   "inner",
+  "inout",
+  "int",
+  "integer",
   "intersect",
+  "interval",
   "into",
   "is",
+  "isnull",
   "join",
+  "json",
+  "json_array",
+  "json_arrayagg",
+  "json_exists",
+  "json_object",
+  "json_objectagg",
+  "json_query",
+  "json_scalar",
+  "json_serialize",
+  "json_table",
+  "json_value",
+  "lateral",
   "leading",
+  "least",
   "left",
   "like",
-  "local",
+  "limit",
+  "localtime",
+  "localtimestamp",
+  "merge_action",
+  "national",
   "natural",
   "nchar",
+  "none",
+  "normalize",
   "not",
+  "notnull",
   "null",
   "nullif",
   "numeric",
+  "offset",
   "on",
+  "only",
   "or",
   "order",
+  "out",
   "outer",
   "overlaps",
+  "overlay",
+  "placing",
   "position",
   "precision",
   "primary",
-  "public",
+  "real",
   "references",
+  "returning",
   "right",
+  "row",
   "select",
   "session_user",
+  "setof",
+  "similar",
+  "smallint",
   "some",
   "substring",
+  "symmetric",
+  "system_user",
   "table",
+  "tablesample",
   "then",
+  "time",
+  "timestamp",
   "to",
-  "transaction",
+  "trailing",
+  "treat",
   "trim",
   "true",
   "union",
   "unique",
   "user",
+  "using",
+  "values",
   "varchar",
+  "variadic",
+  "verbose",
   "when",
-  "where"
+  "where",
+  "window",
+  "with",
+  "xmlattributes",
+  "xmlconcat",
+  "xmlelement",
+  "xmlexists",
+  "xmlforest",
+  "xmlnamespaces",
+  "xmlparse",
+  "xmlpi",
+  "xmlroot",
+  "xmlserialize",
+  "xmltable"
 ]));
 var PgIdentifier = _PgIdentifier;
 
@@ -1081,7 +1167,10 @@ var _IndexOptimizer = class _IndexOptimizer {
       if (!isIndexProbablyDroppable(index)) {
         continue;
       }
-      const indexName = `${index.schema_name}.${index.index_name}`;
+      const indexName = PgIdentifier.fromParts(
+        index.schema_name,
+        index.index_name
+      );
       await dropIndex(tx, indexName);
     }
   }