typeorm 0.3.8-dev.e49d0c8 → 0.3.8

package/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): Query;
+    protected createTableSql(table: Table, createForeignKeys?: boolean, temporaryTable?: boolean): Query;
     /**
      * Builds drop table sql.
      */

package/driver/sqlite-abstract/AbstractSqliteQueryRunner.js

@@ -887,8 +887,9 @@ class AbstractSqliteQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 this.driver.getAttachedDatabaseHandleByRelativePath(dbTable["database"])
                 ? `${this.driver.getAttachedDatabaseHandleByRelativePath(dbTable["database"])}.${dbTable["name"]}`
                 : dbTable["name"];
-            const table = new Table_1.Table({ name: tablePath });
             const sql = dbTable["sql"];
+            const withoutRowid = sql.includes("WITHOUT ROWID");
+            const table = new Table_1.Table({ name: tablePath, withoutRowid });
             // load columns and indices
             const [dbColumns, dbIndices, dbForeignKeys] = await Promise.all([
                 this.loadPragmaRecords(tablePath, `table_xinfo`),
@@ -998,10 +999,10 @@ class AbstractSqliteQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 }
                 return tableColumn;
             }));
-            // find unique constraints from CREATE TABLE sql
+            // find foreign key 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],
@@ -1034,7 +1035,7 @@ class AbstractSqliteQueryRunner extends BaseQueryRunner_1.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],
@@ -1076,7 +1077,7 @@ class AbstractSqliteQueryRunner extends BaseQueryRunner_1.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_1.TableCheck({
                     name: result[1],
@@ -1116,7 +1117,7 @@ class AbstractSqliteQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     /**
      * Builds create table sql.
      */
-    createTableSql(table, createForeignKeys) {
+    createTableSql(table, createForeignKeys, temporaryTable) {
         const primaryColumns = table.columns.filter((column) => column.isPrimary);
         const hasAutoIncrement = primaryColumns.find((column) => column.isGenerated && column.generationStrategy === "increment");
         const skipPrimary = primaryColumns.length > 1;
@@ -1127,6 +1128,10 @@ class AbstractSqliteQueryRunner extends BaseQueryRunner_1.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)
@@ -1144,7 +1149,7 @@ class AbstractSqliteQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 .map((unique) => {
                 const uniqueName = unique.name
                     ? unique.name
-                    : this.connection.namingStrategy.uniqueConstraintName(table, unique.columnNames);
+                    : this.connection.namingStrategy.uniqueConstraintName(newTableName, unique.columnNames);
                 const columnNames = unique.columnNames
                     .map((columnName) => `"${columnName}"`)
                     .join(", ");
@@ -1158,7 +1163,7 @@ class AbstractSqliteQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 .map((check) => {
                 const checkName = check.name
                     ? check.name
-                    : this.connection.namingStrategy.checkConstraintName(table, check.expression);
+                    : this.connection.namingStrategy.checkConstraintName(newTableName, check.expression);
                 return `CONSTRAINT "${checkName}" CHECK (${check.expression})`;
             })
                 .join(", ");
@@ -1179,7 +1184,7 @@ class AbstractSqliteQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     .map((columnName) => `"${columnName}"`)
                     .join(", ");
                 if (!fk.name)
-                    fk.name = this.connection.namingStrategy.foreignKeyName(table, fk.columnNames, this.getTablePath(fk), fk.referencedColumnNames);
+                    fk.name = this.connection.namingStrategy.foreignKeyName(newTableName, fk.columnNames, this.getTablePath(fk), fk.referencedColumnNames);
                 const referencedColumnNames = fk.referencedColumnNames
                     .map((columnName) => `"${columnName}"`)
                     .join(", ");
@@ -1200,8 +1205,7 @@ class AbstractSqliteQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             sql += `, PRIMARY KEY (${columnNames})`;
         }
         sql += `)`;
-        const tableMetadata = this.connection.entityMetadatas.find((metadata) => this.getTablePath(table) === this.getTablePath(metadata));
-        if (tableMetadata && tableMetadata.withoutRowid) {
+        if (table.withoutRowid) {
             sql += " WITHOUT ROWID";
         }
         return new Query_1.Query(sql);
@@ -1328,7 +1332,7 @@ class AbstractSqliteQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         let [, tableNameOld] = this.splitTablePath(oldTable.name);
         newTable.name = tableNameNew = `${databaseNew ? `${databaseNew}.` : ""}temporary_${tableNameNew}`;
         // create new table
-        upQueries.push(this.createTableSql(newTable, true));
+        upQueries.push(this.createTableSql(newTable, true, true));
         downQueries.push(this.dropTableSql(newTable));
         // migrate all data from the old table into new table
         if (migrateData) {