@query-doctor/core 0.1.0 → 0.1.2

package/dist/index.cjs

@@ -44,6 +44,7 @@ __export(index_exports, {
   PgIdentifier: () => PgIdentifier,
   PostgresQueryBuilder: () => PostgresQueryBuilder,
   PostgresVersion: () => PostgresVersion,
+  PssRewriter: () => PssRewriter,
   SKIP: () => SKIP,
   Statistics: () => Statistics,
   StatisticsMode: () => StatisticsMode,
@@ -318,11 +319,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);
@@ -335,9 +340,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;
@@ -573,7 +581,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);
@@ -629,13 +640,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 = {
@@ -2012,6 +2024,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()})`;
+    });
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Analyzer,
@@ -2025,6 +2059,7 @@ var Statistics = _Statistics;
   PgIdentifier,
   PostgresQueryBuilder,
   PostgresVersion,
+  PssRewriter,
   SKIP,
   Statistics,
   StatisticsMode,