@mastra/pg 1.27.1-alpha.0 → 1.27.2-alpha.0

package/dist/index.js

@@ -94,6 +94,34 @@ function buildConnectionStringPoolConfig(config, defaults) {
 	};
 }
 //#endregion
+//#region src/shared/schema-name.ts
+const POSTGRES_IDENTIFIER_MAX_BYTES = 63;
+const UNSAFE_SCHEMA_NAME_CHARS = /["'\\$\u0000-\u001f\u007f]/;
+/**
+* Validates a PostgreSQL schema name.
+*
+* Schema names are always double-quoted in generated SQL, so PostgreSQL accepts any name
+* that fits the identifier limit (for example `my-tenant`). Quotes, backslashes, `$` and
+* control characters are rejected so the name can never break out of a quoted identifier,
+* a string literal, or a dollar-quoted block.
+*/
+function parseSchemaName(name, kind = "schema name") {
+	if (typeof name !== "string" || name.length === 0 || UNSAFE_SCHEMA_NAME_CHARS.test(name) || Buffer.byteLength(name, "utf-8") > POSTGRES_IDENTIFIER_MAX_BYTES) throw new Error(`Invalid ${kind}: ${name}. Must be 1-${POSTGRES_IDENTIFIER_MAX_BYTES} bytes long and must not contain quotes, backslashes, "$", or control characters.`);
+	return name;
+}
+/**
+* Turns a schema name into a string that is safe to use as part of an unquoted identifier,
+* such as the schema prefix of an index or constraint name.
+*
+* Names that are already plain identifiers (letters, digits, underscores) are returned
+* unchanged, so existing index and constraint names keep working. Any other character
+* becomes `_`, e.g. `my-tenant` -> `my_tenant`.
+*/
+function schemaNamePrefix(name) {
+	const sanitized = parseSchemaName(name).replace(/[^A-Za-z0-9_]/g, "_");
+	return /^[0-9]/.test(sanitized) ? `_${sanitized}` : sanitized;
+}
+//#endregion
 //#region src/vector/filter.ts
 /**
 * Translates MongoDB-style filters to PG compatible filters.
@@ -718,7 +746,8 @@ var PgVector = class extends MastraVector {
 		if (vectorType === "bit") return dimension ? `bit(${dimension})` : "bit";
 		if (this.vectorExtensionSchema) {
 			if (this.vectorExtensionSchema === "pg_catalog") return vectorType;
-			return `${parseSqlIdentifier(this.vectorExtensionSchema, "vector extension schema")}.${vectorType}`;
+			const extensionSchema = parseSchemaName(this.vectorExtensionSchema, "vector extension schema");
+			return `${/^[A-Za-z_][A-Za-z0-9_]*$/.test(extensionSchema) ? extensionSchema : `"${extensionSchema}"`}.${vectorType}`;
 		}
 		return vectorType;
 	}
@@ -796,7 +825,7 @@ var PgVector = class extends MastraVector {
 		};
 	}
 	getSchemaName() {
-		return this.schema ? `"${parseSqlIdentifier(this.schema, "schema name")}"` : void 0;
+		return this.schema ? `"${parseSchemaName(this.schema)}"` : void 0;
 	}
 	async ensureNamespaceSchema(indexName, client) {
 		const { tableName, parsedIndexName } = this.getTableName(indexName);
@@ -2551,7 +2580,7 @@ function resolvePgConfig(config) {
 	};
 }
 function getSchemaName$6(schema) {
-	return schema ? `"${parseSqlIdentifier(schema, "schema name")}"` : "\"public\"";
+	return schema ? `"${parseSchemaName(schema)}"` : "\"public\"";
 }
 function getTableName$6({ indexName, schemaName }) {
 	const quotedIndexName = `"${parseSqlIdentifier(indexName, "index name")}"`;
@@ -2590,7 +2619,7 @@ function generateTableSQL({ tableName, schema, schemaName, compositePrimaryKey,
 		...timeZColumns,
 		...tableConstraints
 	].join(",\n");
-	const parsedSchemaName = schemaName ? parseSqlIdentifier(schemaName, "schema name") : "";
+	const parsedSchemaName = schemaName ? schemaNamePrefix(schemaName) : "";
 	const workflowSnapshotConstraint = buildConstraintName({
 		baseName: "mastra_workflow_snapshot_workflow_name_run_id_key",
 		schemaName: parsedSchemaName || void 0
@@ -2600,7 +2629,7 @@ function generateTableSQL({ tableName, schema, schemaName, compositePrimaryKey,
 		schemaName: parsedSchemaName || void 0
 	});
 	const quotedSchemaName = getSchemaName$6(schemaName);
-	const schemaFilter = parsedSchemaName || "public";
+	const schemaFilter = schemaName ? parseSchemaName(schemaName) : "public";
 	return `
             CREATE TABLE IF NOT EXISTS ${getTableName$6({
 		indexName: tableName,
@@ -2726,7 +2755,7 @@ BEGIN
         JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
         WHERE tg.tgname = ${`'${parsedTriggerName}'`}
           AND c.relname = ${`'${parseSqlIdentifier(tableName, "table name")}'`}
-          AND n.nspname = ${schemaName ? `'${parseSqlIdentifier(schemaName, "schema name")}'` : `'public'`}
+          AND n.nspname = ${schemaName ? `'${parseSchemaName(schemaName)}'` : `'public'`}
           AND NOT tg.tgisinternal
           AND tg.tgtype = 23
           AND tg.tgfoid = '${functionName}()'::regprocedure
@@ -2795,7 +2824,7 @@ var PgDB = class extends MastraBase {
 		if (tableName === TABLE_WORKFLOW_SNAPSHOT) {
 			const constraintName = buildConstraintName({
 				baseName: "mastra_workflow_snapshot_workflow_name_run_id_key",
-				schemaName: this.schemaName ? parseSqlIdentifier(this.schemaName, "schema name") : void 0
+				schemaName: this.schemaName ? schemaNamePrefix(this.schemaName) : void 0
 			}).toLowerCase();
 			return snapshot.indexes.has(constraintName) && snapshot.replicaIdentityIndexes.has(constraintName);
 		}
@@ -3400,7 +3429,7 @@ MIGRATION REQUIRED: Duplicate spans detected in ${duplicateInfo.tableName}\n====
 	async spansPrimaryKeyExists() {
 		const constraintName = buildConstraintName({
 			baseName: "mastra_ai_spans_traceid_spanid_pk",
-			schemaName: (this.schemaName ? parseSqlIdentifier(this.schemaName, "schema name") : "") || void 0
+			schemaName: (this.schemaName ? schemaNamePrefix(this.schemaName) : "") || void 0
 		});
 		const schemaFilter = this.schemaName || "public";
 		const snapshot = this.schemaSnapshot;
@@ -3422,7 +3451,7 @@ MIGRATION REQUIRED: Duplicate spans detected in ${duplicateInfo.tableName}\n====
 		});
 		const constraintName = buildConstraintName({
 			baseName: "mastra_ai_spans_traceid_spanid_pk",
-			schemaName: (this.schemaName ? parseSqlIdentifier(this.schemaName, "schema name") : "") || void 0
+			schemaName: (this.schemaName ? schemaNamePrefix(this.schemaName) : "") || void 0
 		});
 		const schemaFilter = this.schemaName || "public";
 		try {
@@ -4015,7 +4044,7 @@ MIGRATION REQUIRED: Duplicate spans detected in ${duplicateInfo.tableName}\n====
 //#endregion
 //#region src/storage/domains/utils.ts
 function getSchemaName$5(schema) {
-	return schema ? `"${parseSqlIdentifier(schema, "schema name")}"` : void 0;
+	return schema ? `"${parseSchemaName(schema)}"` : void 0;
 }
 function getTableName$5({ indexName, schemaName }) {
 	const quotedIndexName = `"${parseSqlIdentifier(indexName, "index name")}"`;
@@ -5069,7 +5098,7 @@ var BackgroundTasksPG = class BackgroundTasksPG extends BackgroundTasksStorage {
 	* so its supporting index is not part of the default index set.
 	*/
 	async ensureRetentionIndexes(policies) {
-		const prefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const prefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		for (const [key, entry] of Object.entries(BackgroundTasksPG.retentionTables)) {
 			if (!entry.indexed || !policies[key]) continue;
 			try {
@@ -5124,7 +5153,7 @@ var BackgroundTasksPG = class BackgroundTasksPG extends BackgroundTasksStorage {
 	}
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? parseSqlIdentifier(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		statements.push(generateTableSQL({
 			tableName: TABLE_BACKGROUND_TASKS,
@@ -5136,7 +5165,7 @@ var BackgroundTasksPG = class BackgroundTasksPG extends BackgroundTasksStorage {
 		return statements;
 	}
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return BackgroundTasksPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	async createDefaultIndexes() {
@@ -5498,7 +5527,7 @@ var ChannelsPG = class ChannelsPG extends ChannelsStorage {
 	}
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? parseSqlIdentifier(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		for (const tableName of ChannelsPG.MANAGED_TABLES) statements.push(generateTableSQL({
 			tableName,
@@ -5510,7 +5539,7 @@ var ChannelsPG = class ChannelsPG extends ChannelsStorage {
 		return statements;
 	}
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return ChannelsPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	async createDefaultIndexes() {
@@ -7022,7 +7051,7 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 	* so its supporting index is not part of the default index set.
 	*/
 	async ensureRetentionIndexes(policies) {
-		const prefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const prefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		for (const [key, entry] of Object.entries(ExperimentsPG.retentionTables)) {
 			if (!entry.indexed || !policies[key]) continue;
 			try {
@@ -8190,7 +8219,7 @@ function postgresSql(sql, schemaName) {
 		return transformed;
 	});
 	if (schemaName) {
-		const quotedSchema = `"${parseSqlIdentifier(schemaName, "schema name")}"`;
+		const quotedSchema = `"${parseSchemaName(schemaName)}"`;
 		normalized = transformSqlCode(normalized, (code) => {
 			let transformed = code;
 			for (const table of [
@@ -8303,7 +8332,7 @@ function parseOutbox(row) {
 function knowledgeIndexes(schemaName) {
 	const table = (name) => {
 		const quotedName = `"${parseSqlIdentifier(name, "table name")}"`;
-		return schemaName ? `"${parseSqlIdentifier(schemaName, "schema name")}".${quotedName}` : quotedName;
+		return schemaName ? `"${parseSchemaName(schemaName)}".${quotedName}` : quotedName;
 	};
 	return [
 		{
@@ -9207,7 +9236,7 @@ var MCPClientsPG = class MCPClientsPG extends MCPClientsStorage {
 	}
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? parseSqlIdentifier(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		for (const tableName of MCPClientsPG.MANAGED_TABLES) statements.push(generateTableSQL({
 			tableName,
@@ -9219,7 +9248,7 @@ var MCPClientsPG = class MCPClientsPG extends MCPClientsStorage {
 		return statements;
 	}
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return MCPClientsPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	async createDefaultIndexes() {
@@ -9775,7 +9804,7 @@ var MCPServersPG = class MCPServersPG extends MCPServersStorage {
 	}
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? parseSqlIdentifier(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		for (const tableName of MCPServersPG.MANAGED_TABLES) statements.push(generateTableSQL({
 			tableName,
@@ -9787,7 +9816,7 @@ var MCPServersPG = class MCPServersPG extends MCPServersStorage {
 		return statements;
 	}
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return MCPServersPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	async createDefaultIndexes() {
@@ -10320,6 +10349,12 @@ var MCPServersPG = class MCPServersPG extends MCPServersStorage {
 * versions that don't export TABLE_OBSERVATIONAL_MEMORY.
 */
 const OM_TABLE = "mastra_observational_memory";
+/**
+* Newest generation first. Databases written before generation creation was
+* serialized can hold several rows with the same generation; the earliest-created
+* one wins so the active record stays stable across reads.
+*/
+const OM_GENERATION_ORDER = `"generationCount" DESC, "createdAt" ASC, id ASC`;
 const POSTGRES_MAX_BIND_PARAMETERS = 65535;
 const MESSAGE_INSERT_BIND_PARAMETERS = 8;
 const MAX_MESSAGES_PER_INSERT = Math.floor(POSTGRES_MAX_BIND_PARAMETERS / MESSAGE_INSERT_BIND_PARAMETERS);
@@ -10497,7 +10532,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 	* so its supporting index is not part of the default index set.
 	*/
 	async ensureRetentionIndexes(policies) {
-		const prefix = this.#schema && this.#schema !== "public" ? `${this.#schema}_` : "";
+		const prefix = this.#schema && this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		for (const [key, entry] of Object.entries(MemoryPG.retentionTables)) {
 			if (!entry.indexed || !policies[key]) continue;
 			try {
@@ -10532,7 +10567,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 	*/
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? parseSqlIdentifier(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		const quotedSchemaName = getSchemaName$6(schemaName);
 		for (const tableName of [
@@ -10567,7 +10602,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 	* Returns default index definitions for this instance's schema.
 	*/
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return MemoryPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	/**
@@ -11921,6 +11956,23 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 	getOMKey(threadId, resourceId) {
 		return threadId ? `thread:${threadId}` : `resource:${resourceId}`;
 	}
+	/**
+	* Runs `fn` in a transaction that holds an advisory lock for one OM lookup key.
+	*
+	* The table has no unique constraint on ("lookupKey", "generationCount"), and
+	* adding one would fail on databases that already contain duplicates. The lock
+	* serializes generation creation across processes instead. It is
+	* transaction-scoped so it also works behind transaction-pooling proxies.
+	*/
+	async #withOMLookupKeyLock(tableName, lookupKey, fn) {
+		return this.#db.client.tx(async (t) => {
+			await t.query("SELECT pg_advisory_xact_lock(hashtextextended($1, 0))", [`${tableName}:${lookupKey}`]);
+			return fn(t);
+		});
+	}
+	async #getLatestOMRow(client, tableName, lookupKey) {
+		return client.oneOrNone(`SELECT * FROM ${tableName} WHERE "lookupKey" = $1 ORDER BY ${OM_GENERATION_ORDER} LIMIT 1`, [lookupKey]);
+	}
 	parseOMRow(row) {
 		return {
 			id: row.id,
@@ -11963,7 +12015,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 				indexName: OM_TABLE,
 				schemaName: getSchemaName$3(this.#schema)
 			});
-			const result = await this.#db.readClient.oneOrNone(`SELECT * FROM ${tableName} WHERE "lookupKey" = $1 ORDER BY "generationCount" DESC LIMIT 1`, [lookupKey]);
+			const result = await this.#getLatestOMRow(this.#db.readClient, tableName, lookupKey);
 			if (!result) return null;
 			return this.parseOMRow(result);
 		} catch (error) {
@@ -11999,7 +12051,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 				paramIndex++;
 			}
 			params.push(limit);
-			let sql = `SELECT * FROM ${tableName} WHERE ${conditions.join(" AND ")} ORDER BY "generationCount" DESC LIMIT $${paramIndex}`;
+			let sql = `SELECT * FROM ${tableName} WHERE ${conditions.join(" AND ")} ORDER BY ${OM_GENERATION_ORDER} LIMIT $${paramIndex}`;
 			paramIndex++;
 			if (options?.offset != null) {
 				params.push(options.offset);
@@ -12054,7 +12106,10 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 				schemaName: getSchemaName$3(this.#schema)
 			});
 			const nowStr = now.toISOString();
-			await this.#db.client.none(`INSERT INTO ${tableName} (
+			return await this.#withOMLookupKeyLock(tableName, lookupKey, async (t) => {
+				const existing = await this.#getLatestOMRow(t, tableName, lookupKey);
+				if (existing) return this.parseOMRow(existing);
+				await t.none(`INSERT INTO ${tableName} (
           id, "lookupKey", scope, "resourceId", "threadId",
           "activeObservations", "activeObservationsPendingUpdate",
           "originType", config, "generationCount", "lastObservedAt", "lastObservedAtZ", "lastReflectionAt", "lastReflectionAtZ",
@@ -12062,36 +12117,37 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
           "isObserving", "isReflecting", "isBufferingObservation", "isBufferingReflection", "lastBufferedAtTokens", "lastBufferedAtTime",
           "observedTimezone", "createdAt", "createdAtZ", "updatedAt", "updatedAtZ"
         ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28)`, [
-				id,
-				lookupKey,
-				input.scope,
-				input.resourceId,
-				input.threadId || null,
-				"",
-				null,
-				"initial",
-				toPgJson(input.config),
-				0,
-				null,
-				null,
-				null,
-				null,
-				0,
-				0,
-				0,
-				false,
-				false,
-				false,
-				false,
-				0,
-				null,
-				input.observedTimezone || null,
-				nowStr,
-				nowStr,
-				nowStr,
-				nowStr
-			]);
-			return record;
+					id,
+					lookupKey,
+					input.scope,
+					input.resourceId,
+					input.threadId || null,
+					"",
+					null,
+					"initial",
+					toPgJson(input.config),
+					0,
+					null,
+					null,
+					null,
+					null,
+					0,
+					0,
+					0,
+					false,
+					false,
+					false,
+					false,
+					0,
+					null,
+					input.observedTimezone || null,
+					nowStr,
+					nowStr,
+					nowStr,
+					nowStr
+				]);
+				return record;
+			});
 		} catch (error) {
 			throw new MastraError({
 				id: createStorageErrorId("PG", "INITIALIZE_OBSERVATIONAL_MEMORY", "FAILED"),
@@ -12223,78 +12279,16 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 	}
 	async createReflectionGeneration(input) {
 		try {
-			const id = crypto.randomUUID();
-			const now = /* @__PURE__ */ new Date();
 			const lookupKey = this.getOMKey(input.currentRecord.threadId, input.currentRecord.resourceId);
-			const record = {
-				id,
-				scope: input.currentRecord.scope,
-				threadId: input.currentRecord.threadId,
-				resourceId: input.currentRecord.resourceId,
-				createdAt: now,
-				updatedAt: now,
-				lastObservedAt: input.currentRecord.lastObservedAt,
-				originType: "reflection",
-				generationCount: input.currentRecord.generationCount + 1,
-				activeObservations: input.reflection,
-				totalTokensObserved: input.currentRecord.totalTokensObserved,
-				observationTokenCount: input.tokenCount,
-				pendingMessageTokens: 0,
-				isReflecting: false,
-				isObserving: false,
-				isBufferingObservation: false,
-				isBufferingReflection: false,
-				lastBufferedAtTokens: 0,
-				lastBufferedAtTime: null,
-				config: input.currentRecord.config,
-				metadata: input.currentRecord.metadata,
-				observedTimezone: input.currentRecord.observedTimezone
-			};
 			const tableName = getTableName$3({
 				indexName: OM_TABLE,
 				schemaName: getSchemaName$3(this.#schema)
 			});
-			const nowStr = now.toISOString();
-			const lastObservedAtStr = record.lastObservedAt?.toISOString() || null;
-			await this.#db.client.none(`INSERT INTO ${tableName} (
-          id, "lookupKey", scope, "resourceId", "threadId",
-          "activeObservations", "activeObservationsPendingUpdate",
-          "originType", config, "generationCount", "lastObservedAt", "lastObservedAtZ", "lastReflectionAt", "lastReflectionAtZ",
-          "pendingMessageTokens", "totalTokensObserved", "observationTokenCount",
-          "isObserving", "isReflecting", "isBufferingObservation", "isBufferingReflection", "lastBufferedAtTokens", "lastBufferedAtTime",
-          "observedTimezone", metadata, "createdAt", "createdAtZ", "updatedAt", "updatedAtZ"
-        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28, $29)`, [
-				id,
-				lookupKey,
-				record.scope,
-				record.resourceId,
-				record.threadId || null,
-				input.reflection,
-				null,
-				"reflection",
-				toPgJson(record.config),
-				input.currentRecord.generationCount + 1,
-				lastObservedAtStr,
-				lastObservedAtStr,
-				nowStr,
-				nowStr,
-				record.pendingMessageTokens,
-				Math.round(record.totalTokensObserved),
-				Math.round(record.observationTokenCount),
-				false,
-				false,
-				false,
-				false,
-				0,
-				null,
-				record.observedTimezone || null,
-				record.metadata ? toPgJson(record.metadata) : null,
-				nowStr,
-				nowStr,
-				nowStr,
-				nowStr
-			]);
-			return record;
+			return await this.#withOMLookupKeyLock(tableName, lookupKey, async (t) => {
+				const newer = await this.#getNewerOMGeneration(t, tableName, lookupKey, input.currentRecord.generationCount);
+				if (newer) return newer;
+				return this.#insertReflectionGeneration(t, tableName, lookupKey, input);
+			});
 		} catch (error) {
 			throw new MastraError({
 				id: createStorageErrorId("PG", "CREATE_REFLECTION_GENERATION", "FAILED"),
@@ -12304,6 +12298,84 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 			}, error);
 		}
 	}
+	/**
+	* Returns the active record when another writer already created a generation
+	* after `generationCount`. Reflecting from the older generation again would
+	* add a second record with the same generation.
+	*/
+	async #getNewerOMGeneration(t, tableName, lookupKey, generationCount) {
+		const latest = await this.#getLatestOMRow(t, tableName, lookupKey);
+		return latest && Number(latest.generationCount) > generationCount ? this.parseOMRow(latest) : null;
+	}
+	async #insertReflectionGeneration(t, tableName, lookupKey, input) {
+		const id = crypto.randomUUID();
+		const now = /* @__PURE__ */ new Date();
+		const record = {
+			id,
+			scope: input.currentRecord.scope,
+			threadId: input.currentRecord.threadId,
+			resourceId: input.currentRecord.resourceId,
+			createdAt: now,
+			updatedAt: now,
+			lastObservedAt: input.currentRecord.lastObservedAt,
+			originType: "reflection",
+			generationCount: input.currentRecord.generationCount + 1,
+			activeObservations: input.reflection,
+			totalTokensObserved: input.currentRecord.totalTokensObserved,
+			observationTokenCount: input.tokenCount,
+			pendingMessageTokens: 0,
+			isReflecting: false,
+			isObserving: false,
+			isBufferingObservation: false,
+			isBufferingReflection: false,
+			lastBufferedAtTokens: 0,
+			lastBufferedAtTime: null,
+			config: input.currentRecord.config,
+			metadata: input.currentRecord.metadata,
+			observedTimezone: input.currentRecord.observedTimezone
+		};
+		const nowStr = now.toISOString();
+		const lastObservedAtStr = record.lastObservedAt?.toISOString() || null;
+		await t.none(`INSERT INTO ${tableName} (
+        id, "lookupKey", scope, "resourceId", "threadId",
+        "activeObservations", "activeObservationsPendingUpdate",
+        "originType", config, "generationCount", "lastObservedAt", "lastObservedAtZ", "lastReflectionAt", "lastReflectionAtZ",
+        "pendingMessageTokens", "totalTokensObserved", "observationTokenCount",
+        "isObserving", "isReflecting", "isBufferingObservation", "isBufferingReflection", "lastBufferedAtTokens", "lastBufferedAtTime",
+        "observedTimezone", metadata, "createdAt", "createdAtZ", "updatedAt", "updatedAtZ"
+      ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28, $29)`, [
+			id,
+			lookupKey,
+			record.scope,
+			record.resourceId,
+			record.threadId || null,
+			input.reflection,
+			null,
+			"reflection",
+			toPgJson(record.config),
+			input.currentRecord.generationCount + 1,
+			lastObservedAtStr,
+			lastObservedAtStr,
+			nowStr,
+			nowStr,
+			record.pendingMessageTokens,
+			Math.round(record.totalTokensObserved),
+			Math.round(record.observationTokenCount),
+			false,
+			false,
+			false,
+			false,
+			0,
+			null,
+			record.observedTimezone || null,
+			record.metadata ? toPgJson(record.metadata) : null,
+			nowStr,
+			nowStr,
+			nowStr,
+			nowStr
+		]);
+		return record;
+	}
 	async setReflectingFlag(id, isReflecting) {
 		try {
 			const tableName = getTableName$3({
@@ -12798,32 +12870,36 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 				indexName: OM_TABLE,
 				schemaName: getSchemaName$3(this.#schema)
 			});
-			const record = await this.#db.client.oneOrNone(`SELECT * FROM ${tableName} WHERE id = $1`, [input.currentRecord.id]);
-			if (!record) throw new MastraError({
-				id: createStorageErrorId("PG", "SWAP_BUFFERED_REFLECTION_TO_ACTIVE", "NOT_FOUND"),
-				text: `Observational memory record not found: ${input.currentRecord.id}`,
-				domain: ErrorDomain.STORAGE,
-				category: ErrorCategory.THIRD_PARTY,
-				details: { id: input.currentRecord.id }
-			});
-			const bufferedReflection = record.bufferedReflection || "";
-			const reflectedLineCount = Number(record.reflectedObservationLineCount || 0);
-			if (!bufferedReflection) throw new MastraError({
-				id: createStorageErrorId("PG", "SWAP_BUFFERED_REFLECTION_TO_ACTIVE", "NO_CONTENT"),
-				text: "No buffered reflection to swap",
-				domain: ErrorDomain.STORAGE,
-				category: ErrorCategory.USER,
-				details: { id: input.currentRecord.id }
-			});
-			const unreflectedContent = (record.activeObservations || "").split("\n").slice(reflectedLineCount).join("\n").trim();
-			const newObservations = unreflectedContent ? `${bufferedReflection}\n\n${unreflectedContent}` : bufferedReflection;
-			const newRecord = await this.createReflectionGeneration({
-				currentRecord: input.currentRecord,
-				reflection: newObservations,
-				tokenCount: input.tokenCount
-			});
-			const nowStr = (/* @__PURE__ */ new Date()).toISOString();
-			await this.#db.client.query(`UPDATE ${tableName} SET
+			const lookupKey = this.getOMKey(input.currentRecord.threadId, input.currentRecord.resourceId);
+			return await this.#withOMLookupKeyLock(tableName, lookupKey, async (t) => {
+				const newer = await this.#getNewerOMGeneration(t, tableName, lookupKey, input.currentRecord.generationCount);
+				if (newer) return newer;
+				const record = await t.oneOrNone(`SELECT * FROM ${tableName} WHERE id = $1`, [input.currentRecord.id]);
+				if (!record) throw new MastraError({
+					id: createStorageErrorId("PG", "SWAP_BUFFERED_REFLECTION_TO_ACTIVE", "NOT_FOUND"),
+					text: `Observational memory record not found: ${input.currentRecord.id}`,
+					domain: ErrorDomain.STORAGE,
+					category: ErrorCategory.THIRD_PARTY,
+					details: { id: input.currentRecord.id }
+				});
+				const bufferedReflection = record.bufferedReflection || "";
+				const reflectedLineCount = Number(record.reflectedObservationLineCount || 0);
+				if (!bufferedReflection) throw new MastraError({
+					id: createStorageErrorId("PG", "SWAP_BUFFERED_REFLECTION_TO_ACTIVE", "NO_CONTENT"),
+					text: "No buffered reflection to swap",
+					domain: ErrorDomain.STORAGE,
+					category: ErrorCategory.USER,
+					details: { id: input.currentRecord.id }
+				});
+				const unreflectedContent = (record.activeObservations || "").split("\n").slice(reflectedLineCount).join("\n").trim();
+				const newObservations = unreflectedContent ? `${bufferedReflection}\n\n${unreflectedContent}` : bufferedReflection;
+				const newRecord = await this.#insertReflectionGeneration(t, tableName, lookupKey, {
+					currentRecord: input.currentRecord,
+					reflection: newObservations,
+					tokenCount: input.tokenCount
+				});
+				const nowStr = (/* @__PURE__ */ new Date()).toISOString();
+				await t.query(`UPDATE ${tableName} SET
           "bufferedReflection" = NULL,
           "bufferedReflectionTokens" = NULL,
           "bufferedReflectionInputTokens" = NULL,
@@ -12831,11 +12907,12 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
           "updatedAt" = $1,
           "updatedAtZ" = $2
         WHERE id = $3`, [
-				nowStr,
-				nowStr,
-				input.currentRecord.id
-			]);
-			return newRecord;
+					nowStr,
+					nowStr,
+					input.currentRecord.id
+				]);
+				return newRecord;
+			});
 		} catch (error) {
 			if (error instanceof MastraError) throw error;
 			throw new MastraError({
@@ -12975,7 +13052,7 @@ var NotificationsPG = class NotificationsPG extends NotificationsStorage {
 	* so its supporting index is not part of the default index set.
 	*/
 	async ensureRetentionIndexes(policies) {
-		const prefix = this.#schema && this.#schema !== "public" ? `${this.#schema}_` : "";
+		const prefix = this.#schema && this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		for (const [key, entry] of Object.entries(NotificationsPG.retentionTables)) {
 			if (!entry.indexed || !policies[key]) continue;
 			try {
@@ -13042,7 +13119,7 @@ var NotificationsPG = class NotificationsPG extends NotificationsStorage {
 	}
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? parseSqlIdentifier(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		statements.push(generateTableSQL({
 			tableName: TABLE_NOTIFICATIONS,
@@ -13054,7 +13131,7 @@ var NotificationsPG = class NotificationsPG extends NotificationsStorage {
 		return statements;
 	}
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return NotificationsPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	async createDefaultIndexes() {
@@ -13351,7 +13428,7 @@ var ObservabilityPG = class ObservabilityPG extends ObservabilityStorage {
 	* so its supporting index is not part of the default index set.
 	*/
 	async ensureRetentionIndexes(policies) {
-		const prefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const prefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		for (const [key, entry] of Object.entries(ObservabilityPG.retentionTables)) {
 			if (!entry.indexed || !policies[key]) continue;
 			try {
@@ -13432,7 +13509,7 @@ var ObservabilityPG = class ObservabilityPG extends ObservabilityStorage {
 	*/
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? parseSqlIdentifier(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		statements.push(generateTableSQL({
 			tableName: TABLE_SPANS,
@@ -13448,7 +13525,7 @@ var ObservabilityPG = class ObservabilityPG extends ObservabilityStorage {
 	* Returns default index definitions for this instance's schema.
 	*/
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return ObservabilityPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	/**
@@ -14659,15 +14736,15 @@ const SIGNAL_TIME_COLUMN = {
 };
 /** Returns a fully-qualified, double-quoted table name. */
 function qualifiedTable(schema, table) {
-	return `"${parseSqlIdentifier(schema, "schema name")}"."${parseSqlIdentifier(table, "table name")}"`;
+	return `"${parseSchemaName(schema)}"."${parseSqlIdentifier(table, "table name")}"`;
 }
 /** Returns a parsed, quoted, schema-prefixed object name (constraint, index, etc.). */
 function qualifiedName(schema, name) {
-	return `"${parseSqlIdentifier(schema, "schema name")}"."${parseSqlIdentifier(name, "object name")}"`;
+	return `"${parseSchemaName(schema)}"."${parseSqlIdentifier(name, "object name")}"`;
 }
 /** Schema CREATE. Safe to run repeatedly before table DDL. */
 function schemaDDL(schema) {
-	return `CREATE SCHEMA IF NOT EXISTS "${parseSqlIdentifier(schema, "schema name")}"`;
+	return `CREATE SCHEMA IF NOT EXISTS "${parseSchemaName(schema)}"`;
 }
 /**
 * Postgres declarative partitioning and Timescale hypertables are mutually
@@ -19207,7 +19284,7 @@ var PromptBlocksPG = class PromptBlocksPG extends PromptBlocksStorage {
 	*/
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? parseSqlIdentifier(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		for (const tableName of PromptBlocksPG.MANAGED_TABLES) statements.push(generateTableSQL({
 			tableName,
@@ -19219,7 +19296,7 @@ var PromptBlocksPG = class PromptBlocksPG extends PromptBlocksStorage {
 		return statements;
 	}
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return PromptBlocksPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	async createDefaultIndexes() {
@@ -19854,7 +19931,7 @@ var SchedulesPG = class SchedulesPG extends SchedulesStorage {
 	* so its supporting index is not part of the default index set.
 	*/
 	async ensureRetentionIndexes(policies) {
-		const prefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const prefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		for (const [key, entry] of Object.entries(SchedulesPG.retentionTables)) {
 			if (!entry.indexed || !policies[key]) continue;
 			try {
@@ -19902,7 +19979,7 @@ var SchedulesPG = class SchedulesPG extends SchedulesStorage {
 		}];
 	}
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return SchedulesPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	async createDefaultIndexes() {
@@ -19923,7 +20000,7 @@ var SchedulesPG = class SchedulesPG extends SchedulesStorage {
 	}
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? parseSqlIdentifier(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		statements.push(generateTableSQL({
 			tableName: TABLE_SCHEDULES,
@@ -19945,7 +20022,7 @@ var SchedulesPG = class SchedulesPG extends SchedulesStorage {
 		await this.#db.clearTable({ tableName: TABLE_SCHEDULES });
 	}
 	#table(tableName) {
-		return getTableName$2(tableName, getSchemaName$2(parseSqlIdentifier(this.#schema, "schema name")));
+		return getTableName$2(tableName, getSchemaName$2(parseSchemaName(this.#schema)));
 	}
 	async createSchedule(schedule) {
 		if (await this.#getSchedule(this.#client, schedule.id)) throw new Error(`Schedule with id "${schedule.id}" already exists`);
@@ -20150,7 +20227,7 @@ var ScorerDefinitionsPG = class ScorerDefinitionsPG extends ScorerDefinitionsSto
 	*/
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? parseSqlIdentifier(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		for (const tableName of ScorerDefinitionsPG.MANAGED_TABLES) statements.push(generateTableSQL({
 			tableName,
@@ -20162,7 +20239,7 @@ var ScorerDefinitionsPG = class ScorerDefinitionsPG extends ScorerDefinitionsSto
 		return statements;
 	}
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return ScorerDefinitionsPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	async createDefaultIndexes() {
@@ -20795,7 +20872,7 @@ var ScoresPG = class ScoresPG extends ScoresStorage {
 	* so its supporting index is not part of the default index set.
 	*/
 	async ensureRetentionIndexes(policies) {
-		const prefix = this.#schema && this.#schema !== "public" ? `${this.#schema}_` : "";
+		const prefix = this.#schema && this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		for (const [key, entry] of Object.entries(ScoresPG.retentionTables)) {
 			if (!entry.indexed || !policies[key]) continue;
 			try {
@@ -20830,7 +20907,7 @@ var ScoresPG = class ScoresPG extends ScoresStorage {
 	*/
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? parseSqlIdentifier(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		statements.push(generateTableSQL({
 			tableName: TABLE_SCORERS,
@@ -20845,7 +20922,7 @@ var ScoresPG = class ScoresPG extends ScoresStorage {
 	* Returns default index definitions for this instance's schema.
 	*/
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return ScoresPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	/**
@@ -21208,7 +21285,7 @@ var SkillsPG = class SkillsPG extends SkillsStorage {
 	}
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? parseSqlIdentifier(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		for (const tableName of SkillsPG.MANAGED_TABLES) statements.push(generateTableSQL({
 			tableName,
@@ -21220,7 +21297,7 @@ var SkillsPG = class SkillsPG extends SkillsStorage {
 		return statements;
 	}
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return SkillsPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	async createDefaultIndexes() {
@@ -21915,7 +21992,7 @@ var ThreadStatePG = class ThreadStatePG extends ThreadStateStorage {
 	* a failure here leaves pruning correct, just slower.
 	*/
 	async #ensureRetentionIndexes(policies) {
-		const prefix = this.#schema && this.#schema !== "public" ? `${this.#schema}_` : "";
+		const prefix = this.#schema && this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		for (const [key, entry] of Object.entries(ThreadStatePG.retentionTables)) {
 			if (!entry.indexed || !policies[key]) continue;
 			try {
@@ -22081,7 +22158,7 @@ var ToolProviderConnectionsPG = class ToolProviderConnectionsPG extends ToolProv
 	}
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? parseSqlIdentifier(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		statements.push(generateTableSQL({
 			tableName: TABLE_TOOL_PROVIDER_CONNECTIONS,
@@ -22098,7 +22175,7 @@ var ToolProviderConnectionsPG = class ToolProviderConnectionsPG extends ToolProv
 		return statements;
 	}
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return ToolProviderConnectionsPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	async createDefaultIndexes() {
@@ -22330,7 +22407,7 @@ var WorkflowDefinitionsPG = class WorkflowDefinitionsPG extends WorkflowDefiniti
 	}
 	getDefaultIndexDefinitions() {
 		return [{
-			name: `${this.#schema !== "public" ? `${this.#schema}_` : ""}idx_workflow_definitions_status`,
+			name: `${this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : ""}idx_workflow_definitions_status`,
 			table: TABLE_WORKFLOW_DEFINITIONS,
 			columns: ["status"]
 		}];
@@ -22607,7 +22684,7 @@ var WorkflowsPG = class WorkflowsPG extends WorkflowsStorage {
 	*/
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? parseSqlIdentifier(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		statements.push(generateTableSQL({
 			tableName: TABLE_WORKFLOW_SNAPSHOT,
@@ -22624,7 +22701,7 @@ var WorkflowsPG = class WorkflowsPG extends WorkflowsStorage {
 	* Returns default index definitions for the workflows domain tables.
 	*/
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return WorkflowsPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	/**
@@ -22674,7 +22751,7 @@ var WorkflowsPG = class WorkflowsPG extends WorkflowsStorage {
 	* so its supporting index is not part of the default index set.
 	*/
 	async ensureRetentionIndexes(policies) {
-		const prefix = this.#schema && this.#schema !== "public" ? `${this.#schema}_` : "";
+		const prefix = this.#schema && this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		for (const [key, entry] of Object.entries(WorkflowsPG.retentionTables)) {
 			if (!entry.indexed || !policies[key]) continue;
 			try {
@@ -23052,7 +23129,7 @@ var WorkspacesPG = class WorkspacesPG extends WorkspacesStorage {
 	}
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? parseSqlIdentifier(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		for (const tableName of WorkspacesPG.MANAGED_TABLES) statements.push(generateTableSQL({
 			tableName,
@@ -23064,7 +23141,7 @@ var WorkspacesPG = class WorkspacesPG extends WorkspacesStorage {
 		return statements;
 	}
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return WorkspacesPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	async createDefaultIndexes() {
@@ -24192,7 +24269,7 @@ var PostgresStore = class extends MastraCompositeStore {
 				disableInit: config.disableInit,
 				retention: config.retention
 			});
-			this.schema = parseSqlIdentifier(config.schemaName || "public", "schema name");
+			this.schema = parseSchemaName(config.schemaName || "public");
 			if (isPoolConfig(config)) {
 				this.#writePool = config.pool;
 				this.#ownsWritePool = false;