@sprucelabs/postgres-data-store 6.1.314 → 6.1.316

package/build/PostgresDatabase.d.ts

@@ -1,4 +1,4 @@
-import { Database, Index, QueryOptions, UniqueIndex } from '@sprucelabs/data-stores';
+import { Database, Index, IndexWithFilter, QueryOptions } from '@sprucelabs/data-stores';
 import { Client } from 'pg';
 export default class PostgresDatabase implements Database {
     private connectionString;
@@ -14,7 +14,7 @@ export default class PostgresDatabase implements Database {
     private executeUpdateAndThrowIfNoResults;
     find(collection: string, query?: Record<string, any> | undefined, options?: QueryOptions | undefined): Promise<Record<string, any>[]>;
     createIndex(collection: string, fields: Index): Promise<void>;
-    getIndexes(collectionName: string): Promise<Index[] | UniqueIndex[]>;
+    getIndexes(collectionName: string): Promise<IndexWithFilter[]>;
     findOne(collection: string, query?: Record<string, any> | undefined, options?: QueryOptions | undefined): Promise<Record<string, any> | null>;
     delete(collection: string, query: Record<string, any>): Promise<number>;
     dropDatabase(): Promise<void>;
@@ -28,14 +28,13 @@ export default class PostgresDatabase implements Database {
     create(collection: string, records: Record<string, any>[]): Promise<Record<string, any>[]>;
     private executeQuery;
     connect(): Promise<void>;
-    getUniqueIndexes(collectionName: string): Promise<UniqueIndex[]>;
+    getUniqueIndexes(collectionName: string): Promise<IndexWithFilter[]>;
     private executeGetIndexes;
-    dropIndex(collectionName: string, index: UniqueIndex): Promise<void>;
+    dropIndex(collectionName: string, index: Index): Promise<void>;
     syncIndexes(collectionName: string, indexes: Index[]): Promise<void>;
-    syncUniqueIndexes(collectionName: string, indexes: UniqueIndex[]): Promise<void>;
+    syncUniqueIndexes(collectionName: string, indexes: Index[]): Promise<void>;
     private executeSyncIndexes;
-    private areIndexesEqual;
-    createUniqueIndex(collection: string, fields: UniqueIndex): Promise<void>;
+    createUniqueIndex(collection: string, fields: Index): Promise<void>;
     private executeCreateIndex;
     private generateIndexName;
     close(): Promise<void>;

package/build/PostgresDatabase.js

@@ -103,7 +103,7 @@ class PostgresDatabase {
         const indexNames = await this.getIndexNames(name);
         for (const indexName of indexNames) {
             try {
-                await this.client.query(`DROP INDEX ${indexName}`);
+                await this.client.query(`DROP INDEX "${indexName}"`);
             }
             catch (err) {
                 console.info('Failed to drop index', indexName, err.stack);
@@ -227,21 +227,21 @@ class PostgresDatabase {
         return uniqueIndexes;
     }
     async executeGetIndexes(collectionName, isUnique) {
-        const query = `SELECT indexname FROM pg_indexes WHERE tablename = '${collectionName}' AND indexdef ${isUnique ? '' : 'NOT'} LIKE '%UNIQUE%';`;
+        const query = `SELECT * FROM pg_indexes WHERE tablename = '${collectionName}' AND indexdef ${isUnique ? '' : 'NOT'} LIKE '%UNIQUE%';`;
         const res = await this.client.query(query);
         const uniqueIndexes = [];
         res.rows.forEach((row) => {
             const indexName = row.indexname.replace(`${collectionName}_`, '');
             const fields = indexName.split('_').slice(0, -1);
             if (fields.length > 0) {
-                uniqueIndexes.push(fields);
+                uniqueIndexes.push({ fields });
             }
         });
         return uniqueIndexes;
     }
     async dropIndex(collectionName, index) {
         const indexName = this.generateIndexName(collectionName, index);
-        const query = `DROP INDEX ${indexName}`;
+        const query = `DROP INDEX "${indexName}"`;
         try {
             await this.client.query({
                 text: query,
@@ -263,8 +263,9 @@ class PostgresDatabase {
     }
     async executeSyncIndexes(collectionName, indexes, isUnique) {
         const existingIndexes = await this.executeGetIndexes(collectionName, isUnique);
-        const indexesToAdd = indexes.filter((index) => !existingIndexes.find((existing) => this.areIndexesEqual(existing, index)));
-        const indexesToRemove = existingIndexes.filter((existing) => !indexes.find((index) => this.areIndexesEqual(existing, index)));
+        const indexesToAdd = (0, data_stores_1.pluckMissingIndexes)(indexes, existingIndexes);
+        const indexesToRemove = (0, data_stores_1.pluckMissingIndexes)(existingIndexes, indexes);
+        await Promise.all(indexesToRemove.map((index) => this.dropIndex(collectionName, index)));
         await Promise.all([
             ...indexesToAdd.map(async (index) => {
                 var _a;
@@ -281,16 +282,10 @@ class PostgresDatabase {
                 }
                 return null;
             }),
-            ...indexesToRemove.map((index) => this.dropIndex(collectionName, index)),
         ]);
     }
-    areIndexesEqual(existing, index) {
-        return (this.generateIndexName('any', existing) ===
-            this.generateIndexName('any', index));
-    }
     async createUniqueIndex(collection, fields) {
-        const isUnique = true;
-        await this.executeCreateIndex(collection, fields, isUnique);
+        await this.executeCreateIndex(collection, fields, true);
     }
     async executeCreateIndex(collection, index, isUnique) {
         var _a, _b;
@@ -305,7 +300,7 @@ class PostgresDatabase {
                 throw new data_stores_1.DataStoresError({
                     code: 'INDEX_EXISTS',
                     collectionName: collection,
-                    index: ['uniqueField'],
+                    index: (0, data_stores_1.normalizeIndex)(index).fields,
                 });
             }
             throw err;

package/build/QueryBuilder.d.ts

@@ -1,9 +1,9 @@
-import { QueryOptions, UniqueIndex } from '@sprucelabs/data-stores';
+import { Index, QueryOptions } from '@sprucelabs/data-stores';
 import { Query } from './postgres.types';
 export default class QueryBuilder {
     private constructor();
     static Builder(): QueryBuilder;
-    createIndex(tableName: string, index: UniqueIndex, isUnique?: boolean): BuiltQuery;
+    createIndex(tableName: string, index: Index, isUnique?: boolean): BuiltQuery;
     find(tableName: string, query: Query, options?: QueryOptions): BuiltQuery;
     buildTableName(tableName: string): string;
     private conditionalQuote;

package/build/QueryBuilder.js

@@ -12,12 +12,19 @@ class QueryBuilder {
         const { fields, filter } = (0, data_stores_1.normalizeIndex)(index);
         const indexName = (0, indexUtils_1.generateIndexName)(tableName, index);
         const keys = (0, indexUtils_1.generateKeyExpressions)(fields);
-        let query = `CREATE ${isUnique ? `UNIQUE` : ''} INDEX ${indexName} ON "${tableName}" (${keys})`;
+        let values = [];
+        let query = `CREATE ${isUnique ? `UNIQUE` : ''} INDEX "${indexName}" ON "${tableName}" (${keys})`;
         if (filter) {
-            const { sql: where } = this.optionallyBuildWhere(filter);
+            const { sql: where, values: v } = this.optionallyBuildWhere(filter);
             query += where;
+            values = v;
         }
-        return { sql: query, values: [] };
+        if (values) {
+            for (let i = 0; i < values.length; i++) {
+                query = query.replace(`$${i + 1}`, values[i]);
+            }
+        }
+        return { sql: query, values };
     }
     find(tableName, query, options) {
         const { includeFields, limit, skip, sort } = options !== null && options !== void 0 ? options : {};
@@ -71,9 +78,12 @@ class QueryBuilder {
                     .map(() => `$${++placeholderCount}`)
                     .join(', ')})`);
             }
-            else if ((value === null || value === void 0 ? void 0 : value.$type) === 'string' || (value === null || value === void 0 ? void 0 : value.$exists)) {
+            else if (value === null || value === void 0 ? void 0 : value.$exists) {
                 set.push(`${formattedK} IS NOT NULL`);
             }
+            else if ((value === null || value === void 0 ? void 0 : value.$type) === 'string') {
+                set.push(`${formattedK} ~ '[A-Za-z]+'`);
+            }
             else if (value === null || value === void 0 ? void 0 : value.$regex) {
                 values.push(this.normalizeValue(value.$regex));
                 set.push(`${formattedK} ~* $${++placeholderCount}`);

package/build/esm/PostgresDatabase.d.ts

@@ -1,4 +1,4 @@
-import { Database, Index, QueryOptions, UniqueIndex } from '@sprucelabs/data-stores';
+import { Database, Index, IndexWithFilter, QueryOptions } from '@sprucelabs/data-stores';
 import { Client } from 'pg';
 export default class PostgresDatabase implements Database {
     private connectionString;
@@ -14,7 +14,7 @@ export default class PostgresDatabase implements Database {
     private executeUpdateAndThrowIfNoResults;
     find(collection: string, query?: Record<string, any> | undefined, options?: QueryOptions | undefined): Promise<Record<string, any>[]>;
     createIndex(collection: string, fields: Index): Promise<void>;
-    getIndexes(collectionName: string): Promise<Index[] | UniqueIndex[]>;
+    getIndexes(collectionName: string): Promise<IndexWithFilter[]>;
     findOne(collection: string, query?: Record<string, any> | undefined, options?: QueryOptions | undefined): Promise<Record<string, any> | null>;
     delete(collection: string, query: Record<string, any>): Promise<number>;
     dropDatabase(): Promise<void>;
@@ -28,14 +28,13 @@ export default class PostgresDatabase implements Database {
     create(collection: string, records: Record<string, any>[]): Promise<Record<string, any>[]>;
     private executeQuery;
     connect(): Promise<void>;
-    getUniqueIndexes(collectionName: string): Promise<UniqueIndex[]>;
+    getUniqueIndexes(collectionName: string): Promise<IndexWithFilter[]>;
     private executeGetIndexes;
-    dropIndex(collectionName: string, index: UniqueIndex): Promise<void>;
+    dropIndex(collectionName: string, index: Index): Promise<void>;
     syncIndexes(collectionName: string, indexes: Index[]): Promise<void>;
-    syncUniqueIndexes(collectionName: string, indexes: UniqueIndex[]): Promise<void>;
+    syncUniqueIndexes(collectionName: string, indexes: Index[]): Promise<void>;
     private executeSyncIndexes;
-    private areIndexesEqual;
-    createUniqueIndex(collection: string, fields: UniqueIndex): Promise<void>;
+    createUniqueIndex(collection: string, fields: Index): Promise<void>;
     private executeCreateIndex;
     private generateIndexName;
     close(): Promise<void>;

package/build/esm/PostgresDatabase.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { randomUUID } from 'crypto';
-import { DataStoresError, normalizeIndex, } from '@sprucelabs/data-stores';
+import { DataStoresError, normalizeIndex, pluckMissingIndexes, } from '@sprucelabs/data-stores';
 import { assertOptions } from '@sprucelabs/schema';
 import { Client } from 'pg';
 import { generateIndexName } from './indexUtils.js';
@@ -125,7 +125,7 @@ export default class PostgresDatabase {
             const indexNames = yield this.getIndexNames(name);
             for (const indexName of indexNames) {
                 try {
-                    yield this.client.query(`DROP INDEX ${indexName}`);
+                    yield this.client.query(`DROP INDEX "${indexName}"`);
                 }
                 catch (err) {
                     console.info('Failed to drop index', indexName, err.stack);
@@ -271,14 +271,14 @@ export default class PostgresDatabase {
     }
     executeGetIndexes(collectionName, isUnique) {
         return __awaiter(this, void 0, void 0, function* () {
-            const query = `SELECT indexname FROM pg_indexes WHERE tablename = '${collectionName}' AND indexdef ${isUnique ? '' : 'NOT'} LIKE '%UNIQUE%';`;
+            const query = `SELECT * FROM pg_indexes WHERE tablename = '${collectionName}' AND indexdef ${isUnique ? '' : 'NOT'} LIKE '%UNIQUE%';`;
             const res = yield this.client.query(query);
             const uniqueIndexes = [];
             res.rows.forEach((row) => {
                 const indexName = row.indexname.replace(`${collectionName}_`, '');
                 const fields = indexName.split('_').slice(0, -1);
                 if (fields.length > 0) {
-                    uniqueIndexes.push(fields);
+                    uniqueIndexes.push({ fields });
                 }
             });
             return uniqueIndexes;
@@ -287,7 +287,7 @@ export default class PostgresDatabase {
     dropIndex(collectionName, index) {
         return __awaiter(this, void 0, void 0, function* () {
             const indexName = this.generateIndexName(collectionName, index);
-            const query = `DROP INDEX ${indexName}`;
+            const query = `DROP INDEX "${indexName}"`;
             try {
                 yield this.client.query({
                     text: query,
@@ -315,8 +315,9 @@ export default class PostgresDatabase {
     executeSyncIndexes(collectionName, indexes, isUnique) {
         return __awaiter(this, void 0, void 0, function* () {
             const existingIndexes = yield this.executeGetIndexes(collectionName, isUnique);
-            const indexesToAdd = indexes.filter((index) => !existingIndexes.find((existing) => this.areIndexesEqual(existing, index)));
-            const indexesToRemove = existingIndexes.filter((existing) => !indexes.find((index) => this.areIndexesEqual(existing, index)));
+            const indexesToAdd = pluckMissingIndexes(indexes, existingIndexes);
+            const indexesToRemove = pluckMissingIndexes(existingIndexes, indexes);
+            yield Promise.all(indexesToRemove.map((index) => this.dropIndex(collectionName, index)));
             yield Promise.all([
                 ...indexesToAdd.map((index) => __awaiter(this, void 0, void 0, function* () {
                     var _a;
@@ -333,18 +334,12 @@ export default class PostgresDatabase {
                     }
                     return null;
                 })),
-                ...indexesToRemove.map((index) => this.dropIndex(collectionName, index)),
             ]);
         });
     }
-    areIndexesEqual(existing, index) {
-        return (this.generateIndexName('any', existing) ===
-            this.generateIndexName('any', index));
-    }
     createUniqueIndex(collection, fields) {
         return __awaiter(this, void 0, void 0, function* () {
-            const isUnique = true;
-            yield this.executeCreateIndex(collection, fields, isUnique);
+            yield this.executeCreateIndex(collection, fields, true);
         });
     }
     executeCreateIndex(collection, index, isUnique) {
@@ -361,7 +356,7 @@ export default class PostgresDatabase {
                     throw new DataStoresError({
                         code: 'INDEX_EXISTS',
                         collectionName: collection,
-                        index: ['uniqueField'],
+                        index: normalizeIndex(index).fields,
                     });
                 }
                 throw err;

package/build/esm/QueryBuilder.d.ts

@@ -1,9 +1,9 @@
-import { QueryOptions, UniqueIndex } from '@sprucelabs/data-stores';
+import { Index, QueryOptions } from '@sprucelabs/data-stores';
 import { Query } from './postgres.types';
 export default class QueryBuilder {
     private constructor();
     static Builder(): QueryBuilder;
-    createIndex(tableName: string, index: UniqueIndex, isUnique?: boolean): BuiltQuery;
+    createIndex(tableName: string, index: Index, isUnique?: boolean): BuiltQuery;
     find(tableName: string, query: Query, options?: QueryOptions): BuiltQuery;
     buildTableName(tableName: string): string;
     private conditionalQuote;

package/build/esm/QueryBuilder.js

@@ -9,12 +9,19 @@ export default class QueryBuilder {
         const { fields, filter } = normalizeIndex(index);
         const indexName = generateIndexName(tableName, index);
         const keys = generateKeyExpressions(fields);
-        let query = `CREATE ${isUnique ? `UNIQUE` : ''} INDEX ${indexName} ON "${tableName}" (${keys})`;
+        let values = [];
+        let query = `CREATE ${isUnique ? `UNIQUE` : ''} INDEX "${indexName}" ON "${tableName}" (${keys})`;
         if (filter) {
-            const { sql: where } = this.optionallyBuildWhere(filter);
+            const { sql: where, values: v } = this.optionallyBuildWhere(filter);
             query += where;
+            values = v;
         }
-        return { sql: query, values: [] };
+        if (values) {
+            for (let i = 0; i < values.length; i++) {
+                query = query.replace(`$${i + 1}`, values[i]);
+            }
+        }
+        return { sql: query, values };
     }
     find(tableName, query, options) {
         const { includeFields, limit, skip, sort } = options !== null && options !== void 0 ? options : {};
@@ -68,9 +75,12 @@ export default class QueryBuilder {
                     .map(() => `$${++placeholderCount}`)
                     .join(', ')})`);
             }
-            else if ((value === null || value === void 0 ? void 0 : value.$type) === 'string' || (value === null || value === void 0 ? void 0 : value.$exists)) {
+            else if (value === null || value === void 0 ? void 0 : value.$exists) {
                 set.push(`${formattedK} IS NOT NULL`);
             }
+            else if ((value === null || value === void 0 ? void 0 : value.$type) === 'string') {
+                set.push(`${formattedK} ~ '[A-Za-z]+'`);
+            }
             else if (value === null || value === void 0 ? void 0 : value.$regex) {
                 values.push(this.normalizeValue(value.$regex));
                 set.push(`${formattedK} ~* $${++placeholderCount}`);

package/build/esm/indexUtils.d.ts

@@ -1,4 +1,4 @@
-import { UniqueIndex } from '@sprucelabs/data-stores';
+import { Index } from '@sprucelabs/data-stores';
 export declare function generateKeyExpression(field: string): string;
 export declare function generateKeyExpressions(fields: string[]): string;
-export declare function generateIndexName(collection: string, index: UniqueIndex): string;
+export declare function generateIndexName(collection: string, index: Index): string;

package/build/esm/indexUtils.js

@@ -15,7 +15,5 @@ export function generateKeyExpressions(fields) {
     return fields.map((f) => generateKeyExpression(f)).join(', ');
 }
 export function generateIndexName(collection, index) {
-    return `${collection}_${normalizeIndex(index)
-        .fields.map((f) => f.toLowerCase())
-        .join('_')}${'_index'}`.replace(/\./g, '_');
+    return `${collection}_${normalizeIndex(index).fields.join('_')}${'_index'}`.replace(/\./g, '_');
 }

package/build/indexUtils.d.ts

@@ -1,4 +1,4 @@
-import { UniqueIndex } from '@sprucelabs/data-stores';
+import { Index } from '@sprucelabs/data-stores';
 export declare function generateKeyExpression(field: string): string;
 export declare function generateKeyExpressions(fields: string[]): string;
-export declare function generateIndexName(collection: string, index: UniqueIndex): string;
+export declare function generateIndexName(collection: string, index: Index): string;

package/build/indexUtils.js

@@ -20,7 +20,5 @@ function generateKeyExpressions(fields) {
     return fields.map((f) => generateKeyExpression(f)).join(', ');
 }
 function generateIndexName(collection, index) {
-    return `${collection}_${(0, data_stores_1.normalizeIndex)(index)
-        .fields.map((f) => f.toLowerCase())
-        .join('_')}${'_index'}`.replace(/\./g, '_');
+    return `${collection}_${(0, data_stores_1.normalizeIndex)(index).fields.join('_')}${'_index'}`.replace(/\./g, '_');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sprucelabs/postgres-data-store",
-  "version": "6.1.314",
+  "version": "6.1.316",
   "description": "Postgres production and test adapters for @sprucelabs/data-stores",
   "skill": {
     "namespace": "postgres-data-store",
@@ -49,19 +49,19 @@
     "watch.tsc": "tsc -w"
   },
   "dependencies": {
-    "@sprucelabs/data-stores": "^28.1.332",
-    "@sprucelabs/schema": "^30.0.382",
+    "@sprucelabs/data-stores": "^28.3.0",
+    "@sprucelabs/schema": "^30.0.393",
     "pg": "^8.12.0"
   },
   "devDependencies": {
-    "@sprucelabs/esm-postbuild": "^6.0.318",
-    "@sprucelabs/jest-json-reporter": "^8.0.336",
-    "@sprucelabs/resolve-path-aliases": "^2.0.313",
+    "@sprucelabs/esm-postbuild": "^6.0.329",
+    "@sprucelabs/jest-json-reporter": "^8.0.346",
+    "@sprucelabs/resolve-path-aliases": "^2.0.324",
     "@sprucelabs/semantic-release": "^5.0.2",
-    "@sprucelabs/test": "^9.0.44",
-    "@sprucelabs/test-utils": "^5.1.280",
+    "@sprucelabs/test": "^9.0.45",
+    "@sprucelabs/test-utils": "^5.1.291",
     "@types/node": "^22.5.4",
-    "@types/pg": "^8.11.8",
+    "@types/pg": "^8.11.9",
     "chokidar-cli": "^3.0.0",
     "eslint": "^9.10.0",
     "eslint-config-spruce": "^11.2.26",