@query-doctor/core 0.1.2 → 0.1.4

package/dist/index.cjs

@@ -600,7 +600,7 @@ var Analyzer = class {
       nudges
     };
   }
-  deriveIndexes(tables, discovered) {
+  deriveIndexes(tables, discovered, referencedTables) {
     const allIndexes = [];
     const seenIndexes = /* @__PURE__ */ new Set();
     function addIndex(index) {
@@ -611,6 +611,7 @@ var Analyzer = class {
       seenIndexes.add(key);
       allIndexes.push(index);
     }
+    const matchingTables = this.filterReferences(referencedTables, tables);
     for (const colReference of discovered) {
       const partsCount = colReference.parts.length;
       const columnOnlyReference = partsCount === 1;
@@ -619,12 +620,10 @@ var Analyzer = class {
       if (columnOnlyReference) {
         const [column] = colReference.parts;
         const referencedColumn = this.normalize(column);
-        const matchingTables = tables.filter((table) => {
-          return table.columns?.some((column2) => {
-            return column2.columnName === referencedColumn;
-          }) ?? false;
-        });
         for (const table of matchingTables) {
+          if (!this.hasColumn(table, referencedColumn)) {
+            continue;
+          }
           const index = {
             schema: table.schemaName,
             table: table.tableName,
@@ -640,16 +639,12 @@ 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.schemaName === referencedSchema && table2.tableName === referencedTable && hasMatchingColumn;
-        });
-        if (matchingTable) {
+        for (const matchingTable of matchingTables) {
+          if (!this.hasColumn(matchingTable, referencedColumn)) {
+            continue;
+          }
           const index = {
             schema: matchingTable.schemaName,
             table: referencedTable,
@@ -690,6 +685,23 @@ var Analyzer = class {
     }
     return allIndexes;
   }
+  filterReferences(referencedTables, tables) {
+    const matchingTables = [];
+    for (const referencedTable of referencedTables) {
+      const refs = tables.filter(({ tableName, schemaName }) => {
+        let schemaMatches = true;
+        if (referencedTable.schema) {
+          schemaMatches = schemaName === referencedTable.schema;
+        }
+        return schemaMatches && tableName === referencedTable.table;
+      });
+      matchingTables.push(...refs);
+    }
+    return matchingTables;
+  }
+  hasColumn(table, columnName) {
+    return table.columns?.some((column) => column.columnName === columnName) ?? false;
+  }
   colorizeKeywords(query, color) {
     return query.replace(
       // eh? This kinda sucks
@@ -903,6 +915,9 @@ var _PgIdentifier = class _PgIdentifier {
     }
     return this.value;
   }
+  toJSON() {
+    return this.toString();
+  }
 };
 // Every keyword that's not explicitly marked as
 // unreserved in src/include/parser/kwlist.h