@query-doctor/core 0.1.11 → 0.2.0

package/dist/index.js

@@ -1170,26 +1170,31 @@ var _IndexOptimizer = class _IndexOptimizer {
   indexesToCreate(rootCandidates) {
     const permutedIndexes = this.tableColumnIndexCandidates(rootCandidates);
     const nextStage = [];
-    for (const { table, schema, columns } of permutedIndexes.values()) {
+    for (const permutation of permutedIndexes.values()) {
+      const { table: rawTable, schema: rawSchema, columns } = permutation;
       const permutations = permuteWithFeedback(columns);
       let iter = permutations.next(PROCEED);
       while (!iter.done) {
         const columns2 = iter.value;
-        const existingIndex = this.indexAlreadyExists(table, columns2);
+        const schema = PgIdentifier.fromString(rawSchema);
+        const table = PgIdentifier.fromString(rawTable);
+        const existingIndex = this.indexAlreadyExists(
+          table.toString(),
+          columns2
+        );
         if (existingIndex) {
           iter = permutations.next(PROCEED);
           continue;
         }
         const indexName = this.indexName();
-        const shortenedSchema = schema === "public" ? "" : `"${schema}".`;
-        const indexDefinitionClean = `${shortenedSchema}"${table}"(${columns2.map((c) => `"${c.column}"`).join(", ")})`;
+        const definition = this.toDefinition(permutation).raw;
         iter = permutations.next(PROCEED);
         nextStage.push({
           name: indexName,
-          schema,
-          table,
+          schema: schema.toString(),
+          table: table.toString(),
           columns: columns2,
-          definition: indexDefinitionClean
+          definition
         });
       }
     }
@@ -1197,10 +1202,20 @@ var _IndexOptimizer = class _IndexOptimizer {
   }
   toDefinition(permuted) {
     const make = (col, order, where, keyword) => {
-      const baseColumn = `"${permuted.schema}"."${permuted.table}"(${permuted.columns.map((c) => {
+      let fullyQualifiedTable;
+      if (permuted.schema.toString() === "public") {
+        fullyQualifiedTable = PgIdentifier.fromString(permuted.table);
+      } else {
+        fullyQualifiedTable = PgIdentifier.fromParts(
+          permuted.schema,
+          permuted.table
+        );
+      }
+      const baseColumn = `${fullyQualifiedTable}(${permuted.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);
-        let sort = col(`"${c.column}"`);
+        let sort = col(column.toString());
         if (direction) {
           sort += ` ${order(direction)}`;
         }