@mastra/pg 1.27.1-alpha.0 → 1.27.1

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.27.1-alpha.0"
+  version: "1.27.1"
 ---
 
 ## When to use

package/dist/docs/assets/SOURCE_MAP.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.27.1-alpha.0",
+  "version": "1.27.1",
   "package": "@mastra/pg",
   "exports": {},
   "modules": {}

package/dist/index.cjs

@@ -118,6 +118,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.
@@ -742,7 +770,8 @@ var PgVector = class extends _mastra_core_vector.MastraVector {
 		if (vectorType === "bit") return dimension ? `bit(${dimension})` : "bit";
 		if (this.vectorExtensionSchema) {
 			if (this.vectorExtensionSchema === "pg_catalog") return vectorType;
-			return `${(0, _mastra_core_utils.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;
 	}
@@ -820,7 +849,7 @@ var PgVector = class extends _mastra_core_vector.MastraVector {
 		};
 	}
 	getSchemaName() {
-		return this.schema ? `"${(0, _mastra_core_utils.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);
@@ -2575,7 +2604,7 @@ function resolvePgConfig(config) {
 	};
 }
 function getSchemaName$6(schema) {
-	return schema ? `"${(0, _mastra_core_utils.parseSqlIdentifier)(schema, "schema name")}"` : "\"public\"";
+	return schema ? `"${parseSchemaName(schema)}"` : "\"public\"";
 }
 function getTableName$6({ indexName, schemaName }) {
 	const quotedIndexName = `"${(0, _mastra_core_utils.parseSqlIdentifier)(indexName, "index name")}"`;
@@ -2614,7 +2643,7 @@ function generateTableSQL({ tableName, schema, schemaName, compositePrimaryKey,
 		...timeZColumns,
 		...tableConstraints
 	].join(",\n");
-	const parsedSchemaName = schemaName ? (0, _mastra_core_utils.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
@@ -2624,7 +2653,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,
@@ -2750,7 +2779,7 @@ BEGIN
         JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
         WHERE tg.tgname = ${`'${parsedTriggerName}'`}
           AND c.relname = ${`'${(0, _mastra_core_utils.parseSqlIdentifier)(tableName, "table name")}'`}
-          AND n.nspname = ${schemaName ? `'${(0, _mastra_core_utils.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
@@ -2819,7 +2848,7 @@ var PgDB = class extends _mastra_core_base.MastraBase {
 		if (tableName === _mastra_core_storage.TABLE_WORKFLOW_SNAPSHOT) {
 			const constraintName = buildConstraintName({
 				baseName: "mastra_workflow_snapshot_workflow_name_run_id_key",
-				schemaName: this.schemaName ? (0, _mastra_core_utils.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);
 		}
@@ -3424,7 +3453,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 ? (0, _mastra_core_utils.parseSqlIdentifier)(this.schemaName, "schema name") : "") || void 0
+			schemaName: (this.schemaName ? schemaNamePrefix(this.schemaName) : "") || void 0
 		});
 		const schemaFilter = this.schemaName || "public";
 		const snapshot = this.schemaSnapshot;
@@ -3446,7 +3475,7 @@ MIGRATION REQUIRED: Duplicate spans detected in ${duplicateInfo.tableName}\n====
 		});
 		const constraintName = buildConstraintName({
 			baseName: "mastra_ai_spans_traceid_spanid_pk",
-			schemaName: (this.schemaName ? (0, _mastra_core_utils.parseSqlIdentifier)(this.schemaName, "schema name") : "") || void 0
+			schemaName: (this.schemaName ? schemaNamePrefix(this.schemaName) : "") || void 0
 		});
 		const schemaFilter = this.schemaName || "public";
 		try {
@@ -4039,7 +4068,7 @@ MIGRATION REQUIRED: Duplicate spans detected in ${duplicateInfo.tableName}\n====
 //#endregion
 //#region src/storage/domains/utils.ts
 function getSchemaName$5(schema) {
-	return schema ? `"${(0, _mastra_core_utils.parseSqlIdentifier)(schema, "schema name")}"` : void 0;
+	return schema ? `"${parseSchemaName(schema)}"` : void 0;
 }
 function getTableName$5({ indexName, schemaName }) {
 	const quotedIndexName = `"${(0, _mastra_core_utils.parseSqlIdentifier)(indexName, "index name")}"`;
@@ -5093,7 +5122,7 @@ var BackgroundTasksPG = class BackgroundTasksPG extends _mastra_core_storage.Bac
 	* 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 {
@@ -5148,7 +5177,7 @@ var BackgroundTasksPG = class BackgroundTasksPG extends _mastra_core_storage.Bac
 	}
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? (0, _mastra_core_utils.parseSqlIdentifier)(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		statements.push(generateTableSQL({
 			tableName: _mastra_core_storage.TABLE_BACKGROUND_TASKS,
@@ -5160,7 +5189,7 @@ var BackgroundTasksPG = class BackgroundTasksPG extends _mastra_core_storage.Bac
 		return statements;
 	}
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return BackgroundTasksPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	async createDefaultIndexes() {
@@ -5522,7 +5551,7 @@ var ChannelsPG = class ChannelsPG extends _mastra_core_storage.ChannelsStorage {
 	}
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? (0, _mastra_core_utils.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,
@@ -5534,7 +5563,7 @@ var ChannelsPG = class ChannelsPG extends _mastra_core_storage.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() {
@@ -7046,7 +7075,7 @@ var ExperimentsPG = class ExperimentsPG extends _mastra_core_storage.Experiments
 	* 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 {
@@ -8214,7 +8243,7 @@ function postgresSql(sql, schemaName) {
 		return transformed;
 	});
 	if (schemaName) {
-		const quotedSchema = `"${(0, _mastra_core_utils.parseSqlIdentifier)(schemaName, "schema name")}"`;
+		const quotedSchema = `"${parseSchemaName(schemaName)}"`;
 		normalized = transformSqlCode(normalized, (code) => {
 			let transformed = code;
 			for (const table of [
@@ -8327,7 +8356,7 @@ function parseOutbox(row) {
 function knowledgeIndexes(schemaName) {
 	const table = (name) => {
 		const quotedName = `"${(0, _mastra_core_utils.parseSqlIdentifier)(name, "table name")}"`;
-		return schemaName ? `"${(0, _mastra_core_utils.parseSqlIdentifier)(schemaName, "schema name")}".${quotedName}` : quotedName;
+		return schemaName ? `"${parseSchemaName(schemaName)}".${quotedName}` : quotedName;
 	};
 	return [
 		{
@@ -9231,7 +9260,7 @@ var MCPClientsPG = class MCPClientsPG extends _mastra_core_storage.MCPClientsSto
 	}
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? (0, _mastra_core_utils.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,
@@ -9243,7 +9272,7 @@ var MCPClientsPG = class MCPClientsPG extends _mastra_core_storage.MCPClientsSto
 		return statements;
 	}
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return MCPClientsPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	async createDefaultIndexes() {
@@ -9799,7 +9828,7 @@ var MCPServersPG = class MCPServersPG extends _mastra_core_storage.MCPServersSto
 	}
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? (0, _mastra_core_utils.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,
@@ -9811,7 +9840,7 @@ var MCPServersPG = class MCPServersPG extends _mastra_core_storage.MCPServersSto
 		return statements;
 	}
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return MCPServersPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	async createDefaultIndexes() {
@@ -10521,7 +10550,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.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 {
@@ -10556,7 +10585,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 	*/
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? (0, _mastra_core_utils.parseSqlIdentifier)(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		const quotedSchemaName = getSchemaName$6(schemaName);
 		for (const tableName of [
@@ -10591,7 +10620,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.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);
 	}
 	/**
@@ -12999,7 +13028,7 @@ var NotificationsPG = class NotificationsPG extends _mastra_core_storage.Notific
 	* 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 {
@@ -13066,7 +13095,7 @@ var NotificationsPG = class NotificationsPG extends _mastra_core_storage.Notific
 	}
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? (0, _mastra_core_utils.parseSqlIdentifier)(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		statements.push(generateTableSQL({
 			tableName: _mastra_core_storage.TABLE_NOTIFICATIONS,
@@ -13078,7 +13107,7 @@ var NotificationsPG = class NotificationsPG extends _mastra_core_storage.Notific
 		return statements;
 	}
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return NotificationsPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	async createDefaultIndexes() {
@@ -13375,7 +13404,7 @@ var ObservabilityPG = class ObservabilityPG extends _mastra_core_storage.Observa
 	* 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 {
@@ -13456,7 +13485,7 @@ var ObservabilityPG = class ObservabilityPG extends _mastra_core_storage.Observa
 	*/
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? (0, _mastra_core_utils.parseSqlIdentifier)(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		statements.push(generateTableSQL({
 			tableName: _mastra_core_storage.TABLE_SPANS,
@@ -13472,7 +13501,7 @@ var ObservabilityPG = class ObservabilityPG extends _mastra_core_storage.Observa
 	* 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);
 	}
 	/**
@@ -14683,15 +14712,15 @@ const SIGNAL_TIME_COLUMN = {
 };
 /** Returns a fully-qualified, double-quoted table name. */
 function qualifiedTable(schema, table) {
-	return `"${(0, _mastra_core_utils.parseSqlIdentifier)(schema, "schema name")}"."${(0, _mastra_core_utils.parseSqlIdentifier)(table, "table name")}"`;
+	return `"${parseSchemaName(schema)}"."${(0, _mastra_core_utils.parseSqlIdentifier)(table, "table name")}"`;
 }
 /** Returns a parsed, quoted, schema-prefixed object name (constraint, index, etc.). */
 function qualifiedName(schema, name) {
-	return `"${(0, _mastra_core_utils.parseSqlIdentifier)(schema, "schema name")}"."${(0, _mastra_core_utils.parseSqlIdentifier)(name, "object name")}"`;
+	return `"${parseSchemaName(schema)}"."${(0, _mastra_core_utils.parseSqlIdentifier)(name, "object name")}"`;
 }
 /** Schema CREATE. Safe to run repeatedly before table DDL. */
 function schemaDDL(schema) {
-	return `CREATE SCHEMA IF NOT EXISTS "${(0, _mastra_core_utils.parseSqlIdentifier)(schema, "schema name")}"`;
+	return `CREATE SCHEMA IF NOT EXISTS "${parseSchemaName(schema)}"`;
 }
 /**
 * Postgres declarative partitioning and Timescale hypertables are mutually
@@ -19231,7 +19260,7 @@ var PromptBlocksPG = class PromptBlocksPG extends _mastra_core_storage.PromptBlo
 	*/
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? (0, _mastra_core_utils.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,
@@ -19243,7 +19272,7 @@ var PromptBlocksPG = class PromptBlocksPG extends _mastra_core_storage.PromptBlo
 		return statements;
 	}
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return PromptBlocksPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	async createDefaultIndexes() {
@@ -19878,7 +19907,7 @@ var SchedulesPG = class SchedulesPG extends _mastra_core_storage.SchedulesStorag
 	* 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 {
@@ -19926,7 +19955,7 @@ var SchedulesPG = class SchedulesPG extends _mastra_core_storage.SchedulesStorag
 		}];
 	}
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return SchedulesPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	async createDefaultIndexes() {
@@ -19947,7 +19976,7 @@ var SchedulesPG = class SchedulesPG extends _mastra_core_storage.SchedulesStorag
 	}
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? (0, _mastra_core_utils.parseSqlIdentifier)(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		statements.push(generateTableSQL({
 			tableName: _mastra_core_storage.TABLE_SCHEDULES,
@@ -19969,7 +19998,7 @@ var SchedulesPG = class SchedulesPG extends _mastra_core_storage.SchedulesStorag
 		await this.#db.clearTable({ tableName: _mastra_core_storage.TABLE_SCHEDULES });
 	}
 	#table(tableName) {
-		return getTableName$2(tableName, getSchemaName$2((0, _mastra_core_utils.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`);
@@ -20174,7 +20203,7 @@ var ScorerDefinitionsPG = class ScorerDefinitionsPG extends _mastra_core_storage
 	*/
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? (0, _mastra_core_utils.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,
@@ -20186,7 +20215,7 @@ var ScorerDefinitionsPG = class ScorerDefinitionsPG extends _mastra_core_storage
 		return statements;
 	}
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return ScorerDefinitionsPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	async createDefaultIndexes() {
@@ -20819,7 +20848,7 @@ var ScoresPG = class ScoresPG extends _mastra_core_storage.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 {
@@ -20854,7 +20883,7 @@ var ScoresPG = class ScoresPG extends _mastra_core_storage.ScoresStorage {
 	*/
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? (0, _mastra_core_utils.parseSqlIdentifier)(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		statements.push(generateTableSQL({
 			tableName: _mastra_core_storage.TABLE_SCORERS,
@@ -20869,7 +20898,7 @@ var ScoresPG = class ScoresPG extends _mastra_core_storage.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);
 	}
 	/**
@@ -21232,7 +21261,7 @@ var SkillsPG = class SkillsPG extends _mastra_core_storage.SkillsStorage {
 	}
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? (0, _mastra_core_utils.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,
@@ -21244,7 +21273,7 @@ var SkillsPG = class SkillsPG extends _mastra_core_storage.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() {
@@ -21939,7 +21968,7 @@ var ThreadStatePG = class ThreadStatePG extends _mastra_core_storage.ThreadState
 	* 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 {
@@ -22105,7 +22134,7 @@ var ToolProviderConnectionsPG = class ToolProviderConnectionsPG extends _mastra_
 	}
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? (0, _mastra_core_utils.parseSqlIdentifier)(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		statements.push(generateTableSQL({
 			tableName: _mastra_core_storage.TABLE_TOOL_PROVIDER_CONNECTIONS,
@@ -22122,7 +22151,7 @@ var ToolProviderConnectionsPG = class ToolProviderConnectionsPG extends _mastra_
 		return statements;
 	}
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return ToolProviderConnectionsPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	async createDefaultIndexes() {
@@ -22354,7 +22383,7 @@ var WorkflowDefinitionsPG = class WorkflowDefinitionsPG extends _mastra_core_sto
 	}
 	getDefaultIndexDefinitions() {
 		return [{
-			name: `${this.#schema !== "public" ? `${this.#schema}_` : ""}idx_workflow_definitions_status`,
+			name: `${this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : ""}idx_workflow_definitions_status`,
 			table: _mastra_core_storage.TABLE_WORKFLOW_DEFINITIONS,
 			columns: ["status"]
 		}];
@@ -22631,7 +22660,7 @@ var WorkflowsPG = class WorkflowsPG extends _mastra_core_storage.WorkflowsStorag
 	*/
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? (0, _mastra_core_utils.parseSqlIdentifier)(schemaName, "schema name") : "";
+		const parsedSchema = schemaName ? schemaNamePrefix(schemaName) : "";
 		const schemaPrefix = parsedSchema && parsedSchema !== "public" ? `${parsedSchema}_` : "";
 		statements.push(generateTableSQL({
 			tableName: _mastra_core_storage.TABLE_WORKFLOW_SNAPSHOT,
@@ -22648,7 +22677,7 @@ var WorkflowsPG = class WorkflowsPG extends _mastra_core_storage.WorkflowsStorag
 	* 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);
 	}
 	/**
@@ -22698,7 +22727,7 @@ var WorkflowsPG = class WorkflowsPG extends _mastra_core_storage.WorkflowsStorag
 	* 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 {
@@ -23076,7 +23105,7 @@ var WorkspacesPG = class WorkspacesPG extends _mastra_core_storage.WorkspacesSto
 	}
 	static getExportDDL(schemaName) {
 		const statements = [];
-		const parsedSchema = schemaName ? (0, _mastra_core_utils.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,
@@ -23088,7 +23117,7 @@ var WorkspacesPG = class WorkspacesPG extends _mastra_core_storage.WorkspacesSto
 		return statements;
 	}
 	getDefaultIndexDefinitions() {
-		const schemaPrefix = this.#schema !== "public" ? `${this.#schema}_` : "";
+		const schemaPrefix = this.#schema !== "public" ? `${schemaNamePrefix(this.#schema)}_` : "";
 		return WorkspacesPG.getDefaultIndexDefs(schemaPrefix);
 	}
 	async createDefaultIndexes() {
@@ -24216,7 +24245,7 @@ var PostgresStore = class extends _mastra_core_storage.MastraCompositeStore {
 				disableInit: config.disableInit,
 				retention: config.retention
 			});
-			this.schema = (0, _mastra_core_utils.parseSqlIdentifier)(config.schemaName || "public", "schema name");
+			this.schema = parseSchemaName(config.schemaName || "public");
 			if (isPoolConfig(config)) {
 				this.#writePool = config.pool;
 				this.#ownsWritePool = false;