@mastra/mssql 1.4.0 → 1.4.1-alpha.0

package/dist/index.js

@@ -4060,6 +4060,19 @@ function transformScoreRow(row) {
     convertTimestamps: true
   });
 }
+function buildTenancyConditions(filters) {
+  const conditions = [];
+  const params = {};
+  if (filters?.organizationId !== void 0) {
+    conditions.push("[organizationId] = @org");
+    params.org = filters.organizationId;
+  }
+  if (filters?.projectId !== void 0) {
+    conditions.push("[projectId] = @proj");
+    params.proj = filters.projectId;
+  }
+  return { conditions, params };
+}
 var ScoresMSSQL = class _ScoresMSSQL extends ScoresStorage {
   pool;
   db;
@@ -4229,7 +4242,8 @@ var ScoresMSSQL = class _ScoresMSSQL extends ScoresStorage {
     pagination,
     entityId,
     entityType,
-    source
+    source,
+    filters
   }) {
     try {
       const conditions = ["[scorerId] = @p1"];
@@ -4250,6 +4264,9 @@ var ScoresMSSQL = class _ScoresMSSQL extends ScoresStorage {
         params[`p${paramIndex}`] = source;
         paramIndex++;
       }
+      const tenancy = buildTenancyConditions(filters);
+      conditions.push(...tenancy.conditions);
+      Object.assign(params, tenancy.params);
       const whereClause = conditions.join(" AND ");
       const tableName = getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.schema) });
       const countRequest = this.pool.request();
@@ -4280,7 +4297,7 @@ var ScoresMSSQL = class _ScoresMSSQL extends ScoresStorage {
       });
       dataRequest.input("perPage", limitValue);
       dataRequest.input("offset", start);
-      const dataQuery = `SELECT * FROM ${tableName} WHERE ${whereClause} ORDER BY [createdAt] DESC OFFSET @offset ROWS FETCH NEXT @perPage ROWS ONLY`;
+      const dataQuery = `SELECT * FROM ${tableName} WHERE ${whereClause} ORDER BY [seq_id] DESC OFFSET @offset ROWS FETCH NEXT @perPage ROWS ONLY`;
       const result = await dataRequest.query(dataQuery);
       return {
         pagination: {
@@ -4305,13 +4322,17 @@ var ScoresMSSQL = class _ScoresMSSQL extends ScoresStorage {
   }
   async listScoresByRunId({
     runId,
-    pagination
+    pagination,
+    filters
   }) {
     try {
+      const tenancy = buildTenancyConditions(filters);
+      const tenancySql = tenancy.conditions.length > 0 ? ` AND ${tenancy.conditions.join(" AND ")}` : "";
       const request = this.pool.request();
       request.input("p1", runId);
+      Object.entries(tenancy.params).forEach(([key, value]) => request.input(key, value));
       const totalResult = await request.query(
-        `SELECT COUNT(*) as count FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.schema) })} WHERE [runId] = @p1`
+        `SELECT COUNT(*) as count FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.schema) })} WHERE [runId] = @p1${tenancySql}`
       );
       const total = totalResult.recordset[0]?.count || 0;
       const { page, perPage: perPageInput } = pagination;
@@ -4334,8 +4355,9 @@ var ScoresMSSQL = class _ScoresMSSQL extends ScoresStorage {
       dataRequest.input("p1", runId);
       dataRequest.input("p2", limitValue);
       dataRequest.input("p3", start);
+      Object.entries(tenancy.params).forEach(([key, value]) => dataRequest.input(key, value));
       const result = await dataRequest.query(
-        `SELECT * FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.schema) })} WHERE [runId] = @p1 ORDER BY [createdAt] DESC OFFSET @p3 ROWS FETCH NEXT @p2 ROWS ONLY`
+        `SELECT * FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.schema) })} WHERE [runId] = @p1${tenancySql} ORDER BY [seq_id] DESC OFFSET @p3 ROWS FETCH NEXT @p2 ROWS ONLY`
       );
       return {
         pagination: {
@@ -4361,14 +4383,18 @@ var ScoresMSSQL = class _ScoresMSSQL extends ScoresStorage {
   async listScoresByEntityId({
     entityId,
     entityType,
-    pagination
+    pagination,
+    filters
   }) {
     try {
+      const tenancy = buildTenancyConditions(filters);
+      const tenancySql = tenancy.conditions.length > 0 ? ` AND ${tenancy.conditions.join(" AND ")}` : "";
       const request = this.pool.request();
       request.input("p1", entityId);
       request.input("p2", entityType);
+      Object.entries(tenancy.params).forEach(([key, value]) => request.input(key, value));
       const totalResult = await request.query(
-        `SELECT COUNT(*) as count FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.schema) })} WHERE [entityId] = @p1 AND [entityType] = @p2`
+        `SELECT COUNT(*) as count FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.schema) })} WHERE [entityId] = @p1 AND [entityType] = @p2${tenancySql}`
       );
       const total = totalResult.recordset[0]?.count || 0;
       const { page, perPage: perPageInput } = pagination;
@@ -4392,8 +4418,9 @@ var ScoresMSSQL = class _ScoresMSSQL extends ScoresStorage {
       dataRequest.input("p2", entityType);
       dataRequest.input("p3", limitValue);
       dataRequest.input("p4", start);
+      Object.entries(tenancy.params).forEach(([key, value]) => dataRequest.input(key, value));
       const result = await dataRequest.query(
-        `SELECT * FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.schema) })} WHERE [entityId] = @p1 AND [entityType] = @p2 ORDER BY [createdAt] DESC OFFSET @p4 ROWS FETCH NEXT @p3 ROWS ONLY`
+        `SELECT * FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.schema) })} WHERE [entityId] = @p1 AND [entityType] = @p2${tenancySql} ORDER BY [seq_id] DESC OFFSET @p4 ROWS FETCH NEXT @p3 ROWS ONLY`
       );
       return {
         pagination: {
@@ -4419,14 +4446,18 @@ var ScoresMSSQL = class _ScoresMSSQL extends ScoresStorage {
   async listScoresBySpan({
     traceId,
     spanId,
-    pagination
+    pagination,
+    filters
   }) {
     try {
+      const tenancy = buildTenancyConditions(filters);
+      const tenancySql = tenancy.conditions.length > 0 ? ` AND ${tenancy.conditions.join(" AND ")}` : "";
       const request = this.pool.request();
       request.input("p1", traceId);
       request.input("p2", spanId);
+      Object.entries(tenancy.params).forEach(([key, value]) => request.input(key, value));
       const totalResult = await request.query(
-        `SELECT COUNT(*) as count FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.schema) })} WHERE [traceId] = @p1 AND [spanId] = @p2`
+        `SELECT COUNT(*) as count FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.schema) })} WHERE [traceId] = @p1 AND [spanId] = @p2${tenancySql}`
       );
       const total = totalResult.recordset[0]?.count || 0;
       const { page, perPage: perPageInput } = pagination;
@@ -4450,8 +4481,9 @@ var ScoresMSSQL = class _ScoresMSSQL extends ScoresStorage {
       dataRequest.input("p2", spanId);
       dataRequest.input("p3", limitValue);
       dataRequest.input("p4", start);
+      Object.entries(tenancy.params).forEach(([key, value]) => dataRequest.input(key, value));
       const result = await dataRequest.query(
-        `SELECT * FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.schema) })} WHERE [traceId] = @p1 AND [spanId] = @p2 ORDER BY [createdAt] DESC OFFSET @p4 ROWS FETCH NEXT @p3 ROWS ONLY`
+        `SELECT * FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.schema) })} WHERE [traceId] = @p1 AND [spanId] = @p2${tenancySql} ORDER BY [seq_id] DESC OFFSET @p4 ROWS FETCH NEXT @p3 ROWS ONLY`
       );
       return {
         pagination: {