typeorm 0.2.42-dev.f3e2b0e → 0.2.43-dev.4590c9b

package/driver/sqlite-abstract/AbstractSqliteQueryRunner.js

@@ -233,7 +233,7 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         tableName = tableOrName instanceof Table_1.Table ? tableOrName.name : tableOrName;
-                        sql = "PRAGMA table_info(\"" + tableName + "\")";
+                        sql = "PRAGMA table_info(" + this.escapePath(tableName) + ")";
                         return [4 /*yield*/, this.query(sql)];
                     case 1:
                         columns = _a.sent();
@@ -443,8 +443,8 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
                         oldTable = _a;
                         newTable = oldTable.clone();
                         newTable.name = newTableName;
-                        up = new Query_1.Query("ALTER TABLE \"" + oldTable.name + "\" RENAME TO \"" + newTableName + "\"");
-                        down = new Query_1.Query("ALTER TABLE \"" + newTableName + "\" RENAME TO \"" + oldTable.name + "\"");
+                        up = new Query_1.Query("ALTER TABLE " + this.escapePath(oldTable.name) + " RENAME TO " + this.escapePath(newTableName));
+                        down = new Query_1.Query("ALTER TABLE " + this.escapePath(newTableName) + " RENAME TO " + this.escapePath(oldTable.name));
                         return [4 /*yield*/, this.executeQueries(up, down)];
                     case 4:
                         _b.sent();
@@ -1198,7 +1198,7 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
                         table = _a;
                         index = indexOrName instanceof TableIndex_1.TableIndex ? indexOrName : table.indices.find(function (i) { return i.name === indexOrName; });
                         if (!index)
-                            throw new error_1.TypeORMError("Supplied index was not found in table " + table.name);
+                            throw new error_1.TypeORMError("Supplied index " + indexOrName + " was not found in table " + table.name);
                         up = this.dropIndexSql(index);
                         down = this.createIndexSql(table, index);
                         return [4 /*yield*/, this.executeQueries(up, down)];
@@ -1237,7 +1237,7 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.query("DELETE FROM \"" + tableName + "\"")];
+                    case 0: return [4 /*yield*/, this.query("DELETE FROM " + this.escapePath(tableName))];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -1248,13 +1248,18 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
     /**
      * Removes all tables from the currently connected database.
      */
-    AbstractSqliteQueryRunner.prototype.clearDatabase = function () {
+    AbstractSqliteQueryRunner.prototype.clearDatabase = function (database) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var selectViewDropsQuery, dropViewQueries, selectTableDropsQuery, dropTableQueries, error_2, rollbackError_1;
+            var dbPath, selectViewDropsQuery, dropViewQueries, selectTableDropsQuery, dropTableQueries, error_2, rollbackError_1;
             var _this = this;
             return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.query("PRAGMA foreign_keys = OFF;")];
+                    case 0:
+                        dbPath = undefined;
+                        if (database && this.driver.getAttachedDatabaseHandleByRelativePath(database)) {
+                            dbPath = this.driver.getAttachedDatabaseHandleByRelativePath(database);
+                        }
+                        return [4 /*yield*/, this.query("PRAGMA foreign_keys = OFF;")];
                     case 1:
                         _a.sent();
                         return [4 /*yield*/, this.startTransaction()];
@@ -1263,14 +1268,14 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
                         _a.label = 3;
                     case 3:
                         _a.trys.push([3, 9, 14, 16]);
-                        selectViewDropsQuery = "SELECT 'DROP VIEW \"' || name || '\";' as query FROM \"sqlite_master\" WHERE \"type\" = 'view'";
+                        selectViewDropsQuery = dbPath ? "SELECT 'DROP VIEW \"" + dbPath + "\".\"' || name || '\";' as query FROM \"" + dbPath + "\".\"sqlite_master\" WHERE \"type\" = 'view'" : "SELECT 'DROP VIEW \"' || name || '\";' as query FROM \"sqlite_master\" WHERE \"type\" = 'view'";
                         return [4 /*yield*/, this.query(selectViewDropsQuery)];
                     case 4:
                         dropViewQueries = _a.sent();
                         return [4 /*yield*/, Promise.all(dropViewQueries.map(function (q) { return _this.query(q["query"]); }))];
                     case 5:
                         _a.sent();
-                        selectTableDropsQuery = "SELECT 'DROP TABLE \"' || name || '\";' as query FROM \"sqlite_master\" WHERE \"type\" = 'table' AND \"name\" != 'sqlite_sequence'";
+                        selectTableDropsQuery = dbPath ? "SELECT 'DROP TABLE \"" + dbPath + "\".\"' || name || '\";' as query FROM \"" + dbPath + "\".\"sqlite_master\" WHERE \"type\" = 'table' AND \"name\" != 'sqlite_sequence'" : "SELECT 'DROP TABLE \"' || name || '\";' as query FROM \"sqlite_master\" WHERE \"type\" = 'table' AND \"name\" != 'sqlite_sequence'";
                         return [4 /*yield*/, this.query(selectTableDropsQuery)];
                     case 6:
                         dropTableQueries = _a.sent();
@@ -1337,66 +1342,97 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
             });
         });
     };
+    AbstractSqliteQueryRunner.prototype.loadTableRecords = function (tablePath, tableOrIndex) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var database, _a, schema, tableName, res;
+            return (0, tslib_1.__generator)(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        database = undefined;
+                        _a = (0, tslib_1.__read)(this.splitTablePath(tablePath), 2), schema = _a[0], tableName = _a[1];
+                        if (schema && this.driver.getAttachedDatabasePathRelativeByHandle(schema)) {
+                            database = this.driver.getAttachedDatabasePathRelativeByHandle(schema);
+                        }
+                        return [4 /*yield*/, this.query("SELECT " + (database ? "'" + database + "'" : null) + " as database, " + (schema ? "'" + schema + "'" : null) + " as schema, * FROM " + (schema ? "\"" + schema + "\"." : "") + this.escapePath("sqlite_master") + " WHERE \"type\" = '" + tableOrIndex + "' AND \"" + (tableOrIndex === "table" ? "name" : "tbl_name") + "\" IN ('" + tableName + "')")];
+                    case 1:
+                        res = _b.sent();
+                        return [2 /*return*/, res];
+                }
+            });
+        });
+    };
+    AbstractSqliteQueryRunner.prototype.loadPragmaRecords = function (tablePath, pragma) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var _a, tableName, res;
+            return (0, tslib_1.__generator)(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = (0, tslib_1.__read)(this.splitTablePath(tablePath), 2), tableName = _a[1];
+                        return [4 /*yield*/, this.query("PRAGMA " + pragma + "(\"" + tableName + "\")")];
+                    case 1:
+                        res = _b.sent();
+                        return [2 /*return*/, res];
+                }
+            });
+        });
+    };
     /**
      * Loads all tables (with given names) from the database and creates a Table from them.
      */
     AbstractSqliteQueryRunner.prototype.loadTables = function (tableNames) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var dbTables, tablesSql, _a, _b, _c, _d, tableNamesString_1, tablesSql, _e, _f, _g, _h, tableNamesString, dbIndicesDef;
+            var dbTables, dbIndicesDef, tablesSql, _a, _b, _c, _d, tableNamesString;
             var _this = this;
-            return (0, tslib_1.__generator)(this, function (_j) {
-                switch (_j.label) {
+            return (0, tslib_1.__generator)(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         // if no tables given then no need to proceed
                         if (tableNames && tableNames.length === 0) {
                             return [2 /*return*/, []];
                         }
                         dbTables = [];
-                        if (!!tableNames) return [3 /*break*/, 2];
+                        if (!!tableNames) return [3 /*break*/, 3];
                         tablesSql = "SELECT * FROM \"sqlite_master\" WHERE \"type\" = 'table'";
                         _b = (_a = dbTables.push).apply;
                         _c = [dbTables];
                         _d = [[]];
                         return [4 /*yield*/, this.query(tablesSql)];
                     case 1:
-                        _b.apply(_a, _c.concat([tslib_1.__spreadArray.apply(void 0, _d.concat([tslib_1.__read.apply(void 0, [_j.sent()]), false]))]));
-                        return [3 /*break*/, 4];
-                    case 2:
-                        tableNamesString_1 = tableNames.map(function (tableName) { return "'" + tableName + "'"; }).join(", ");
-                        tablesSql = "SELECT * FROM \"sqlite_master\" WHERE \"type\" = 'table' AND \"name\" IN (" + tableNamesString_1 + ")";
-                        _f = (_e = dbTables.push).apply;
-                        _g = [dbTables];
-                        _h = [[]];
-                        return [4 /*yield*/, this.query(tablesSql)];
-                    case 3:
-                        _f.apply(_e, _g.concat([tslib_1.__spreadArray.apply(void 0, _h.concat([tslib_1.__read.apply(void 0, [_j.sent()]), false]))]));
-                        _j.label = 4;
-                    case 4:
-                        // if tables were not found in the db, no need to proceed
-                        if (dbTables.length === 0) {
-                            return [2 /*return*/, []];
-                        }
+                        _b.apply(_a, _c.concat([tslib_1.__spreadArray.apply(void 0, _d.concat([tslib_1.__read.apply(void 0, [_e.sent()]), false]))]));
                         tableNamesString = dbTables.map(function (_a) {
                             var name = _a.name;
                             return "'" + name + "'";
                         }).join(", ");
                         return [4 /*yield*/, this.query("SELECT * FROM \"sqlite_master\" WHERE \"type\" = 'index' AND \"tbl_name\" IN (" + tableNamesString + ")")];
+                    case 2:
+                        dbIndicesDef = _e.sent();
+                        return [3 /*break*/, 6];
+                    case 3: return [4 /*yield*/, Promise.all(tableNames.map(function (tableName) { return _this.loadTableRecords(tableName, "table"); }))];
+                    case 4:
+                        dbTables = (_e.sent()).reduce(function (acc, res) { return ((0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(acc), false), (0, tslib_1.__read)(res), false)); }, []).filter(Boolean);
+                        return [4 /*yield*/, Promise.all((tableNames !== null && tableNames !== void 0 ? tableNames : []).map(function (tableName) { return _this.loadTableRecords(tableName, "index"); }))];
                     case 5:
-                        dbIndicesDef = _j.sent();
+                        dbIndicesDef = (_e.sent()).reduce(function (acc, res) { return ((0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(acc), false), (0, tslib_1.__read)(res), false)); }, []).filter(Boolean);
+                        _e.label = 6;
+                    case 6:
+                        // if tables were not found in the db, no need to proceed
+                        if (dbTables.length === 0) {
+                            return [2 /*return*/, []];
+                        }
                         // create table schemas for loaded tables
                         return [2 /*return*/, Promise.all(dbTables.map(function (dbTable) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
-                                var table, sql, _a, dbColumns, dbIndices, dbForeignKeys, autoIncrementColumnName, tableSql, autoIncrementIndex, comma, bracket, tableForeignKeyConstraints, uniqueRegexResult, uniqueMappings, uniqueRegex, tableUniquePromises, _b, result, regexp, indicesPromises, indices;
+                                var tablePath, table, sql, _a, dbColumns, dbIndices, dbForeignKeys, autoIncrementColumnName, tableSql, autoIncrementIndex, comma, bracket, tableForeignKeyConstraints, uniqueRegexResult, uniqueMappings, uniqueRegex, tableUniquePromises, _b, result, regexp, indicesPromises, indices;
                                 var _this = this;
                                 return (0, tslib_1.__generator)(this, function (_c) {
                                     switch (_c.label) {
                                         case 0:
-                                            table = new Table_1.Table();
-                                            table.name = dbTable["name"];
+                                            tablePath = dbTable['database'] && this.driver.getAttachedDatabaseHandleByRelativePath(dbTable['database']) ? this.driver.getAttachedDatabaseHandleByRelativePath(dbTable['database']) + "." + dbTable['name'] : dbTable['name'];
+                                            table = new Table_1.Table({ name: tablePath });
                                             sql = dbTable["sql"];
                                             return [4 /*yield*/, Promise.all([
-                                                    this.query("PRAGMA table_info(\"" + dbTable["name"] + "\")"),
-                                                    this.query("PRAGMA index_list(\"" + dbTable["name"] + "\")"),
-                                                    this.query("PRAGMA foreign_key_list(\"" + dbTable["name"] + "\")"),
+                                                    this.loadPragmaRecords(tablePath, "table_info"),
+                                                    this.loadPragmaRecords(tablePath, "index_list"),
+                                                    this.loadPragmaRecords(tablePath, "foreign_key_list"),
                                                 ])];
                                         case 1:
                                             _a = tslib_1.__read.apply(void 0, [_c.sent(), 3]), dbColumns = _a[0], dbIndices = _a[1], dbForeignKeys = _a[2];
@@ -1434,7 +1470,7 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
                                                 }
                                                 if (tableColumn.type === "varchar") {
                                                     // Check if this is an enum
-                                                    var enumMatch = sql.match(new RegExp("\"(" + tableColumn.name + ")\" varchar CHECK\\s*\\(\\s*\\1\\s+IN\\s*\\(('[^']+'(?:\\s*,\\s*'[^']+')+)\\s*\\)\\s*\\)"));
+                                                    var enumMatch = sql.match(new RegExp("\"(" + tableColumn.name + ")\" varchar CHECK\\s*\\(\\s*\"\\1\"\\s+IN\\s*\\(('[^']+'(?:\\s*,\\s*'[^']+')+)\\s*\\)\\s*\\)"));
                                                     if (enumMatch) {
                                                         // This is an enum
                                                         tableColumn.enum = enumMatch[2].substr(1, enumMatch[2].length - 2).split("','");
@@ -1540,7 +1576,7 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
                                                 .map(function (dbIndex) { return dbIndex["name"]; })
                                                 .filter(function (value, index, self) { return self.indexOf(value) === index; }) // unqiue
                                                 .map(function (dbIndexName) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
-                                                var indexDef, condition, dbIndex, indexInfos, indexColumns, isUnique;
+                                                var indexDef, condition, dbIndex, indexInfos, indexColumns, dbIndexPath, isUnique;
                                                 return (0, tslib_1.__generator)(this, function (_a) {
                                                     switch (_a.label) {
                                                         case 0:
@@ -1553,10 +1589,11 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
                                                             indexColumns = indexInfos
                                                                 .sort(function (indexInfo1, indexInfo2) { return parseInt(indexInfo1["seqno"]) - parseInt(indexInfo2["seqno"]); })
                                                                 .map(function (indexInfo) { return indexInfo["name"]; });
+                                                            dbIndexPath = "" + (dbTable["database"] ? dbTable["database"] + "." : '') + dbIndex["name"];
                                                             isUnique = dbIndex["unique"] === "1" || dbIndex["unique"] === 1;
                                                             return [2 /*return*/, new TableIndex_1.TableIndex({
                                                                     table: table,
-                                                                    name: dbIndex["name"],
+                                                                    name: dbIndexPath,
                                                                     columnNames: indexColumns,
                                                                     isUnique: isUnique,
                                                                     where: condition ? condition[1] : undefined
@@ -1587,7 +1624,8 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
         if (skipPrimary && hasAutoIncrement)
             throw new error_1.TypeORMError("Sqlite does not support AUTOINCREMENT on composite primary key");
         var columnDefinitions = table.columns.map(function (column) { return _this.buildCreateColumnSql(column, skipPrimary); }).join(", ");
-        var sql = "CREATE TABLE \"" + table.name + "\" (" + columnDefinitions;
+        var _a = (0, tslib_1.__read)(this.splitTablePath(table.name), 1), database = _a[0];
+        var sql = "CREATE TABLE " + this.escapePath(table.name) + " (" + columnDefinitions;
         // need for `addColumn()` method, because it recreates table.
         table.columns
             .filter(function (column) { return column.isUnique; })
@@ -1615,12 +1653,20 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
             sql += ", " + checksSql;
         }
         if (table.foreignKeys.length > 0 && createForeignKeys) {
-            var foreignKeysSql = table.foreignKeys.map(function (fk) {
+            var foreignKeysSql = table.foreignKeys.filter(function (fk) {
+                var _a = (0, tslib_1.__read)(_this.splitTablePath(fk.referencedTableName), 1), referencedDatabase = _a[0];
+                if (referencedDatabase !== database) {
+                    return false;
+                }
+                return true;
+            })
+                .map(function (fk) {
+                var _a = (0, tslib_1.__read)(_this.splitTablePath(fk.referencedTableName), 2), referencedTable = _a[1];
                 var columnNames = fk.columnNames.map(function (columnName) { return "\"" + columnName + "\""; }).join(", ");
                 if (!fk.name)
                     fk.name = _this.connection.namingStrategy.foreignKeyName(table, fk.columnNames, _this.getTablePath(fk), fk.referencedColumnNames);
                 var referencedColumnNames = fk.referencedColumnNames.map(function (columnName) { return "\"" + columnName + "\""; }).join(", ");
-                var constraint = "CONSTRAINT \"" + fk.name + "\" FOREIGN KEY (" + columnNames + ") REFERENCES \"" + fk.referencedTableName + "\" (" + referencedColumnNames + ")";
+                var constraint = "CONSTRAINT \"" + fk.name + "\" FOREIGN KEY (" + columnNames + ") REFERENCES \"" + referencedTable + "\" (" + referencedColumnNames + ")";
                 if (fk.onDelete)
                     constraint += " ON DELETE " + fk.onDelete;
                 if (fk.onUpdate)
@@ -1645,7 +1691,7 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
      */
     AbstractSqliteQueryRunner.prototype.dropTableSql = function (tableOrName, ifExist) {
         var tableName = tableOrName instanceof Table_1.Table ? tableOrName.name : tableOrName;
-        var query = ifExist ? "DROP TABLE IF EXISTS \"" + tableName + "\"" : "DROP TABLE \"" + tableName + "\"";
+        var query = ifExist ? "DROP TABLE IF EXISTS " + this.escapePath(tableName) : "DROP TABLE " + this.escapePath(tableName);
         return new Query_1.Query(query);
     };
     AbstractSqliteQueryRunner.prototype.createViewSql = function (view) {
@@ -1683,14 +1729,15 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
      */
     AbstractSqliteQueryRunner.prototype.createIndexSql = function (table, index) {
         var columns = index.columnNames.map(function (columnName) { return "\"" + columnName + "\""; }).join(", ");
-        return new Query_1.Query("CREATE " + (index.isUnique ? "UNIQUE " : "") + "INDEX \"" + index.name + "\" ON \"" + table.name + "\" (" + columns + ") " + (index.where ? "WHERE " + index.where : ""));
+        var _a = (0, tslib_1.__read)(this.splitTablePath(table.name), 2), database = _a[0], tableName = _a[1];
+        return new Query_1.Query("CREATE " + (index.isUnique ? "UNIQUE " : "") + "INDEX " + (database ? "\"" + database + "\"." : "") + this.escapePath(index.name) + " ON \"" + tableName + "\" (" + columns + ") " + (index.where ? "WHERE " + index.where : ""));
     };
     /**
      * Builds drop index sql.
      */
     AbstractSqliteQueryRunner.prototype.dropIndexSql = function (indexOrName) {
         var indexName = indexOrName instanceof TableIndex_1.TableIndex ? indexOrName.name : indexOrName;
-        return new Query_1.Query("DROP INDEX \"" + indexName + "\"");
+        return new Query_1.Query("DROP INDEX " + this.escapePath(indexName));
     };
     /**
      * Builds a query for create column.
@@ -1704,7 +1751,7 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
             c += " " + this.connection.driver.createFullType(column);
         }
         if (column.enum)
-            c += " CHECK( " + column.name + " IN (" + column.enum.map(function (val) { return "'" + val + "'"; }).join(",") + ") )";
+            c += " CHECK( \"" + column.name + "\" IN (" + column.enum.map(function (val) { return "'" + val + "'"; }).join(",") + ") )";
         if (column.isPrimary && !skipPrimary)
             c += " PRIMARY KEY";
         if (column.isGenerated === true && column.generationStrategy === "increment") // don't use skipPrimary here since updates can update already exist primary without auto inc.
@@ -1720,10 +1767,10 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
     AbstractSqliteQueryRunner.prototype.recreateTable = function (newTable, oldTable, migrateData) {
         if (migrateData === void 0) { migrateData = true; }
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var upQueries, downQueries, newColumnNames, oldColumnNames;
+            var upQueries, downQueries, _a, databaseNew, tableNameNew, _b, tableNameOld, newColumnNames, oldColumnNames;
             var _this = this;
-            return (0, tslib_1.__generator)(this, function (_a) {
-                switch (_a.label) {
+            return (0, tslib_1.__generator)(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         upQueries = [];
                         downQueries = [];
@@ -1732,8 +1779,9 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
                             upQueries.push(_this.dropIndexSql(index));
                             downQueries.push(_this.createIndexSql(oldTable, index));
                         });
-                        // change table name into 'temporary_table'
-                        newTable.name = "temporary_" + newTable.name;
+                        _a = (0, tslib_1.__read)(this.splitTablePath(newTable.name), 2), databaseNew = _a[0], tableNameNew = _a[1];
+                        _b = (0, tslib_1.__read)(this.splitTablePath(oldTable.name), 2), tableNameOld = _b[1];
+                        newTable.name = tableNameNew = (databaseNew ? databaseNew + "." : "") + "temporary_" + tableNameNew;
                         // create new table
                         upQueries.push(this.createTableSql(newTable, true));
                         downQueries.push(this.dropTableSql(newTable));
@@ -1751,15 +1799,15 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
                                     return newTable.columns.find(function (c) { return c.name === column.name; });
                                 }).map(function (column) { return "\"" + column.name + "\""; }).join(", ");
                             }
-                            upQueries.push(new Query_1.Query("INSERT INTO \"" + newTable.name + "\"(" + newColumnNames + ") SELECT " + oldColumnNames + " FROM \"" + oldTable.name + "\""));
-                            downQueries.push(new Query_1.Query("INSERT INTO \"" + oldTable.name + "\"(" + oldColumnNames + ") SELECT " + newColumnNames + " FROM \"" + newTable.name + "\""));
+                            upQueries.push(new Query_1.Query("INSERT INTO " + this.escapePath(newTable.name) + "(" + newColumnNames + ") SELECT " + oldColumnNames + " FROM " + this.escapePath(oldTable.name)));
+                            downQueries.push(new Query_1.Query("INSERT INTO " + this.escapePath(oldTable.name) + "(" + oldColumnNames + ") SELECT " + newColumnNames + " FROM " + this.escapePath(newTable.name)));
                         }
                         // drop old table
                         upQueries.push(this.dropTableSql(oldTable));
                         downQueries.push(this.createTableSql(oldTable, true));
                         // rename old table
-                        upQueries.push(new Query_1.Query("ALTER TABLE \"" + newTable.name + "\" RENAME TO \"" + oldTable.name + "\""));
-                        downQueries.push(new Query_1.Query("ALTER TABLE \"" + oldTable.name + "\" RENAME TO \"" + newTable.name + "\""));
+                        upQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(newTable.name) + " RENAME TO " + this.escapePath(tableNameOld)));
+                        downQueries.push(new Query_1.Query("ALTER TABLE " + this.escapePath(oldTable.name) + " RENAME TO " + this.escapePath(tableNameNew)));
                         newTable.name = oldTable.name;
                         // recreate table indices
                         newTable.indices.forEach(function (index) {
@@ -1771,13 +1819,26 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
                         });
                         return [4 /*yield*/, this.executeQueries(upQueries, downQueries)];
                     case 1:
-                        _a.sent();
+                        _c.sent();
                         this.replaceCachedTable(oldTable, newTable);
                         return [2 /*return*/];
                 }
             });
         });
     };
+    /**
+     * tablePath e.g. "myDB.myTable", "myTable"
+     */
+    AbstractSqliteQueryRunner.prototype.splitTablePath = function (tablePath) {
+        return ((tablePath.indexOf(".") !== -1) ? tablePath.split(".") : [undefined, tablePath]);
+    };
+    /**
+     * Escapes given table or view path. Tolerates leading/trailing dots
+     */
+    AbstractSqliteQueryRunner.prototype.escapePath = function (target, disableEscape) {
+        var tableName = target instanceof Table_1.Table || target instanceof View_1.View ? target.name : target;
+        return tableName.replace(/^\.+|\.+$/g, "").split(".").map(function (i) { return disableEscape ? i : "\"" + i + "\""; }).join(".");
+    };
     return AbstractSqliteQueryRunner;
 }(BaseQueryRunner_1.BaseQueryRunner));
 exports.AbstractSqliteQueryRunner = AbstractSqliteQueryRunner;