typeorm 0.2.28 → 0.2.32

package/browser/metadata/types/TableTypes.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=TableTypes.js.map

package/browser/metadata/types/TreeTypes.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=TreeTypes.js.map

package/browser/metadata-args/CheckMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=CheckMetadataArgs.js.map

package/browser/metadata-args/ColumnMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=ColumnMetadataArgs.js.map

package/browser/metadata-args/DiscriminatorValueMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=DiscriminatorValueMetadataArgs.js.map

package/browser/metadata-args/EmbeddedMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=EmbeddedMetadataArgs.js.map

package/browser/metadata-args/EntityListenerMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=EntityListenerMetadataArgs.js.map

package/browser/metadata-args/EntityRepositoryMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=EntityRepositoryMetadataArgs.js.map

package/browser/metadata-args/EntitySubscriberMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=EntitySubscriberMetadataArgs.js.map

package/browser/metadata-args/ExclusionMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=ExclusionMetadataArgs.js.map

package/browser/metadata-args/GeneratedMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=GeneratedMetadataArgs.js.map

package/browser/metadata-args/IndexMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=IndexMetadataArgs.js.map

package/browser/metadata-args/InheritanceMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=InheritanceMetadataArgs.js.map

package/browser/metadata-args/JoinColumnMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=JoinColumnMetadataArgs.js.map

package/browser/metadata-args/JoinTableMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=JoinTableMetadataArgs.js.map

package/browser/metadata-args/NamingStrategyMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=NamingStrategyMetadataArgs.js.map

package/browser/metadata-args/RelationCountMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=RelationCountMetadataArgs.js.map

package/browser/metadata-args/RelationIdMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=RelationIdMetadataArgs.js.map

package/browser/metadata-args/RelationMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=RelationMetadataArgs.js.map

package/browser/metadata-args/TableMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=TableMetadataArgs.js.map

package/browser/metadata-args/TransactionEntityMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=TransactionEntityMetadataArgs.js.map

package/browser/metadata-args/TransactionRepositoryMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=TransactionRepositoryMetadataArgs.js.map

package/browser/metadata-args/TreeMetadataArgs.d.ts

@@ -1,4 +1,5 @@
 import { TreeType } from "../metadata/types/TreeTypes";
+import { ClosureTreeOptions } from "../metadata/types/ClosureTreeOptions";
 /**
  * Stores metadata collected for Tree entities.
  */
@@ -11,4 +12,8 @@ export interface TreeMetadataArgs {
      * Tree type.
      */
     type: TreeType;
+    /**
+     * Tree options
+     */
+    options?: ClosureTreeOptions;
 }

package/browser/metadata-args/TreeMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=TreeMetadataArgs.js.map

package/browser/metadata-args/TreeMetadataArgs.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../browser/src/metadata-args/TreeMetadataArgs.ts"],"names":[],"mappings":"","file":"TreeMetadataArgs.js","sourcesContent":["import {TreeType} from \"../metadata/types/TreeTypes\";\n\n/**\n * Stores metadata collected for Tree entities.\n */\nexport interface TreeMetadataArgs {\n\n    /**\n     * Entity to which tree is applied.\n     */\n    target: Function|string;\n\n    /**\n     * Tree type.\n     */\n    type: TreeType;\n\n}\n"],"sourceRoot":".."}
+{"version":3,"sources":["../browser/src/metadata-args/TreeMetadataArgs.ts"],"names":[],"mappings":"","file":"TreeMetadataArgs.js","sourcesContent":["import {TreeType} from \"../metadata/types/TreeTypes\";\nimport {ClosureTreeOptions} from \"../metadata/types/ClosureTreeOptions\";\n\n/**\n * Stores metadata collected for Tree entities.\n */\nexport interface TreeMetadataArgs {\n\n    /**\n     * Entity to which tree is applied.\n     */\n    target: Function|string;\n\n    /**\n     * Tree type.\n     */\n    type: TreeType;\n\n    /**\n     * Tree options\n     */\n    options?: ClosureTreeOptions;\n}\n"],"sourceRoot":".."}

package/browser/metadata-args/UniqueMetadataArgs.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=UniqueMetadataArgs.js.map

package/browser/metadata-args/types/ColumnMode.js

@@ -1,3 +1,3 @@
-
+export {};
 
 //# sourceMappingURL=ColumnMode.js.map

package/browser/metadata-builder/ClosureJunctionEntityMetadataBuilder.js

@@ -27,7 +27,7 @@ var ClosureJunctionEntityMetadataBuilder = /** @class */ (function () {
             connection: this.connection,
             args: {
                 target: "",
-                name: parentClosureEntityMetadata.tableNameWithoutPrefix,
+                name: parentClosureEntityMetadata.treeOptions && parentClosureEntityMetadata.treeOptions.closureTableName ? parentClosureEntityMetadata.treeOptions.closureTableName : parentClosureEntityMetadata.tableNameWithoutPrefix,
                 type: "closure-junction"
             }
         });
@@ -42,7 +42,7 @@ var ClosureJunctionEntityMetadataBuilder = /** @class */ (function () {
                 args: {
                     target: "",
                     mode: "virtual",
-                    propertyName: primaryColumn.propertyName + "_ancestor",
+                    propertyName: parentClosureEntityMetadata.treeOptions && parentClosureEntityMetadata.treeOptions.ancestorColumnName ? parentClosureEntityMetadata.treeOptions.ancestorColumnName(primaryColumn) : primaryColumn.propertyName + "_ancestor",
                     options: {
                         primary: true,
                         length: primaryColumn.length,
@@ -58,7 +58,7 @@ var ClosureJunctionEntityMetadataBuilder = /** @class */ (function () {
                 args: {
                     target: "",
                     mode: "virtual",
-                    propertyName: primaryColumn.propertyName + "_descendant",
+                    propertyName: parentClosureEntityMetadata.treeOptions && parentClosureEntityMetadata.treeOptions.descendantColumnName ? parentClosureEntityMetadata.treeOptions.descendantColumnName(primaryColumn) : primaryColumn.propertyName + "_descendant",
                     options: {
                         primary: true,
                         length: primaryColumn.length,
@@ -107,12 +107,14 @@ var ClosureJunctionEntityMetadataBuilder = /** @class */ (function () {
                 referencedEntityMetadata: parentClosureEntityMetadata,
                 columns: [entityMetadata.ownColumns[0]],
                 referencedColumns: parentClosureEntityMetadata.primaryColumns,
+                // onDelete: "CASCADE" // todo: does not work in mssql for some reason
             }),
             new ForeignKeyMetadata({
                 entityMetadata: entityMetadata,
                 referencedEntityMetadata: parentClosureEntityMetadata,
                 columns: [entityMetadata.ownColumns[1]],
                 referencedColumns: parentClosureEntityMetadata.primaryColumns,
+                // onDelete: "CASCADE" // todo: does not work in mssql for some reason
             }),
         ];
         return entityMetadata;

package/browser/metadata-builder/ClosureJunctionEntityMetadataBuilder.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../browser/src/metadata-builder/ClosureJunctionEntityMetadataBuilder.ts"],"names":[],"mappings":"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","file":"ClosureJunctionEntityMetadataBuilder.js","sourcesContent":["import {EntityMetadata} from \"../metadata/EntityMetadata\";\nimport {ColumnMetadata} from \"../metadata/ColumnMetadata\";\nimport {ForeignKeyMetadata} from \"../metadata/ForeignKeyMetadata\";\nimport {Connection} from \"../connection/Connection\";\nimport {IndexMetadata} from \"../metadata/IndexMetadata\";\n\n/**\n * Creates EntityMetadata for junction tables of the closure entities.\n * Closure junction tables are tables generated by closure entities.\n */\nexport class ClosureJunctionEntityMetadataBuilder {\n\n    // -------------------------------------------------------------------------\n    // Constructor\n    // -------------------------------------------------------------------------\n\n    constructor(private connection: Connection) {\n    }\n\n    // -------------------------------------------------------------------------\n    // Public Methods\n    // -------------------------------------------------------------------------\n\n    /**\n     * Builds EntityMetadata for the closure junction of the given closure entity.\n     */\n    build(parentClosureEntityMetadata: EntityMetadata) {\n\n        // create entity metadata itself\n        const entityMetadata = new EntityMetadata({\n            parentClosureEntityMetadata: parentClosureEntityMetadata,\n            connection: this.connection,\n            args: {\n                target: \"\",\n                name: parentClosureEntityMetadata.tableNameWithoutPrefix,\n                type: \"closure-junction\"\n            }\n        });\n        entityMetadata.build();\n\n        // create ancestor and descendant columns for new closure junction table\n        parentClosureEntityMetadata.primaryColumns.forEach(primaryColumn => {\n            entityMetadata.ownColumns.push(new ColumnMetadata({\n                connection: this.connection,\n                entityMetadata: entityMetadata,\n                closureType: \"ancestor\",\n                referencedColumn: primaryColumn,\n                args: {\n                    target: \"\",\n                    mode: \"virtual\",\n                    propertyName: primaryColumn.propertyName + \"_ancestor\", // todo: naming strategy\n                    options: {\n                        primary: true,\n                        length: primaryColumn.length,\n                        type: primaryColumn.type\n                    }\n                }\n            }));\n            entityMetadata.ownColumns.push(new ColumnMetadata({\n                connection: this.connection,\n                entityMetadata: entityMetadata,\n                closureType: \"descendant\",\n                referencedColumn: primaryColumn,\n                args: {\n                    target: \"\",\n                    mode: \"virtual\",\n                    propertyName: primaryColumn.propertyName + \"_descendant\",\n                    options: {\n                        primary: true,\n                        length: primaryColumn.length,\n                        type: primaryColumn.type,\n                    }\n                }\n            }));\n        });\n\n        entityMetadata.ownIndices = [\n            new IndexMetadata({\n                entityMetadata: entityMetadata,\n                columns: [entityMetadata.ownColumns[0]],\n                args: {\n                    target: entityMetadata.target,\n                    synchronize: true\n                }\n            }),\n            new IndexMetadata({\n                entityMetadata: entityMetadata,\n                columns: [entityMetadata.ownColumns[1]],\n                args: {\n                    target: entityMetadata.target,\n                    synchronize: true\n                }\n            })\n        ];\n\n        // if tree level column was defined by a closure entity then add it to the junction columns as well\n        if (parentClosureEntityMetadata.treeLevelColumn) {\n            entityMetadata.ownColumns.push(new ColumnMetadata({\n                connection: this.connection,\n                entityMetadata: entityMetadata,\n                args: {\n                    target: \"\",\n                    mode: \"virtual\",\n                    propertyName: \"level\",\n                    options: {\n                        type: this.connection.driver.mappedDataTypes.treeLevel,\n                    }\n                }\n            }));\n        }\n\n        // create junction table foreign keys\n        entityMetadata.foreignKeys = [\n            new ForeignKeyMetadata({\n                entityMetadata: entityMetadata,\n                referencedEntityMetadata: parentClosureEntityMetadata,\n                columns: [entityMetadata.ownColumns[0]],\n                referencedColumns: parentClosureEntityMetadata.primaryColumns,\n                // onDelete: \"CASCADE\" // todo: does not work in mssql for some reason\n            }),\n            new ForeignKeyMetadata({\n                entityMetadata: entityMetadata,\n                referencedEntityMetadata: parentClosureEntityMetadata,\n                columns: [entityMetadata.ownColumns[1]],\n                referencedColumns: parentClosureEntityMetadata.primaryColumns,\n                // onDelete: \"CASCADE\" // todo: does not work in mssql for some reason\n            }),\n        ];\n\n        return entityMetadata;\n    }\n\n}\n"],"sourceRoot":".."}
+{"version":3,"sources":["../browser/src/metadata-builder/ClosureJunctionEntityMetadataBuilder.ts"],"names":[],"mappings":"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","file":"ClosureJunctionEntityMetadataBuilder.js","sourcesContent":["import {EntityMetadata} from \"../metadata/EntityMetadata\";\nimport {ColumnMetadata} from \"../metadata/ColumnMetadata\";\nimport {ForeignKeyMetadata} from \"../metadata/ForeignKeyMetadata\";\nimport {Connection} from \"../connection/Connection\";\nimport {IndexMetadata} from \"../metadata/IndexMetadata\";\n\n/**\n * Creates EntityMetadata for junction tables of the closure entities.\n * Closure junction tables are tables generated by closure entities.\n */\nexport class ClosureJunctionEntityMetadataBuilder {\n\n    // -------------------------------------------------------------------------\n    // Constructor\n    // -------------------------------------------------------------------------\n\n    constructor(private connection: Connection) {\n    }\n\n    // -------------------------------------------------------------------------\n    // Public Methods\n    // -------------------------------------------------------------------------\n\n    /**\n     * Builds EntityMetadata for the closure junction of the given closure entity.\n     */\n    build(parentClosureEntityMetadata: EntityMetadata) {\n\n        // create entity metadata itself\n        const entityMetadata = new EntityMetadata({\n            parentClosureEntityMetadata: parentClosureEntityMetadata,\n            connection: this.connection,\n            args: {\n                target: \"\",\n                name: parentClosureEntityMetadata.treeOptions && parentClosureEntityMetadata.treeOptions.closureTableName ? parentClosureEntityMetadata.treeOptions.closureTableName : parentClosureEntityMetadata.tableNameWithoutPrefix,\n                type: \"closure-junction\"\n            }\n        });\n        entityMetadata.build();\n\n        // create ancestor and descendant columns for new closure junction table\n        parentClosureEntityMetadata.primaryColumns.forEach(primaryColumn => {\n            entityMetadata.ownColumns.push(new ColumnMetadata({\n                connection: this.connection,\n                entityMetadata: entityMetadata,\n                closureType: \"ancestor\",\n                referencedColumn: primaryColumn,\n                args: {\n                    target: \"\",\n                    mode: \"virtual\",\n                    propertyName: parentClosureEntityMetadata.treeOptions && parentClosureEntityMetadata.treeOptions.ancestorColumnName ? parentClosureEntityMetadata.treeOptions.ancestorColumnName(primaryColumn) : primaryColumn.propertyName + \"_ancestor\",\n                    options: {\n                        primary: true,\n                        length: primaryColumn.length,\n                        type: primaryColumn.type\n                    }\n                }\n            }));\n            entityMetadata.ownColumns.push(new ColumnMetadata({\n                connection: this.connection,\n                entityMetadata: entityMetadata,\n                closureType: \"descendant\",\n                referencedColumn: primaryColumn,\n                args: {\n                    target: \"\",\n                    mode: \"virtual\",\n                    propertyName: parentClosureEntityMetadata.treeOptions && parentClosureEntityMetadata.treeOptions.descendantColumnName ? parentClosureEntityMetadata.treeOptions.descendantColumnName(primaryColumn) : primaryColumn.propertyName + \"_descendant\",\n                    options: {\n                        primary: true,\n                        length: primaryColumn.length,\n                        type: primaryColumn.type,\n                    }\n                }\n            }));\n        });\n\n        entityMetadata.ownIndices = [\n            new IndexMetadata({\n                entityMetadata: entityMetadata,\n                columns: [entityMetadata.ownColumns[0]],\n                args: {\n                    target: entityMetadata.target,\n                    synchronize: true\n                }\n            }),\n            new IndexMetadata({\n                entityMetadata: entityMetadata,\n                columns: [entityMetadata.ownColumns[1]],\n                args: {\n                    target: entityMetadata.target,\n                    synchronize: true\n                }\n            })\n        ];\n\n        // if tree level column was defined by a closure entity then add it to the junction columns as well\n        if (parentClosureEntityMetadata.treeLevelColumn) {\n            entityMetadata.ownColumns.push(new ColumnMetadata({\n                connection: this.connection,\n                entityMetadata: entityMetadata,\n                args: {\n                    target: \"\",\n                    mode: \"virtual\",\n                    propertyName: \"level\",\n                    options: {\n                        type: this.connection.driver.mappedDataTypes.treeLevel,\n                    }\n                }\n            }));\n        }\n\n        // create junction table foreign keys\n        entityMetadata.foreignKeys = [\n            new ForeignKeyMetadata({\n                entityMetadata: entityMetadata,\n                referencedEntityMetadata: parentClosureEntityMetadata,\n                columns: [entityMetadata.ownColumns[0]],\n                referencedColumns: parentClosureEntityMetadata.primaryColumns,\n                // onDelete: \"CASCADE\" // todo: does not work in mssql for some reason\n            }),\n            new ForeignKeyMetadata({\n                entityMetadata: entityMetadata,\n                referencedEntityMetadata: parentClosureEntityMetadata,\n                columns: [entityMetadata.ownColumns[1]],\n                referencedColumns: parentClosureEntityMetadata.primaryColumns,\n                // onDelete: \"CASCADE\" // todo: does not work in mssql for some reason\n            }),\n        ];\n\n        return entityMetadata;\n    }\n\n}\n"],"sourceRoot":".."}

package/browser/metadata-builder/EntityMetadataBuilder.js

@@ -1,4 +1,4 @@
-import { __read, __spread } from "tslib";
+import { __read, __spreadArray } from "tslib";
 import { CockroachDriver } from "../driver/cockroachdb/CockroachDriver";
 import { SapDriver } from "../driver/sap/SapDriver";
 import { EntityMetadata } from "../metadata/EntityMetadata";
@@ -8,6 +8,7 @@ import { RelationMetadata } from "../metadata/RelationMetadata";
 import { EmbeddedMetadata } from "../metadata/EmbeddedMetadata";
 import { RelationIdMetadata } from "../metadata/RelationIdMetadata";
 import { RelationCountMetadata } from "../metadata/RelationCountMetadata";
+import { EventListenerTypes } from "../metadata/types/EventListenerTypes";
 import { MetadataUtils } from "./MetadataUtils";
 import { JunctionEntityMetadataBuilder } from "./JunctionEntityMetadataBuilder";
 import { ClosureJunctionEntityMetadataBuilder } from "./ClosureJunctionEntityMetadataBuilder";
@@ -85,11 +86,14 @@ var EntityMetadataBuilder = /** @class */ (function () {
             // create entity's relations join columns (for many-to-one and one-to-one owner)
             entityMetadata.relations.filter(function (relation) { return relation.isOneToOne || relation.isManyToOne; }).forEach(function (relation) {
                 var joinColumns = _this.metadataArgsStorage.filterJoinColumns(relation.target, relation.propertyName);
-                var _a = _this.relationJoinColumnBuilder.build(joinColumns, relation), foreignKey = _a.foreignKey, uniqueConstraint = _a.uniqueConstraint; // create a foreign key based on its metadata args
+                var _a = _this.relationJoinColumnBuilder.build(joinColumns, relation), foreignKey = _a.foreignKey, columns = _a.columns, uniqueConstraint = _a.uniqueConstraint; // create a foreign key based on its metadata args
                 if (foreignKey) {
                     relation.registerForeignKeys(foreignKey); // push it to the relation and thus register there a join column
                     entityMetadata.foreignKeys.push(foreignKey);
                 }
+                if (columns) {
+                    relation.registerJoinColumns(columns);
+                }
                 if (uniqueConstraint) {
                     if (_this.connection.driver instanceof MysqlDriver || _this.connection.driver instanceof AuroraDataApiDriver
                         || _this.connection.driver instanceof SqlServerDriver || _this.connection.driver instanceof SapDriver) {
@@ -151,7 +155,8 @@ var EntityMetadataBuilder = /** @class */ (function () {
                     return; // no join table set - no need to do anything (it means this is many-to-many inverse side)
                 // here we create a junction entity metadata for a new junction table of many-to-many relation
                 var junctionEntityMetadata = _this.junctionEntityMetadataBuilder.build(relation, joinTable);
-                relation.registerForeignKeys.apply(relation, __spread(junctionEntityMetadata.foreignKeys));
+                relation.registerForeignKeys.apply(relation, __spreadArray([], __read(junctionEntityMetadata.foreignKeys)));
+                relation.registerJoinColumns(junctionEntityMetadata.ownIndices[0].columns, junctionEntityMetadata.ownIndices[1].columns);
                 relation.registerJunctionEntityMetadata(junctionEntityMetadata);
                 // compute new entity metadata properties and push it to entity metadatas pool
                 _this.computeEntityMetadataStep2(junctionEntityMetadata);
@@ -251,7 +256,7 @@ var EntityMetadataBuilder = /** @class */ (function () {
                 .filterSingleTableChildren(tableArgs.target)
                 .map(function (args) { return args.target; })
                 .filter(function (target) { return target instanceof Function; });
-            inheritanceTree.push.apply(inheritanceTree, __spread(singleTableChildrenTargets));
+            inheritanceTree.push.apply(inheritanceTree, __spreadArray([], __read(singleTableChildrenTargets)));
         }
         return new EntityMetadata({
             connection: this.connection,
@@ -274,7 +279,12 @@ var EntityMetadataBuilder = /** @class */ (function () {
         var _this = this;
         var entityInheritance = this.metadataArgsStorage.findInheritanceType(entityMetadata.target);
         var discriminatorValue = this.metadataArgsStorage.findDiscriminatorValue(entityMetadata.target);
-        entityMetadata.discriminatorValue = discriminatorValue ? discriminatorValue.value : entityMetadata.target.name; // todo: pass this to naming strategy to generate a name
+        if (typeof discriminatorValue !== "undefined") {
+            entityMetadata.discriminatorValue = discriminatorValue.value;
+        }
+        else {
+            entityMetadata.discriminatorValue = entityMetadata.target.name;
+        }
         // if single table inheritance is used, we need to mark all embedded columns as nullable
         entityMetadata.embeddeds = this.createEmbeddedsRecursively(entityMetadata, this.metadataArgsStorage.filterEmbeddeds(entityMetadata.inheritanceTree))
             .map(function (embedded) {
@@ -438,7 +448,7 @@ var EntityMetadataBuilder = /** @class */ (function () {
                     }
                 });
             });
-            (_a = entityMetadata.ownUniques).push.apply(_a, __spread(uniques));
+            (_a = entityMetadata.ownUniques).push.apply(_a, __spreadArray([], __read(uniques)));
         }
         else {
             entityMetadata.ownIndices = this.metadataArgsStorage.filterIndices(entityMetadata.inheritanceTree).map(function (args) {
@@ -459,13 +469,13 @@ var EntityMetadataBuilder = /** @class */ (function () {
                     }
                 });
             });
-            (_b = entityMetadata.ownIndices).push.apply(_b, __spread(indices));
+            (_b = entityMetadata.ownIndices).push.apply(_b, __spreadArray([], __read(indices)));
         }
         else {
             var uniques = this.metadataArgsStorage.filterUniques(entityMetadata.inheritanceTree).map(function (args) {
                 return new UniqueMetadata({ entityMetadata: entityMetadata, args: args });
             });
-            (_c = entityMetadata.ownUniques).push.apply(_c, __spread(uniques));
+            (_c = entityMetadata.ownUniques).push.apply(_c, __spreadArray([], __read(uniques)));
         }
     };
     /**
@@ -529,13 +539,13 @@ var EntityMetadataBuilder = /** @class */ (function () {
         entityMetadata.treeChildrenRelation = entityMetadata.relations.find(function (relation) { return relation.isTreeChildren; });
         entityMetadata.columns = entityMetadata.embeddeds.reduce(function (columns, embedded) { return columns.concat(embedded.columnsFromTree); }, entityMetadata.ownColumns);
         entityMetadata.listeners = entityMetadata.embeddeds.reduce(function (columns, embedded) { return columns.concat(embedded.listenersFromTree); }, entityMetadata.ownListeners);
-        entityMetadata.afterLoadListeners = entityMetadata.listeners.filter(function (listener) { return listener.type === "after-load"; });
-        entityMetadata.afterInsertListeners = entityMetadata.listeners.filter(function (listener) { return listener.type === "after-insert"; });
-        entityMetadata.afterUpdateListeners = entityMetadata.listeners.filter(function (listener) { return listener.type === "after-update"; });
-        entityMetadata.afterRemoveListeners = entityMetadata.listeners.filter(function (listener) { return listener.type === "after-remove"; });
-        entityMetadata.beforeInsertListeners = entityMetadata.listeners.filter(function (listener) { return listener.type === "before-insert"; });
-        entityMetadata.beforeUpdateListeners = entityMetadata.listeners.filter(function (listener) { return listener.type === "before-update"; });
-        entityMetadata.beforeRemoveListeners = entityMetadata.listeners.filter(function (listener) { return listener.type === "before-remove"; });
+        entityMetadata.afterLoadListeners = entityMetadata.listeners.filter(function (listener) { return listener.type === EventListenerTypes.AFTER_LOAD; });
+        entityMetadata.afterInsertListeners = entityMetadata.listeners.filter(function (listener) { return listener.type === EventListenerTypes.AFTER_INSERT; });
+        entityMetadata.afterUpdateListeners = entityMetadata.listeners.filter(function (listener) { return listener.type === EventListenerTypes.AFTER_UPDATE; });
+        entityMetadata.afterRemoveListeners = entityMetadata.listeners.filter(function (listener) { return listener.type === EventListenerTypes.AFTER_REMOVE; });
+        entityMetadata.beforeInsertListeners = entityMetadata.listeners.filter(function (listener) { return listener.type === EventListenerTypes.BEFORE_INSERT; });
+        entityMetadata.beforeUpdateListeners = entityMetadata.listeners.filter(function (listener) { return listener.type === EventListenerTypes.BEFORE_UPDATE; });
+        entityMetadata.beforeRemoveListeners = entityMetadata.listeners.filter(function (listener) { return listener.type === EventListenerTypes.BEFORE_REMOVE; });
         entityMetadata.indices = entityMetadata.embeddeds.reduce(function (columns, embedded) { return columns.concat(embedded.indicesFromTree); }, entityMetadata.ownIndices);
         entityMetadata.uniques = entityMetadata.embeddeds.reduce(function (columns, embedded) { return columns.concat(embedded.uniquesFromTree); }, entityMetadata.ownUniques);
         entityMetadata.primaryColumns = entityMetadata.columns.filter(function (column) { return column.isPrimary; });
@@ -570,7 +580,7 @@ var EntityMetadataBuilder = /** @class */ (function () {
     EntityMetadataBuilder.prototype.computeInverseProperties = function (entityMetadata, entityMetadatas) {
         entityMetadata.relations.forEach(function (relation) {
             // compute inverse side (related) entity metadatas for all relation metadatas
-            var inverseEntityMetadata = entityMetadatas.find(function (m) { return m.target === relation.type || (typeof relation.type === "string" && m.targetName === relation.type); });
+            var inverseEntityMetadata = entityMetadatas.find(function (m) { return m.target === relation.type || (typeof relation.type === "string" && (m.targetName === relation.type || m.givenTableName === relation.type)); });
             if (!inverseEntityMetadata)
                 throw new Error("Entity metadata for " + entityMetadata.name + "#" + relation.propertyPath + " was not found. Check if you specified a correct entity object and if it's connected in the connection options.");
             relation.inverseEntityMetadata = inverseEntityMetadata;