typeorm 0.2.41-dev.c895680 → 0.2.42-dev.1cfd7b9

package/driver/sqlite/SqliteDriver.js

@@ -94,25 +94,26 @@ var SqliteDriver = /** @class */ (function (_super) {
                             })];
                     case 2:
                         databaseConnection = _a.sent();
-                        if (!this.options.enableWAL) return [3 /*break*/, 4];
-                        return [4 /*yield*/, run("PRAGMA journal_mode = WAL;")];
+                        if (!this.options.key) return [3 /*break*/, 4];
+                        return [4 /*yield*/, run("PRAGMA key = " + JSON.stringify(this.options.key) + ";")];
                     case 3:
                         _a.sent();
                         _a.label = 4;
-                    case 4: 
+                    case 4:
+                        if (!this.options.enableWAL) return [3 /*break*/, 6];
+                        return [4 /*yield*/, run("PRAGMA journal_mode = WAL;")];
+                    case 5:
+                        _a.sent();
+                        _a.label = 6;
+                    case 6: 
                     // we need to enable foreign keys in sqlite to make sure all foreign key related features
                     // working properly. this also makes onDelete to work with sqlite.
                     return [4 /*yield*/, run("PRAGMA foreign_keys = ON;")];
-                    case 5:
+                    case 7:
                         // we need to enable foreign keys in sqlite to make sure all foreign key related features
                         // working properly. this also makes onDelete to work with sqlite.
                         _a.sent();
-                        if (!this.options.key) return [3 /*break*/, 7];
-                        return [4 /*yield*/, run("PRAGMA key = " + JSON.stringify(this.options.key) + ";")];
-                    case 6:
-                        _a.sent();
-                        _a.label = 7;
-                    case 7: return [2 /*return*/, databaseConnection];
+                        return [2 /*return*/, databaseConnection];
                 }
             });
         });

package/driver/sqlite/SqliteDriver.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/driver/sqlite/SqliteDriver.ts"],"names":[],"mappings":"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","file":"SqliteDriver.js","sourcesContent":["import mkdirp from \"mkdirp\";\nimport path from \"path\";\nimport { DriverPackageNotInstalledError } from \"../../error/DriverPackageNotInstalledError\";\nimport { SqliteQueryRunner } from \"./SqliteQueryRunner\";\nimport { DriverOptionNotSetError } from \"../../error/DriverOptionNotSetError\";\nimport { PlatformTools } from \"../../platform/PlatformTools\";\nimport { Connection } from \"../../connection/Connection\";\nimport { SqliteConnectionOptions } from \"./SqliteConnectionOptions\";\nimport { ColumnType } from \"../types/ColumnTypes\";\nimport { QueryRunner } from \"../../query-runner/QueryRunner\";\nimport { AbstractSqliteDriver } from \"../sqlite-abstract/AbstractSqliteDriver\";\nimport {ReplicationMode} from \"../types/ReplicationMode\";\n\n/**\n * Organizes communication with sqlite DBMS.\n */\nexport class SqliteDriver extends AbstractSqliteDriver {\n\n    // -------------------------------------------------------------------------\n    // Public Properties\n    // -------------------------------------------------------------------------\n\n    /**\n     * Connection options.\n     */\n    options: SqliteConnectionOptions;\n\n    /**\n     * SQLite underlying library.\n     */\n    sqlite: any;\n\n    // -------------------------------------------------------------------------\n    // Constructor\n    // -------------------------------------------------------------------------\n\n    constructor(connection: Connection) {\n        super(connection);\n\n        this.connection = connection;\n        this.options = connection.options as SqliteConnectionOptions;\n        this.database = this.options.database;\n\n        // validate options to make sure everything is set\n        if (!this.options.database)\n            throw new DriverOptionNotSetError(\"database\");\n\n        // load sqlite package\n        this.loadDependencies();\n    }\n\n    // -------------------------------------------------------------------------\n    // Public Methods\n    // -------------------------------------------------------------------------\n\n    /**\n     * Closes connection with database.\n     */\n    async disconnect(): Promise<void> {\n        return new Promise<void>((ok, fail) => {\n            this.queryRunner = undefined;\n            this.databaseConnection.close((err: any) => err ? fail(err) : ok());\n        });\n    }\n\n    /**\n     * Creates a query runner used to execute database queries.\n     */\n    createQueryRunner(mode: ReplicationMode): QueryRunner {\n        if (!this.queryRunner)\n            this.queryRunner = new SqliteQueryRunner(this);\n\n        return this.queryRunner;\n    }\n\n    normalizeType(column: { type?: ColumnType, length?: number | string, precision?: number | null, scale?: number }): string {\n        if ((column.type as any) === Buffer) {\n            return \"blob\";\n        }\n\n        return super.normalizeType(column);\n    }\n\n    // -------------------------------------------------------------------------\n    // Protected Methods\n    // -------------------------------------------------------------------------\n\n    /**\n     * Creates connection with the database.\n     */\n    protected async createDatabaseConnection() {\n        await this.createDatabaseDirectory(this.options.database);\n\n        const databaseConnection: any = await new Promise((ok, fail) => {\n            const connection = new this.sqlite.Database(this.options.database, (err: any) => {\n                if (err) return fail(err);\n                ok(connection);\n            });\n        });\n\n        // Internal function to run a command on the connection and fail if an error occured.\n        function run(line: string): Promise<void> {\n            return new Promise((ok, fail) => {\n                databaseConnection.run(line, (err: any) => {\n                    if (err) return fail(err);\n                    ok();\n                });\n            });\n        }\n\n        if (this.options.enableWAL) {\n            await run(`PRAGMA journal_mode = WAL;`);\n        }\n\n        // we need to enable foreign keys in sqlite to make sure all foreign key related features\n        // working properly. this also makes onDelete to work with sqlite.\n        await run(`PRAGMA foreign_keys = ON;`);\n\n        // in the options, if encryption key for SQLCipher is setted.\n        if (this.options.key) {\n            await run(`PRAGMA key = ${JSON.stringify(this.options.key)};`);\n        }\n\n        return databaseConnection;\n    }\n\n    /**\n     * If driver dependency is not given explicitly, then try to load it via \"require\".\n     */\n    protected loadDependencies(): void {\n        try {\n            const sqlite = this.options.driver || PlatformTools.load(\"sqlite3\");\n            this.sqlite = sqlite.verbose();\n\n        } catch (e) {\n            throw new DriverPackageNotInstalledError(\"SQLite\", \"sqlite3\");\n        }\n    }\n\n    /**\n     * Auto creates database directory if it does not exist.\n     */\n    protected async createDatabaseDirectory(fullPath: string): Promise<void> {\n        await mkdirp(path.dirname(fullPath));\n    }\n\n}\n"],"sourceRoot":"../.."}
+{"version":3,"sources":["../../src/driver/sqlite/SqliteDriver.ts"],"names":[],"mappings":"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","file":"SqliteDriver.js","sourcesContent":["import mkdirp from \"mkdirp\";\nimport path from \"path\";\nimport { DriverPackageNotInstalledError } from \"../../error/DriverPackageNotInstalledError\";\nimport { SqliteQueryRunner } from \"./SqliteQueryRunner\";\nimport { DriverOptionNotSetError } from \"../../error/DriverOptionNotSetError\";\nimport { PlatformTools } from \"../../platform/PlatformTools\";\nimport { Connection } from \"../../connection/Connection\";\nimport { SqliteConnectionOptions } from \"./SqliteConnectionOptions\";\nimport { ColumnType } from \"../types/ColumnTypes\";\nimport { QueryRunner } from \"../../query-runner/QueryRunner\";\nimport { AbstractSqliteDriver } from \"../sqlite-abstract/AbstractSqliteDriver\";\nimport {ReplicationMode} from \"../types/ReplicationMode\";\n\n/**\n * Organizes communication with sqlite DBMS.\n */\nexport class SqliteDriver extends AbstractSqliteDriver {\n\n    // -------------------------------------------------------------------------\n    // Public Properties\n    // -------------------------------------------------------------------------\n\n    /**\n     * Connection options.\n     */\n    options: SqliteConnectionOptions;\n\n    /**\n     * SQLite underlying library.\n     */\n    sqlite: any;\n\n    // -------------------------------------------------------------------------\n    // Constructor\n    // -------------------------------------------------------------------------\n\n    constructor(connection: Connection) {\n        super(connection);\n\n        this.connection = connection;\n        this.options = connection.options as SqliteConnectionOptions;\n        this.database = this.options.database;\n\n        // validate options to make sure everything is set\n        if (!this.options.database)\n            throw new DriverOptionNotSetError(\"database\");\n\n        // load sqlite package\n        this.loadDependencies();\n    }\n\n    // -------------------------------------------------------------------------\n    // Public Methods\n    // -------------------------------------------------------------------------\n\n    /**\n     * Closes connection with database.\n     */\n    async disconnect(): Promise<void> {\n        return new Promise<void>((ok, fail) => {\n            this.queryRunner = undefined;\n            this.databaseConnection.close((err: any) => err ? fail(err) : ok());\n        });\n    }\n\n    /**\n     * Creates a query runner used to execute database queries.\n     */\n    createQueryRunner(mode: ReplicationMode): QueryRunner {\n        if (!this.queryRunner)\n            this.queryRunner = new SqliteQueryRunner(this);\n\n        return this.queryRunner;\n    }\n\n    normalizeType(column: { type?: ColumnType, length?: number | string, precision?: number | null, scale?: number }): string {\n        if ((column.type as any) === Buffer) {\n            return \"blob\";\n        }\n\n        return super.normalizeType(column);\n    }\n\n    // -------------------------------------------------------------------------\n    // Protected Methods\n    // -------------------------------------------------------------------------\n\n    /**\n     * Creates connection with the database.\n     */\n    protected async createDatabaseConnection() {\n        await this.createDatabaseDirectory(this.options.database);\n\n        const databaseConnection: any = await new Promise((ok, fail) => {\n            const connection = new this.sqlite.Database(this.options.database, (err: any) => {\n                if (err) return fail(err);\n                ok(connection);\n            });\n        });\n\n        // Internal function to run a command on the connection and fail if an error occured.\n        function run(line: string): Promise<void> {\n            return new Promise((ok, fail) => {\n                databaseConnection.run(line, (err: any) => {\n                    if (err) return fail(err);\n                    ok();\n                });\n            });\n        }\n        // in the options, if encryption key for SQLCipher is setted.\n        // Must invoke key pragma before trying to do any other interaction with the database.\n        if (this.options.key) {\n            await run(`PRAGMA key = ${JSON.stringify(this.options.key)};`);\n        }\n\n        if (this.options.enableWAL) {\n            await run(`PRAGMA journal_mode = WAL;`);\n        }\n\n        // we need to enable foreign keys in sqlite to make sure all foreign key related features\n        // working properly. this also makes onDelete to work with sqlite.\n        await run(`PRAGMA foreign_keys = ON;`);\n\n        return databaseConnection;\n    }\n\n    /**\n     * If driver dependency is not given explicitly, then try to load it via \"require\".\n     */\n    protected loadDependencies(): void {\n        try {\n            const sqlite = this.options.driver || PlatformTools.load(\"sqlite3\");\n            this.sqlite = sqlite.verbose();\n\n        } catch (e) {\n            throw new DriverPackageNotInstalledError(\"SQLite\", \"sqlite3\");\n        }\n    }\n\n    /**\n     * Auto creates database directory if it does not exist.\n     */\n    protected async createDatabaseDirectory(fullPath: string): Promise<void> {\n        await mkdirp(path.dirname(fullPath));\n    }\n\n}\n"],"sourceRoot":"../.."}

package/driver/sqlite-abstract/AbstractSqliteQueryRunner.js

@@ -16,6 +16,7 @@ var BaseQueryRunner_1 = require("../../query-runner/BaseQueryRunner");
 var OrmUtils_1 = require("../../util/OrmUtils");
 var TableCheck_1 = require("../../schema-builder/table/TableCheck");
 var error_1 = require("../../error");
+var MetadataTableType_1 = require("../types/MetadataTableType");
 /**
  * Runs queries on a single sqlite database connection.
  */
@@ -1197,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)];
@@ -1320,7 +1321,7 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
                             viewNames = [];
                         }
                         viewNamesString = viewNames.map(function (name) { return "'" + name + "'"; }).join(", ");
-                        query = "SELECT \"t\".* FROM \"" + this.getTypeormMetadataTableName() + "\" \"t\" INNER JOIN \"sqlite_master\" s ON \"s\".\"name\" = \"t\".\"name\" AND \"s\".\"type\" = 'view' WHERE \"t\".\"type\" = 'VIEW'";
+                        query = "SELECT \"t\".* FROM \"" + this.getTypeormMetadataTableName() + "\" \"t\" INNER JOIN \"sqlite_master\" s ON \"s\".\"name\" = \"t\".\"name\" AND \"s\".\"type\" = 'view' WHERE \"t\".\"type\" = '" + MetadataTableType_1.MetadataTableType.VIEW + "'";
                         if (viewNamesString.length > 0)
                             query += " AND \"t\".\"name\" IN (" + viewNamesString + ")";
                         return [4 /*yield*/, this.query(query)];
@@ -1657,12 +1658,11 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
     };
     AbstractSqliteQueryRunner.prototype.insertViewDefinitionSql = function (view) {
         var expression = typeof view.expression === "string" ? view.expression.trim() : view.expression(this.connection).getQuery();
-        var _a = (0, tslib_1.__read)(this.connection.createQueryBuilder()
-            .insert()
-            .into(this.getTypeormMetadataTableName())
-            .values({ type: "VIEW", name: view.name, value: expression })
-            .getQueryAndParameters(), 2), query = _a[0], parameters = _a[1];
-        return new Query_1.Query(query, parameters);
+        return this.insertTypeormMetadataSql({
+            type: MetadataTableType_1.MetadataTableType.VIEW,
+            name: view.name,
+            value: expression
+        });
     };
     /**
      * Builds drop view sql.
@@ -1676,13 +1676,7 @@ var AbstractSqliteQueryRunner = /** @class */ (function (_super) {
      */
     AbstractSqliteQueryRunner.prototype.deleteViewDefinitionSql = function (viewOrPath) {
         var viewName = viewOrPath instanceof View_1.View ? viewOrPath.name : viewOrPath;
-        var qb = this.connection.createQueryBuilder();
-        var _a = (0, tslib_1.__read)(qb.delete()
-            .from(this.getTypeormMetadataTableName())
-            .where(qb.escape("type") + " = 'VIEW'")
-            .andWhere(qb.escape("name") + " = :name", { name: viewName })
-            .getQueryAndParameters(), 2), query = _a[0], parameters = _a[1];
-        return new Query_1.Query(query, parameters);
+        return this.deleteTypeormMetadataSql({ type: MetadataTableType_1.MetadataTableType.VIEW, name: viewName });
     };
     /**
      * Builds create index sql.