@mastra/mssql 1.1.1 → 1.2.0

package/dist/index.js

@@ -1,5 +1,5 @@
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { MemoryStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, TABLE_SCHEMAS, createStorageErrorId, normalizePerPage, calculatePagination, ObservabilityStorage, TABLE_SPANS, SPAN_SCHEMA, listTracesArgsSchema, toTraceSpans, ScoresStorage, TABLE_SCORERS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, MastraCompositeStore, TraceStatus, getDefaultValue, transformScoreRow as transformScoreRow$1 } from '@mastra/core/storage';
+import { MemoryStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, TABLE_SCHEMAS, createStorageErrorId, normalizePerPage, calculatePagination, ObservabilityStorage, TABLE_SPANS, SPAN_SCHEMA, listTracesArgsSchema, toTraceSpans, ScoresStorage, TABLE_SCORERS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, MastraCompositeStore, getDefaultValue, transformScoreRow as transformScoreRow$1, TraceStatus } from '@mastra/core/storage';
 import sql from 'mssql';
 import { MessageList } from '@mastra/core/agent';
 import { MastraBase } from '@mastra/core/base';
@@ -52,6 +52,8 @@ var MssqlDB = class extends MastraBase {
   skipDefaultIndexes;
   setupSchemaPromise = null;
   schemaSetupComplete = void 0;
+  /** Cache of actual table columns: tableName -> Set<columnName> */
+  tableColumnsCache = /* @__PURE__ */ new Map();
   /**
    * Columns that participate in composite indexes need smaller sizes (NVARCHAR(100)).
    * MSSQL has a 900-byte index key limit, so composite indexes with NVARCHAR(400) columns fail.
@@ -136,6 +138,41 @@ var MssqlDB = class extends MastraBase {
     this.schemaName = schemaName;
     this.skipDefaultIndexes = skipDefaultIndexes;
   }
+  /**
+   * Gets the set of column names that actually exist in the database table.
+   * Results are cached; the cache is invalidated when alterTable() adds new columns.
+   */
+  async getTableColumns(tableName) {
+    const cached = this.tableColumnsCache.get(tableName);
+    if (cached) return cached;
+    const schema = this.schemaName || "dbo";
+    const request = this.pool.request();
+    request.input("schema", schema);
+    request.input("tableName", tableName);
+    const result = await request.query(
+      `SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = @schema AND TABLE_NAME = @tableName`
+    );
+    const columns = new Set((result.recordset || []).map((r) => r.COLUMN_NAME));
+    if (columns.size > 0) {
+      this.tableColumnsCache.set(tableName, columns);
+    }
+    return columns;
+  }
+  /**
+   * Filters a record to only include columns that exist in the actual database table.
+   * Unknown columns are silently dropped to ensure forward compatibility.
+   */
+  async filterRecordToKnownColumns(tableName, record) {
+    const knownColumns = await this.getTableColumns(tableName);
+    if (knownColumns.size === 0) return record;
+    const filtered = {};
+    for (const [key, value] of Object.entries(record)) {
+      if (knownColumns.has(key)) {
+        filtered[key] = value;
+      }
+    }
+    return filtered;
+  }
   async hasColumn(table, column) {
     const schema = this.schemaName || "dbo";
     const request = this.pool.request();
@@ -191,13 +228,15 @@ var MssqlDB = class extends MastraBase {
     transaction
   }) {
     try {
-      const columns = Object.keys(record);
+      const filteredRecord = await this.filterRecordToKnownColumns(tableName, record);
+      const columns = Object.keys(filteredRecord);
+      if (columns.length === 0) return;
       const parsedColumns = columns.map((col) => parseSqlIdentifier(col, "column name"));
       const paramNames = columns.map((_, i) => `@param${i}`);
       const insertSql = `INSERT INTO ${getTableName({ indexName: tableName, schemaName: getSchemaName(this.schemaName) })} (${parsedColumns.map((c) => `[${c}]`).join(", ")}) VALUES (${paramNames.join(", ")})`;
       const request = transaction ? transaction.request() : this.pool.request();
       columns.forEach((col, i) => {
-        const value = record[col];
+        const value = filteredRecord[col];
         const preparedValue = this.prepareValue(value, col, tableName);
         if (preparedValue instanceof Date) {
           request.input(`param${i}`, sql.DateTime2, preparedValue);
@@ -388,6 +427,8 @@ Note: This migration may take some time for large tables.
         },
         error
       );
+    } finally {
+      this.tableColumnsCache.delete(tableName);
     }
   }
   /**
@@ -615,6 +656,8 @@ Note: This migration may take some time for large tables.
         },
         error
       );
+    } finally {
+      this.tableColumnsCache.delete(tableName);
     }
   }
   async load({ tableName, keys }) {
@@ -698,6 +741,8 @@ Note: This migration may take some time for large tables.
         },
         error
       );
+    } finally {
+      this.tableColumnsCache.delete(tableName);
     }
   }
   /**
@@ -789,10 +834,12 @@ Note: This migration may take some time for large tables.
           text: "Cannot update without keys to identify records"
         });
       }
+      const filteredData = await this.filterRecordToKnownColumns(tableName, data);
+      if (Object.keys(filteredData).length === 0) return;
       const setClauses = [];
       const request = transaction ? transaction.request() : this.pool.request();
       let paramIndex = 0;
-      Object.entries(data).forEach(([key, value]) => {
+      Object.entries(filteredData).forEach(([key, value]) => {
         const parsedKey = parseSqlIdentifier(key, "column name");
         const paramName = `set${paramIndex++}`;
         setClauses.push(`[${parsedKey}] = @${paramName}`);
@@ -1728,6 +1775,18 @@ var MemoryMSSQL = class _MemoryMSSQL extends MemoryStorage {
       );
     }
   }
+  _sortMessages(messages, field, direction) {
+    const mult = direction === "ASC" ? 1 : -1;
+    return messages.sort((a, b) => {
+      const aVal = field === "createdAt" ? new Date(a.createdAt).getTime() : a[field];
+      const bVal = field === "createdAt" ? new Date(b.createdAt).getTime() : b[field];
+      if (aVal == null || bVal == null) {
+        return aVal == null && bVal == null ? a.id.localeCompare(b.id) : aVal == null ? 1 : -1;
+      }
+      const diff = (typeof aVal === "number" && typeof bVal === "number" ? aVal - bVal : String(aVal).localeCompare(String(bVal))) * mult;
+      return diff !== 0 ? diff : a.id.localeCompare(b.id);
+    });
+  }
   async _getIncludedMessages({ include }) {
     if (!include || include.length === 0) return null;
     const unionQueries = [];
@@ -1889,6 +1948,20 @@ var MemoryMSSQL = class _MemoryMSSQL extends MemoryStorage {
       const bindWhereParams = (req) => {
         Object.entries(whereParams).forEach(([paramName, paramValue]) => req.input(paramName, paramValue));
       };
+      if (perPage === 0 && (!include || include.length === 0)) {
+        return { messages: [], total: 0, page, perPage: perPageForResponse, hasMore: false };
+      }
+      if (perPage === 0 && include && include.length > 0) {
+        const includeMessages = await this._getIncludedMessages({ include });
+        const messages2 = this._parseAndFormatMessages(includeMessages ?? [], "v2");
+        return {
+          messages: this._sortMessages(messages2, field, direction),
+          total: 0,
+          page,
+          perPage: perPageForResponse,
+          hasMore: false
+        };
+      }
       const countRequest = this.pool.request();
       bindWhereParams(countRequest);
       const countResult = await countRequest.query(`SELECT COUNT(*) as total FROM ${tableName}${actualWhereClause}`);
@@ -2354,6 +2427,11 @@ var ObservabilityMSSQL = class _ObservabilityMSSQL extends ObservabilityStorage
       this.needsConnect = false;
     }
     await this.db.createTable({ tableName: TABLE_SPANS, schema: SPAN_SCHEMA });
+    await this.db.alterTable({
+      tableName: TABLE_SPANS,
+      schema: SPAN_SCHEMA,
+      ifNotExists: ["requestContext"]
+    });
     await this.createDefaultIndexes();
     await this.createCustomIndexes();
   }
@@ -2666,7 +2744,8 @@ var ObservabilityMSSQL = class _ObservabilityMSSQL extends ObservabilityStorage
   }
   async listTraces(args) {
     const { filters, pagination, orderBy } = listTracesArgsSchema.parse(args);
-    const { page, perPage } = pagination;
+    const page = pagination?.page ?? 0;
+    const perPage = pagination?.perPage ?? 10;
     const tableName = getTableName2({
       indexName: TABLE_SPANS,
       schemaName: getSchemaName2(this.schema)
@@ -2831,8 +2910,8 @@ var ObservabilityMSSQL = class _ObservabilityMSSQL extends ObservabilityStorage
         }
       }
       const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
-      const sortField = orderBy.field;
-      const sortDirection = orderBy.direction;
+      const sortField = orderBy?.field ?? "startedAt";
+      const sortDirection = orderBy?.direction ?? "DESC";
       const countRequest = this.pool.request();
       Object.entries(params).forEach(([key, value]) => {
         countRequest.input(key, value);