@query-doctor/core 0.1.6 → 0.1.8

package/dist/index.cjs

@@ -344,9 +344,12 @@ var Walker = class _Walker {
             part.schema = node.RangeVar.schemaname;
           }
           if (existingMapping) {
-            console.warn(
-              `Ignoring alias ${aliasName} as it shadows an existing mapping for ${existingMapping.text}. We currently do not support alias shadowing.`
-            );
+            const isSystemCatalog = node.RangeVar.relname?.startsWith("pg_") ?? false;
+            if (!isSystemCatalog) {
+              console.warn(
+                `Ignoring alias ${aliasName} as it shadows an existing mapping for ${existingMapping.text}. We currently do not support alias shadowing.`
+              );
+            }
             this.shadowedAliases.push(part);
             return;
           }
@@ -744,7 +747,7 @@ var Analyzer = class {
       return { tags: [], queryWithoutTags: trimmedQuery };
     }
     const queryWithoutTags = trimmedQuery.slice(0, startPosition);
-    const tagString = trimmedQuery.slice(startPosition + 2, endPosition);
+    const tagString = trimmedQuery.slice(startPosition + 2, endPosition).trim();
     if (!tagString || typeof tagString !== "string") {
       return { tags: [], queryWithoutTags };
     }
@@ -752,7 +755,11 @@ var Analyzer = class {
     for (const match of tagString.split(",")) {
       const [key, value] = match.split("=");
       if (!key || !value) {
-        console.warn(`Invalid sqlcommenter tag: ${match}. Ignoring`);
+        if (tags.length > 0) {
+          console.warn(
+            `Invalid sqlcommenter tag: ${match} in comment: ${tagString}. Ignoring`
+          );
+        }
         continue;
       }
       try {
@@ -1331,11 +1338,15 @@ var _IndexOptimizer = class _IndexOptimizer {
   findUsedIndexes(explain) {
     const newIndexes = /* @__PURE__ */ new Set();
     const existingIndexes = /* @__PURE__ */ new Set();
+    const prefix = _IndexOptimizer.prefix;
     function go(plan) {
       const indexName = plan["Index Name"];
       if (indexName) {
-        if (indexName.startsWith(_IndexOptimizer.prefix)) {
+        if (indexName.startsWith(prefix)) {
           newIndexes.add(indexName);
+        } else if (indexName.includes(prefix)) {
+          const actualName = indexName.substring(indexName.indexOf(prefix));
+          newIndexes.add(actualName);
         } else {
           existingIndexes.add(indexName);
         }