@query-doctor/core 0.1.0 → 0.1.2

package/dist/index.d.ts

@@ -6,4 +6,5 @@ export * from "./sql/builder.js";
 export * from "./sql/pg-identifier.js";
 export * from "./optimizer/genalgo.js";
 export * from "./optimizer/statistics.js";
+export * from "./optimizer/pss-rewriter.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC"}

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 = {
@@ -1963,6 +1974,28 @@ __publicField(_Statistics, "defaultStatsMode", Object.freeze({
   relpages: DEFAULT_RELPAGES
 }));
 var Statistics = _Statistics;
+
+// src/optimizer/pss-rewriter.ts
+var PssRewriter = class {
+  constructor() {
+    __publicField(this, "problematicKeywords", ["interval", "timestamp", "geometry"]);
+  }
+  rewrite(query) {
+    return this.rewriteKeywordWithParameter(query);
+  }
+  rewriteKeywordWithParameter(query) {
+    return query.replace(/\b(\w+) (\$\d+)\b/gi, (match) => {
+      const [keyword, parameter] = match.split(" ");
+      const isProblematicKeyword = this.problematicKeywords.includes(
+        keyword.toLowerCase()
+      );
+      if (!isProblematicKeyword) {
+        return match;
+      }
+      return `(${parameter}::${keyword.toLowerCase()})`;
+    });
+  }
+};
 export {
   Analyzer,
   ExportedStats,
@@ -1975,6 +2008,7 @@ export {
   PgIdentifier,
   PostgresQueryBuilder,
   PostgresVersion,
+  PssRewriter,
   SKIP,
   Statistics,
   StatisticsMode,