typeorm 0.3.8-dev.bb33cd0 → 0.3.8-dev.dadb658

package/driver/mysql/MysqlQueryRunner.js

@@ -1212,7 +1212,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             : await this.getCachedTable(tableOrName);
         // new index may be passed without name. In this case we generate index name manually.
         if (!index.name)
-            index.name = this.connection.namingStrategy.indexName(table, index.columnNames, index.where);
+            index.name = this.generateIndexName(table, index);
         const up = this.createIndexSql(table, index);
         const down = this.dropIndexSql(table, index);
         await this.executeQueries(up, down);
@@ -1237,6 +1237,9 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             : table.indices.find((i) => i.name === indexOrName);
         if (!index)
             throw new error_1.TypeORMError(`Supplied index ${indexOrName} was not found in table ${table.name}`);
+        // old index may be passed without name. In this case we generate index name manually.
+        if (!index.name)
+            index.name = this.generateIndexName(table, index);
         const up = this.dropIndexSql(table, index);
         const down = this.createIndexSql(table, index);
         await this.executeQueries(up, down);
@@ -1557,6 +1560,11 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 tableColumn.name = dbColumn["COLUMN_NAME"];
                 tableColumn.type =
                     dbColumn["DATA_TYPE"].toLowerCase();
+                // since mysql 8.0, "geometrycollection" returned as "geomcollection"
+                // typeorm still use "geometrycollection"
+                if (tableColumn.type === "geomcollection") {
+                    tableColumn.type = "geometrycollection";
+                }
                 tableColumn.zerofill =
                     dbColumn["COLUMN_TYPE"].indexOf("zerofill") !==
                         -1;