@mastra/pg 1.23.0-alpha.4 → 1.23.0-alpha.6

package/dist/docs/SKILL.md

@@ -3,7 +3,7 @@ name: mastra-pg
 description: Documentation for @mastra/pg. Use when working with @mastra/pg APIs, configuration, or implementation.
 metadata:
   package: "@mastra/pg"
-  version: "1.23.0-alpha.4"
+  version: "1.23.0-alpha.6"
 ---
 
 ## When to use

package/dist/docs/assets/SOURCE_MAP.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.23.0-alpha.4",
+  "version": "1.23.0-alpha.6",
   "package": "@mastra/pg",
   "exports": {},
   "modules": {}

package/dist/index.cjs

@@ -5577,6 +5577,17 @@ var ChannelsPG = class ChannelsPG extends _mastra_core_storage.ChannelsStorage {
 function jsonbArg(value) {
 	return value === void 0 || value === null ? null : JSON.stringify(value);
 }
+function parseStoredJSON(value) {
+	if (typeof value === "string") try {
+		return JSON.parse(value);
+	} catch {
+		return value;
+	}
+	return value;
+}
+function parseOptionalJSON(value, emptyValue) {
+	return value === null || value === void 0 ? emptyValue : parseStoredJSON(value);
+}
 var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 	#db;
 	#schema;
@@ -5753,6 +5764,8 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 		};
 	}
 	transformItemRow(row) {
+		const metadata = parseOptionalJSON(row.metadata, void 0);
+		const emptyValue = metadata?.__purged === true ? null : void 0;
 		return {
 			id: row.id,
 			datasetId: row.datasetId,
@@ -5760,20 +5773,22 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 			externalId: row.externalId ?? null,
 			organizationId: row.organizationId ?? null,
 			projectId: row.projectId ?? null,
-			input: (0, _mastra_core_storage.safelyParseJSON)(row.input),
-			groundTruth: row.groundTruth ? (0, _mastra_core_storage.safelyParseJSON)(row.groundTruth) : void 0,
-			expectedTrajectory: row.expectedTrajectory ? (0, _mastra_core_storage.safelyParseJSON)(row.expectedTrajectory) : void 0,
-			toolMocks: row.toolMocks ? (0, _mastra_core_storage.safelyParseJSON)(row.toolMocks) : void 0,
-			unmockedToolPolicy: row.unmockedToolPolicy ?? void 0,
-			scorerIds: row.scorerIds ? (0, _mastra_core_storage.safelyParseJSON)(row.scorerIds) : void 0,
-			requestContext: row.requestContext ? (0, _mastra_core_storage.safelyParseJSON)(row.requestContext) : void 0,
-			metadata: row.metadata ? (0, _mastra_core_storage.safelyParseJSON)(row.metadata) : void 0,
-			source: row.source ? (0, _mastra_core_storage.safelyParseJSON)(row.source) : void 0,
+			input: row.input === null ? null : parseStoredJSON(row.input),
+			groundTruth: parseOptionalJSON(row.groundTruth, emptyValue),
+			expectedTrajectory: parseOptionalJSON(row.expectedTrajectory, emptyValue),
+			toolMocks: parseOptionalJSON(row.toolMocks, emptyValue),
+			unmockedToolPolicy: row.unmockedToolPolicy ?? emptyValue,
+			scorerIds: parseOptionalJSON(row.scorerIds, emptyValue),
+			requestContext: parseOptionalJSON(row.requestContext, emptyValue),
+			metadata,
+			source: parseOptionalJSON(row.source, emptyValue),
 			createdAt: (0, _mastra_core_storage.ensureDate)(row.createdAtZ || row.createdAt),
 			updatedAt: (0, _mastra_core_storage.ensureDate)(row.updatedAtZ || row.updatedAt)
 		};
 	}
 	transformItemRowFull(row) {
+		const metadata = parseOptionalJSON(row.metadata, void 0);
+		const emptyValue = metadata?.__purged === true ? null : void 0;
 		return {
 			id: row.id,
 			datasetId: row.datasetId,
@@ -5783,15 +5798,15 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 			projectId: row.projectId ?? null,
 			validTo: row.validTo,
 			isDeleted: Boolean(row.isDeleted),
-			input: (0, _mastra_core_storage.safelyParseJSON)(row.input),
-			groundTruth: row.groundTruth ? (0, _mastra_core_storage.safelyParseJSON)(row.groundTruth) : void 0,
-			expectedTrajectory: row.expectedTrajectory ? (0, _mastra_core_storage.safelyParseJSON)(row.expectedTrajectory) : void 0,
-			toolMocks: row.toolMocks ? (0, _mastra_core_storage.safelyParseJSON)(row.toolMocks) : void 0,
-			unmockedToolPolicy: row.unmockedToolPolicy ?? void 0,
-			scorerIds: row.scorerIds ? (0, _mastra_core_storage.safelyParseJSON)(row.scorerIds) : void 0,
-			requestContext: row.requestContext ? (0, _mastra_core_storage.safelyParseJSON)(row.requestContext) : void 0,
-			metadata: row.metadata ? (0, _mastra_core_storage.safelyParseJSON)(row.metadata) : void 0,
-			source: row.source ? (0, _mastra_core_storage.safelyParseJSON)(row.source) : void 0,
+			input: row.input === null ? null : parseStoredJSON(row.input),
+			groundTruth: parseOptionalJSON(row.groundTruth, emptyValue),
+			expectedTrajectory: parseOptionalJSON(row.expectedTrajectory, emptyValue),
+			toolMocks: parseOptionalJSON(row.toolMocks, emptyValue),
+			unmockedToolPolicy: row.unmockedToolPolicy ?? emptyValue,
+			scorerIds: parseOptionalJSON(row.scorerIds, emptyValue),
+			requestContext: parseOptionalJSON(row.requestContext, emptyValue),
+			metadata,
+			source: parseOptionalJSON(row.source, emptyValue),
 			createdAt: (0, _mastra_core_storage.ensureDate)(row.createdAtZ || row.createdAt),
 			updatedAt: (0, _mastra_core_storage.ensureDate)(row.updatedAtZ || row.updatedAt)
 		};
@@ -6367,6 +6382,52 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 			}, error);
 		}
 	}
+	async _doPurgeItem({ id, datasetId }) {
+		try {
+			const datasetsTable = getTableName$5({
+				indexName: _mastra_core_storage.TABLE_DATASETS,
+				schemaName: getSchemaName$5(this.#schema)
+			});
+			const itemsTable = getTableName$5({
+				indexName: _mastra_core_storage.TABLE_DATASET_ITEMS,
+				schemaName: getSchemaName$5(this.#schema)
+			});
+			const experimentsTable = getTableName$5({
+				indexName: _mastra_core_storage.TABLE_EXPERIMENTS,
+				schemaName: getSchemaName$5(this.#schema)
+			});
+			const experimentResultsTable = getTableName$5({
+				indexName: _mastra_core_storage.TABLE_EXPERIMENT_RESULTS,
+				schemaName: getSchemaName$5(this.#schema)
+			});
+			const purgedAt = (/* @__PURE__ */ new Date()).toISOString();
+			const purgedMetadata = JSON.stringify({
+				__purged: true,
+				purgedAt
+			});
+			await this.#db.client.tx(async (t) => {
+				if (!await t.oneOrNone(`SELECT "id" FROM ${datasetsTable} WHERE "id" = $1 FOR UPDATE`, [datasetId])) return;
+				if (!await t.oneOrNone(`SELECT "id" FROM ${itemsTable} WHERE "id" = $1 AND "datasetId" = $2 LIMIT 1 FOR UPDATE`, [id, datasetId])) return;
+				await t.none(`UPDATE ${itemsTable} SET "input" = 'null'::jsonb, "groundTruth" = NULL, "expectedTrajectory" = NULL, "toolMocks" = NULL, "unmockedToolPolicy" = NULL, "scorerIds" = NULL, "requestContext" = NULL, "metadata" = $2::jsonb, "source" = NULL WHERE "id" = $1 AND "datasetId" = $3`, [
+					id,
+					purgedMetadata,
+					datasetId
+				]);
+				if ((await t.one(`SELECT to_regclass($1) IS NOT NULL AND to_regclass($2) IS NOT NULL AS exists`, [experimentResultsTable, experimentsTable])).exists) await t.none(`UPDATE ${experimentResultsTable} SET "input" = 'null'::jsonb, "output" = NULL, "groundTruth" = NULL, "error" = NULL, "toolMockReport" = NULL, "tags" = NULL, "comment" = NULL, "metadata" = $2::jsonb WHERE "itemId" = $1 AND "experimentId" IN (SELECT "id" FROM ${experimentsTable} WHERE "datasetId" = $3)`, [
+					id,
+					purgedMetadata,
+					datasetId
+				]);
+			});
+		} catch (error) {
+			if (error instanceof _mastra_core_error.MastraError) throw error;
+			throw new _mastra_core_error.MastraError({
+				id: (0, _mastra_core_storage.createStorageErrorId)("PG", "PURGE_ITEM", "FAILED"),
+				domain: _mastra_core_error.ErrorDomain.STORAGE,
+				category: _mastra_core_error.ErrorCategory.THIRD_PARTY
+			}, error);
+		}
+	}
 	async _doBatchInsertItems(input) {
 		try {
 			if (input.items.length === 0) return [];
@@ -7018,7 +7079,7 @@ var ExperimentsPG = class ExperimentsPG extends _mastra_core_storage.Experiments
 			itemDatasetVersion: row.itemDatasetVersion != null ? row.itemDatasetVersion : null,
 			organizationId: row.organizationId ?? null,
 			projectId: row.projectId ?? null,
-			input: (0, _mastra_core_storage.safelyParseJSON)(row.input),
+			input: row.input === null ? null : (0, _mastra_core_storage.safelyParseJSON)(row.input),
 			output: row.output ? (0, _mastra_core_storage.safelyParseJSON)(row.output) : null,
 			groundTruth: row.groundTruth ? (0, _mastra_core_storage.safelyParseJSON)(row.groundTruth) : null,
 			metadata: row.metadata ? (0, _mastra_core_storage.safelyParseJSON)(row.metadata) : null,
@@ -7320,58 +7381,65 @@ var ExperimentsPG = class ExperimentsPG extends _mastra_core_storage.Experiments
 			}, error);
 		}
 	}
+	async #resolvePurgeMetadata(t, datasetId, itemId) {
+		if (!datasetId) return null;
+		const datasetsTable = getTableName$5({
+			indexName: _mastra_core_storage.TABLE_DATASETS,
+			schemaName: getSchemaName$5(this.#schema)
+		});
+		const itemsTable = getTableName$5({
+			indexName: _mastra_core_storage.TABLE_DATASET_ITEMS,
+			schemaName: getSchemaName$5(this.#schema)
+		});
+		if (!await t.oneOrNone(`SELECT "id" FROM ${datasetsTable} WHERE "id" = $1 FOR UPDATE`, [datasetId])) return null;
+		return (await t.oneOrNone(`SELECT "metadata" FROM ${itemsTable}
+       WHERE "id" = $1 AND "datasetId" = $2 AND "metadata"->>'__purged' = 'true'
+       LIMIT 1`, [itemId, datasetId]))?.metadata ?? null;
+	}
 	async addExperimentResult(input) {
 		try {
 			const id = input.id ?? crypto.randomUUID();
-			const now = /* @__PURE__ */ new Date();
-			const nowIso = now.toISOString();
-			await this.#db.insert({
-				tableName: _mastra_core_storage.TABLE_EXPERIMENT_RESULTS,
-				record: {
+			const resultsTable = getTableName$5({
+				indexName: _mastra_core_storage.TABLE_EXPERIMENT_RESULTS,
+				schemaName: getSchemaName$5(this.#schema)
+			});
+			const experimentsTable = getTableName$5({
+				indexName: _mastra_core_storage.TABLE_EXPERIMENTS,
+				schemaName: getSchemaName$5(this.#schema)
+			});
+			const row = await this.#db.client.tx(async (t) => {
+				const owner = await t.oneOrNone(`SELECT "datasetId" FROM ${experimentsTable} WHERE "id" = $1`, [input.experimentId]);
+				const purgeMetadata = await this.#resolvePurgeMetadata(t, owner?.datasetId, input.itemId);
+				const nowIso = (/* @__PURE__ */ new Date()).toISOString();
+				return t.one(`INSERT INTO ${resultsTable} (
+            "id", "experimentId", "itemId", "itemDatasetVersion", "organizationId", "projectId",
+            "input", "output", "groundTruth", "metadata", "error", "startedAt", "completedAt",
+            "retryCount", "attempt", "traceId", "status", "tags", "toolMockReport", "createdAt"
+          ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20)
+          RETURNING *`, [
 					id,
-					experimentId: input.experimentId,
-					itemId: input.itemId,
-					itemDatasetVersion: input.itemDatasetVersion ?? null,
-					organizationId: input.organizationId ?? null,
-					projectId: input.projectId ?? null,
-					input: input.input,
-					output: input.output ?? null,
-					groundTruth: input.groundTruth ?? null,
-					metadata: input.metadata ?? null,
-					error: input.error ?? null,
-					startedAt: input.startedAt.toISOString(),
-					completedAt: input.completedAt.toISOString(),
-					retryCount: input.retryCount,
-					attempt: input.attempt ?? 0,
-					traceId: input.traceId ?? null,
-					status: input.status ?? null,
-					tags: input.tags ?? null,
-					toolMockReport: input.toolMockReport ?? null,
-					createdAt: nowIso
-				}
+					input.experimentId,
+					input.itemId,
+					input.itemDatasetVersion ?? null,
+					input.organizationId ?? null,
+					input.projectId ?? null,
+					JSON.stringify(purgeMetadata ? null : input.input),
+					purgeMetadata || input.output == null ? null : JSON.stringify(input.output),
+					purgeMetadata || input.groundTruth == null ? null : JSON.stringify(input.groundTruth),
+					JSON.stringify(purgeMetadata ?? input.metadata ?? null),
+					purgeMetadata || input.error == null ? null : JSON.stringify(input.error),
+					input.startedAt.toISOString(),
+					input.completedAt.toISOString(),
+					input.retryCount,
+					input.attempt ?? 0,
+					input.traceId ?? null,
+					input.status ?? null,
+					purgeMetadata || input.tags == null ? null : JSON.stringify(input.tags),
+					purgeMetadata || input.toolMockReport == null ? null : JSON.stringify(input.toolMockReport),
+					nowIso
+				]);
 			});
-			return {
-				id,
-				experimentId: input.experimentId,
-				itemId: input.itemId,
-				itemDatasetVersion: input.itemDatasetVersion ?? null,
-				organizationId: input.organizationId ?? null,
-				projectId: input.projectId ?? null,
-				input: input.input,
-				output: input.output ?? null,
-				groundTruth: input.groundTruth ?? null,
-				metadata: input.metadata ?? null,
-				error: input.error ?? null,
-				startedAt: input.startedAt,
-				completedAt: input.completedAt,
-				retryCount: input.retryCount,
-				attempt: input.attempt ?? 0,
-				traceId: input.traceId ?? null,
-				status: input.status ?? null,
-				tags: input.tags ?? null,
-				toolMockReport: input.toolMockReport ?? null,
-				createdAt: now
-			};
+			return this.transformExperimentResultRow(row);
 		} catch (error) {
 			throw new _mastra_core_error.MastraError({
 				id: (0, _mastra_core_storage.createStorageErrorId)("PG", "ADD_EXPERIMENT_RESULT", "FAILED"),
@@ -7386,8 +7454,14 @@ var ExperimentsPG = class ExperimentsPG extends _mastra_core_storage.Experiments
 				indexName: _mastra_core_storage.TABLE_EXPERIMENT_RESULTS,
 				schemaName: getSchemaName$5(this.#schema)
 			});
+			const experimentsTable = getTableName$5({
+				indexName: _mastra_core_storage.TABLE_EXPERIMENTS,
+				schemaName: getSchemaName$5(this.#schema)
+			});
 			const attempt = input.attempt ?? 0;
 			const row = await this.#db.client.tx(async (t) => {
+				const owner = await t.oneOrNone(`SELECT "datasetId" FROM ${experimentsTable} WHERE "id" = $1`, [input.experimentId]);
+				const purgeMetadata = await this.#resolvePurgeMetadata(t, owner?.datasetId, input.itemId);
 				const existing = await t.oneOrNone(`SELECT "id" FROM ${tableName} WHERE "experimentId" = $1 AND "itemId" = $2 AND COALESCE("attempt", 0) = $3 FOR UPDATE`, [
 					input.experimentId,
 					input.itemId,
@@ -7407,19 +7481,19 @@ var ExperimentsPG = class ExperimentsPG extends _mastra_core_storage.Experiments
 						input.itemDatasetVersion ?? null,
 						input.organizationId ?? null,
 						input.projectId ?? null,
-						JSON.stringify(input.input),
-						input.output != null ? JSON.stringify(input.output) : null,
-						input.groundTruth != null ? JSON.stringify(input.groundTruth) : null,
-						input.metadata != null ? JSON.stringify(input.metadata) : null,
-						input.error != null ? JSON.stringify(input.error) : null,
+						JSON.stringify(purgeMetadata ? null : input.input),
+						purgeMetadata || input.output == null ? null : JSON.stringify(input.output),
+						purgeMetadata || input.groundTruth == null ? null : JSON.stringify(input.groundTruth),
+						JSON.stringify(purgeMetadata ?? input.metadata ?? null),
+						purgeMetadata || input.error == null ? null : JSON.stringify(input.error),
 						input.startedAt.toISOString(),
 						input.completedAt.toISOString(),
 						input.retryCount,
 						attempt,
 						input.traceId ?? null,
 						input.status ?? null,
-						input.tags != null ? JSON.stringify(input.tags) : null,
-						input.toolMockReport != null ? JSON.stringify(input.toolMockReport) : null,
+						purgeMetadata || input.tags == null ? null : JSON.stringify(input.tags),
+						purgeMetadata || input.toolMockReport == null ? null : JSON.stringify(input.toolMockReport),
 						(/* @__PURE__ */ new Date()).toISOString()
 					]);
 				}
@@ -7433,19 +7507,19 @@ var ExperimentsPG = class ExperimentsPG extends _mastra_core_storage.Experiments
 					input.itemDatasetVersion ?? null,
 					input.organizationId ?? null,
 					input.projectId ?? null,
-					JSON.stringify(input.input),
-					input.output != null ? JSON.stringify(input.output) : null,
-					input.groundTruth != null ? JSON.stringify(input.groundTruth) : null,
-					input.metadata != null ? JSON.stringify(input.metadata) : null,
-					input.error != null ? JSON.stringify(input.error) : null,
+					JSON.stringify(purgeMetadata ? null : input.input),
+					purgeMetadata || input.output == null ? null : JSON.stringify(input.output),
+					purgeMetadata || input.groundTruth == null ? null : JSON.stringify(input.groundTruth),
+					JSON.stringify(purgeMetadata ?? input.metadata ?? null),
+					purgeMetadata || input.error == null ? null : JSON.stringify(input.error),
 					input.startedAt.toISOString(),
 					input.completedAt.toISOString(),
 					input.retryCount,
 					attempt,
 					input.traceId ?? null,
 					input.status ?? null,
-					input.tags != null ? JSON.stringify(input.tags) : null,
-					input.toolMockReport != null ? JSON.stringify(input.toolMockReport) : null
+					purgeMetadata || input.tags == null ? null : JSON.stringify(input.tags),
+					purgeMetadata || input.toolMockReport == null ? null : JSON.stringify(input.toolMockReport)
 				]);
 			});
 			return this.transformExperimentResultRow(row);
@@ -7463,39 +7537,34 @@ var ExperimentsPG = class ExperimentsPG extends _mastra_core_storage.Experiments
 				indexName: _mastra_core_storage.TABLE_EXPERIMENT_RESULTS,
 				schemaName: getSchemaName$5(this.#schema)
 			});
-			const setClauses = [];
-			const values = [];
-			let paramIndex = 1;
-			if (input.status !== void 0) {
-				setClauses.push(`"status" = $${paramIndex++}`);
-				values.push(input.status);
-			}
-			if (input.tags !== void 0) {
-				setClauses.push(`"tags" = $${paramIndex++}`);
-				values.push(JSON.stringify(input.tags));
-			}
-			if (input.comment !== void 0) {
-				setClauses.push(`"comment" = $${paramIndex++}`);
-				values.push(input.comment);
-			}
-			if (setClauses.length === 0) {
-				const existing = await this.#getExperimentResultById(this.#db.client, { id: input.id });
-				if (!existing) throw new _mastra_core_error.MastraError({
-					id: (0, _mastra_core_storage.createStorageErrorId)("PG", "UPDATE_EXPERIMENT_RESULT", "NOT_FOUND"),
-					domain: _mastra_core_error.ErrorDomain.STORAGE,
-					category: _mastra_core_error.ErrorCategory.USER,
-					details: { resultId: input.id }
-				});
-				return existing;
-			}
-			values.push(input.id);
-			let whereClause = `"id" = $${paramIndex}`;
-			if (input.experimentId) {
-				paramIndex++;
-				values.push(input.experimentId);
-				whereClause += ` AND "experimentId" = $${paramIndex}`;
-			}
-			const row = await this.#db.client.oneOrNone(`UPDATE ${tableName} SET ${setClauses.join(", ")} WHERE ${whereClause} RETURNING *`, values);
+			const experimentsTable = getTableName$5({
+				indexName: _mastra_core_storage.TABLE_EXPERIMENTS,
+				schemaName: getSchemaName$5(this.#schema)
+			});
+			const row = await this.#db.client.tx(async (t) => {
+				const owner = await t.oneOrNone(`SELECT e."datasetId", r."itemId"
+           FROM ${tableName} r
+           JOIN ${experimentsTable} e ON e."id" = r."experimentId"
+           WHERE r."id" = $1${input.experimentId !== void 0 ? " AND r.\"experimentId\" = $2" : ""}`, input.experimentId !== void 0 ? [input.id, input.experimentId] : [input.id]);
+				if (!owner) return null;
+				const purgeMetadata = await this.#resolvePurgeMetadata(t, owner.datasetId, owner.itemId);
+				return t.oneOrNone(`UPDATE ${tableName}
+           SET "status" = CASE WHEN $2 THEN $3 ELSE "status" END,
+               "tags" = CASE WHEN $4 THEN NULL WHEN $5 THEN $6::jsonb ELSE "tags" END,
+               "comment" = CASE WHEN $4 THEN NULL WHEN $7 THEN $8 ELSE "comment" END
+           WHERE "id" = $1${input.experimentId !== void 0 ? " AND \"experimentId\" = $9" : ""}
+           RETURNING *`, [
+					input.id,
+					input.status !== void 0,
+					input.status ?? null,
+					Boolean(purgeMetadata),
+					input.tags !== void 0,
+					input.tags === void 0 ? null : JSON.stringify(input.tags),
+					input.comment !== void 0,
+					input.comment ?? null,
+					...input.experimentId !== void 0 ? [input.experimentId] : []
+				]);
+			});
 			if (!row) throw new _mastra_core_error.MastraError({
 				id: (0, _mastra_core_storage.createStorageErrorId)("PG", "UPDATE_EXPERIMENT_RESULT", "NOT_FOUND"),
 				domain: _mastra_core_error.ErrorDomain.STORAGE,
@@ -10895,12 +10964,13 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 	/**
 	* Reads one page of messages together with the total row count.
 	*
-	* `COUNT(*) OVER ()` reports the count over the whole WHERE result on the same
-	* statement as the page, so the page costs one database round-trip instead of
-	* two. The page and the count also come from one snapshot, so the count always
-	* describes the returned rows. A separate `COUNT(*)` runs only when the page is
-	* empty and the caller asked for a page after the last row, because a window
-	* function has no row to carry the count on.
+	* Every page query carries a skinny scalar `(SELECT COUNT(*) ...)` subquery that
+	* reports the total over the whole WHERE result on the same statement as the page,
+	* so the page costs one database round-trip instead of two. The page and the count
+	* also come from one snapshot, so the count always describes the returned rows. A
+	* separate `COUNT(*)` runs only as a fallback when the page is empty and the caller
+	* asked for a page after the last row, because there is then no row to carry the
+	* count on.
 	*/
 	async #fetchMessagePage({ selectStatement, tableName, whereClause, orderByStatement, queryParams, perPageInput, perPage, offset }) {
 		const limitClause = perPageInput === false ? "" : ` LIMIT $${queryParams.length + 1} OFFSET $${queryParams.length + 2}`;
@@ -10909,7 +10979,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 			perPage,
 			offset
 		];
-		const rows = await this.#db.readClient.manyOrNone(`${selectStatement}, COUNT(*) OVER () AS "__total" FROM ${tableName} ${whereClause} ${orderByStatement}${limitClause}`, dataParams) || [];
+		const rows = await this.#db.readClient.manyOrNone(`${selectStatement}, (SELECT COUNT(*) FROM ${tableName} ${whereClause}) AS "__total" FROM ${tableName} ${whereClause} ${orderByStatement}${limitClause}`, dataParams) || [];
 		if (rows.length > 0) return {
 			total: Number(rows[0].__total),
 			messages: rows
@@ -10948,7 +11018,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 		const metadataFilter = (0, _mastra_core_storage.validateStorageMetadataFilter)(filter?.metadata);
 		try {
 			const { field, direction } = this.parseOrderBy(orderBy, "ASC");
-			const orderByStatement = `ORDER BY COALESCE("${field}Z", "${field}") ${direction}`;
+			const orderByStatement = `ORDER BY "${field}" ${direction}`;
 			const selectStatement = `SELECT id, content, role, type, "createdAt", "createdAtZ", thread_id AS "threadId", "resourceId"`;
 			const tableName = getTableName$3({
 				indexName: _mastra_core_storage.TABLE_MESSAGES,
@@ -11096,7 +11166,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 		const metadataFilter = (0, _mastra_core_storage.validateStorageMetadataFilter)(filter?.metadata);
 		try {
 			const { field, direction } = this.parseOrderBy(orderBy, "ASC");
-			const orderByStatement = `ORDER BY COALESCE("${field}Z", "${field}") ${direction}`;
+			const orderByStatement = `ORDER BY "${field}" ${direction}`;
 			const selectStatement = `SELECT id, content, role, type, "createdAt", "createdAtZ", thread_id AS "threadId", "resourceId"`;
 			const tableName = getTableName$3({
 				indexName: _mastra_core_storage.TABLE_MESSAGES,
@@ -23057,6 +23127,11 @@ var PgFactoryStorage = class extends _mastra_core_storage.FactoryStorage {
 			if (!spec.nullable || spec.type === "uuid-pk" || spec.primaryKey) continue;
 			await this.#pool.query(`ALTER TABLE "${schema.name}" ALTER COLUMN "${name}" DROP NOT NULL`);
 		}
+		for (const [name, spec] of Object.entries(schema.columns)) {
+			if (spec.type !== "bigint") continue;
+			const { rows } = await this.#pool.query(`SELECT data_type FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = $1 AND column_name = $2`, [schema.name, name]);
+			if (rows[0]?.data_type === "integer") await this.#pool.query(`ALTER TABLE "${schema.name}" ALTER COLUMN "${name}" TYPE BIGINT`);
+		}
 		for (const index of schema.uniqueIndexes ?? []) {
 			assertIdentifier("index", index.name);
 			index.columns.forEach((column) => assertIdentifier("column", column));