@onivoro/server-typeorm-postgres 22.0.1 → 22.0.3

package/dist/cjs/lib/classes/redshift-repository.class.d.ts

@@ -15,12 +15,8 @@ export declare class RedshiftRepository<TEntity> extends TypeOrmRepository<TEnti
     forTransaction(entityManager: EntityManager): TypeOrmRepository<TEntity>;
     getManyAndCount(options: FindManyOptions<TEntity>): Promise<[TEntity[], number]>;
     softDelete(where: FindOptionsWhere<TEntity>): Promise<void>;
-    protected buildInsertManyQuery(entities: Partial<TEntity>[]): {
-        insertQuery: string;
-        values: any[];
-    };
-    private mapPlaceholderExpression;
     postOneWithoutReturn(entity: Partial<TEntity>): Promise<void>;
     postManyWithoutReturn(entities: Partial<TEntity>[]): Promise<void>;
     private throwNotImplemented;
+    protected mapPlaceholderExpression(length: number, index: number, column: string): string;
 }

package/dist/cjs/lib/classes/redshift-repository.class.js

@@ -83,33 +83,6 @@ let RedshiftRepository = class RedshiftRepository extends type_orm_repository_cl
     async softDelete(where) {
         await this.patch(where, { deletedAt: new Date().toISOString() });
     }
-    buildInsertManyQuery(entities) {
-        const keyMap = {};
-        entities.forEach(entity => {
-            Object.keys(entity)
-                .forEach(key => {
-                keyMap[key] = true;
-            });
-        });
-        const columnNames = Object.keys(keyMap).map(key => this.columns[key].databasePath).join(', ');
-        const valuesExpressions = [];
-        const values = [];
-        entities.forEach(entity => {
-            const length = values.length;
-            Object.keys(keyMap).forEach(key => {
-                values.push((typeof entity[key] === 'undefined') ? this.columns[key].default : entity[key]);
-            });
-            const paramPlaceholders = Object.keys(keyMap).map((_, index) => this.mapPlaceholderExpression(length, index, _)).join(', ');
-            valuesExpressions.push(`(${paramPlaceholders})`);
-        });
-        const insertQuery = `INSERT INTO "${this.table}" (${columnNames}) VALUES ${valuesExpressions.join(', ')}`;
-        return { insertQuery, values };
-    }
-    mapPlaceholderExpression(length, index, column) {
-        const exp = `$${length + index + 1}`;
-        const meta = this.columns[column];
-        return meta.type === 'jsonb' ? `JSON_PARSE('${exp}')` : exp;
-    }
     async postOneWithoutReturn(entity) {
         // PERFORM AN INSERT BUT NOT THE RETRIEVAL QUERY FOR PERFORMANCE
         const { insertQuery, values } = this.buildInsertQuery(entity);
@@ -123,6 +96,11 @@ let RedshiftRepository = class RedshiftRepository extends type_orm_repository_cl
     throwNotImplemented(feature) {
         throw new common_1.NotImplementedException(`RedshiftRepository of type "${this.entityType?.name}" has no implementation for "${feature}"`);
     }
+    mapPlaceholderExpression(length, index, column) {
+        const exp = `$${length + index + 1}`;
+        const meta = this.columns[column];
+        return meta.type === 'jsonb' ? `JSON_PARSE(${exp})` : exp;
+    }
 };
 exports.RedshiftRepository = RedshiftRepository;
 exports.RedshiftRepository = RedshiftRepository = __decorate([

package/dist/cjs/lib/classes/type-orm-repository.class.d.ts

@@ -43,6 +43,7 @@ export declare class TypeOrmRepository<TEntity> implements IEntityProvider<TEnti
         insertQuery: string;
         values: any[];
     };
+    protected mapPlaceholderExpression(length: number, index: number, column: string): string;
     protected buildSelectManyQuery(entities: Partial<TEntity>[]): {
         selectQuery: string;
         values: any[];

package/dist/cjs/lib/classes/type-orm-repository.class.js

@@ -96,7 +96,7 @@ class TypeOrmRepository {
         const keys = Object.keys(entity);
         const values = Object.values(entity);
         const columnNames = keys.map(key => this.columns[key].databasePath).join(', ');
-        const paramPlaceholders = keys.map((_, index) => `$${index + 1}`).join(', ');
+        const paramPlaceholders = keys.map((key, index) => this.mapPlaceholderExpression(0, index, key)).join(', ');
         const insertQuery = `INSERT INTO "${this.table}" (${columnNames}) VALUES (${paramPlaceholders})`;
         return { insertQuery, values };
     }
@@ -116,12 +116,17 @@ class TypeOrmRepository {
             Object.keys(keyMap).forEach(key => {
                 values.push((typeof entity[key] === 'undefined') ? this.columns[key].default : entity[key]);
             });
-            const paramPlaceholders = Object.keys(keyMap).map((_, index) => `$${length + index + 1}`).join(', ');
+            const paramPlaceholders = Object.keys(keyMap).map((_, index) => this.mapPlaceholderExpression(length, index, _)).join(', ');
             valuesExpressions.push(`(${paramPlaceholders})`);
         });
         const insertQuery = `INSERT INTO "${this.table}" (${columnNames}) VALUES ${valuesExpressions.join(', ')}`;
         return { insertQuery, values };
     }
+    mapPlaceholderExpression(length, index, column) {
+        const exp = `$${length + index + 1}`;
+        const meta = this.columns[column];
+        return meta.type === 'jsonb' ? exp : exp; // TODO: figure out how to handle this for postgres... $1::jsonb equivalent
+    }
     buildSelectManyQuery(entities) {
         const keyMap = {};
         entities.forEach(entity => {

package/dist/esm/lib/classes/redshift-repository.class.d.ts

@@ -15,12 +15,8 @@ export declare class RedshiftRepository<TEntity> extends TypeOrmRepository<TEnti
     forTransaction(entityManager: EntityManager): TypeOrmRepository<TEntity>;
     getManyAndCount(options: FindManyOptions<TEntity>): Promise<[TEntity[], number]>;
     softDelete(where: FindOptionsWhere<TEntity>): Promise<void>;
-    protected buildInsertManyQuery(entities: Partial<TEntity>[]): {
-        insertQuery: string;
-        values: any[];
-    };
-    private mapPlaceholderExpression;
     postOneWithoutReturn(entity: Partial<TEntity>): Promise<void>;
     postManyWithoutReturn(entities: Partial<TEntity>[]): Promise<void>;
     private throwNotImplemented;
+    protected mapPlaceholderExpression(length: number, index: number, column: string): string;
 }

package/dist/esm/lib/classes/redshift-repository.class.js

@@ -83,33 +83,6 @@ let RedshiftRepository = class RedshiftRepository extends type_orm_repository_cl
     async softDelete(where) {
         await this.patch(where, { deletedAt: new Date().toISOString() });
     }
-    buildInsertManyQuery(entities) {
-        const keyMap = {};
-        entities.forEach(entity => {
-            Object.keys(entity)
-                .forEach(key => {
-                keyMap[key] = true;
-            });
-        });
-        const columnNames = Object.keys(keyMap).map(key => this.columns[key].databasePath).join(', ');
-        const valuesExpressions = [];
-        const values = [];
-        entities.forEach(entity => {
-            const length = values.length;
-            Object.keys(keyMap).forEach(key => {
-                values.push((typeof entity[key] === 'undefined') ? this.columns[key].default : entity[key]);
-            });
-            const paramPlaceholders = Object.keys(keyMap).map((_, index) => this.mapPlaceholderExpression(length, index, _)).join(', ');
-            valuesExpressions.push(`(${paramPlaceholders})`);
-        });
-        const insertQuery = `INSERT INTO "${this.table}" (${columnNames}) VALUES ${valuesExpressions.join(', ')}`;
-        return { insertQuery, values };
-    }
-    mapPlaceholderExpression(length, index, column) {
-        const exp = `$${length + index + 1}`;
-        const meta = this.columns[column];
-        return meta.type === 'jsonb' ? `JSON_PARSE('${exp}')` : exp;
-    }
     async postOneWithoutReturn(entity) {
         // PERFORM AN INSERT BUT NOT THE RETRIEVAL QUERY FOR PERFORMANCE
         const { insertQuery, values } = this.buildInsertQuery(entity);
@@ -123,6 +96,11 @@ let RedshiftRepository = class RedshiftRepository extends type_orm_repository_cl
     throwNotImplemented(feature) {
         throw new common_1.NotImplementedException(`RedshiftRepository of type "${this.entityType?.name}" has no implementation for "${feature}"`);
     }
+    mapPlaceholderExpression(length, index, column) {
+        const exp = `$${length + index + 1}`;
+        const meta = this.columns[column];
+        return meta.type === 'jsonb' ? `JSON_PARSE(${exp})` : exp;
+    }
 };
 exports.RedshiftRepository = RedshiftRepository;
 exports.RedshiftRepository = RedshiftRepository = __decorate([

package/dist/esm/lib/classes/type-orm-repository.class.d.ts

@@ -43,6 +43,7 @@ export declare class TypeOrmRepository<TEntity> implements IEntityProvider<TEnti
         insertQuery: string;
         values: any[];
     };
+    protected mapPlaceholderExpression(length: number, index: number, column: string): string;
     protected buildSelectManyQuery(entities: Partial<TEntity>[]): {
         selectQuery: string;
         values: any[];

package/dist/esm/lib/classes/type-orm-repository.class.js

@@ -96,7 +96,7 @@ class TypeOrmRepository {
         const keys = Object.keys(entity);
         const values = Object.values(entity);
         const columnNames = keys.map(key => this.columns[key].databasePath).join(', ');
-        const paramPlaceholders = keys.map((_, index) => `$${index + 1}`).join(', ');
+        const paramPlaceholders = keys.map((key, index) => this.mapPlaceholderExpression(0, index, key)).join(', ');
         const insertQuery = `INSERT INTO "${this.table}" (${columnNames}) VALUES (${paramPlaceholders})`;
         return { insertQuery, values };
     }
@@ -116,12 +116,17 @@ class TypeOrmRepository {
             Object.keys(keyMap).forEach(key => {
                 values.push((typeof entity[key] === 'undefined') ? this.columns[key].default : entity[key]);
             });
-            const paramPlaceholders = Object.keys(keyMap).map((_, index) => `$${length + index + 1}`).join(', ');
+            const paramPlaceholders = Object.keys(keyMap).map((_, index) => this.mapPlaceholderExpression(length, index, _)).join(', ');
             valuesExpressions.push(`(${paramPlaceholders})`);
         });
         const insertQuery = `INSERT INTO "${this.table}" (${columnNames}) VALUES ${valuesExpressions.join(', ')}`;
         return { insertQuery, values };
     }
+    mapPlaceholderExpression(length, index, column) {
+        const exp = `$${length + index + 1}`;
+        const meta = this.columns[column];
+        return meta.type === 'jsonb' ? exp : exp; // TODO: figure out how to handle this for postgres... $1::jsonb equivalent
+    }
     buildSelectManyQuery(entities) {
         const keyMap = {};
         entities.forEach(entity => {

package/dist/types/lib/classes/redshift-repository.class.d.ts

@@ -15,12 +15,8 @@ export declare class RedshiftRepository<TEntity> extends TypeOrmRepository<TEnti
     forTransaction(entityManager: EntityManager): TypeOrmRepository<TEntity>;
     getManyAndCount(options: FindManyOptions<TEntity>): Promise<[TEntity[], number]>;
     softDelete(where: FindOptionsWhere<TEntity>): Promise<void>;
-    protected buildInsertManyQuery(entities: Partial<TEntity>[]): {
-        insertQuery: string;
-        values: any[];
-    };
-    private mapPlaceholderExpression;
     postOneWithoutReturn(entity: Partial<TEntity>): Promise<void>;
     postManyWithoutReturn(entities: Partial<TEntity>[]): Promise<void>;
     private throwNotImplemented;
+    protected mapPlaceholderExpression(length: number, index: number, column: string): string;
 }

package/dist/types/lib/classes/type-orm-repository.class.d.ts

@@ -43,6 +43,7 @@ export declare class TypeOrmRepository<TEntity> implements IEntityProvider<TEnti
         insertQuery: string;
         values: any[];
     };
+    protected mapPlaceholderExpression(length: number, index: number, column: string): string;
     protected buildSelectManyQuery(entities: Partial<TEntity>[]): {
         selectQuery: string;
         values: any[];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@onivoro/server-typeorm-postgres",
-    "version": "22.0.1",
+    "version": "22.0.3",
     "repository": {
         "url": "git+https://github.com/onivoro/server-typeorm-postgres.git"
     },