typeorm 0.3.18-dev.48f5f85 → 0.3.18-dev.6d5b5d9

package/browser/driver/postgres/PostgresQueryRunner.js

@@ -1857,26 +1857,34 @@ export class PostgresQueryRunner extends BaseQueryRunner {
                 tableColumn.name = dbColumn["column_name"];
                 tableColumn.type = dbColumn["regtype"].toLowerCase();
                 if (tableColumn.type === "numeric" ||
+                    tableColumn.type === "numeric[]" ||
                     tableColumn.type === "decimal" ||
                     tableColumn.type === "float") {
+                    let numericPrecision = dbColumn["numeric_precision"];
+                    let numericScale = dbColumn["numeric_scale"];
+                    if (dbColumn["data_type"] === "ARRAY") {
+                        const numericSize = dbColumn["format_type"].match(/^numeric\(([0-9]+),([0-9]+)\)\[\]$/);
+                        if (numericSize) {
+                            numericPrecision = +numericSize[1];
+                            numericScale = +numericSize[2];
+                        }
+                    }
                     // If one of these properties was set, and another was not, Postgres sets '0' in to unspecified property
                     // we set 'undefined' in to unspecified property to avoid changing column on sync
-                    if (dbColumn["numeric_precision"] !== null &&
-                        !this.isDefaultColumnPrecision(table, tableColumn, dbColumn["numeric_precision"])) {
-                        tableColumn.precision =
-                            dbColumn["numeric_precision"];
+                    if (numericPrecision !== null &&
+                        !this.isDefaultColumnPrecision(table, tableColumn, numericPrecision)) {
+                        tableColumn.precision = numericPrecision;
                     }
-                    else if (dbColumn["numeric_scale"] !== null &&
-                        !this.isDefaultColumnScale(table, tableColumn, dbColumn["numeric_scale"])) {
+                    else if (numericScale !== null &&
+                        !this.isDefaultColumnScale(table, tableColumn, numericScale)) {
                         tableColumn.precision = undefined;
                     }
-                    if (dbColumn["numeric_scale"] !== null &&
-                        !this.isDefaultColumnScale(table, tableColumn, dbColumn["numeric_scale"])) {
-                        tableColumn.scale =
-                            dbColumn["numeric_scale"];
+                    if (numericScale !== null &&
+                        !this.isDefaultColumnScale(table, tableColumn, numericScale)) {
+                        tableColumn.scale = numericScale;
                     }
-                    else if (dbColumn["numeric_precision"] !== null &&
-                        !this.isDefaultColumnPrecision(table, tableColumn, dbColumn["numeric_precision"])) {
+                    else if (numericPrecision !== null &&
+                        !this.isDefaultColumnPrecision(table, tableColumn, numericPrecision)) {
                         tableColumn.scale = undefined;
                     }
                 }
@@ -2380,7 +2388,7 @@ export class PostgresQueryRunner extends BaseQueryRunner {
         const columns = index.columnNames
             .map((columnName) => `"${columnName}"`)
             .join(", ");
-        return new Query(`CREATE ${index.isUnique ? "UNIQUE " : ""}INDEX "${index.name}" ON ${this.escapePath(table)} ${index.isSpatial ? "USING GiST " : ""}(${columns}) ${index.where ? "WHERE " + index.where : ""}`);
+        return new Query(`CREATE ${index.isUnique ? "UNIQUE " : ""}${index.isConcurrent ? "CONCURRENTLY " : ""}INDEX "${index.name}" ON ${this.escapePath(table)} ${index.isSpatial ? "USING GiST " : ""}(${columns}) ${index.where ? "WHERE " + index.where : ""}`);
     }
     /**
      * Builds create view index sql.
@@ -2398,10 +2406,13 @@ export class PostgresQueryRunner extends BaseQueryRunner {
         let indexName = InstanceChecker.isTableIndex(indexOrName)
             ? indexOrName.name
             : indexOrName;
+        const concurrent = InstanceChecker.isTableIndex(indexOrName)
+            ? indexOrName.isConcurrent
+            : false;
         const { schema } = this.driver.parseTableName(table);
         return schema
-            ? new Query(`DROP INDEX "${schema}"."${indexName}"`)
-            : new Query(`DROP INDEX "${indexName}"`);
+            ? new Query(`DROP INDEX ${concurrent ? "CONCURRENTLY" : ""}"${schema}"."${indexName}"`)
+            : new Query(`DROP INDEX ${concurrent ? "CONCURRENTLY" : ""}"${indexName}"`);
     }
     /**
      * Builds create primary key sql.