@onivoro/server-typeorm-postgres 22.0.3 → 22.0.5

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

@@ -56,7 +56,7 @@ let RedshiftRepository = class RedshiftRepository extends type_orm_repository_cl
             setExpressions.push(`${this.columns[key].databasePath} = ${this.mapPlaceholderExpression(length, index, key)}`);
             setParams.push(value);
         });
-        let query = `UPDATE "${this.table}" SET ${setExpressions.join(', ')} ${whereClause}`;
+        let query = `UPDATE ${this.getTableNameExpression()} SET ${setExpressions.join(', ')} ${whereClause}`;
         await this.query(query, [...queryParams, ...setParams]);
     }
     async postOne(entity) {

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

@@ -8,6 +8,7 @@ export declare class TypeOrmRepository<TEntity> implements IEntityProvider<TEnti
     entityManager: EntityManager;
     protected columns: TKeysOf<TEntity, TTableMeta>;
     protected table: string;
+    protected schema: string;
     debug: boolean;
     constructor(entityType: any, entityManager: EntityManager);
     forTransaction(entityManager: EntityManager): TypeOrmRepository<TEntity>;
@@ -23,6 +24,8 @@ export declare class TypeOrmRepository<TEntity> implements IEntityProvider<TEnti
     get repo(): import("typeorm").Repository<import("typeorm").ObjectLiteral>;
     protected insertAndReturn(entityToInsert: TEntity): Promise<TEntity>;
     protected insertAndReturnMany(entitiesToInsert: TEntity[]): Promise<TEntity[]>;
+    protected getSchemaPrefix(): string;
+    protected getTableNameExpression(): string;
     protected buildSelectStatement(options: FindManyOptions<TEntity>): {
         query: string;
         queryParams: any[];

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

@@ -6,12 +6,14 @@ class TypeOrmRepository {
     entityManager;
     columns = {};
     table;
+    schema;
     debug = false;
     constructor(entityType, entityManager) {
         this.entityType = entityType;
         this.entityManager = entityManager;
-        const { tableName } = this.repo.metadata;
+        const { tableName, schema } = this.repo.metadata;
         this.table = tableName;
+        this.schema = schema;
         this.repo.metadata.columns.forEach((_) => {
             const { databasePath, propertyPath, type, isPrimary } = _;
             this.columns[propertyPath] = { databasePath, type, propertyPath, isPrimary, default: _.default };
@@ -67,14 +69,21 @@ class TypeOrmRepository {
         const insertedEntity = insertionResult.generatedMaps;
         return insertedEntity;
     }
+    getSchemaPrefix() {
+        return this.schema ? `"${this.schema}".` : '';
+    }
+    getTableNameExpression() {
+        const schemaPrefix = this.getSchemaPrefix();
+        return `${schemaPrefix}"${this.table}"`;
+    }
     buildSelectStatement(options) {
         const { whereClause, queryParams } = this.buildWhereExpression(options.where);
-        const query = `SELECT * FROM "${this.table}"${whereClause};`;
+        const query = `SELECT * FROM ${this.getTableNameExpression()}${whereClause};`;
         return { query, queryParams };
     }
     buildDeleteStatement(where) {
         const { whereClause, queryParams } = this.buildWhereExpression(where);
-        const query = `DELETE FROM "${this.table}"${whereClause};`;
+        const query = `DELETE FROM ${this.getTableNameExpression()}${whereClause};`;
         return { query, queryParams };
     }
     buildWhereExpression(where) {
@@ -97,7 +106,7 @@ class TypeOrmRepository {
         const values = Object.values(entity);
         const columnNames = keys.map(key => this.columns[key].databasePath).join(', ');
         const paramPlaceholders = keys.map((key, index) => this.mapPlaceholderExpression(0, index, key)).join(', ');
-        const insertQuery = `INSERT INTO "${this.table}" (${columnNames}) VALUES (${paramPlaceholders})`;
+        const insertQuery = `INSERT INTO ${this.getTableNameExpression()} (${columnNames}) VALUES (${paramPlaceholders})`;
         return { insertQuery, values };
     }
     buildInsertManyQuery(entities) {
@@ -119,7 +128,7 @@ class TypeOrmRepository {
             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(', ')}`;
+        const insertQuery = `INSERT INTO ${this.getTableNameExpression()} (${columnNames}) VALUES ${valuesExpressions.join(', ')}`;
         return { insertQuery, values };
     }
     mapPlaceholderExpression(length, index, column) {
@@ -143,7 +152,7 @@ class TypeOrmRepository {
                 values.push((typeof entity[key] === 'undefined') ? this.columns[key].default : entity[key]);
             });
             const whereExpression = Object.keys(keyMap).map((_, index) => `(${this.columns[_].databasePath} = $${length + index + 1})`).join(' AND ');
-            selectExpressions.push(`(select * from "${this.table}" where (${whereExpression}))`);
+            selectExpressions.push(`(select * from ${this.getTableNameExpression()} where (${whereExpression}))`);
         });
         const selectQuery = selectExpressions.join(' UNION ');
         return { selectQuery, values };
@@ -158,11 +167,11 @@ class TypeOrmRepository {
     }
     async query(query, parameters) {
         if (this.debug) {
-            console.log({ table: this.table, query, parameters });
+            console.log({ schema: this.schema, table: this.table, query, parameters });
         }
         const result = await this.repo.query(query, parameters);
         if (this.debug) {
-            console.log({ table: this.table, query, parameters, result });
+            console.log({ schema: this.schema, table: this.table, query, parameters, result });
         }
         return result;
     }

package/dist/cjs/lib/functions/data-source-config-factory.function.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.dataSourceConfigFactory = dataSourceConfigFactory;
 const typeorm_naming_strategies_1 = require("typeorm-naming-strategies");
 function dataSourceConfigFactory(name, options, entities) {
-    const { ca, database, host, password, port, username, synchronize = false, logging = false } = options;
+    const { ca, database, host, password, port, username, synchronize = false, logging = false, schema, } = options;
     const config = {
         name,
         type: 'postgres',
@@ -16,6 +16,7 @@ function dataSourceConfigFactory(name, options, entities) {
         synchronize,
         logging,
         entities,
+        schema,
         subscribers: [],
         migrations: [],
         namingStrategy: new typeorm_naming_strategies_1.SnakeNamingStrategy(),

package/dist/cjs/lib/types/data-source-options.interface.d.ts

@@ -6,5 +6,6 @@ export interface IDataSourceOptions {
     password: string;
     synchronize?: boolean;
     logging?: boolean;
+    schema?: string;
     ca?: string;
 }

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

@@ -56,7 +56,7 @@ let RedshiftRepository = class RedshiftRepository extends type_orm_repository_cl
             setExpressions.push(`${this.columns[key].databasePath} = ${this.mapPlaceholderExpression(length, index, key)}`);
             setParams.push(value);
         });
-        let query = `UPDATE "${this.table}" SET ${setExpressions.join(', ')} ${whereClause}`;
+        let query = `UPDATE ${this.getTableNameExpression()} SET ${setExpressions.join(', ')} ${whereClause}`;
         await this.query(query, [...queryParams, ...setParams]);
     }
     async postOne(entity) {

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

@@ -8,6 +8,7 @@ export declare class TypeOrmRepository<TEntity> implements IEntityProvider<TEnti
     entityManager: EntityManager;
     protected columns: TKeysOf<TEntity, TTableMeta>;
     protected table: string;
+    protected schema: string;
     debug: boolean;
     constructor(entityType: any, entityManager: EntityManager);
     forTransaction(entityManager: EntityManager): TypeOrmRepository<TEntity>;
@@ -23,6 +24,8 @@ export declare class TypeOrmRepository<TEntity> implements IEntityProvider<TEnti
     get repo(): import("typeorm").Repository<import("typeorm").ObjectLiteral>;
     protected insertAndReturn(entityToInsert: TEntity): Promise<TEntity>;
     protected insertAndReturnMany(entitiesToInsert: TEntity[]): Promise<TEntity[]>;
+    protected getSchemaPrefix(): string;
+    protected getTableNameExpression(): string;
     protected buildSelectStatement(options: FindManyOptions<TEntity>): {
         query: string;
         queryParams: any[];

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

@@ -6,12 +6,14 @@ class TypeOrmRepository {
     entityManager;
     columns = {};
     table;
+    schema;
     debug = false;
     constructor(entityType, entityManager) {
         this.entityType = entityType;
         this.entityManager = entityManager;
-        const { tableName } = this.repo.metadata;
+        const { tableName, schema } = this.repo.metadata;
         this.table = tableName;
+        this.schema = schema;
         this.repo.metadata.columns.forEach((_) => {
             const { databasePath, propertyPath, type, isPrimary } = _;
             this.columns[propertyPath] = { databasePath, type, propertyPath, isPrimary, default: _.default };
@@ -67,14 +69,21 @@ class TypeOrmRepository {
         const insertedEntity = insertionResult.generatedMaps;
         return insertedEntity;
     }
+    getSchemaPrefix() {
+        return this.schema ? `"${this.schema}".` : '';
+    }
+    getTableNameExpression() {
+        const schemaPrefix = this.getSchemaPrefix();
+        return `${schemaPrefix}"${this.table}"`;
+    }
     buildSelectStatement(options) {
         const { whereClause, queryParams } = this.buildWhereExpression(options.where);
-        const query = `SELECT * FROM "${this.table}"${whereClause};`;
+        const query = `SELECT * FROM ${this.getTableNameExpression()}${whereClause};`;
         return { query, queryParams };
     }
     buildDeleteStatement(where) {
         const { whereClause, queryParams } = this.buildWhereExpression(where);
-        const query = `DELETE FROM "${this.table}"${whereClause};`;
+        const query = `DELETE FROM ${this.getTableNameExpression()}${whereClause};`;
         return { query, queryParams };
     }
     buildWhereExpression(where) {
@@ -97,7 +106,7 @@ class TypeOrmRepository {
         const values = Object.values(entity);
         const columnNames = keys.map(key => this.columns[key].databasePath).join(', ');
         const paramPlaceholders = keys.map((key, index) => this.mapPlaceholderExpression(0, index, key)).join(', ');
-        const insertQuery = `INSERT INTO "${this.table}" (${columnNames}) VALUES (${paramPlaceholders})`;
+        const insertQuery = `INSERT INTO ${this.getTableNameExpression()} (${columnNames}) VALUES (${paramPlaceholders})`;
         return { insertQuery, values };
     }
     buildInsertManyQuery(entities) {
@@ -119,7 +128,7 @@ class TypeOrmRepository {
             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(', ')}`;
+        const insertQuery = `INSERT INTO ${this.getTableNameExpression()} (${columnNames}) VALUES ${valuesExpressions.join(', ')}`;
         return { insertQuery, values };
     }
     mapPlaceholderExpression(length, index, column) {
@@ -143,7 +152,7 @@ class TypeOrmRepository {
                 values.push((typeof entity[key] === 'undefined') ? this.columns[key].default : entity[key]);
             });
             const whereExpression = Object.keys(keyMap).map((_, index) => `(${this.columns[_].databasePath} = $${length + index + 1})`).join(' AND ');
-            selectExpressions.push(`(select * from "${this.table}" where (${whereExpression}))`);
+            selectExpressions.push(`(select * from ${this.getTableNameExpression()} where (${whereExpression}))`);
         });
         const selectQuery = selectExpressions.join(' UNION ');
         return { selectQuery, values };
@@ -158,11 +167,11 @@ class TypeOrmRepository {
     }
     async query(query, parameters) {
         if (this.debug) {
-            console.log({ table: this.table, query, parameters });
+            console.log({ schema: this.schema, table: this.table, query, parameters });
         }
         const result = await this.repo.query(query, parameters);
         if (this.debug) {
-            console.log({ table: this.table, query, parameters, result });
+            console.log({ schema: this.schema, table: this.table, query, parameters, result });
         }
         return result;
     }

package/dist/esm/lib/functions/data-source-config-factory.function.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.dataSourceConfigFactory = dataSourceConfigFactory;
 const typeorm_naming_strategies_1 = require("typeorm-naming-strategies");
 function dataSourceConfigFactory(name, options, entities) {
-    const { ca, database, host, password, port, username, synchronize = false, logging = false } = options;
+    const { ca, database, host, password, port, username, synchronize = false, logging = false, schema, } = options;
     const config = {
         name,
         type: 'postgres',
@@ -16,6 +16,7 @@ function dataSourceConfigFactory(name, options, entities) {
         synchronize,
         logging,
         entities,
+        schema,
         subscribers: [],
         migrations: [],
         namingStrategy: new typeorm_naming_strategies_1.SnakeNamingStrategy(),

package/dist/esm/lib/types/data-source-options.interface.d.ts

@@ -6,5 +6,6 @@ export interface IDataSourceOptions {
     password: string;
     synchronize?: boolean;
     logging?: boolean;
+    schema?: string;
     ca?: string;
 }

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

@@ -8,6 +8,7 @@ export declare class TypeOrmRepository<TEntity> implements IEntityProvider<TEnti
     entityManager: EntityManager;
     protected columns: TKeysOf<TEntity, TTableMeta>;
     protected table: string;
+    protected schema: string;
     debug: boolean;
     constructor(entityType: any, entityManager: EntityManager);
     forTransaction(entityManager: EntityManager): TypeOrmRepository<TEntity>;
@@ -23,6 +24,8 @@ export declare class TypeOrmRepository<TEntity> implements IEntityProvider<TEnti
     get repo(): import("typeorm").Repository<import("typeorm").ObjectLiteral>;
     protected insertAndReturn(entityToInsert: TEntity): Promise<TEntity>;
     protected insertAndReturnMany(entitiesToInsert: TEntity[]): Promise<TEntity[]>;
+    protected getSchemaPrefix(): string;
+    protected getTableNameExpression(): string;
     protected buildSelectStatement(options: FindManyOptions<TEntity>): {
         query: string;
         queryParams: any[];

package/dist/types/lib/types/data-source-options.interface.d.ts

@@ -6,5 +6,6 @@ export interface IDataSourceOptions {
     password: string;
     synchronize?: boolean;
     logging?: boolean;
+    schema?: string;
     ca?: string;
 }

package/package.json

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