@mastra/pg 0.11.0-alpha.1 → 0.11.0-alpha.3

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @mastra/pg@0.11.0-alpha.1 build /home/runner/work/mastra/mastra/stores/pg
+> @mastra/pg@0.11.0-alpha.3 build /home/runner/work/mastra/mastra/stores/pg
 > tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting
 
 CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.5.0
 TSC Build start
-TSC ⚡️ Build success in 10371ms
+TSC ⚡️ Build success in 10074ms
 DTS Build start
 CLI Target: es2022
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/stores/pg/dist/_tsup-dts-rollup.d.ts
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/stores/pg/dist/_tsup-dts-rollup.d.cts
-DTS ⚡️ Build success in 11657ms
+DTS ⚡️ Build success in 11524ms
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-CJS dist/index.cjs 68.06 KB
-CJS ⚡️ Build success in 1500ms
-ESM dist/index.js 67.49 KB
-ESM ⚡️ Build success in 1504ms
+CJS dist/index.cjs 68.48 KB
+CJS ⚡️ Build success in 1389ms
+ESM dist/index.js 67.91 KB
+ESM ⚡️ Build success in 1390ms

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @mastra/pg
 
+## 0.11.0-alpha.3
+
+### Patch Changes
+
+- 6c23252: [MASTRA-3982] Fix Memory Retrieval for PG when scope is resource
+- Updated dependencies [9589624]
+  - @mastra/core@0.10.6-alpha.4
+
+## 0.11.0-alpha.2
+
+### Patch Changes
+
+- eed55d7: quotes table and schema names for vector and storage to allow for camelcase
+- Updated dependencies [d70c420]
+- Updated dependencies [2a16996]
+  - @mastra/core@0.10.6-alpha.3
+
 ## 0.11.0-alpha.1
 
 ### Minor Changes

package/dist/_tsup-dts-rollup.d.cts

@@ -196,6 +196,7 @@ declare class PgVector extends MastraVector {
     });
     private getMutexByName;
     private getTableName;
+    private getSchemaName;
     transformFilter(filter?: VectorFilter): VectorFilter;
     getIndexInfo({ indexName }: DescribeIndexParams): Promise<PGIndexStats>;
     query({ indexName, queryVector, topK, filter, includeVector, minScore, ef, probes, }: PgQueryVectorParams): Promise<QueryResult[]>;
@@ -276,6 +277,7 @@ declare class PostgresStore extends MastraStorage {
         selectByIncludeResourceScope: boolean;
     };
     private getTableName;
+    private getSchemaName;
     /** @deprecated use getEvals instead */
     getEvalsByAgentName(agentName: string, type?: 'test' | 'live'): Promise<EvalRow[]>;
     private transformEvalRow;

package/dist/_tsup-dts-rollup.d.ts

@@ -196,6 +196,7 @@ declare class PgVector extends MastraVector {
     });
     private getMutexByName;
     private getTableName;
+    private getSchemaName;
     transformFilter(filter?: VectorFilter): VectorFilter;
     getIndexInfo({ indexName }: DescribeIndexParams): Promise<PGIndexStats>;
     query({ indexName, queryVector, topK, filter, includeVector, minScore, ef, probes, }: PgQueryVectorParams): Promise<QueryResult[]>;
@@ -276,6 +277,7 @@ declare class PostgresStore extends MastraStorage {
         selectByIncludeResourceScope: boolean;
     };
     private getTableName;
+    private getSchemaName;
     /** @deprecated use getEvals instead */
     getEvalsByAgentName(agentName: string, type?: 'test' | 'live'): Promise<EvalRow[]>;
     private transformEvalRow;

package/dist/index.cjs

@@ -420,8 +420,16 @@ var PgVector = class extends vector.MastraVector {
   }
   getTableName(indexName) {
     const parsedIndexName = utils.parseSqlIdentifier(indexName, "index name");
-    const parsedSchemaName = this.schema ? utils.parseSqlIdentifier(this.schema, "schema name") : void 0;
-    return parsedSchemaName ? `${parsedSchemaName}.${parsedIndexName}` : parsedIndexName;
+    const quotedIndexName = `"${parsedIndexName}"`;
+    const quotedSchemaName = this.getSchemaName();
+    const quotedVectorName = `"${parsedIndexName}_vector_idx"`;
+    return {
+      tableName: quotedSchemaName ? `${quotedSchemaName}.${quotedIndexName}` : quotedIndexName,
+      vectorIndexName: quotedVectorName
+    };
+  }
+  getSchemaName() {
+    return this.schema ? `"${utils.parseSqlIdentifier(this.schema, "schema name")}"` : void 0;
   }
   transformFilter(filter) {
     const translator = new PGFilterTranslator();
@@ -463,7 +471,7 @@ var PgVector = class extends vector.MastraVector {
       if (indexInfo.type === "ivfflat" && probes) {
         await client.query(`SET LOCAL ivfflat.probes = ${probes}`);
       }
-      const tableName = this.getTableName(indexName);
+      const { tableName } = this.getTableName(indexName);
       const query = `
         WITH vector_scores AS (
           SELECT
@@ -491,7 +499,7 @@ var PgVector = class extends vector.MastraVector {
     }
   }
   async upsert({ indexName, vectors, metadata, ids }) {
-    const tableName = this.getTableName(indexName);
+    const { tableName } = this.getTableName(indexName);
     const client = await this.pool.connect();
     try {
       await client.query("BEGIN");
@@ -559,7 +567,7 @@ var PgVector = class extends vector.MastraVector {
           const schemaExists = schemaCheck.rows[0].exists;
           if (!schemaExists) {
             try {
-              await client.query(`CREATE SCHEMA IF NOT EXISTS ${this.schema}`);
+              await client.query(`CREATE SCHEMA IF NOT EXISTS ${this.getSchemaName()}`);
               this.logger.info(`Schema "${this.schema}" created successfully`);
             } catch (error) {
               this.logger.error(`Failed to create schema "${this.schema}"`, { error });
@@ -588,7 +596,7 @@ var PgVector = class extends vector.MastraVector {
     indexConfig = {},
     buildIndex = true
   }) {
-    const tableName = this.getTableName(indexName);
+    const { tableName } = this.getTableName(indexName);
     if (!indexName.match(/^[a-zA-Z_][a-zA-Z0-9_]*$/)) {
       throw new Error("Invalid index name format");
     }
@@ -639,9 +647,9 @@ var PgVector = class extends vector.MastraVector {
   async setupIndex({ indexName, metric, indexConfig }, client) {
     const mutex = this.getMutexByName(`build-${indexName}`);
     await mutex.runExclusive(async () => {
-      const tableName = this.getTableName(indexName);
+      const { tableName, vectorIndexName } = this.getTableName(indexName);
       if (this.createdIndexes.has(indexName)) {
-        await client.query(`DROP INDEX IF EXISTS ${tableName}_vector_idx`);
+        await client.query(`DROP INDEX IF EXISTS ${vectorIndexName}`);
       }
       if (indexConfig.type === "flat") {
         this.describeIndexCache.delete(indexName);
@@ -653,7 +661,7 @@ var PgVector = class extends vector.MastraVector {
         const m = indexConfig.hnsw?.m ?? 8;
         const efConstruction = indexConfig.hnsw?.efConstruction ?? 32;
         indexSQL = `
-          CREATE INDEX IF NOT EXISTS ${indexName}_vector_idx 
+          CREATE INDEX IF NOT EXISTS ${vectorIndexName} 
           ON ${tableName} 
           USING hnsw (embedding ${metricOp})
           WITH (
@@ -670,7 +678,7 @@ var PgVector = class extends vector.MastraVector {
           lists = Math.max(100, Math.min(4e3, Math.floor(Math.sqrt(size) * 2)));
         }
         indexSQL = `
-          CREATE INDEX IF NOT EXISTS ${indexName}_vector_idx
+          CREATE INDEX IF NOT EXISTS ${vectorIndexName}
           ON ${tableName}
           USING ivfflat (embedding ${metricOp})
           WITH (lists = ${lists});
@@ -741,7 +749,7 @@ var PgVector = class extends vector.MastraVector {
   async describeIndex({ indexName }) {
     const client = await this.pool.connect();
     try {
-      const tableName = this.getTableName(indexName);
+      const { tableName } = this.getTableName(indexName);
       const tableExistsQuery = `
         SELECT 1
         FROM information_schema.columns
@@ -815,7 +823,7 @@ var PgVector = class extends vector.MastraVector {
   async deleteIndex({ indexName }) {
     const client = await this.pool.connect();
     try {
-      const tableName = this.getTableName(indexName);
+      const { tableName } = this.getTableName(indexName);
       await client.query(`DROP TABLE IF EXISTS ${tableName} CASCADE`);
       this.createdIndexes.delete(indexName);
     } catch (error) {
@@ -828,7 +836,7 @@ var PgVector = class extends vector.MastraVector {
   async truncateIndex({ indexName }) {
     const client = await this.pool.connect();
     try {
-      const tableName = this.getTableName(indexName);
+      const { tableName } = this.getTableName(indexName);
       await client.query(`TRUNCATE ${tableName}`);
     } catch (e) {
       await client.query("ROLLBACK");
@@ -871,7 +879,7 @@ var PgVector = class extends vector.MastraVector {
       if (updateParts.length === 0) {
         return;
       }
-      const tableName = this.getTableName(indexName);
+      const { tableName } = this.getTableName(indexName);
       const query = `
         UPDATE ${tableName}
         SET ${updateParts.join(", ")}
@@ -894,7 +902,7 @@ var PgVector = class extends vector.MastraVector {
   async deleteVector({ indexName, id }) {
     const client = await this.pool.connect();
     try {
-      const tableName = this.getTableName(indexName);
+      const { tableName } = this.getTableName(indexName);
       const query = `
         DELETE FROM ${tableName}
         WHERE vector_id = $1
@@ -950,9 +958,13 @@ var PostgresStore = class extends storage.MastraStorage {
     };
   }
   getTableName(indexName) {
-    const parsedIndexName = utils.parseSqlIdentifier(indexName, "table name");
-    const parsedSchemaName = this.schema ? utils.parseSqlIdentifier(this.schema, "schema name") : void 0;
-    return parsedSchemaName ? `${parsedSchemaName}."${parsedIndexName}"` : `"${parsedIndexName}"`;
+    const parsedIndexName = utils.parseSqlIdentifier(indexName, "index name");
+    const quotedIndexName = `"${parsedIndexName}"`;
+    const quotedSchemaName = this.getSchemaName();
+    return quotedSchemaName ? `${quotedSchemaName}.${quotedIndexName}` : quotedIndexName;
+  }
+  getSchemaName() {
+    return this.schema ? `"${utils.parseSqlIdentifier(this.schema, "schema name")}"` : void 0;
   }
   /** @deprecated use getEvals instead */
   async getEvalsByAgentName(agentName, type) {
@@ -1117,7 +1129,7 @@ var PostgresStore = class extends storage.MastraStorage {
           );
           if (!schemaExists?.exists) {
             try {
-              await this.db.none(`CREATE SCHEMA IF NOT EXISTS ${this.schema}`);
+              await this.db.none(`CREATE SCHEMA IF NOT EXISTS ${this.getSchemaName()}`);
               this.logger.info(`Schema "${this.schema}" created successfully`);
             } catch (error) {
               this.logger.error(`Failed to create schema "${this.schema}"`, { error });
@@ -1476,7 +1488,7 @@ var PostgresStore = class extends storage.MastraStorage {
                   (m.row_num >= target.row_num - $${paramIdx + 3} AND m.row_num < target.row_num)
                 )
               )
-            ) 
+            ) AS query_${paramIdx}
             `
             // Keep ASC for final sorting after fetching context
           );

package/dist/index.js

@@ -412,8 +412,16 @@ var PgVector = class extends MastraVector {
   }
   getTableName(indexName) {
     const parsedIndexName = parseSqlIdentifier(indexName, "index name");
-    const parsedSchemaName = this.schema ? parseSqlIdentifier(this.schema, "schema name") : void 0;
-    return parsedSchemaName ? `${parsedSchemaName}.${parsedIndexName}` : parsedIndexName;
+    const quotedIndexName = `"${parsedIndexName}"`;
+    const quotedSchemaName = this.getSchemaName();
+    const quotedVectorName = `"${parsedIndexName}_vector_idx"`;
+    return {
+      tableName: quotedSchemaName ? `${quotedSchemaName}.${quotedIndexName}` : quotedIndexName,
+      vectorIndexName: quotedVectorName
+    };
+  }
+  getSchemaName() {
+    return this.schema ? `"${parseSqlIdentifier(this.schema, "schema name")}"` : void 0;
   }
   transformFilter(filter) {
     const translator = new PGFilterTranslator();
@@ -455,7 +463,7 @@ var PgVector = class extends MastraVector {
       if (indexInfo.type === "ivfflat" && probes) {
         await client.query(`SET LOCAL ivfflat.probes = ${probes}`);
       }
-      const tableName = this.getTableName(indexName);
+      const { tableName } = this.getTableName(indexName);
       const query = `
         WITH vector_scores AS (
           SELECT
@@ -483,7 +491,7 @@ var PgVector = class extends MastraVector {
     }
   }
   async upsert({ indexName, vectors, metadata, ids }) {
-    const tableName = this.getTableName(indexName);
+    const { tableName } = this.getTableName(indexName);
     const client = await this.pool.connect();
     try {
       await client.query("BEGIN");
@@ -551,7 +559,7 @@ var PgVector = class extends MastraVector {
           const schemaExists = schemaCheck.rows[0].exists;
           if (!schemaExists) {
             try {
-              await client.query(`CREATE SCHEMA IF NOT EXISTS ${this.schema}`);
+              await client.query(`CREATE SCHEMA IF NOT EXISTS ${this.getSchemaName()}`);
               this.logger.info(`Schema "${this.schema}" created successfully`);
             } catch (error) {
               this.logger.error(`Failed to create schema "${this.schema}"`, { error });
@@ -580,7 +588,7 @@ var PgVector = class extends MastraVector {
     indexConfig = {},
     buildIndex = true
   }) {
-    const tableName = this.getTableName(indexName);
+    const { tableName } = this.getTableName(indexName);
     if (!indexName.match(/^[a-zA-Z_][a-zA-Z0-9_]*$/)) {
       throw new Error("Invalid index name format");
     }
@@ -631,9 +639,9 @@ var PgVector = class extends MastraVector {
   async setupIndex({ indexName, metric, indexConfig }, client) {
     const mutex = this.getMutexByName(`build-${indexName}`);
     await mutex.runExclusive(async () => {
-      const tableName = this.getTableName(indexName);
+      const { tableName, vectorIndexName } = this.getTableName(indexName);
       if (this.createdIndexes.has(indexName)) {
-        await client.query(`DROP INDEX IF EXISTS ${tableName}_vector_idx`);
+        await client.query(`DROP INDEX IF EXISTS ${vectorIndexName}`);
       }
       if (indexConfig.type === "flat") {
         this.describeIndexCache.delete(indexName);
@@ -645,7 +653,7 @@ var PgVector = class extends MastraVector {
         const m = indexConfig.hnsw?.m ?? 8;
         const efConstruction = indexConfig.hnsw?.efConstruction ?? 32;
         indexSQL = `
-          CREATE INDEX IF NOT EXISTS ${indexName}_vector_idx 
+          CREATE INDEX IF NOT EXISTS ${vectorIndexName} 
           ON ${tableName} 
           USING hnsw (embedding ${metricOp})
           WITH (
@@ -662,7 +670,7 @@ var PgVector = class extends MastraVector {
           lists = Math.max(100, Math.min(4e3, Math.floor(Math.sqrt(size) * 2)));
         }
         indexSQL = `
-          CREATE INDEX IF NOT EXISTS ${indexName}_vector_idx
+          CREATE INDEX IF NOT EXISTS ${vectorIndexName}
           ON ${tableName}
           USING ivfflat (embedding ${metricOp})
           WITH (lists = ${lists});
@@ -733,7 +741,7 @@ var PgVector = class extends MastraVector {
   async describeIndex({ indexName }) {
     const client = await this.pool.connect();
     try {
-      const tableName = this.getTableName(indexName);
+      const { tableName } = this.getTableName(indexName);
       const tableExistsQuery = `
         SELECT 1
         FROM information_schema.columns
@@ -807,7 +815,7 @@ var PgVector = class extends MastraVector {
   async deleteIndex({ indexName }) {
     const client = await this.pool.connect();
     try {
-      const tableName = this.getTableName(indexName);
+      const { tableName } = this.getTableName(indexName);
       await client.query(`DROP TABLE IF EXISTS ${tableName} CASCADE`);
       this.createdIndexes.delete(indexName);
     } catch (error) {
@@ -820,7 +828,7 @@ var PgVector = class extends MastraVector {
   async truncateIndex({ indexName }) {
     const client = await this.pool.connect();
     try {
-      const tableName = this.getTableName(indexName);
+      const { tableName } = this.getTableName(indexName);
       await client.query(`TRUNCATE ${tableName}`);
     } catch (e) {
       await client.query("ROLLBACK");
@@ -863,7 +871,7 @@ var PgVector = class extends MastraVector {
       if (updateParts.length === 0) {
         return;
       }
-      const tableName = this.getTableName(indexName);
+      const { tableName } = this.getTableName(indexName);
       const query = `
         UPDATE ${tableName}
         SET ${updateParts.join(", ")}
@@ -886,7 +894,7 @@ var PgVector = class extends MastraVector {
   async deleteVector({ indexName, id }) {
     const client = await this.pool.connect();
     try {
-      const tableName = this.getTableName(indexName);
+      const { tableName } = this.getTableName(indexName);
       const query = `
         DELETE FROM ${tableName}
         WHERE vector_id = $1
@@ -942,9 +950,13 @@ var PostgresStore = class extends MastraStorage {
     };
   }
   getTableName(indexName) {
-    const parsedIndexName = parseSqlIdentifier(indexName, "table name");
-    const parsedSchemaName = this.schema ? parseSqlIdentifier(this.schema, "schema name") : void 0;
-    return parsedSchemaName ? `${parsedSchemaName}."${parsedIndexName}"` : `"${parsedIndexName}"`;
+    const parsedIndexName = parseSqlIdentifier(indexName, "index name");
+    const quotedIndexName = `"${parsedIndexName}"`;
+    const quotedSchemaName = this.getSchemaName();
+    return quotedSchemaName ? `${quotedSchemaName}.${quotedIndexName}` : quotedIndexName;
+  }
+  getSchemaName() {
+    return this.schema ? `"${parseSqlIdentifier(this.schema, "schema name")}"` : void 0;
   }
   /** @deprecated use getEvals instead */
   async getEvalsByAgentName(agentName, type) {
@@ -1109,7 +1121,7 @@ var PostgresStore = class extends MastraStorage {
           );
           if (!schemaExists?.exists) {
             try {
-              await this.db.none(`CREATE SCHEMA IF NOT EXISTS ${this.schema}`);
+              await this.db.none(`CREATE SCHEMA IF NOT EXISTS ${this.getSchemaName()}`);
               this.logger.info(`Schema "${this.schema}" created successfully`);
             } catch (error) {
               this.logger.error(`Failed to create schema "${this.schema}"`, { error });
@@ -1468,7 +1480,7 @@ var PostgresStore = class extends MastraStorage {
                   (m.row_num >= target.row_num - $${paramIdx + 3} AND m.row_num < target.row_num)
                 )
               )
-            ) 
+            ) AS query_${paramIdx}
             `
             // Keep ASC for final sorting after fetching context
           );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/pg",
-  "version": "0.11.0-alpha.1",
+  "version": "0.11.0-alpha.3",
   "description": "Postgres provider for Mastra - includes both vector and db storage capabilities",
   "type": "module",
   "main": "dist/index.js",
@@ -34,8 +34,8 @@
     "typescript": "^5.8.3",
     "vitest": "^3.2.3",
     "@internal/lint": "0.0.12",
-    "@internal/storage-test-utils": "0.0.8",
-    "@mastra/core": "0.10.6-alpha.0"
+    "@mastra/core": "0.10.6-alpha.4",
+    "@internal/storage-test-utils": "0.0.8"
   },
   "peerDependencies": {
     "@mastra/core": ">=0.10.4-0 <0.11.0"

package/src/storage/index.test.ts

@@ -1016,7 +1016,7 @@ describe('PostgresStore', () => {
   });
 
   describe('Schema Support', () => {
-    const customSchema = 'mastra_test';
+    const customSchema = 'mastraTest';
     let customSchemaStore: PostgresStore;
 
     beforeAll(async () => {
@@ -1494,10 +1494,83 @@ describe('PostgresStore', () => {
     });
   });
 
+  describe('PgStorage Table Name Quoting', () => {
+    const camelCaseTable = 'TestCamelCaseTable';
+    const snakeCaseTable = 'test_snake_case_table';
+    const BASE_SCHEMA = {
+      id: { type: 'integer', primaryKey: true, nullable: false },
+      name: { type: 'text', nullable: true },
+    } as Record<string, StorageColumn>;
+
+    beforeEach(async () => {
+      // Only clear tables if store is initialized
+      try {
+        // Clear tables before each test
+        await store.clearTable({ tableName: camelCaseTable as TABLE_NAMES });
+        await store.clearTable({ tableName: snakeCaseTable as TABLE_NAMES });
+      } catch (error) {
+        // Ignore errors during table clearing
+        console.warn('Error clearing tables:', error);
+      }
+    });
+
+    afterEach(async () => {
+      // Only clear tables if store is initialized
+      try {
+        // Clear tables before each test
+        await store.clearTable({ tableName: camelCaseTable as TABLE_NAMES });
+        await store.clearTable({ tableName: snakeCaseTable as TABLE_NAMES });
+      } catch (error) {
+        // Ignore errors during table clearing
+        console.warn('Error clearing tables:', error);
+      }
+    });
+
+    it('should create and upsert to a camelCase table without quoting errors', async () => {
+      await expect(
+        store.createTable({
+          tableName: camelCaseTable as TABLE_NAMES,
+          schema: BASE_SCHEMA,
+        }),
+      ).resolves.not.toThrow();
+
+      await store.insert({
+        tableName: camelCaseTable as TABLE_NAMES,
+        record: { id: '1', name: 'Alice' },
+      });
+
+      const row = await store.load({
+        tableName: camelCaseTable as TABLE_NAMES,
+        keys: { id: '1' },
+      });
+      expect(row?.name).toBe('Alice');
+    });
+
+    it('should create and upsert to a snake_case table without quoting errors', async () => {
+      await expect(
+        store.createTable({
+          tableName: snakeCaseTable as TABLE_NAMES,
+          schema: BASE_SCHEMA,
+        }),
+      ).resolves.not.toThrow();
+
+      await store.insert({
+        tableName: snakeCaseTable as TABLE_NAMES,
+        record: { id: '2', name: 'Bob' },
+      });
+
+      const row = await store.load({
+        tableName: snakeCaseTable as TABLE_NAMES,
+        keys: { id: '2' },
+      });
+      expect(row?.name).toBe('Bob');
+    });
+  });
+
   describe('Permission Handling', () => {
     const schemaRestrictedUser = 'mastra_schema_restricted_storage';
     const restrictedPassword = 'test123';
-    const testSchema = 'test_schema';
+    const testSchema = 'testSchema';
     let adminDb: pgPromise.IDatabase<{}>;
     let pgpAdmin: pgPromise.IMain;
 

package/src/storage/index.ts

@@ -96,9 +96,14 @@ export class PostgresStore extends MastraStorage {
   }
 
   private getTableName(indexName: string) {
-    const parsedIndexName = parseSqlIdentifier(indexName, 'table name');
-    const parsedSchemaName = this.schema ? parseSqlIdentifier(this.schema, 'schema name') : undefined;
-    return parsedSchemaName ? `${parsedSchemaName}."${parsedIndexName}"` : `"${parsedIndexName}"`;
+    const parsedIndexName = parseSqlIdentifier(indexName, 'index name');
+    const quotedIndexName = `"${parsedIndexName}"`;
+    const quotedSchemaName = this.getSchemaName();
+    return quotedSchemaName ? `${quotedSchemaName}.${quotedIndexName}` : quotedIndexName;
+  }
+
+  private getSchemaName() {
+    return this.schema ? `"${parseSqlIdentifier(this.schema, 'schema name')}"` : undefined;
   }
 
   /** @deprecated use getEvals instead */
@@ -311,7 +316,7 @@ export class PostgresStore extends MastraStorage {
 
           if (!schemaExists?.exists) {
             try {
-              await this.db.none(`CREATE SCHEMA IF NOT EXISTS ${this.schema}`);
+              await this.db.none(`CREATE SCHEMA IF NOT EXISTS ${this.getSchemaName()}`);
               this.logger.info(`Schema "${this.schema}" created successfully`);
             } catch (error) {
               this.logger.error(`Failed to create schema "${this.schema}"`, { error });
@@ -753,7 +758,7 @@ export class PostgresStore extends MastraStorage {
                   (m.row_num >= target.row_num - $${paramIdx + 3} AND m.row_num < target.row_num)
                 )
               )
-            ) 
+            ) AS query_${paramIdx}
             `, // Keep ASC for final sorting after fetching context
           );
           params.push(searchId, id, withPreviousMessages, withNextMessages);

package/src/vector/index.test.ts

@@ -1647,6 +1647,75 @@ describe('PgVector', () => {
       });
     });
 
+    describe('PgVector Table Name Quoting', () => {
+      const camelCaseIndex = 'TestCamelCaseIndex';
+      const snakeCaseIndex = 'test_snake_case_index';
+
+      beforeEach(async () => {
+        // Clean up any existing indexes
+        try {
+          await vectorDB.deleteIndex({ indexName: camelCaseIndex });
+        } catch {
+          // Ignore if doesn't exist
+        }
+        try {
+          await vectorDB.deleteIndex({ indexName: snakeCaseIndex });
+        } catch {
+          // Ignore if doesn't exist
+        }
+      });
+
+      afterEach(async () => {
+        // Clean up indexes after each test
+        try {
+          await vectorDB.deleteIndex({ indexName: camelCaseIndex });
+        } catch {
+          // Ignore if doesn't exist
+        }
+        try {
+          await vectorDB.deleteIndex({ indexName: snakeCaseIndex });
+        } catch {
+          // Ignore if doesn't exist
+        }
+      });
+
+      it('should create and query a camelCase index without quoting errors', async () => {
+        await expect(
+          vectorDB.createIndex({
+            indexName: camelCaseIndex,
+            dimension: 3,
+            metric: 'cosine',
+            indexConfig: { type: 'hnsw' },
+          }),
+        ).resolves.not.toThrow();
+
+        const results = await vectorDB.query({
+          indexName: camelCaseIndex,
+          queryVector: [1, 0, 0],
+          topK: 1,
+        });
+        expect(Array.isArray(results)).toBe(true);
+      });
+
+      it('should create and query a snake_case index without quoting errors', async () => {
+        await expect(
+          vectorDB.createIndex({
+            indexName: snakeCaseIndex,
+            dimension: 3,
+            metric: 'cosine',
+            indexConfig: { type: 'hnsw' },
+          }),
+        ).resolves.not.toThrow();
+
+        const results = await vectorDB.query({
+          indexName: snakeCaseIndex,
+          queryVector: [1, 0, 0],
+          topK: 1,
+        });
+        expect(Array.isArray(results)).toBe(true);
+      });
+    });
+
     // Regex Operator Tests
     describe('Regex Operators', () => {
       it('should handle $regex with case sensitivity', async () => {
@@ -1878,7 +1947,7 @@ describe('PgVector', () => {
   });
 
   describe('Schema Support', () => {
-    const customSchema = 'mastra_test';
+    const customSchema = 'mastraTest';
     let vectorDB: PgVector;
     let customSchemaVectorDB: PgVector;
 

package/src/vector/index.ts

@@ -125,8 +125,17 @@ export class PgVector extends MastraVector {
 
   private getTableName(indexName: string) {
     const parsedIndexName = parseSqlIdentifier(indexName, 'index name');
-    const parsedSchemaName = this.schema ? parseSqlIdentifier(this.schema, 'schema name') : undefined;
-    return parsedSchemaName ? `${parsedSchemaName}.${parsedIndexName}` : parsedIndexName;
+    const quotedIndexName = `"${parsedIndexName}"`;
+    const quotedSchemaName = this.getSchemaName();
+    const quotedVectorName = `"${parsedIndexName}_vector_idx"`;
+    return {
+      tableName: quotedSchemaName ? `${quotedSchemaName}.${quotedIndexName}` : quotedIndexName,
+      vectorIndexName: quotedVectorName,
+    };
+  }
+
+  private getSchemaName() {
+    return this.schema ? `"${parseSqlIdentifier(this.schema, 'schema name')}"` : undefined;
   }
 
   transformFilter(filter?: VectorFilter) {
@@ -179,7 +188,7 @@ export class PgVector extends MastraVector {
         await client.query(`SET LOCAL ivfflat.probes = ${probes}`);
       }
 
-      const tableName = this.getTableName(indexName);
+      const { tableName } = this.getTableName(indexName);
 
       const query = `
         WITH vector_scores AS (
@@ -210,7 +219,7 @@ export class PgVector extends MastraVector {
   }
 
   async upsert({ indexName, vectors, metadata, ids }: UpsertVectorParams): Promise<string[]> {
-    const tableName = this.getTableName(indexName);
+    const { tableName } = this.getTableName(indexName);
 
     // Start a transaction
     const client = await this.pool.connect();
@@ -289,7 +298,7 @@ export class PgVector extends MastraVector {
 
           if (!schemaExists) {
             try {
-              await client.query(`CREATE SCHEMA IF NOT EXISTS ${this.schema}`);
+              await client.query(`CREATE SCHEMA IF NOT EXISTS ${this.getSchemaName()}`);
               this.logger.info(`Schema "${this.schema}" created successfully`);
             } catch (error) {
               this.logger.error(`Failed to create schema "${this.schema}"`, { error });
@@ -324,7 +333,7 @@ export class PgVector extends MastraVector {
     indexConfig = {},
     buildIndex = true,
   }: PgCreateIndexParams): Promise<void> {
-    const tableName = this.getTableName(indexName);
+    const { tableName } = this.getTableName(indexName);
 
     // Validate inputs
     if (!indexName.match(/^[a-zA-Z_][a-zA-Z0-9_]*$/)) {
@@ -391,10 +400,10 @@ export class PgVector extends MastraVector {
     const mutex = this.getMutexByName(`build-${indexName}`);
     // Use async-mutex instead of advisory lock for perf (over 2x as fast)
     await mutex.runExclusive(async () => {
-      const tableName = this.getTableName(indexName);
+      const { tableName, vectorIndexName } = this.getTableName(indexName);
 
       if (this.createdIndexes.has(indexName)) {
-        await client.query(`DROP INDEX IF EXISTS ${tableName}_vector_idx`);
+        await client.query(`DROP INDEX IF EXISTS ${vectorIndexName}`);
       }
 
       if (indexConfig.type === 'flat') {
@@ -411,7 +420,7 @@ export class PgVector extends MastraVector {
         const efConstruction = indexConfig.hnsw?.efConstruction ?? 32;
 
         indexSQL = `
-          CREATE INDEX IF NOT EXISTS ${indexName}_vector_idx 
+          CREATE INDEX IF NOT EXISTS ${vectorIndexName} 
           ON ${tableName} 
           USING hnsw (embedding ${metricOp})
           WITH (
@@ -428,7 +437,7 @@ export class PgVector extends MastraVector {
           lists = Math.max(100, Math.min(4000, Math.floor(Math.sqrt(size) * 2)));
         }
         indexSQL = `
-          CREATE INDEX IF NOT EXISTS ${indexName}_vector_idx
+          CREATE INDEX IF NOT EXISTS ${vectorIndexName}
           ON ${tableName}
           USING ivfflat (embedding ${metricOp})
           WITH (lists = ${lists});
@@ -517,7 +526,7 @@ export class PgVector extends MastraVector {
   async describeIndex({ indexName }: DescribeIndexParams): Promise<PGIndexStats> {
     const client = await this.pool.connect();
     try {
-      const tableName = this.getTableName(indexName);
+      const { tableName } = this.getTableName(indexName);
 
       // Check if table exists with a vector column
       const tableExistsQuery = `
@@ -613,7 +622,7 @@ export class PgVector extends MastraVector {
   async deleteIndex({ indexName }: DeleteIndexParams): Promise<void> {
     const client = await this.pool.connect();
     try {
-      const tableName = this.getTableName(indexName);
+      const { tableName } = this.getTableName(indexName);
       // Drop the table
       await client.query(`DROP TABLE IF EXISTS ${tableName} CASCADE`);
       this.createdIndexes.delete(indexName);
@@ -628,7 +637,7 @@ export class PgVector extends MastraVector {
   async truncateIndex({ indexName }: DeleteIndexParams): Promise<void> {
     const client = await this.pool.connect();
     try {
-      const tableName = this.getTableName(indexName);
+      const { tableName } = this.getTableName(indexName);
       await client.query(`TRUNCATE ${tableName}`);
     } catch (e: any) {
       await client.query('ROLLBACK');
@@ -678,7 +687,7 @@ export class PgVector extends MastraVector {
         return;
       }
 
-      const tableName = this.getTableName(indexName);
+      const { tableName } = this.getTableName(indexName);
 
       // query looks like this:
       // UPDATE table SET embedding = $2::vector, metadata = $3::jsonb WHERE id = $1
@@ -706,7 +715,7 @@ export class PgVector extends MastraVector {
   async deleteVector({ indexName, id }: DeleteVectorParams): Promise<void> {
     const client = await this.pool.connect();
     try {
-      const tableName = this.getTableName(indexName);
+      const { tableName } = this.getTableName(indexName);
       const query = `
         DELETE FROM ${tableName}
         WHERE vector_id = $1