From ec8724dde0aea402943be5be435441fb6896c5fa Mon Sep 17 00:00:00 2001 From: Igor Aguiar Rodrigues Date: Fri, 3 Apr 2020 00:35:04 -0300 Subject: [PATCH 1/2] Fix wrong table name parameter when not using default schema --- src/driver/postgres/PostgresQueryRunner.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/driver/postgres/PostgresQueryRunner.ts b/src/driver/postgres/PostgresQueryRunner.ts index 80850f8258..2f918ccaed 100644 --- a/src/driver/postgres/PostgresQueryRunner.ts +++ b/src/driver/postgres/PostgresQueryRunner.ts @@ -1501,7 +1501,7 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner "type" FROM "geometry_columns" ) AS _ - WHERE (${tablesCondition}) AND "column_name" = '${tableColumn.name}' AND "table_name" = '${table.name}'`; + WHERE (${tablesCondition}) AND "column_name" = '${tableColumn.name}' AND "table_name" = '${dbTable['table_name']}'`; const results: ObjectLiteral[] = await this.query(geometryColumnSql); tableColumn.spatialFeatureType = results[0].type; @@ -1518,7 +1518,7 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner "type" FROM "geography_columns" ) AS _ - WHERE (${tablesCondition}) AND "column_name" = '${tableColumn.name}' AND "table_name" = '${table.name}'`; + WHERE (${tablesCondition}) AND "column_name" = '${tableColumn.name}' AND "table_name" = '${dbTable['table_name']}'`; const results: ObjectLiteral[] = await this.query(geographyColumnSql); tableColumn.spatialFeatureType = results[0].type; From d9a98b336d53be83bba9aa867b83d9f49fa23b45 Mon Sep 17 00:00:00 2001 From: Igor Aguiar Rodrigues Date: Fri, 3 Apr 2020 00:57:34 -0300 Subject: [PATCH 2/2] Fix linting issue --- src/driver/postgres/PostgresQueryRunner.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/driver/postgres/PostgresQueryRunner.ts b/src/driver/postgres/PostgresQueryRunner.ts index 2f918ccaed..fff6060fbd 100644 --- a/src/driver/postgres/PostgresQueryRunner.ts +++ b/src/driver/postgres/PostgresQueryRunner.ts @@ -1501,7 +1501,7 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner "type" FROM "geometry_columns" ) AS _ - WHERE (${tablesCondition}) AND "column_name" = '${tableColumn.name}' AND "table_name" = '${dbTable['table_name']}'`; + WHERE (${tablesCondition}) AND "column_name" = '${tableColumn.name}' AND "table_name" = '${dbTable["table_name"]}'`; const results: ObjectLiteral[] = await this.query(geometryColumnSql); tableColumn.spatialFeatureType = results[0].type; @@ -1518,7 +1518,7 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner "type" FROM "geography_columns" ) AS _ - WHERE (${tablesCondition}) AND "column_name" = '${tableColumn.name}' AND "table_name" = '${dbTable['table_name']}'`; + WHERE (${tablesCondition}) AND "column_name" = '${tableColumn.name}' AND "table_name" = '${dbTable["table_name"]}'`; const results: ObjectLiteral[] = await this.query(geographyColumnSql); tableColumn.spatialFeatureType = results[0].type;