@memberjunction/core-entities-server 4.0.0 → 4.1.0

package/README.md

@@ -1,19 +1,38 @@
-# MemberJunction Core Entities Server
+# @memberjunction/core-entities-server
 
 Server-side entity subclasses for MemberJunction that provide extended functionality and business logic for core entities when running in a Node.js environment.
 
 ## Overview
 
-This package contains server-side implementations of MemberJunction entity subclasses that require server-specific functionality such as:
-- Direct database access
-- File system operations
-- Server-side API integrations
-- Complex business logic that should only run on the server
-- Automatic creation/management of related entities
-
-## Purpose
-
-While the base `@memberjunction/core-entities` package provides entity classes that work in any JavaScript environment (browser or server), some entity operations require server-specific capabilities. This package provides those extended implementations.
+This package contains server-side implementations of MemberJunction entity subclasses that require server-specific functionality such as direct database access, file system operations, server-side API integrations, complex business logic, and automatic creation/management of related entities.
+
+```mermaid
+graph TD
+    A["Core Entities Server"] --> B["AIPromptEntityExtended"]
+    A --> C["QueryEntityExtended"]
+    A --> D["ComponentEntityExtended"]
+    A --> E["ActionEntityExtended"]
+    A --> F["ApplicationEntityExtended"]
+    A --> G["Other Server Entities"]
+
+    B -->|manages| H["Templates<br/>Template Contents"]
+    C -->|manages| H
+    D -->|generates| I["Vector Embeddings"]
+
+    J["MJ Class Factory"] -->|returns server subclass| A
+    K["Core Entities<br/>(base classes)"] -->|extended by| A
+
+    style A fill:#2d6a9f,stroke:#1a4971,color:#fff
+    style B fill:#7c5295,stroke:#563a6b,color:#fff
+    style C fill:#7c5295,stroke:#563a6b,color:#fff
+    style D fill:#7c5295,stroke:#563a6b,color:#fff
+    style E fill:#7c5295,stroke:#563a6b,color:#fff
+    style F fill:#7c5295,stroke:#563a6b,color:#fff
+    style H fill:#2d8659,stroke:#1a5c3a,color:#fff
+    style I fill:#b8762f,stroke:#8a5722,color:#fff
+    style J fill:#2d6a9f,stroke:#1a4971,color:#fff
+    style K fill:#b8762f,stroke:#8a5722,color:#fff
+```
 
 ### Key Differences from Core Entities
 
@@ -264,6 +283,123 @@ export class OrderEntityServer extends OrderEntity {
 }
 ```
 
+## SQL Parser
+
+The `SQLParser` utility class extracts table/view references and column references from SQL statements. It uses `node-sql-parser` for AST-based parsing with automatic regex fallback when the AST parser fails. This class has **no dependency on MJ Metadata** — it returns raw parse results that callers cross-reference against entities themselves.
+
+### When to Use
+
+- **Virtual entity decoration**: Parse a view's SQL to identify which source entities it pulls from
+- **Query entity metadata**: Parse SQL queries to find referenced tables and columns
+- **Any server-side SQL analysis**: Extract structural information from SQL without executing it
+
+### Basic Usage — Plain SQL
+
+```typescript
+import { SQLParser } from '@memberjunction/core-entities-server';
+
+const sql = `
+  SELECT c.Name, c.Email, o.OrderDate, o.Total
+  FROM [dbo].[Customer] c
+  INNER JOIN [dbo].[Order] o ON o.CustomerID = c.ID
+  WHERE o.Status = 'Active'
+`;
+
+const result = SQLParser.Parse(sql);
+
+// Tables found in the query
+for (const table of result.Tables) {
+  console.log(`${table.SchemaName}.${table.TableName} (alias: ${table.Alias})`);
+}
+// Output:
+//   dbo.Customer (alias: c)
+//   dbo.Order (alias: o)
+
+// Columns referenced in the query
+for (const col of result.Columns) {
+  console.log(`${col.TableQualifier ? col.TableQualifier + '.' : ''}${col.ColumnName}`);
+}
+// Output:
+//   c.Name, c.Email, o.OrderDate, o.Total, o.CustomerID, c.ID, o.Status
+
+// Whether AST parsing succeeded (true) or regex fallback was used (false)
+console.log(`Used AST: ${result.UsedASTParsing}`);
+```
+
+### Nunjucks Template SQL
+
+For SQL that contains Nunjucks template syntax (e.g., MemberJunction query templates), use `ParseWithTemplatePreprocessing`. This replaces template expressions with safe placeholder values before parsing:
+
+```typescript
+import { SQLParser } from '@memberjunction/core-entities-server';
+
+const templateSQL = `
+  SELECT * FROM [dbo].[Customer]
+  WHERE Status = {{ status | sqlString }}
+  {% if regionId %}
+    AND RegionID = {{ regionId | sqlNumber }}
+  {% endif %}
+`;
+
+// Nunjucks syntax is replaced with placeholders, then parsed normally
+const result = SQLParser.ParseWithTemplatePreprocessing(templateSQL);
+console.log(result.Tables); // [{ TableName: 'Customer', SchemaName: 'dbo', Alias: 'Customer' }]
+```
+
+### Cross-Referencing with Entity Metadata
+
+The parser returns raw table/column references. To resolve them to MemberJunction entities:
+
+```typescript
+import { Metadata } from '@memberjunction/core';
+import { SQLParser } from '@memberjunction/core-entities-server';
+
+const parseResult = SQLParser.Parse(viewDefinitionSQL);
+const md = new Metadata();
+
+for (const tableRef of parseResult.Tables) {
+  const entity = md.Entities.find(e =>
+    (e.BaseTable.toLowerCase() === tableRef.TableName.toLowerCase() ||
+     e.BaseView.toLowerCase() === tableRef.TableName.toLowerCase()) &&
+    e.SchemaName.toLowerCase() === tableRef.SchemaName.toLowerCase()
+  );
+
+  if (entity) {
+    console.log(`Table ${tableRef.TableName} → Entity "${entity.Name}"`);
+    // Access entity.Fields for full field metadata
+  }
+}
+```
+
+### Return Types
+
+```typescript
+interface SQLParseResult {
+  Tables: SQLTableReference[];   // All table/view references (FROM, JOIN, subqueries, CTEs)
+  Columns: SQLColumnReference[]; // All column references (SELECT, WHERE, JOIN ON, etc.)
+  UsedASTParsing: boolean;       // true = AST parsed, false = regex fallback
+}
+
+interface SQLTableReference {
+  TableName: string;    // Table or view name
+  SchemaName: string;   // Schema name (defaults to 'dbo')
+  Alias: string;        // Query alias, or table name if no alias
+}
+
+interface SQLColumnReference {
+  ColumnName: string;        // Column name
+  TableQualifier: string | null; // Table alias prefix (e.g., "c" in "c.Name")
+}
+```
+
+### How It Works
+
+1. **AST Parsing** (preferred): Uses `node-sql-parser` with `TransactSQL` dialect to build an AST, then recursively walks it to extract table references from `FROM`/`JOIN` clauses, subqueries, and CTEs, plus column references from `SELECT`, `WHERE`, `GROUP BY`, `ORDER BY`, and `ON` conditions.
+
+2. **Regex Fallback**: If AST parsing fails (complex SQL, dialect edge cases), a regex-based extractor finds `FROM`/`JOIN` table references. Column references are not extracted in regex mode (the `Columns` array will be empty).
+
+3. **Nunjucks Preprocessing**: `ParseWithTemplatePreprocessing` first renders the SQL through a Nunjucks environment with placeholder filters (`sqlString` → `'placeholder'`, `sqlNumber` → `0`, etc.), stripping template blocks while preserving the SQL structure. If Nunjucks rendering fails, it falls back to regex-based template removal.
+
 ## Troubleshooting
 
 ### Entity subclass not being used

package/dist/custom/ApplicationEntity.server.d.ts

@@ -32,6 +32,15 @@ export declare class ApplicationEntityServerEntity extends ApplicationEntity {
      * Example: "my-app" -> "my-app-2" if "my-app" already exists.
      */
     protected ensureUniqueSlug(baseSlug: string): Promise<string>;
+    /**
+     * Calculates the appropriate Sequence value for a new UserApplication record
+     * using the application's DefaultSequence to determine placement.
+     * If DefaultSequence fits between existing sequences, it's used directly.
+     * Otherwise, the app is appended after the highest existing sequence.
+     */
+    protected calculateSequenceFromDefault(existingUserApps: {
+        Sequence: number;
+    }[]): number;
     /**
      * Creates UserApplication records for all users in the system for this application
      */

package/dist/custom/ApplicationEntity.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ApplicationEntity.server.d.ts","sourceRoot":"","sources":["../../src/custom/ApplicationEntity.server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,UAAU,EAAE,iBAAiB,EAA6D,MAAM,sBAAsB,CAAC;AAClK,OAAO,EAAE,iBAAiB,EAAyB,MAAM,+BAA+B,CAAC;AAGzF;;;;;;;GAOG;AACH,qBACa,6BAA8B,SAAQ,iBAAiB;gBACpD,MAAM,EAAE,UAAU;IAS9B;;;;OAIG;IACmB,IAAI,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IA+CzE;;;;OAIG;cACa,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAyBjD;;;OAGG;IACH,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAgBpD;;;OAGG;cACa,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAqCnE;;OAEG;cACa,iCAAiC,IAAI,OAAO,CAAC,IAAI,CAAC;CA+ErE"}
+{"version":3,"file":"ApplicationEntity.server.d.ts","sourceRoot":"","sources":["../../src/custom/ApplicationEntity.server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,UAAU,EAAE,iBAAiB,EAA6D,MAAM,sBAAsB,CAAC;AAClK,OAAO,EAAE,iBAAiB,EAAyB,MAAM,+BAA+B,CAAC;AAGzF;;;;;;;GAOG;AACH,qBACa,6BAA8B,SAAQ,iBAAiB;gBACpD,MAAM,EAAE,UAAU;IAS9B;;;;OAIG;IACmB,IAAI,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IA+CzE;;;;OAIG;cACa,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAyBjD;;;OAGG;IACH,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAgBpD;;;OAGG;cACa,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAqCnE;;;;;OAKG;IACH,SAAS,CAAC,4BAA4B,CAAC,gBAAgB,EAAE;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,EAAE,GAAG,MAAM;IAkBtF;;OAEG;cACa,iCAAiC,IAAI,OAAO,CAAC,IAAI,CAAC;CA4ErE"}

package/dist/custom/ApplicationEntity.server.js

@@ -144,6 +144,26 @@ let ApplicationEntityServerEntity = class ApplicationEntityServerEntity extends
         }
         return `${baseSlug}-${suffix}`;
     }
+    /**
+     * Calculates the appropriate Sequence value for a new UserApplication record
+     * using the application's DefaultSequence to determine placement.
+     * If DefaultSequence fits between existing sequences, it's used directly.
+     * Otherwise, the app is appended after the highest existing sequence.
+     */
+    calculateSequenceFromDefault(existingUserApps) {
+        const defaultSeq = this.DefaultSequence ?? 100;
+        if (existingUserApps.length === 0) {
+            return defaultSeq;
+        }
+        // Check if DefaultSequence conflicts with an existing sequence
+        const existingSequences = new Set(existingUserApps.map(ua => ua.Sequence || 0));
+        if (!existingSequences.has(defaultSeq)) {
+            return defaultSeq;
+        }
+        // Conflict exists — append after the highest existing sequence
+        const maxSequence = Math.max(...existingSequences);
+        return maxSequence + 1;
+    }
     /**
      * Creates UserApplication records for all users in the system for this application
      */
@@ -184,18 +204,15 @@ let ApplicationEntityServerEntity = class ApplicationEntityServerEntity extends
                     LogStatus(`UserApplication already exists for user ${user.Name}, skipping`);
                     continue;
                 }
-                // Calculate max sequence for this user (client-side)
+                // Calculate sequence using DefaultSequence to place the app in its intended position
                 const userApps = allUserApps.filter((ua) => ua.UserID === user.ID);
-                let maxSequence = 0;
-                if (userApps.length > 0) {
-                    maxSequence = Math.max(...userApps.map((ua) => ua.Sequence || 0));
-                }
+                const sequence = this.calculateSequenceFromDefault(userApps);
                 // Create new UserApplication record
                 const userApp = await md.GetEntityObject('User Applications', this.ContextCurrentUser);
                 userApp.NewRecord();
                 userApp.UserID = user.ID;
                 userApp.ApplicationID = this.ID;
-                userApp.Sequence = maxSequence + 1;
+                userApp.Sequence = sequence;
                 userApp.IsActive = true;
                 const saveResult = await userApp.Save();
                 if (saveResult) {

package/dist/custom/ApplicationEntity.server.js.map

@@ -1 +1 @@
-{"version":3,"file":"ApplicationEntity.server.js","sourceRoot":"","sources":["../../src/custom/ApplicationEntity.server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ApplicationEntity.server.js","sourceRoot":"","sources":["../../src/custom/ApplicationEntity.server.ts"],"names":[],"mappings":"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"}

package/dist/custom/QueryEntity.server.d.ts

@@ -32,28 +32,6 @@ export declare class QueryEntityExtended extends QueryEntity {
      * Uses node-sql-parser for robust SQL parsing after pre-processing Nunjucks templates.
      */
     private extractEntityMetadataFromSQL;
-    /**
-     * Pre-processes Nunjucks templates in SQL to create valid SQL for parsing.
-     * Replaces Nunjucks syntax with placeholder values.
-     */
-    private preProcessNunjucksForParsing;
-    /**
-     * Recursively extracts table references and column references from SQL AST.
-     */
-    private extractFromAST;
-    /**
-     * Extracts table information from a FROM clause item, handling tables and JOINs.
-     */
-    private extractTableFromItem;
-    /**
-     * Extracts column references from an expression node.
-     * Also extracts tables from subqueries found in expressions (e.g., EXISTS, IN subqueries).
-     */
-    private extractColumnReferences;
-    /**
-     * Fallback regex-based extraction for when SQL parsing fails.
-     */
-    private extractEntityMetadataFromSQLRegex;
     private syncQueryParameters;
     private removeAllQueryParameters;
     /**

package/dist/custom/QueryEntity.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryEntity.server.d.ts","sourceRoot":"","sources":["../../src/custom/QueryEntity.server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,YAAY,EAAE,iBAAiB,EAAyC,eAAe,EAAE,cAAc,EAAE,kBAAkB,EAAE,mBAAmB,EAAW,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AACpO,OAAO,EAAE,WAAW,EAA6D,MAAM,+BAA+B,CAAC;AAwCvH,qBACa,mBAAoB,SAAQ,WAAW;IAChD,OAAO,CAAC,cAAc,CAAyB;IAC/C,OAAO,CAAC,YAAY,CAAwB;IAC5C,OAAO,CAAC,gBAAgB,CAA4B;IACpD,OAAO,CAAC,iBAAiB,CAA6B;IAEtD,IAAW,aAAa,IAAI,eAAe,EAAE,CAE5C;IAED,IAAW,WAAW,IAAI,cAAc,EAAE,CAEzC;IAED,IAAW,eAAe,IAAI,kBAAkB,EAAE,CAEjD;IAED,IAAW,gBAAgB,IAAI,mBAAmB,EAAE,CAEnD;IAED;;;;OAIG;cACsB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAI7E,IAAI,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IA4CnD,MAAM,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAqBpE;;;OAGG;YACW,uBAAuB;IAuBrC;;OAEG;YACW,sBAAsB;YAkBtB,kBAAkB;IA+FhC;;;OAGG;YACW,4BAA4B;IA4G1C;;;OAGG;IACH,OAAO,CAAC,4BAA4B;IAkDpC;;OAEG;IACH,OAAO,CAAC,cAAc;IA8DtB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IA4C5B;;;OAGG;IACH,OAAO,CAAC,uBAAuB;IA6B/B;;OAEG;IACH,OAAO,CAAC,iCAAiC;YA8D3B,mBAAmB;YAoJnB,wBAAwB;IA8BtC;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;YAqDd,eAAe;YA0Kf,iBAAiB;YAsFjB,oBAAoB;YA4BpB,sBAAsB;IA4BrB,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,yBAAyB,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAMxE,SAAS,CAAC,YAAY,EAAE,YAAY,EAAE,yBAAyB,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAM7F,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,iBAAiB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAMrF;;;;;OAKG;IACU,sBAAsB,CAAC,aAAa,EAAE,OAAO;CAgB7D"}
+{"version":3,"file":"QueryEntity.server.d.ts","sourceRoot":"","sources":["../../src/custom/QueryEntity.server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,YAAY,EAAE,iBAAiB,EAAyC,eAAe,EAAE,cAAc,EAAE,kBAAkB,EAAE,mBAAmB,EAAW,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AACpO,OAAO,EAAE,WAAW,EAA6D,MAAM,+BAA+B,CAAC;AAsCvH,qBACa,mBAAoB,SAAQ,WAAW;IAChD,OAAO,CAAC,cAAc,CAAyB;IAC/C,OAAO,CAAC,YAAY,CAAwB;IAC5C,OAAO,CAAC,gBAAgB,CAA4B;IACpD,OAAO,CAAC,iBAAiB,CAA6B;IAEtD,IAAW,aAAa,IAAI,eAAe,EAAE,CAE5C;IAED,IAAW,WAAW,IAAI,cAAc,EAAE,CAEzC;IAED,IAAW,eAAe,IAAI,kBAAkB,EAAE,CAEjD;IAED,IAAW,gBAAgB,IAAI,mBAAmB,EAAE,CAEnD;IAED;;;;OAIG;cACsB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAI7E,IAAI,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IA4CnD,MAAM,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAqBpE;;;OAGG;YACW,uBAAuB;IAuBrC;;OAEG;YACW,sBAAsB;YAkBtB,kBAAkB;IA+FhC;;;OAGG;YACW,4BAA4B;YA0E5B,mBAAmB;YAoJnB,wBAAwB;IA8BtC;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;YAqDd,eAAe;YA0Kf,iBAAiB;YAsFjB,oBAAoB;YA4BpB,sBAAsB;IA4BrB,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,yBAAyB,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAMxE,SAAS,CAAC,YAAY,EAAE,YAAY,EAAE,yBAAyB,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAM7F,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,iBAAiB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAMrF;;;;;OAKG;IACU,sBAAsB,CAAC,aAAa,EAAE,OAAO;CAgB7D"}

package/dist/custom/QueryEntity.server.js

@@ -11,9 +11,7 @@ import { AIEngine } from "@memberjunction/aiengine";
 import { AIPromptRunner } from "@memberjunction/ai-prompts";
 import { AIPromptParams } from "@memberjunction/ai-core-plus";
 import { EmbedTextLocalHelper } from "./util.js";
-import NodeSqlParser from 'node-sql-parser';
-const { Parser } = NodeSqlParser;
-import * as nunjucks from 'nunjucks';
+import { SQLParser } from "./sql-parser.js";
 let QueryEntityExtended = class QueryEntityExtended extends QueryEntity {
     constructor() {
         super(...arguments);
@@ -237,69 +235,41 @@ let QueryEntityExtended = class QueryEntityExtended extends QueryEntity {
         if (!this.SQL)
             return results;
         try {
-            // Pre-process Nunjucks templates to get valid SQL for parsing
-            const processedSQL = this.preProcessNunjucksForParsing(this.SQL);
-            // Parse the SQL using node-sql-parser
-            const parser = new Parser();
-            let ast;
-            try {
-                ast = parser.astify(processedSQL, { database: 'TransactSQL' });
-            }
-            catch (parseError) {
-                // If parsing fails, fall back to regex-based extraction
-                console.warn(`SQL parsing failed, falling back to regex: ${parseError.message}`);
-                return this.extractEntityMetadataFromSQLRegex();
-            }
-            // Extract table references and column references from AST
-            const tableAliasMap = new Map();
-            const referencedColumns = new Set();
-            // Process AST (handle both single statement and array of statements)
-            const statements = Array.isArray(ast) ? ast : [ast];
-            for (const statement of statements) {
-                this.extractFromAST(statement, tableAliasMap, referencedColumns);
-            }
-            // Build entity metadata with only referenced fields
-            const processedEntities = new Set();
-            for (const [alias, tableInfo] of tableAliasMap) {
-                const schemaName = tableInfo.schemaName || 'dbo';
-                const tableName = tableInfo.tableName;
-                const key = `${schemaName.toLowerCase()}.${tableName.toLowerCase()}`;
-                if (processedEntities.has(key))
-                    continue;
-                processedEntities.add(key);
-                // Find matching entity in metadata
-                const matchingEntity = md.Entities.find(e => (e.BaseView.toLowerCase() === tableName.toLowerCase() ||
-                    e.BaseTable.toLowerCase() === tableName.toLowerCase()) &&
-                    e.SchemaName.toLowerCase() === schemaName.toLowerCase());
+            // Use the shared SQLParser with Nunjucks preprocessing
+            const parseResult = SQLParser.ParseWithTemplatePreprocessing(this.SQL);
+            // Cross-reference parsed tables against entity metadata
+            for (const tableRef of parseResult.Tables) {
+                const matchingEntity = md.Entities.find(e => (e.BaseView.toLowerCase() === tableRef.TableName.toLowerCase() ||
+                    e.BaseTable.toLowerCase() === tableRef.TableName.toLowerCase()) &&
+                    e.SchemaName.toLowerCase() === tableRef.SchemaName.toLowerCase());
                 if (matchingEntity) {
-                    // Get fields from the entity's Fields property
-                    const entityFields = matchingEntity.Fields;
                     // Filter to fields that are actually referenced in the SQL
-                    // Check both the field name directly and with table alias prefix
-                    const relevantFields = entityFields
+                    const relevantFields = matchingEntity.Fields
                         .filter(f => {
                         const fieldLower = f.Name.toLowerCase();
-                        // Check if this field is referenced directly or with any alias
-                        for (const colRef of referencedColumns) {
-                            const colLower = colRef.toLowerCase();
-                            // Match: fieldName, alias.fieldName, tableName.fieldName
-                            if (colLower === fieldLower ||
-                                colLower === `${alias.toLowerCase()}.${fieldLower}` ||
-                                colLower === `${tableName.toLowerCase()}.${fieldLower}` ||
-                                colLower.endsWith(`.${fieldLower}`)) {
+                        for (const colRef of parseResult.Columns) {
+                            const colLower = colRef.ColumnName.toLowerCase();
+                            if (colLower === fieldLower)
                                 return true;
+                            // Check if column qualifier matches table alias or name
+                            if (colRef.TableQualifier) {
+                                const qualLower = colRef.TableQualifier.toLowerCase();
+                                if ((qualLower === tableRef.Alias.toLowerCase() ||
+                                    qualLower === tableRef.TableName.toLowerCase()) &&
+                                    colLower === fieldLower) {
+                                    return true;
+                                }
                             }
                         }
                         // Also include primary keys as they're always useful context
                         return f.IsPrimaryKey;
                     })
-                        .slice(0, 20) // Limit to 20 most relevant fields per entity
+                        .slice(0, 20)
                         .map(f => ({
                         name: f.Name,
                         type: f.Type,
                         isPrimaryKey: f.IsPrimaryKey
                     }));
-                    // Only include entity if we found relevant fields
                     if (relevantFields.length > 0) {
                         results.push({
                             name: matchingEntity.Name,
@@ -313,225 +283,9 @@ let QueryEntityExtended = class QueryEntityExtended extends QueryEntity {
             return results;
         }
         catch (error) {
-            console.warn(`Error in extractEntityMetadataFromSQL: ${error.message}`);
-            return this.extractEntityMetadataFromSQLRegex();
-        }
-    }
-    /**
-     * Pre-processes Nunjucks templates in SQL to create valid SQL for parsing.
-     * Replaces Nunjucks syntax with placeholder values.
-     */
-    preProcessNunjucksForParsing(sql) {
-        // Create a Nunjucks environment that won't throw on undefined
-        const env = new nunjucks.Environment(null, {
-            autoescape: false,
-            throwOnUndefined: false
-        });
-        // Add placeholder filters that return safe SQL values
-        env.addFilter('sqlString', () => "'placeholder'");
-        env.addFilter('sqlNumber', () => '0');
-        env.addFilter('sqlDate', () => "'2000-01-01'");
-        env.addFilter('sqlIn', () => "('placeholder')");
-        env.addFilter('sqlIdentifier', (val) => val || 'placeholder');
-        env.addFilter('sqlNoKeywordsExpression', (val) => val || 'placeholder');
-        env.addFilter('default', (val, defaultVal) => val || defaultVal || 'placeholder');
-        env.addFilter('safe', (val) => val || 'placeholder');
-        env.addFilter('dump', (val) => JSON.stringify(val || {}));
-        try {
-            // Try to render the template with placeholder data
-            // This handles most Nunjucks constructs
-            const rendered = env.renderString(sql, {});
-            return rendered;
-        }
-        catch (e) {
-            // If rendering fails, do manual regex replacement
-            let processed = sql;
-            // Replace {{ variable | filter }} patterns
-            processed = processed.replace(/\{\{\s*[\w.]+\s*\|\s*sqlString\s*\}\}/g, "'placeholder'");
-            processed = processed.replace(/\{\{\s*[\w.]+\s*\|\s*sqlNumber\s*\}\}/g, '0');
-            processed = processed.replace(/\{\{\s*[\w.]+\s*\|\s*sqlDate\s*\}\}/g, "'2000-01-01'");
-            processed = processed.replace(/\{\{\s*[\w.]+\s*\|\s*sqlIn\s*\}\}/g, "('placeholder')");
-            processed = processed.replace(/\{\{\s*[\w.]+\s*\|\s*sqlIdentifier\s*\}\}/g, 'placeholder');
-            processed = processed.replace(/\{\{\s*[\w.]+\s*[^}]*\}\}/g, "'placeholder'");
-            // Remove {% if %}, {% endif %}, {% for %}, {% endfor %} blocks
-            // Keep the content between them
-            processed = processed.replace(/\{%\s*if\s+[^%]+%\}/g, '');
-            processed = processed.replace(/\{%\s*endif\s*%\}/g, '');
-            processed = processed.replace(/\{%\s*else\s*%\}/g, '');
-            processed = processed.replace(/\{%\s*elif\s+[^%]+%\}/g, '');
-            processed = processed.replace(/\{%\s*for\s+[^%]+%\}/g, '');
-            processed = processed.replace(/\{%\s*endfor\s*%\}/g, '');
-            processed = processed.replace(/\{%\s*set\s+[^%]+%\}/g, '');
-            processed = processed.replace(/\{#[^#]*#\}/g, ''); // Comments
-            return processed;
-        }
-    }
-    /**
-     * Recursively extracts table references and column references from SQL AST.
-     */
-    extractFromAST(node, tableAliasMap, referencedColumns) {
-        if (!node || typeof node !== 'object')
-            return;
-        // Handle CTEs (WITH clause) - process these first as they define tables used later
-        if (node.with) {
-            for (const cte of Array.isArray(node.with) ? node.with : [node.with]) {
-                // CTE structure can vary - check multiple possible locations
-                if (cte.stmt) {
-                    // stmt might be the AST directly or contain ast property
-                    const cteAst = cte.stmt.ast || cte.stmt;
-                    this.extractFromAST(cteAst, tableAliasMap, referencedColumns);
-                }
-            }
-        }
-        // Extract FROM clause tables (including JOINs)
-        if (node.from) {
-            for (const fromItem of Array.isArray(node.from) ? node.from : [node.from]) {
-                this.extractTableFromItem(fromItem, tableAliasMap, referencedColumns);
-            }
-        }
-        // Extract column references from SELECT
-        if (node.columns) {
-            for (const col of Array.isArray(node.columns) ? node.columns : [node.columns]) {
-                if (col === '*')
-                    continue;
-                if (col.expr) {
-                    this.extractColumnReferences(col.expr, referencedColumns, tableAliasMap);
-                }
-            }
-        }
-        // Extract column references from WHERE (and tables from subqueries like EXISTS, IN)
-        if (node.where) {
-            this.extractColumnReferences(node.where, referencedColumns, tableAliasMap);
-        }
-        // Extract column references from GROUP BY
-        if (node.groupby) {
-            const groupItems = node.groupby.columns || node.groupby;
-            for (const group of Array.isArray(groupItems) ? groupItems : [groupItems]) {
-                this.extractColumnReferences(group, referencedColumns, tableAliasMap);
-            }
-        }
-        // Extract column references from ORDER BY
-        if (node.orderby) {
-            for (const order of Array.isArray(node.orderby) ? node.orderby : [node.orderby]) {
-                this.extractColumnReferences(order.expr || order, referencedColumns, tableAliasMap);
-            }
-        }
-        // Handle UNION/INTERSECT/EXCEPT - the next query is in _next
-        if (node._next) {
-            this.extractFromAST(node._next, tableAliasMap, referencedColumns);
-        }
-    }
-    /**
-     * Extracts table information from a FROM clause item, handling tables and JOINs.
-     */
-    extractTableFromItem(fromItem, tableAliasMap, referencedColumns) {
-        if (!fromItem)
-            return;
-        // Direct table reference
-        if (fromItem.table) {
-            const alias = fromItem.as || fromItem.table;
-            tableAliasMap.set(alias, {
-                schemaName: fromItem.db || 'dbo',
-                tableName: fromItem.table
-            });
-        }
-        // Handle subqueries in FROM (derived tables)
-        if (fromItem.expr) {
-            // The subquery AST is inside expr.ast
-            const subqueryAst = fromItem.expr.ast || fromItem.expr;
-            this.extractFromAST(subqueryAst, tableAliasMap, referencedColumns);
-        }
-        // Note: In node-sql-parser, JOINs are represented as separate items in the from array
-        // with a 'join' property that's a string (e.g., "INNER JOIN", "LEFT JOIN")
-        // So no need to recurse into join - each table is already in the from array
-        // Extract column references from ON conditions
-        if (fromItem.on) {
-            this.extractColumnReferences(fromItem.on, referencedColumns, tableAliasMap);
-        }
-        // Some parsers use 'using' for join conditions
-        if (fromItem.using) {
-            for (const col of Array.isArray(fromItem.using) ? fromItem.using : [fromItem.using]) {
-                if (typeof col === 'string') {
-                    referencedColumns.add(col);
-                }
-                else if (col.column) {
-                    referencedColumns.add(col.column);
-                }
-            }
-        }
-    }
-    /**
-     * Extracts column references from an expression node.
-     * Also extracts tables from subqueries found in expressions (e.g., EXISTS, IN subqueries).
-     */
-    extractColumnReferences(expr, referencedColumns, tableAliasMap) {
-        if (!expr || typeof expr !== 'object')
-            return;
-        if (expr.type === 'column_ref') {
-            const colName = expr.table ? `${expr.table}.${expr.column}` : expr.column;
-            referencedColumns.add(colName);
-        }
-        // Handle subqueries in expressions (EXISTS, IN, scalar subqueries)
-        if (expr.ast && tableAliasMap) {
-            this.extractFromAST(expr.ast, tableAliasMap, referencedColumns);
-        }
-        // Recursively process nested expressions
-        if (expr.left)
-            this.extractColumnReferences(expr.left, referencedColumns, tableAliasMap);
-        if (expr.right)
-            this.extractColumnReferences(expr.right, referencedColumns, tableAliasMap);
-        if (expr.args) {
-            const args = expr.args.value || expr.args;
-            for (const arg of Array.isArray(args) ? args : [args]) {
-                this.extractColumnReferences(arg, referencedColumns, tableAliasMap);
-            }
-        }
-        if (expr.expr)
-            this.extractColumnReferences(expr.expr, referencedColumns, tableAliasMap);
-    }
-    /**
-     * Fallback regex-based extraction for when SQL parsing fails.
-     */
-    extractEntityMetadataFromSQLRegex() {
-        const md = this.ProviderToUse;
-        const results = [];
-        if (!this.SQL)
+            console.warn(`Error in extractEntityMetadataFromSQL: ${error}`);
             return results;
-        // Simple regex to find schema.table or schema.view references in SQL
-        const tablePattern = /(?:FROM|JOIN|INTO)\s+(?:\[?(\w+)\]?\.)?\[?(\w+)\]?(?:\s+(?:AS\s+)?(\w+))?/gi;
-        const matches = [...this.SQL.matchAll(tablePattern)];
-        const processedViews = new Set();
-        for (const match of matches) {
-            const schemaName = match[1] || 'dbo';
-            const viewOrTable = match[2];
-            const key = `${schemaName.toLowerCase()}.${viewOrTable.toLowerCase()}`;
-            if (processedViews.has(key))
-                continue;
-            processedViews.add(key);
-            const matchingEntity = md.Entities.find(e => (e.BaseView.toLowerCase() === viewOrTable.toLowerCase() ||
-                e.BaseTable.toLowerCase() === viewOrTable.toLowerCase()) &&
-                e.SchemaName.toLowerCase() === schemaName.toLowerCase());
-            if (matchingEntity) {
-                // Get fields from the entity's Fields property
-                const entityFields = matchingEntity.Fields;
-                // Include primary keys and fields ending in ID for fallback
-                const relevantFields = entityFields
-                    .filter(f => f.IsPrimaryKey || f.Name.endsWith('ID'))
-                    .slice(0, 15)
-                    .map(f => ({
-                    name: f.Name,
-                    type: f.Type,
-                    isPrimaryKey: f.IsPrimaryKey
-                }));
-                results.push({
-                    name: matchingEntity.Name,
-                    schemaName: matchingEntity.SchemaName,
-                    baseView: matchingEntity.BaseView,
-                    fields: relevantFields
-                });
-            }
         }
-        return results;
     }
     async syncQueryParameters(extractedParams) {
         // Use the entity's provider instead of creating new Metadata instance