typeorm 0.3.8-dev.eb8f0c6 → 0.3.8-dev.fd7ae97

package/browser/driver/sqlite-abstract/AbstractSqliteQueryRunner.d.ts

@@ -263,7 +263,7 @@ export declare abstract class AbstractSqliteQueryRunner extends BaseQueryRunner
     /**
      * Builds create table sql.
      */
-    protected createTableSql(table: Table, createForeignKeys?: boolean, temporaryTable?: boolean): Query;
+    protected createTableSql(table: Table, createForeignKeys?: boolean): Query;
     /**
      * Builds drop table sql.
      */

package/browser/driver/sqlite-abstract/AbstractSqliteQueryRunner.js

@@ -719,7 +719,7 @@ export class AbstractSqliteQueryRunner extends 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.generateIndexName(table, index);
+            index.name = this.connection.namingStrategy.indexName(table, index.columnNames, index.where);
         const up = this.createIndexSql(table, index);
         const down = this.dropIndexSql(index);
         await this.executeQueries(up, down);
@@ -744,9 +744,6 @@ export class AbstractSqliteQueryRunner extends BaseQueryRunner {
             : table.indices.find((i) => i.name === indexOrName);
         if (!index)
             throw new 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(index);
         const down = this.createIndexSql(table, index);
         await this.executeQueries(up, down);
@@ -995,10 +992,10 @@ export class AbstractSqliteQueryRunner extends BaseQueryRunner {
                 }
                 return tableColumn;
             }));
-            // find foreign key constraints from CREATE TABLE sql
+            // find unique constraints from CREATE TABLE sql
             let fkResult;
             const fkMappings = [];
-            const fkRegex = /CONSTRAINT "([^"]*)" FOREIGN KEY ?\((.*?)\) REFERENCES "([^"]*)"/g;
+            const fkRegex = /CONSTRAINT "([^"]*)" FOREIGN KEY \((.*?)\) REFERENCES "([^"]*)" /g;
             while ((fkResult = fkRegex.exec(sql)) !== null) {
                 fkMappings.push({
                     name: fkResult[1],
@@ -1031,7 +1028,7 @@ export class AbstractSqliteQueryRunner extends BaseQueryRunner {
             // find unique constraints from CREATE TABLE sql
             let uniqueRegexResult;
             const uniqueMappings = [];
-            const uniqueRegex = /CONSTRAINT "([^"]*)" UNIQUE ?\((.*?)\)/g;
+            const uniqueRegex = /CONSTRAINT "([^"]*)" UNIQUE \((.*?)\)/g;
             while ((uniqueRegexResult = uniqueRegex.exec(sql)) !== null) {
                 uniqueMappings.push({
                     name: uniqueRegexResult[1],
@@ -1073,7 +1070,7 @@ export class AbstractSqliteQueryRunner extends BaseQueryRunner {
             table.uniques = (await Promise.all(tableUniquePromises));
             // build checks
             let result;
-            const regexp = /CONSTRAINT "([^"]*)" CHECK ?(\(.*?\))([,]|[)]$)/g;
+            const regexp = /CONSTRAINT "([^"]*)" CHECK (\(.*?\))([,]|[)]$)/g;
             while ((result = regexp.exec(sql)) !== null) {
                 table.checks.push(new TableCheck({
                     name: result[1],
@@ -1113,7 +1110,7 @@ export class AbstractSqliteQueryRunner extends BaseQueryRunner {
     /**
      * Builds create table sql.
      */
-    createTableSql(table, createForeignKeys, temporaryTable) {
+    createTableSql(table, createForeignKeys) {
         const primaryColumns = table.columns.filter((column) => column.isPrimary);
         const hasAutoIncrement = primaryColumns.find((column) => column.isGenerated && column.generationStrategy === "increment");
         const skipPrimary = primaryColumns.length > 1;
@@ -1124,10 +1121,6 @@ export class AbstractSqliteQueryRunner extends BaseQueryRunner {
             .join(", ");
         const [database] = this.splitTablePath(table.name);
         let sql = `CREATE TABLE ${this.escapePath(table.name)} (${columnDefinitions}`;
-        let [databaseNew, tableName] = this.splitTablePath(table.name);
-        const newTableName = temporaryTable
-            ? `${databaseNew ? `${databaseNew}.` : ""}${tableName.replace(/^temporary_/, "")}`
-            : table.name;
         // need for `addColumn()` method, because it recreates table.
         table.columns
             .filter((column) => column.isUnique)
@@ -1145,7 +1138,7 @@ export class AbstractSqliteQueryRunner extends BaseQueryRunner {
                 .map((unique) => {
                 const uniqueName = unique.name
                     ? unique.name
-                    : this.connection.namingStrategy.uniqueConstraintName(newTableName, unique.columnNames);
+                    : this.connection.namingStrategy.uniqueConstraintName(table, unique.columnNames);
                 const columnNames = unique.columnNames
                     .map((columnName) => `"${columnName}"`)
                     .join(", ");
@@ -1159,7 +1152,7 @@ export class AbstractSqliteQueryRunner extends BaseQueryRunner {
                 .map((check) => {
                 const checkName = check.name
                     ? check.name
-                    : this.connection.namingStrategy.checkConstraintName(newTableName, check.expression);
+                    : this.connection.namingStrategy.checkConstraintName(table, check.expression);
                 return `CONSTRAINT "${checkName}" CHECK (${check.expression})`;
             })
                 .join(", ");
@@ -1180,7 +1173,7 @@ export class AbstractSqliteQueryRunner extends BaseQueryRunner {
                     .map((columnName) => `"${columnName}"`)
                     .join(", ");
                 if (!fk.name)
-                    fk.name = this.connection.namingStrategy.foreignKeyName(newTableName, fk.columnNames, this.getTablePath(fk), fk.referencedColumnNames);
+                    fk.name = this.connection.namingStrategy.foreignKeyName(table, fk.columnNames, this.getTablePath(fk), fk.referencedColumnNames);
                 const referencedColumnNames = fk.referencedColumnNames
                     .map((columnName) => `"${columnName}"`)
                     .join(", ");
@@ -1329,7 +1322,7 @@ export class AbstractSqliteQueryRunner extends BaseQueryRunner {
         let [, tableNameOld] = this.splitTablePath(oldTable.name);
         newTable.name = tableNameNew = `${databaseNew ? `${databaseNew}.` : ""}temporary_${tableNameNew}`;
         // create new table
-        upQueries.push(this.createTableSql(newTable, true, true));
+        upQueries.push(this.createTableSql(newTable, true));
         downQueries.push(this.dropTableSql(newTable));
         // migrate all data from the old table into new table
         if (migrateData) {