typeorm 0.3.0-rc.9 → 0.3.0

package/browser/driver/mongodb/MongoDriver.d.ts

@@ -2,20 +2,24 @@ import { Driver } from "../Driver";
 import { MongoQueryRunner } from "./MongoQueryRunner";
 import { ObjectLiteral } from "../../common/ObjectLiteral";
 import { ColumnMetadata } from "../../metadata/ColumnMetadata";
-import { Connection } from "../../connection/Connection";
+import { DataSource } from "../../data-source/DataSource";
 import { MongoConnectionOptions } from "./MongoConnectionOptions";
 import { MappedColumnTypes } from "../types/MappedColumnTypes";
 import { ColumnType } from "../types/ColumnTypes";
 import { MongoSchemaBuilder } from "../../schema-builder/MongoSchemaBuilder";
 import { DataTypeDefaults } from "../types/DataTypeDefaults";
 import { TableColumn } from "../../schema-builder/table/TableColumn";
-import { ConnectionOptions } from "../../connection/ConnectionOptions";
+import { DataSourceOptions } from "../../data-source/DataSourceOptions";
 import { EntityMetadata } from "../../metadata/EntityMetadata";
+import { ReplicationMode } from "../types/ReplicationMode";
+import { Table } from "../../schema-builder/table/Table";
+import { View } from "../../schema-builder/view/View";
+import { TableForeignKey } from "../../schema-builder/table/TableForeignKey";
 /**
  * Organizes communication with MongoDB.
  */
 export declare class MongoDriver implements Driver {
-    protected connection: Connection;
+    protected connection: DataSource;
     /**
      * Underlying mongodb library.
      */
@@ -41,6 +45,10 @@ export declare class MongoDriver implements Driver {
      * Indicates if tree tables are supported by this driver.
      */
     treeSupport: boolean;
+    /**
+     * Represent transaction support by this driver
+     */
+    transactionSupport: "none";
     /**
      * Mongodb does not need to have column types because they are not used in schema sync.
      */
@@ -78,10 +86,10 @@ export declare class MongoDriver implements Driver {
     /**
      * Valid mongo connection options
      * NOTE: Keep sync with MongoConnectionOptions
-     * Sync with http://mongodb.github.io/node-mongodb-native/3.1/api/MongoClient.html
+     * Sync with http://mongodb.github.io/node-mongodb-native/3.5/api/MongoClient.html
      */
     protected validOptionNames: string[];
-    constructor(connection: Connection);
+    constructor(connection: DataSource);
     /**
      * Performs connection to the database.
      */
@@ -98,7 +106,7 @@ export declare class MongoDriver implements Driver {
     /**
      * Creates a query runner used to execute database queries.
      */
-    createQueryRunner(mode?: "master" | "slave"): MongoQueryRunner;
+    createQueryRunner(mode: ReplicationMode): MongoQueryRunner;
     /**
      * Replaces parameters in the given sql with special escaping character
      * and an array of parameter names to be passed to a query.
@@ -110,9 +118,17 @@ export declare class MongoDriver implements Driver {
     escape(columnName: string): string;
     /**
      * Build full table name with database name, schema name and table name.
-     * E.g. "myDB"."mySchema"."myTable"
+     * E.g. myDB.mySchema.myTable
      */
     buildTableName(tableName: string, schema?: string, database?: string): string;
+    /**
+     * Parse a target table name or other types and return a normalized table definition.
+     */
+    parseTableName(target: EntityMetadata | Table | View | TableForeignKey | string): {
+        tableName: string;
+        schema?: string;
+        database?: string;
+    };
     /**
      * Prepares given value to a value to be persisted, based on its column type and metadata.
      */
@@ -127,13 +143,13 @@ export declare class MongoDriver implements Driver {
     normalizeType(column: {
         type?: ColumnType;
         length?: number | string;
-        precision?: number;
+        precision?: number | null;
         scale?: number;
     }): string;
     /**
      * Normalizes "default" value of the column.
      */
-    normalizeDefault(columnMetadata: ColumnMetadata): string;
+    normalizeDefault(columnMetadata: ColumnMetadata): string | undefined;
     /**
      * Normalizes "isUnique" value of the column.
      */
@@ -175,6 +191,10 @@ export declare class MongoDriver implements Driver {
      * Returns true if driver supports uuid values generation on its own.
      */
     isUUIDGenerationSupported(): boolean;
+    /**
+     * Returns true if driver supports fulltext indices.
+     */
+    isFullTextColumnTypeSupported(): boolean;
     /**
      * Creates an escaped parameter.
      */
@@ -182,7 +202,7 @@ export declare class MongoDriver implements Driver {
     /**
      * Validate driver options to make sure everything is correct and driver will be able to establish connection.
      */
-    protected validateOptions(options: ConnectionOptions): void;
+    protected validateOptions(options: DataSourceOptions): void;
     /**
      * Loads all driver dependencies.
      */
@@ -190,9 +210,13 @@ export declare class MongoDriver implements Driver {
     /**
      * Builds connection url that is passed to underlying driver to perform connection to the mongodb database.
      */
-    protected buildConnectionUrl(): string;
+    protected buildConnectionUrl(options: {
+        [key: string]: any;
+    }): string;
     /**
      * Build connection options from MongoConnectionOptions
      */
-    protected buildConnectionOptions(): any;
+    protected buildConnectionOptions(options: {
+        [key: string]: any;
+    }): any;
 }

package/browser/driver/mongodb/MongoDriver.js

@@ -1,4 +1,3 @@
-import * as tslib_1 from "tslib";
 import { ConnectionIsNotSetError } from "../../error/ConnectionIsNotSetError";
 import { DriverPackageNotInstalledError } from "../../error/DriverPackageNotInstalledError";
 import { MongoQueryRunner } from "./MongoQueryRunner";
@@ -6,14 +5,17 @@ import { PlatformTools } from "../../platform/PlatformTools";
 import { MongoSchemaBuilder } from "../../schema-builder/MongoSchemaBuilder";
 import { ObjectUtils } from "../../util/ObjectUtils";
 import { ApplyValueTransformers } from "../../util/ApplyValueTransformers";
+import { DriverUtils } from "../DriverUtils";
+import { TypeORMError } from "../../error";
+import { InstanceChecker } from "../../util/InstanceChecker";
 /**
  * Organizes communication with MongoDB.
  */
-var MongoDriver = /** @class */ (function () {
+export class MongoDriver {
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------
-    function MongoDriver(connection) {
+    constructor(connection) {
         this.connection = connection;
         /**
          * Indicates if replication is enabled.
@@ -23,6 +25,10 @@ var MongoDriver = /** @class */ (function () {
          * Indicates if tree tables are supported by this driver.
          */
         this.treeSupport = false;
+        /**
+         * Represent transaction support by this driver
+         */
+        this.transactionSupport = "none";
         /**
          * Mongodb does not need to have column types because they are not used in schema sync.
          */
@@ -51,6 +57,8 @@ var MongoDriver = /** @class */ (function () {
             createDateDefault: "",
             updateDate: "int",
             updateDateDefault: "",
+            deleteDate: "int",
+            deleteDateNullable: true,
             version: "int",
             treeLevel: "int",
             migrationId: "int",
@@ -75,7 +83,7 @@ var MongoDriver = /** @class */ (function () {
         /**
          * Valid mongo connection options
          * NOTE: Keep sync with MongoConnectionOptions
-         * Sync with http://mongodb.github.io/node-mongodb-native/3.1/api/MongoClient.html
+         * Sync with http://mongodb.github.io/node-mongodb-native/3.5/api/MongoClient.html
          */
         this.validOptionNames = [
             "poolSize",
@@ -105,6 +113,7 @@ var MongoDriver = /** @class */ (function () {
             "w",
             "wtimeout",
             "j",
+            "writeConcern",
             "forceServerObjectId",
             "serializeFunctions",
             "ignoreUndefined",
@@ -116,7 +125,7 @@ var MongoDriver = /** @class */ (function () {
             "readConcern",
             "maxStalenessSeconds",
             "loggerLevel",
-            // Do not overwrite BaseConnectionOptions.logger
+            // Do not overwrite BaseDataSourceOptions.logger
             // "logger",
             "promoteValues",
             "promoteBuffers",
@@ -136,13 +145,16 @@ var MongoDriver = /** @class */ (function () {
             "minSize",
             "monitorCommands",
             "useNewUrlParser",
-            "useUnifiedTopology"
+            "useUnifiedTopology",
+            "autoEncryption",
+            "retryWrites",
         ];
         this.options = connection.options;
         // validate options to make sure everything is correct and driver will be able to establish connection
         this.validateOptions(connection.options);
         // load mongodb package
         this.loadDependencies();
+        this.database = DriverUtils.buildMongoDBDriverOptions(this.options).database;
     }
     // -------------------------------------------------------------------------
     // Public Methods
@@ -150,216 +162,250 @@ var MongoDriver = /** @class */ (function () {
     /**
      * Performs connection to the database.
      */
-    MongoDriver.prototype.connect = function () {
-        var _this = this;
-        return new Promise(function (ok, fail) {
-            _this.mongodb.MongoClient.connect(_this.buildConnectionUrl(), _this.buildConnectionOptions(), function (err, client) {
+    connect() {
+        return new Promise((ok, fail) => {
+            const options = DriverUtils.buildMongoDBDriverOptions(this.options);
+            this.mongodb.MongoClient.connect(this.buildConnectionUrl(options), this.buildConnectionOptions(options), (err, client) => {
                 if (err)
                     return fail(err);
-                _this.queryRunner = new MongoQueryRunner(_this.connection, client);
-                ObjectUtils.assign(_this.queryRunner, { manager: _this.connection.manager });
+                this.queryRunner = new MongoQueryRunner(this.connection, client);
+                ObjectUtils.assign(this.queryRunner, {
+                    manager: this.connection.manager,
+                });
                 ok();
             });
         });
-    };
-    MongoDriver.prototype.afterConnect = function () {
+    }
+    afterConnect() {
         return Promise.resolve();
-    };
+    }
     /**
      * Closes connection with the database.
      */
-    MongoDriver.prototype.disconnect = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, new Promise(function (ok, fail) {
-                        if (!_this.queryRunner)
-                            return fail(new ConnectionIsNotSetError("mongodb"));
-                        var handler = function (err) { return err ? fail(err) : ok(); };
-                        _this.queryRunner.databaseConnection.close(handler);
-                        _this.queryRunner = undefined;
-                    })];
-            });
+    async disconnect() {
+        return new Promise((ok, fail) => {
+            if (!this.queryRunner)
+                return fail(new ConnectionIsNotSetError("mongodb"));
+            const handler = (err) => (err ? fail(err) : ok());
+            this.queryRunner.databaseConnection.close(handler);
+            this.queryRunner = undefined;
         });
-    };
+    }
     /**
      * Creates a schema builder used to build and sync a schema.
      */
-    MongoDriver.prototype.createSchemaBuilder = function () {
+    createSchemaBuilder() {
         return new MongoSchemaBuilder(this.connection);
-    };
+    }
     /**
      * Creates a query runner used to execute database queries.
      */
-    MongoDriver.prototype.createQueryRunner = function (mode) {
-        if (mode === void 0) { mode = "master"; }
+    createQueryRunner(mode) {
         return this.queryRunner;
-    };
+    }
     /**
      * Replaces parameters in the given sql with special escaping character
      * and an array of parameter names to be passed to a query.
      */
-    MongoDriver.prototype.escapeQueryWithParameters = function (sql, parameters, nativeParameters) {
-        throw new Error("This operation is not supported by Mongodb driver.");
-    };
+    escapeQueryWithParameters(sql, parameters, nativeParameters) {
+        throw new TypeORMError(`This operation is not supported by Mongodb driver.`);
+    }
     /**
      * Escapes a column name.
      */
-    MongoDriver.prototype.escape = function (columnName) {
+    escape(columnName) {
         return columnName;
-    };
+    }
     /**
      * Build full table name with database name, schema name and table name.
-     * E.g. "myDB"."mySchema"."myTable"
+     * E.g. myDB.mySchema.myTable
      */
-    MongoDriver.prototype.buildTableName = function (tableName, schema, database) {
+    buildTableName(tableName, schema, database) {
         return tableName;
-    };
+    }
+    /**
+     * Parse a target table name or other types and return a normalized table definition.
+     */
+    parseTableName(target) {
+        if (InstanceChecker.isEntityMetadata(target)) {
+            return {
+                tableName: target.tableName,
+            };
+        }
+        if (InstanceChecker.isTable(target) || InstanceChecker.isView(target)) {
+            return {
+                tableName: target.name,
+            };
+        }
+        if (InstanceChecker.isTableForeignKey(target)) {
+            return {
+                tableName: target.referencedTableName,
+            };
+        }
+        return {
+            tableName: target,
+        };
+    }
     /**
      * Prepares given value to a value to be persisted, based on its column type and metadata.
      */
-    MongoDriver.prototype.preparePersistentValue = function (value, columnMetadata) {
+    preparePersistentValue(value, columnMetadata) {
         if (columnMetadata.transformer)
             value = ApplyValueTransformers.transformTo(columnMetadata.transformer, value);
         return value;
-    };
+    }
     /**
      * Prepares given value to a value to be persisted, based on its column type or metadata.
      */
-    MongoDriver.prototype.prepareHydratedValue = function (value, columnMetadata) {
+    prepareHydratedValue(value, columnMetadata) {
         if (columnMetadata.transformer)
             value = ApplyValueTransformers.transformFrom(columnMetadata.transformer, value);
         return value;
-    };
+    }
     /**
      * Creates a database type from a given column metadata.
      */
-    MongoDriver.prototype.normalizeType = function (column) {
-        throw new Error("MongoDB is schema-less, not supported by this driver.");
-    };
+    normalizeType(column) {
+        throw new TypeORMError(`MongoDB is schema-less, not supported by this driver.`);
+    }
     /**
      * Normalizes "default" value of the column.
      */
-    MongoDriver.prototype.normalizeDefault = function (columnMetadata) {
-        throw new Error("MongoDB is schema-less, not supported by this driver.");
-    };
+    normalizeDefault(columnMetadata) {
+        throw new TypeORMError(`MongoDB is schema-less, not supported by this driver.`);
+    }
     /**
      * Normalizes "isUnique" value of the column.
      */
-    MongoDriver.prototype.normalizeIsUnique = function (column) {
-        throw new Error("MongoDB is schema-less, not supported by this driver.");
-    };
+    normalizeIsUnique(column) {
+        throw new TypeORMError(`MongoDB is schema-less, not supported by this driver.`);
+    }
     /**
      * Calculates column length taking into account the default length values.
      */
-    MongoDriver.prototype.getColumnLength = function (column) {
-        throw new Error("MongoDB is schema-less, not supported by this driver.");
-    };
+    getColumnLength(column) {
+        throw new TypeORMError(`MongoDB is schema-less, not supported by this driver.`);
+    }
     /**
      * Normalizes "default" value of the column.
      */
-    MongoDriver.prototype.createFullType = function (column) {
-        throw new Error("MongoDB is schema-less, not supported by this driver.");
-    };
+    createFullType(column) {
+        throw new TypeORMError(`MongoDB is schema-less, not supported by this driver.`);
+    }
     /**
      * Obtains a new database connection to a master server.
      * Used for replication.
      * If replication is not setup then returns default connection's database connection.
      */
-    MongoDriver.prototype.obtainMasterConnection = function () {
+    obtainMasterConnection() {
         return Promise.resolve();
-    };
+    }
     /**
      * Obtains a new database connection to a slave server.
      * Used for replication.
      * If replication is not setup then returns master (default) connection's database connection.
      */
-    MongoDriver.prototype.obtainSlaveConnection = function () {
+    obtainSlaveConnection() {
         return Promise.resolve();
-    };
+    }
     /**
      * Creates generated map of values generated or returned by database after INSERT query.
      */
-    MongoDriver.prototype.createGeneratedMap = function (metadata, insertedId) {
+    createGeneratedMap(metadata, insertedId) {
         return metadata.objectIdColumn.createValueMap(insertedId);
-    };
+    }
     /**
      * Differentiate columns of this table and columns from the given column metadatas columns
      * and returns only changed.
      */
-    MongoDriver.prototype.findChangedColumns = function (tableColumns, columnMetadatas) {
-        throw new Error("MongoDB is schema-less, not supported by this driver.");
-    };
+    findChangedColumns(tableColumns, columnMetadatas) {
+        throw new TypeORMError(`MongoDB is schema-less, not supported by this driver.`);
+    }
     /**
      * Returns true if driver supports RETURNING / OUTPUT statement.
      */
-    MongoDriver.prototype.isReturningSqlSupported = function () {
+    isReturningSqlSupported() {
         return false;
-    };
+    }
     /**
      * Returns true if driver supports uuid values generation on its own.
      */
-    MongoDriver.prototype.isUUIDGenerationSupported = function () {
+    isUUIDGenerationSupported() {
         return false;
-    };
+    }
+    /**
+     * Returns true if driver supports fulltext indices.
+     */
+    isFullTextColumnTypeSupported() {
+        return false;
+    }
     /**
      * Creates an escaped parameter.
      */
-    MongoDriver.prototype.createParameter = function (parameterName, index) {
+    createParameter(parameterName, index) {
         return "";
-    };
+    }
     // -------------------------------------------------------------------------
     // Protected Methods
     // -------------------------------------------------------------------------
     /**
      * Validate driver options to make sure everything is correct and driver will be able to establish connection.
      */
-    MongoDriver.prototype.validateOptions = function (options) {
+    validateOptions(options) {
+        // todo: fix
         // if (!options.url) {
         //     if (!options.database)
         //         throw new DriverOptionNotSetError("database");
         // }
-    };
+    }
     /**
      * Loads all driver dependencies.
      */
-    MongoDriver.prototype.loadDependencies = function () {
+    loadDependencies() {
         try {
-            this.mongodb = PlatformTools.load("mongodb"); // try to load native driver dynamically
+            const mongodb = this.options.driver || PlatformTools.load("mongodb");
+            this.mongodb = mongodb;
         }
         catch (e) {
             throw new DriverPackageNotInstalledError("MongoDB", "mongodb");
         }
-    };
+    }
     /**
      * Builds connection url that is passed to underlying driver to perform connection to the mongodb database.
      */
-    MongoDriver.prototype.buildConnectionUrl = function () {
-        if (this.options.url)
-            return this.options.url;
-        var credentialsUrlPart = (this.options.username && this.options.password)
-            ? this.options.username + ":" + this.options.password + "@"
+    buildConnectionUrl(options) {
+        const schemaUrlPart = options.type.toLowerCase();
+        const credentialsUrlPart = options.username && options.password
+            ? `${options.username}:${options.password}@`
             : "";
-        return "mongodb://" + credentialsUrlPart + (this.options.host || "127.0.0.1") + ":" + (this.options.port || "27017") + "/" + this.options.database;
-    };
+        const portUrlPart = schemaUrlPart === "mongodb+srv" ? "" : `:${options.port || "27017"}`;
+        let connectionString;
+        if (options.replicaSet) {
+            connectionString = `${schemaUrlPart}://${credentialsUrlPart}${options.hostReplicaSet ||
+                options.host + portUrlPart ||
+                "127.0.0.1" + portUrlPart}/${options.database || ""}?replicaSet=${options.replicaSet}${options.tls ? "&tls=true" : ""}`;
+        }
+        else {
+            connectionString = `${schemaUrlPart}://${credentialsUrlPart}${options.host || "127.0.0.1"}${portUrlPart}/${options.database || ""}${options.tls ? "?tls=true" : ""}`;
+        }
+        return connectionString;
+    }
     /**
      * Build connection options from MongoConnectionOptions
      */
-    MongoDriver.prototype.buildConnectionOptions = function () {
-        var mongoOptions = {};
-        for (var index = 0; index < this.validOptionNames.length; index++) {
-            var optionName = this.validOptionNames[index];
-            if (this.options.extra && optionName in this.options.extra) {
-                mongoOptions[optionName] = this.options.extra[optionName];
+    buildConnectionOptions(options) {
+        const mongoOptions = {};
+        for (let index = 0; index < this.validOptionNames.length; index++) {
+            const optionName = this.validOptionNames[index];
+            if (options.extra && optionName in options.extra) {
+                mongoOptions[optionName] = options.extra[optionName];
             }
-            else if (optionName in this.options) {
-                mongoOptions[optionName] = this.options[optionName];
+            else if (optionName in options) {
+                mongoOptions[optionName] = options[optionName];
             }
         }
         return mongoOptions;
-    };
-    return MongoDriver;
-}());
-export { MongoDriver };
+    }
+}
 
 //# sourceMappingURL=MongoDriver.js.map