@mastra/pg 1.36.0-alpha.1 → 1.36.0-alpha.2

package/dist/index.js

@@ -2696,7 +2696,8 @@ async function loadSchemaSnapshot(client, schemaName) {
 		notNullColumns,
 		indexes,
 		replicaIdentityIndexes,
-		primaryKeyIndexes
+		primaryKeyIndexes,
+		createdTables: /* @__PURE__ */ new Set()
 	};
 }
 // src/storage/db/index.ts
@@ -2856,26 +2857,30 @@ function generateTableSQL({ tableName, schema, schemaName, compositePrimaryKey,
             ` : ""}
           `;
 }
+function indexColumnsSQL(columns, opclass) {
+	return columns.map((col) => {
+		const [colName, ...modifiers] = col.includes(" DESC") || col.includes(" ASC") ? col.split(" ") : [col];
+		if (!colName) throw new Error(`Invalid column specification: ${col}`);
+		return [
+			`"${parseSqlIdentifier(colName, "column name")}"`,
+			opclass,
+			...modifiers
+		].filter(Boolean).join(" ");
+	}).join(", ");
+}
 /**
 * Generates a CREATE INDEX SQL statement from index options.
 * Used by exportSchemas to produce index DDL without a database connection.
 */
 function generateIndexSQL(options, schemaName) {
-	const { name, table, columns, unique = false, where, method = "btree" } = options;
+	const { name, table, columns, unique = false, where, method = "btree", opclass } = options;
 	const fullTableName = getTableName$6({
 		indexName: table,
 		schemaName: getSchemaName$6(schemaName)
 	});
 	const uniqueStr = unique ? "UNIQUE " : "";
 	const methodStr = method !== "btree" ? `USING ${method} ` : "";
-	const columnsStr = columns.map((col) => {
-		if (col.includes(" DESC") || col.includes(" ASC")) {
-			const [colName, ...modifiers] = col.split(" ");
-			if (!colName) throw new Error(`Invalid column specification: ${col}`);
-			return `"${parseSqlIdentifier(colName, "column name")}" ${modifiers.join(" ")}`;
-		}
-		return `"${parseSqlIdentifier(col, "column name")}"`;
-	}).join(", ");
+	const columnsStr = indexColumnsSQL(columns, opclass);
 	const whereStr = where ? ` WHERE ${where}` : "";
 	return `CREATE ${uniqueStr}INDEX IF NOT EXISTS ${`"${parseSqlIdentifier(name, "index name")}"`} ON ${fullTableName} ${methodStr}(${columnsStr})${whereStr};`;
 }
@@ -3386,6 +3391,7 @@ var PgDB = class extends MastraBase {
 			if (this.schemaName) await this.setupSchema();
 			const snapshot = this.schemaSnapshot;
 			if (!snapshot || !this.snapshotShowsTableConverged(snapshot, tableName)) {
+				const isNewTable = snapshot ? !snapshot.tables.has(tableName) : false;
 				const sql = generateTableSQL({
 					tableName,
 					schema,
@@ -3399,6 +3405,7 @@ var PgDB = class extends MastraBase {
 				}
 				if (snapshot) {
 					snapshot.tables.add(tableName);
+					if (isNewTable) snapshot.createdTables.add(tableName);
 					const created = this.snapshotColumns(snapshot, tableName);
 					for (const [name, def] of Object.entries(schema)) {
 						const parsedName = parseSqlIdentifier(name, "column name");
@@ -3867,18 +3874,9 @@ MIGRATION REQUIRED: Duplicate spans detected in ${duplicateInfo.tableName}\n====
 			const snapshot = this.schemaSnapshot;
 			if (snapshot?.indexes.has(name)) return;
 			const uniqueStr = unique ? "UNIQUE " : "";
-			const concurrentStr = concurrent ? "CONCURRENTLY " : "";
+			const concurrentStr = concurrent && !this.isTableCreatedInThisInit(table) ? "CONCURRENTLY " : "";
 			const methodStr = method !== "btree" ? `USING ${method} ` : "";
-			const columnsStr = columns.map((col) => {
-				if (col.includes(" DESC") || col.includes(" ASC")) {
-					const [colName, ...modifiers] = col.split(" ");
-					if (!colName) throw new Error(`Invalid column specification: ${col}`);
-					const quotedCol = `"${parseSqlIdentifier(colName, "column name")}" ${modifiers.join(" ")}`;
-					return opclass ? `${quotedCol} ${opclass}` : quotedCol;
-				}
-				const quotedCol = `"${parseSqlIdentifier(col, "column name")}"`;
-				return opclass ? `${quotedCol} ${opclass}` : quotedCol;
-			}).join(", ");
+			const columnsStr = indexColumnsSQL(columns, opclass);
 			const whereStr = where ? ` WHERE ${where}` : "";
 			const tablespaceStr = tablespace ? ` TABLESPACE ${tablespace}` : "";
 			let withStr = "";
@@ -3911,6 +3909,13 @@ MIGRATION REQUIRED: Duplicate spans detected in ${duplicateInfo.tableName}\n====
 		if (snapshot?.indexes.has(indexName)) return;
 		if (await buildIndex(this.client, this.schemaName || "public", indexName, () => this.timedIndexBuild(indexName, sql), this.logger)) snapshot?.indexes.add(indexName);
 	}
+	/**
+	* Whether `tableName` was absent when this init's snapshot was read and this
+	* init created it, so its indexes can be built without CONCURRENTLY.
+	*/
+	isTableCreatedInThisInit(tableName) {
+		return this.schemaSnapshot?.createdTables.has(tableName) ?? false;
+	}
 	async timedIndexBuild(indexName, sql) {
 		const startedAt = Date.now();
 		this.logger.info(`Creating index ${indexName}`);
@@ -25941,15 +25946,16 @@ var WorkflowsPG = class WorkflowsPG extends WorkflowsStorage {
 			this.logger?.warn?.(`Failed to create index ${stateBaseIndexName}:`, error);
 		}
 		if (await this.#db.getColumnType(TABLE_WORKFLOW_SNAPSHOT, "snapshot") !== "jsonb") return;
+		const concurrently = !this.#db.isTableCreatedInThisInit(TABLE_WORKFLOW_SNAPSHOT);
 		const indexName = workflowSnapshotStatusIndexName(this.#schema);
 		try {
-			await this.#db.createIndexFromStatement(indexName, workflowSnapshotStatusIndexSQL(indexName, this.#schema, true));
+			await this.#db.createIndexFromStatement(indexName, workflowSnapshotStatusIndexSQL(indexName, this.#schema, concurrently));
 		} catch (error) {
 			this.logger?.warn?.(`Failed to create index ${indexName}:`, error);
 		}
 		const threadIdIndexName = workflowSnapshotThreadIdIndexName(this.#schema);
 		try {
-			await this.#db.createIndexFromStatement(threadIdIndexName, workflowSnapshotThreadIdIndexSQL(threadIdIndexName, this.#schema, true));
+			await this.#db.createIndexFromStatement(threadIdIndexName, workflowSnapshotThreadIdIndexSQL(threadIdIndexName, this.#schema, concurrently));
 		} catch (error) {
 			this.logger?.warn?.(`Failed to create index ${threadIdIndexName}:`, error);
 		}