@query-doctor/core 0.2.0 → 0.2.2

package/dist/index.cjs

@@ -929,7 +929,13 @@ var _PgIdentifier = class _PgIdentifier {
    */
   static fromParts(...identifiers) {
     return new _PgIdentifier(
-      identifiers.map((identifier) => _PgIdentifier.fromString(identifier)).join("."),
+      identifiers.map((identifier) => {
+        if (typeof identifier === "string") {
+          return _PgIdentifier.fromString(identifier);
+        } else {
+          return identifier;
+        }
+      }).join("."),
       false
     );
   }
@@ -1142,7 +1148,7 @@ var _IndexOptimizer = class _IndexOptimizer {
       }
       for (const permutation of toCreate) {
         const createIndex = PostgresQueryBuilder.createIndex(
-          this.toDefinition(permutation).raw,
+          permutation.definition,
           permutation.name
         ).introspect().build();
         await tx.exec(createIndex);
@@ -1166,13 +1172,17 @@ var _IndexOptimizer = class _IndexOptimizer {
     }
     const baseIndexes = this.findUsedIndexes(baseExplain.Plan);
     const finalIndexes = this.findUsedIndexes(finalExplain.Plan);
+    const triedIndexes = new Map(
+      toCreate.map((index) => [index.name.toString(), index])
+    );
+    this.replaceUsedIndexesWithDefinition(finalExplain.Plan, triedIndexes);
     return {
       kind: "ok",
       baseCost,
       finalCost,
       newIndexes: finalIndexes.newIndexes,
       existingIndexes: baseIndexes.existingIndexes,
-      triedIndexes: new Map(toCreate.map((index) => [index.name, index])),
+      triedIndexes,
       baseExplainPlan: baseExplain.Plan,
       explainPlan: finalExplain.Plan
     };
@@ -1206,7 +1216,8 @@ var _IndexOptimizer = class _IndexOptimizer {
    * overflow that limit.
    */
   indexName() {
-    return _IndexOptimizer.prefix + Math.random().toString(36).substring(2, 16);
+    const indexName = _IndexOptimizer.prefix + Math.random().toString(36).substring(2, 16);
+    return PgIdentifier.fromString(indexName);
   }
   // TODO: this doesn't belong in the optimizer
   indexAlreadyExists(table, columns) {
@@ -1237,7 +1248,7 @@ var _IndexOptimizer = class _IndexOptimizer {
           continue;
         }
         const indexName = this.indexName();
-        const definition = this.toDefinition(permutation).raw;
+        const definition = this.toDefinition({ table, schema, columns: columns2 }).raw;
         iter = permutations.next(PROCEED);
         nextStage.push({
           name: indexName,
@@ -1250,18 +1261,19 @@ var _IndexOptimizer = class _IndexOptimizer {
     }
     return nextStage;
   }
-  toDefinition(permuted) {
+  toDefinition({
+    schema,
+    table,
+    columns
+  }) {
     const make = (col, order, where, keyword) => {
       let fullyQualifiedTable;
-      if (permuted.schema.toString() === "public") {
-        fullyQualifiedTable = PgIdentifier.fromString(permuted.table);
+      if (schema.toString() === "public") {
+        fullyQualifiedTable = table;
       } else {
-        fullyQualifiedTable = PgIdentifier.fromParts(
-          permuted.schema,
-          permuted.table
-        );
+        fullyQualifiedTable = PgIdentifier.fromParts(schema, table);
       }
-      const baseColumn = `${fullyQualifiedTable}(${permuted.columns.map((c) => {
+      const baseColumn = `${fullyQualifiedTable}(${columns.map((c) => {
         const column = PgIdentifier.fromString(c.column);
         const direction = c.sort && this.sortDirection(c.sort);
         const nulls = c.sort && this.nullsOrder(c.sort);
@@ -1389,8 +1401,8 @@ var _IndexOptimizer = class _IndexOptimizer {
     const newIndexes = /* @__PURE__ */ new Set();
     const existingIndexes = /* @__PURE__ */ new Set();
     const prefix = _IndexOptimizer.prefix;
-    function go(plan) {
-      const indexName = plan["Index Name"];
+    walkExplain(explain, (stage) => {
+      const indexName = stage["Index Name"];
       if (indexName) {
         if (indexName.startsWith(prefix)) {
           newIndexes.add(indexName);
@@ -1401,21 +1413,36 @@ var _IndexOptimizer = class _IndexOptimizer {
           existingIndexes.add(indexName);
         }
       }
-      if (plan.Plans) {
-        for (const p of plan.Plans) {
-          go(p);
-        }
-      }
-    }
-    go(explain);
+    });
     return {
       newIndexes,
       existingIndexes
     };
   }
+  replaceUsedIndexesWithDefinition(explain, triedIndexes) {
+    walkExplain(explain, (stage) => {
+      const indexName = stage["Index Name"];
+      if (indexName) {
+        const recommendation = triedIndexes.get(indexName);
+        if (recommendation) {
+          stage["Index Name"] = recommendation.definition;
+        }
+      }
+    });
+  }
 };
 __publicField(_IndexOptimizer, "prefix", "__qd_");
 var IndexOptimizer = _IndexOptimizer;
+function walkExplain(explain, f) {
+  function go(plan) {
+    f(plan);
+    if (plan.Plans) {
+      for (const p of plan.Plans) {
+        go(p);
+      }
+    }
+  }
+}
 var RollbackError = class {
   constructor(value) {
     this.value = value;