refactored metadata namespaces

src/connection/Connection.ts

@@ -3,17 +3,17 @@ import {ConnectionOptions} from "./ConnectionOptions";
 import {Repository} from "../repository/Repository";
 import {EventSubscriberInterface} from "../subscriber/EventSubscriberInterface";
 import {RepositoryNotFoundError} from "./error/RepositoryNotFoundError";
-import {EntityMetadata} from "../metadata-builder/metadata/EntityMetadata";
+import {EntityMetadata} from "../metadata/EntityMetadata";
 import {SchemaCreator} from "../schema-creator/SchemaCreator";
 import {ConstructorFunction} from "../common/ConstructorFunction";
-import {EntityListenerMetadata} from "../metadata-builder/metadata/EntityListenerMetadata";
+import {EntityListenerMetadata} from "../metadata/EntityListenerMetadata";
 import {EntityManager} from "../repository/EntityManager";
 import {importClassesFromDirectories} from "../util/DirectoryExportedClassesLoader";
 import {defaultMetadataStorage, getContainer} from "../typeorm";
-import {EntityMetadataBuilder} from "../metadata-builder/EntityMetadataBuilder";
+import {EntityMetadataBuilder} from "../metadata-storage/EntityMetadataBuilder";
 import {DefaultNamingStrategy} from "../naming-strategy/DefaultNamingStrategy";
-import {EntityMetadataArray} from "../metadata-builder/metadata/EntityMetadataArray";
-import {NamingStrategyMetadata} from "../metadata-builder/metadata/NamingStrategyMetadata";
+import {EntityMetadataArray} from "../metadata/EntityMetadataArray";
+import {NamingStrategyMetadata} from "../metadata/NamingStrategyMetadata";
 import {NoConnectionForRepositoryError} from "./error/NoConnectionForRepositoryError";
 import {CannotImportAlreadyConnectedError} from "./error/CannotImportAlreadyConnectedError";
 import {CannotCloseNotConnectedError} from "./error/CannotCloseNotConnectedError";

src/decorator/NamingStrategy.ts

@@ -1,5 +1,5 @@
 import "reflect-metadata";
-import {NamingStrategyMetadata} from "../metadata-builder/metadata/NamingStrategyMetadata";
+import {NamingStrategyMetadata} from "../metadata/NamingStrategyMetadata";
 import {defaultMetadataStorage} from "../typeorm";
 
 /**

src/decorator/columns/Column.ts

@@ -1,9 +1,9 @@
-import {ColumnOptions} from "../../metadata-builder/options/ColumnOptions";
+import {ColumnOptions} from "../../metadata/options/ColumnOptions";
 import {ColumnTypeUndefinedError} from "../error/ColumnTypeUndefinedError";
 import {AutoIncrementOnlyForPrimaryError} from "../error/AutoIncrementOnlyForPrimaryError";
 import {defaultMetadataStorage} from "../../typeorm";
-import {ColumnMetadata} from "../../metadata-builder/metadata/ColumnMetadata";
-import {ColumnType, ColumnTypes} from "../../metadata-builder/types/ColumnTypes";
+import {ColumnMetadata} from "../../metadata/ColumnMetadata";
+import {ColumnType, ColumnTypes} from "../../metadata/types/ColumnTypes";
 import "reflect-metadata";
 
 /**

src/decorator/columns/CreateDateColumn.ts

@@ -1,7 +1,7 @@
-import {ColumnOptions} from "../../metadata-builder/options/ColumnOptions";
-import {ColumnType, ColumnTypes} from "../../metadata-builder/types/ColumnTypes";
+import {ColumnOptions} from "../../metadata/options/ColumnOptions";
+import {ColumnType, ColumnTypes} from "../../metadata/types/ColumnTypes";
 import {defaultMetadataStorage} from "../../typeorm";
-import {ColumnMetadata} from "../../metadata-builder/metadata/ColumnMetadata";
+import {ColumnMetadata} from "../../metadata/ColumnMetadata";
 import "reflect-metadata";
 
 /**

src/decorator/columns/PrimaryColumn.ts

@@ -1,8 +1,8 @@
-import {ColumnOptions} from "../../metadata-builder/options/ColumnOptions";
-import {ColumnType, ColumnTypes} from "../../metadata-builder/types/ColumnTypes";
+import {ColumnOptions} from "../../metadata/options/ColumnOptions";
+import {ColumnType, ColumnTypes} from "../../metadata/types/ColumnTypes";
 import {ColumnTypeUndefinedError} from "../error/ColumnTypeUndefinedError";
 import {defaultMetadataStorage} from "../../typeorm";
-import {ColumnMetadata} from "../../metadata-builder/metadata/ColumnMetadata";
+import {ColumnMetadata} from "../../metadata/ColumnMetadata";
 import {PrimaryColumnCannotBeNullableError} from "../error/PrimaryColumnCannotBeNullableError";
 import "reflect-metadata";
 

src/decorator/columns/UpdateDateColumn.ts

@@ -1,7 +1,7 @@
-import {ColumnOptions} from "../../metadata-builder/options/ColumnOptions";
-import {ColumnTypes} from "../../metadata-builder/types/ColumnTypes";
+import {ColumnOptions} from "../../metadata/options/ColumnOptions";
+import {ColumnTypes} from "../../metadata/types/ColumnTypes";
 import {defaultMetadataStorage} from "../../typeorm";
-import {ColumnMetadata} from "../../metadata-builder/metadata/ColumnMetadata";
+import {ColumnMetadata} from "../../metadata/ColumnMetadata";
 import "reflect-metadata";
 
 /**

src/decorator/indices/CompoundIndex.ts

@@ -1,4 +1,4 @@
-import {CompoundIndexMetadata} from "../../metadata-builder/metadata/CompoundIndexMetadata";
+import {CompoundIndexMetadata} from "../../metadata/CompoundIndexMetadata";
 import {defaultMetadataStorage} from "../../typeorm";
 
 /**

src/decorator/indices/Index.ts

@@ -1,5 +1,5 @@
 import {defaultMetadataStorage} from "../../typeorm";
-import {IndexMetadata} from "../../metadata-builder/metadata/IndexMetadata";
+import {IndexMetadata} from "../../metadata/IndexMetadata";
 
 /**
  * Fields that needs to be indexed must be marked with this decorator.

src/decorator/listeners/AfterInsert.ts

@@ -1,6 +1,6 @@
 import {defaultMetadataStorage} from "../../typeorm";
-import {EventListenerTypes} from "../../metadata-builder/types/EventListenerTypes";
-import {EntityListenerMetadata} from "../../metadata-builder/metadata/EntityListenerMetadata";
+import {EventListenerTypes} from "../../metadata/types/EventListenerTypes";
+import {EntityListenerMetadata} from "../../metadata/EntityListenerMetadata";
 
 /**
  * Calls a method on which this decorator is applied after this entity insertion.

src/decorator/listeners/AfterLoad.ts

@@ -1,6 +1,6 @@
 import {defaultMetadataStorage} from "../../typeorm";
-import {EventListenerTypes} from "../../metadata-builder/types/EventListenerTypes";
-import {EntityListenerMetadata} from "../../metadata-builder/metadata/EntityListenerMetadata";
+import {EventListenerTypes} from "../../metadata/types/EventListenerTypes";
+import {EntityListenerMetadata} from "../../metadata/EntityListenerMetadata";
 
 /**
  * Calls a method on which this decorator is applied after entity is loaded.

src/decorator/listeners/AfterRemove.ts

@@ -1,6 +1,6 @@
 import {defaultMetadataStorage} from "../../typeorm";
-import {EventListenerTypes} from "../../metadata-builder/types/EventListenerTypes";
-import {EntityListenerMetadata} from "../../metadata-builder/metadata/EntityListenerMetadata";
+import {EventListenerTypes} from "../../metadata/types/EventListenerTypes";
+import {EntityListenerMetadata} from "../../metadata/EntityListenerMetadata";
 
 /**
  * Calls a method on which this decorator is applied after this entity removal.

src/decorator/listeners/AfterUpdate.ts

@@ -1,6 +1,6 @@
 import {defaultMetadataStorage} from "../../typeorm";
-import {EventListenerTypes} from "../../metadata-builder/types/EventListenerTypes";
-import {EntityListenerMetadata} from "../../metadata-builder/metadata/EntityListenerMetadata";
+import {EventListenerTypes} from "../../metadata/types/EventListenerTypes";
+import {EntityListenerMetadata} from "../../metadata/EntityListenerMetadata";
 
 /**
  * Calls a method on which this decorator is applied after this entity update.

src/decorator/listeners/BeforeInsert.ts

@@ -1,6 +1,6 @@
 import {defaultMetadataStorage} from "../../typeorm";
-import {EventListenerTypes} from "../../metadata-builder/types/EventListenerTypes";
-import {EntityListenerMetadata} from "../../metadata-builder/metadata/EntityListenerMetadata";
+import {EventListenerTypes} from "../../metadata/types/EventListenerTypes";
+import {EntityListenerMetadata} from "../../metadata/EntityListenerMetadata";
 
 /**
  * Calls a method on which this decorator is applied before this entity insertion.

src/decorator/listeners/BeforeRemove.ts

@@ -1,6 +1,6 @@
 import {defaultMetadataStorage} from "../../typeorm";
-import {EventListenerTypes} from "../../metadata-builder/types/EventListenerTypes";
-import {EntityListenerMetadata} from "../../metadata-builder/metadata/EntityListenerMetadata";
+import {EventListenerTypes} from "../../metadata/types/EventListenerTypes";
+import {EntityListenerMetadata} from "../../metadata/EntityListenerMetadata";
 
 /**
  * Calls a method on which this decorator is applied before this entity removal.

src/decorator/listeners/BeforeUpdate.ts

@@ -1,6 +1,6 @@
 import {defaultMetadataStorage} from "../../typeorm";
-import {EventListenerTypes} from "../../metadata-builder/types/EventListenerTypes";
-import {EntityListenerMetadata} from "../../metadata-builder/metadata/EntityListenerMetadata";
+import {EventListenerTypes} from "../../metadata/types/EventListenerTypes";
+import {EntityListenerMetadata} from "../../metadata/EntityListenerMetadata";
 
 /**
  * Calls a method on which this decorator is applied before this entity update.

src/decorator/listeners/EventSubscriber.ts

@@ -1,5 +1,5 @@
 import {defaultMetadataStorage} from "../../typeorm";
-import {EventSubscriberMetadata} from "../../metadata-builder/metadata/EventSubscriberMetadata";
+import {EventSubscriberMetadata} from "../../metadata/EventSubscriberMetadata";
 
 /**
  * Classes decorated with this decorator will listen to ORM events and their methods will be triggered when event

src/decorator/relations/JoinColumn.ts

@@ -1,6 +1,6 @@
 import {defaultMetadataStorage} from "../../typeorm";
-import {JoinTableOptions} from "../../metadata-builder/options/JoinTableOptions";
-import {JoinColumnMetadata} from "../../metadata-builder/metadata/JoinColumnMetadata";
+import {JoinTableOptions} from "../../metadata/options/JoinTableOptions";
+import {JoinColumnMetadata} from "../../metadata/JoinColumnMetadata";
 
 /**
  */

src/decorator/relations/JoinTable.ts

@@ -1,6 +1,6 @@
 import {defaultMetadataStorage} from "../../typeorm";
-import {JoinTableOptions} from "../../metadata-builder/options/JoinTableOptions";
-import {JoinTableMetadata} from "../../metadata-builder/metadata/JoinTableMetadata";
+import {JoinTableOptions} from "../../metadata/options/JoinTableOptions";
+import {JoinTableMetadata} from "../../metadata/JoinTableMetadata";
 
 /**
  */

src/decorator/relations/ManyToMany.ts

@@ -1,6 +1,6 @@
-import {RelationMetadata} from "../../metadata-builder/metadata/RelationMetadata";
-import {RelationOptions} from "../../metadata-builder/options/RelationOptions";
-import {RelationTypes} from "../../metadata-builder/types/RelationTypes";
+import {RelationMetadata} from "../../metadata/RelationMetadata";
+import {RelationOptions} from "../../metadata/options/RelationOptions";
+import {RelationTypes} from "../../metadata/types/RelationTypes";
 import {defaultMetadataStorage} from "../../typeorm";
 import {ConstructorFunction} from "../../common/ConstructorFunction";
 

src/decorator/relations/ManyToManyInverse.ts

@@ -1,6 +1,6 @@
-import {RelationMetadata} from "../../metadata-builder/metadata/RelationMetadata";
-import {RelationOptions} from "../../metadata-builder/options/RelationOptions";
-import {RelationTypes} from "../../metadata-builder/types/RelationTypes";
+import {RelationMetadata} from "../../metadata/RelationMetadata";
+import {RelationOptions} from "../../metadata/options/RelationOptions";
+import {RelationTypes} from "../../metadata/types/RelationTypes";
 import {defaultMetadataStorage} from "../../typeorm";
 import {ConstructorFunction} from "../../common/ConstructorFunction";
 

src/decorator/relations/ManyToOne.ts

@@ -1,6 +1,6 @@
-import {RelationMetadata} from "../../metadata-builder/metadata/RelationMetadata";
-import {RelationOptions} from "../../metadata-builder/options/RelationOptions";
-import {RelationTypes} from "../../metadata-builder/types/RelationTypes";
+import {RelationMetadata} from "../../metadata/RelationMetadata";
+import {RelationOptions} from "../../metadata/options/RelationOptions";
+import {RelationTypes} from "../../metadata/types/RelationTypes";
 import {defaultMetadataStorage} from "../../typeorm";
 import {ConstructorFunction} from "../../common/ConstructorFunction";
 

src/decorator/relations/OneToMany.ts

@@ -1,6 +1,6 @@
-import {RelationMetadata} from "../../metadata-builder/metadata/RelationMetadata";
-import {RelationOptions} from "../../metadata-builder/options/RelationOptions";
-import {RelationTypes} from "../../metadata-builder/types/RelationTypes";
+import {RelationMetadata} from "../../metadata/RelationMetadata";
+import {RelationOptions} from "../../metadata/options/RelationOptions";
+import {RelationTypes} from "../../metadata/types/RelationTypes";
 import {defaultMetadataStorage} from "../../typeorm";
 import {ConstructorFunction} from "../../common/ConstructorFunction";
 

src/decorator/relations/OneToOne.ts

@@ -1,6 +1,6 @@
-import {RelationMetadata} from "../../metadata-builder/metadata/RelationMetadata";
-import {RelationOptions} from "../../metadata-builder/options/RelationOptions";
-import {RelationTypes} from "../../metadata-builder/types/RelationTypes";
+import {RelationMetadata} from "../../metadata/RelationMetadata";
+import {RelationOptions} from "../../metadata/options/RelationOptions";
+import {RelationTypes} from "../../metadata/types/RelationTypes";
 import {defaultMetadataStorage} from "../../typeorm";
 import {ConstructorFunction} from "../../common/ConstructorFunction";
 

src/decorator/relations/OneToOneInverse.ts

@@ -1,6 +1,6 @@
-import {RelationMetadata} from "../../metadata-builder/metadata/RelationMetadata";
-import {RelationOptions} from "../../metadata-builder/options/RelationOptions";
-import {RelationTypes} from "../../metadata-builder/types/RelationTypes";
+import {RelationMetadata} from "../../metadata/RelationMetadata";
+import {RelationOptions} from "../../metadata/options/RelationOptions";
+import {RelationTypes} from "../../metadata/types/RelationTypes";
 import {defaultMetadataStorage} from "../../typeorm";
 import {ConstructorFunction} from "../../common/ConstructorFunction";
 

src/decorator/tables/AbstractTable.ts

@@ -1,4 +1,4 @@
-import {TableMetadata} from "../../metadata-builder/metadata/TableMetadata";
+import {TableMetadata} from "../../metadata/TableMetadata";
 import {defaultMetadataStorage} from "../../typeorm";
 
 /**

src/decorator/tables/Table.ts

@@ -1,5 +1,5 @@
 import {defaultMetadataStorage} from "../../typeorm";
-import {TableMetadata} from "../../metadata-builder/metadata/TableMetadata";
+import {TableMetadata} from "../../metadata/TableMetadata";
 
 /**
  * This decorator is used to mark classes that will be a tables. Database schema will be created for all classes

src/driver/Driver.ts

@@ -1,5 +1,5 @@
 import {SchemaBuilder} from "../schema-builder/SchemaBuilder";
-import {ColumnMetadata} from "../metadata-builder/metadata/ColumnMetadata";
+import {ColumnMetadata} from "../metadata/ColumnMetadata";
 import {ConnectionOptions} from "../connection/ConnectionOptions";
 
 /**

src/driver/MysqlDriver.ts

@@ -4,8 +4,8 @@ import {QueryBuilder} from "../query-builder/QueryBuilder";
 import {MysqlSchemaBuilder} from "../schema-builder/MysqlSchemaBuilder";
 import {ConnectionIsNotSetError} from "./error/ConnectionIsNotSetError";
 import {BaseDriver} from "./BaseDriver";
-import {ColumnMetadata} from "../metadata-builder/metadata/ColumnMetadata";
-import {ColumnTypes} from "../metadata-builder/types/ColumnTypes";
+import {ColumnMetadata} from "../metadata/ColumnMetadata";
+import {ColumnTypes} from "../metadata/types/ColumnTypes";
 import * as moment from "moment";
 import {ConnectionOptions} from "../connection/ConnectionOptions";
 

src/metadata-storage/EntityMetadataBuilder.ts

@@ -1,12 +1,12 @@
 import {MetadataStorage} from "./MetadataStorage";
-import {PropertyMetadata} from "./metadata/PropertyMetadata";
-import {TableMetadata} from "./metadata/TableMetadata";
-import {EntityMetadata} from "./metadata/EntityMetadata";
+import {PropertyMetadata} from "../metadata/PropertyMetadata";
+import {TableMetadata} from "../metadata/TableMetadata";
+import {EntityMetadata} from "../metadata/EntityMetadata";
 import {NamingStrategyInterface} from "../naming-strategy/NamingStrategy";
-import {ColumnMetadata} from "./metadata/ColumnMetadata";
-import {ColumnOptions} from "./options/ColumnOptions";
-import {ForeignKeyMetadata} from "./metadata/ForeignKeyMetadata";
-import {JunctionTableMetadata} from "./metadata/JunctionTableMetadata";
+import {ColumnMetadata} from "../metadata/ColumnMetadata";
+import {ColumnOptions} from "../metadata/options/ColumnOptions";
+import {ForeignKeyMetadata} from "../metadata/ForeignKeyMetadata";
+import {JunctionTableMetadata} from "../metadata/JunctionTableMetadata";
 import {defaultMetadataStorage} from "../typeorm";
 
 /**

src/metadata-storage/MetadataStorage.ts

@@ -1,15 +1,15 @@
-import {TableMetadata} from "./metadata/TableMetadata";
+import {TableMetadata} from "../metadata/TableMetadata";
 import {MetadataAlreadyExistsError} from "./error/MetadataAlreadyExistsError";
 import {MetadataWithSuchNameAlreadyExistsError} from "./error/MetadataWithSuchNameAlreadyExistsError";
-import {RelationMetadata} from "./metadata/RelationMetadata";
-import {IndexMetadata} from "./metadata/IndexMetadata";
-import {CompoundIndexMetadata} from "./metadata/CompoundIndexMetadata";
-import {ColumnMetadata} from "./metadata/ColumnMetadata";
-import {EventSubscriberMetadata} from "./metadata/EventSubscriberMetadata";
-import {EntityListenerMetadata} from "./metadata/EntityListenerMetadata";
-import {NamingStrategyMetadata} from "./metadata/NamingStrategyMetadata";
-import {JoinColumnMetadata} from "./metadata/JoinColumnMetadata";
-import {JoinTableMetadata} from "./metadata/JoinTableMetadata";
+import {RelationMetadata} from "../metadata/RelationMetadata";
+import {IndexMetadata} from "../metadata/IndexMetadata";
+import {CompoundIndexMetadata} from "../metadata/CompoundIndexMetadata";
+import {ColumnMetadata} from "../metadata/ColumnMetadata";
+import {EventSubscriberMetadata} from "../metadata/EventSubscriberMetadata";
+import {EntityListenerMetadata} from "../metadata/EntityListenerMetadata";
+import {NamingStrategyMetadata} from "../metadata/NamingStrategyMetadata";
+import {JoinColumnMetadata} from "../metadata/JoinColumnMetadata";
+import {JoinTableMetadata} from "../metadata/JoinTableMetadata";
 
 /**
  * Storage all metadatas of all available types: tables, fields, subscribers, relations, etc.

src/metadata/ColumnMetadata.ts

@@ -1,7 +1,7 @@
 import {PropertyMetadata} from "./PropertyMetadata";
-import {ColumnOptions} from "../options/ColumnOptions";
-import {NamingStrategyInterface} from "../../naming-strategy/NamingStrategy";
-import {ColumnType} from "../types/ColumnTypes";
+import {ColumnOptions} from "./options/ColumnOptions";
+import {NamingStrategyInterface} from "../naming-strategy/NamingStrategy";
+import {ColumnType} from "./types/ColumnTypes";
 
 /**
  * Constructor arguments for ColumnMetadata class.

src/metadata/EntityListenerMetadata.ts

@@ -1,5 +1,5 @@
 import {PropertyMetadata} from "./PropertyMetadata";
-import {EventListenerType} from "../types/EventListenerTypes";
+import {EventListenerType} from "./types/EventListenerTypes";
 
 /**
  * This metadata interface contains all information about some index on a field.

src/metadata/EntityMetadata.ts

@@ -1,9 +1,9 @@
-import {TableMetadata} from "../metadata/TableMetadata";
-import {ColumnMetadata} from "../metadata/ColumnMetadata";
-import {RelationMetadata} from "../metadata/RelationMetadata";
-import {IndexMetadata} from "../metadata/IndexMetadata";
-import {CompoundIndexMetadata} from "../metadata/CompoundIndexMetadata";
-import {RelationTypes} from "../types/RelationTypes";
+import {TableMetadata} from "./TableMetadata";
+import {ColumnMetadata} from "./ColumnMetadata";
+import {RelationMetadata} from "./RelationMetadata";
+import {IndexMetadata} from "./IndexMetadata";
+import {CompoundIndexMetadata} from "./CompoundIndexMetadata";
+import {RelationTypes} from "./types/RelationTypes";
 import {ForeignKeyMetadata} from "./ForeignKeyMetadata";
 
 /**

src/metadata/EntityMetadataArray.ts

@@ -1,5 +1,5 @@
 import {EntityMetadata} from "./EntityMetadata";
-import {EntityMetadataNotFound} from "../error/EntityMetadataNotFound";
+import {EntityMetadataNotFound} from "./error/EntityMetadataNotFound";
 
 /**
  * Array for the entity metadatas.

src/metadata/JoinColumnMetadata.ts

@@ -1,5 +1,5 @@
 import {PropertyMetadata} from "./PropertyMetadata";
-import {JoinColumnOptions} from "../options/JoinColumnOptions";
+import {JoinColumnOptions} from "./options/JoinColumnOptions";
 
 /**
  */

src/metadata/JoinTableMetadata.ts

@@ -1,5 +1,5 @@
 import {PropertyMetadata} from "./PropertyMetadata";
-import {JoinTableOptions} from "../options/JoinTableOptions";
+import {JoinTableOptions} from "./options/JoinTableOptions";
 
 /**
  */

src/metadata/RelationMetadata.ts

@@ -1,7 +1,7 @@
 import {PropertyMetadata} from "./PropertyMetadata";
-import {RelationTypes, RelationType} from "../types/RelationTypes";
-import {RelationOptions} from "../options/RelationOptions";
-import {NamingStrategyInterface} from "../../naming-strategy/NamingStrategy";
+import {RelationTypes, RelationType} from "./types/RelationTypes";
+import {RelationOptions} from "./options/RelationOptions";
+import {NamingStrategyInterface} from "../naming-strategy/NamingStrategy";
 import {EntityMetadata} from "./EntityMetadata";
 import {OnDeleteType} from "./ForeignKeyMetadata";
 

src/metadata/TableMetadata.ts

@@ -1,4 +1,4 @@
-import {NamingStrategyInterface} from "../../naming-strategy/NamingStrategy";
+import {NamingStrategyInterface} from "../naming-strategy/NamingStrategy";
 
 /**
  * This metadata interface contains all information about specific table.

src/metadata/options/RelationOptions.ts

@@ -1,4 +1,4 @@
-import {OnDeleteType} from "../metadata/ForeignKeyMetadata";
+import {OnDeleteType} from "../../metadata/ForeignKeyMetadata";
 
 /**
  * Describes all relation's options.

src/persistment/EntityPersistOperationsBuilder.ts

@@ -1,5 +1,5 @@
-import {EntityMetadata} from "../metadata-builder/metadata/EntityMetadata";
-import {RelationMetadata} from "../metadata-builder/metadata/RelationMetadata";
+import {EntityMetadata} from "../metadata/EntityMetadata";
+import {RelationMetadata} from "../metadata/RelationMetadata";
 import {Connection} from "../connection/Connection";
 import {PersistOperation, EntityWithId} from "./operation/PersistOperation";
 import {InsertOperation} from "./operation/InsertOperation";

src/persistment/PersistOperationExecutor.ts

@@ -7,7 +7,7 @@ import {InsertOperation} from "./operation/InsertOperation";
 import {JunctionRemoveOperation} from "./operation/JunctionRemoveOperation";
 import {UpdateByRelationOperation} from "./operation/UpdateByRelationOperation";
 import {Broadcaster} from "../subscriber/Broadcaster";
-import {EntityMetadata} from "../metadata-builder/metadata/EntityMetadata";
+import {EntityMetadata} from "../metadata/EntityMetadata";
 
 /**
  * Executes PersistOperation in the given connection.

src/persistment/error/CascadesNotAllowedError.ts

@@ -1,5 +1,5 @@
-import {EntityMetadata} from "../../metadata-builder/metadata/EntityMetadata";
-import {RelationMetadata} from "../../metadata-builder/metadata/RelationMetadata";
+import {EntityMetadata} from "../../metadata/EntityMetadata";
+import {RelationMetadata} from "../../metadata/RelationMetadata";
 
 /**
  * @internal

src/persistment/operation/JunctionInsertOperation.ts

@@ -1,4 +1,4 @@
-import {EntityMetadata} from "../../metadata-builder/metadata/EntityMetadata";
+import {EntityMetadata} from "../../metadata/EntityMetadata";
 
 /**
  * @internal

src/persistment/operation/JunctionRemoveOperation.ts

@@ -1,4 +1,4 @@
-import {EntityMetadata} from "../../metadata-builder/metadata/EntityMetadata";
+import {EntityMetadata} from "../../metadata/EntityMetadata";
 
 /**
  * @internal

src/persistment/operation/RemoveOperation.ts

@@ -1,5 +1,5 @@
-import {RelationMetadata} from "../../metadata-builder/metadata/RelationMetadata";
-import {EntityMetadata} from "../../metadata-builder/metadata/EntityMetadata";
+import {RelationMetadata} from "../../metadata/RelationMetadata";
+import {EntityMetadata} from "../../metadata/EntityMetadata";
 
 /**
  * @internal

src/persistment/operation/UpdateByRelationOperation.ts

@@ -1,5 +1,5 @@
 import {InsertOperation} from "./InsertOperation";
-import {RelationMetadata} from "../../metadata-builder/metadata/RelationMetadata";
+import {RelationMetadata} from "../../metadata/RelationMetadata";
 
 /**
  * @internal

src/persistment/operation/UpdateOperation.ts

@@ -1,4 +1,4 @@
-import {ColumnMetadata} from "../../metadata-builder/metadata/ColumnMetadata";
+import {ColumnMetadata} from "../../metadata/ColumnMetadata";
 
 /**
  * @internal

src/query-builder/QueryBuilder.ts

@@ -3,7 +3,7 @@ import {AliasMap} from "./alias/AliasMap";
 import {Connection} from "../connection/Connection";
 import {RawSqlResultsToEntityTransformer} from "./transformer/RawSqlResultsToEntityTransformer";
 import {Broadcaster} from "../subscriber/Broadcaster";
-import {EntityMetadata} from "../metadata-builder/metadata/EntityMetadata";
+import {EntityMetadata} from "../metadata/EntityMetadata";
 
 /**
  * @internal

src/query-builder/alias/Alias.ts

@@ -1,4 +1,4 @@
-import {ColumnMetadata} from "../../metadata-builder/metadata/ColumnMetadata";
+import {ColumnMetadata} from "../../metadata/ColumnMetadata";
 
 /**
  * @internal

src/query-builder/alias/AliasMap.ts

@@ -1,4 +1,4 @@
-import {EntityMetadata} from "../../metadata-builder/metadata/EntityMetadata";
+import {EntityMetadata} from "../../metadata/EntityMetadata";
 import {Alias} from "./Alias";
 
 /**

src/query-builder/transformer/PlainObjectToDatabaseEntityTransformer.ts

@@ -1,4 +1,4 @@
-import {EntityMetadata} from "../../metadata-builder/metadata/EntityMetadata";
+import {EntityMetadata} from "../../metadata/EntityMetadata";
 import {QueryBuilder} from "../QueryBuilder";
 
 /**

src/query-builder/transformer/PlainObjectToNewEntityTransformer.ts

@@ -1,4 +1,4 @@
-import {EntityMetadata} from "../../metadata-builder/metadata/EntityMetadata";
+import {EntityMetadata} from "../../metadata/EntityMetadata";
 
 /**
  * Transforms plain old javascript object

src/query-builder/transformer/RawSqlResultsToEntityTransformer.ts

@@ -1,7 +1,7 @@
 import {AliasMap} from "../alias/AliasMap";
 import {Alias} from "../alias/Alias";
 import * as _ from "lodash";
-import {EntityMetadata} from "../../metadata-builder/metadata/EntityMetadata";
+import {EntityMetadata} from "../../metadata/EntityMetadata";
 import {Connection} from "../../connection/Connection";
 import {OrmUtils} from "../../util/OrmUtils";
 

src/repository/Repository.ts

@@ -1,5 +1,5 @@
 import {Connection} from "../connection/Connection";
-import {EntityMetadata} from "../metadata-builder/metadata/EntityMetadata";
+import {EntityMetadata} from "../metadata/EntityMetadata";
 import {QueryBuilder} from "../query-builder/QueryBuilder";
 import {PlainObjectToNewEntityTransformer} from "../query-builder/transformer/PlainObjectToNewEntityTransformer";
 import {PlainObjectToDatabaseEntityTransformer} from "../query-builder/transformer/PlainObjectToDatabaseEntityTransformer";

src/schema-builder/MysqlSchemaBuilder.ts

@@ -1,8 +1,8 @@
 import {SchemaBuilder} from "./SchemaBuilder";
 import {MysqlDriver} from "../driver/MysqlDriver";
-import {ColumnMetadata} from "../metadata-builder/metadata/ColumnMetadata";
-import {ForeignKeyMetadata} from "../metadata-builder/metadata/ForeignKeyMetadata";
-import {TableMetadata} from "../metadata-builder/metadata/TableMetadata";
+import {ColumnMetadata} from "../metadata/ColumnMetadata";
+import {ForeignKeyMetadata} from "../metadata/ForeignKeyMetadata";
+import {TableMetadata} from "../metadata/TableMetadata";
 
 /**
  * @internal

src/schema-builder/SchemaBuilder.ts

@@ -1,6 +1,6 @@
-import {ColumnMetadata} from "../metadata-builder/metadata/ColumnMetadata";
-import {ForeignKeyMetadata} from "../metadata-builder/metadata/ForeignKeyMetadata";
-import {TableMetadata} from "../metadata-builder/metadata/TableMetadata";
+import {ColumnMetadata} from "../metadata/ColumnMetadata";
+import {ForeignKeyMetadata} from "../metadata/ForeignKeyMetadata";
+import {TableMetadata} from "../metadata/TableMetadata";
 
 /**
  * todo: make internal too (need to refactor driver).

src/schema-creator/SchemaCreator.ts

@@ -1,9 +1,9 @@
-import {TableMetadata} from "../metadata-builder/metadata/TableMetadata";
-import {ColumnMetadata} from "../metadata-builder/metadata/ColumnMetadata";
-import {ForeignKeyMetadata} from "../metadata-builder/metadata/ForeignKeyMetadata";
-import {EntityMetadata} from "../metadata-builder/metadata/EntityMetadata";
+import {TableMetadata} from "../metadata/TableMetadata";
+import {ColumnMetadata} from "../metadata/ColumnMetadata";
+import {ForeignKeyMetadata} from "../metadata/ForeignKeyMetadata";
+import {EntityMetadata} from "../metadata/EntityMetadata";
 import {SchemaBuilder} from "../schema-builder/SchemaBuilder";
-import {EntityMetadataArray} from "../metadata-builder/metadata/EntityMetadataArray";
+import {EntityMetadataArray} from "../metadata/EntityMetadataArray";
 
 /**
  * Creates indexes based on the given metadata.

src/subscriber/Broadcaster.ts

@@ -1,8 +1,8 @@
 import {EventSubscriberInterface} from "./EventSubscriberInterface";
 import {Connection} from "../connection/Connection";
-import {ColumnMetadata} from "../metadata-builder/metadata/ColumnMetadata";
-import {EventListenerTypes} from "../metadata-builder/types/EventListenerTypes";
-import {EntityMetadata} from "../metadata-builder/metadata/EntityMetadata";
+import {ColumnMetadata} from "../metadata/ColumnMetadata";
+import {EventListenerTypes} from "../metadata/types/EventListenerTypes";
+import {EntityMetadata} from "../metadata/EntityMetadata";
 
 /**
  * Broadcaster provides a helper methods to broadcast events to the subscribers.

src/subscriber/event/UpdateEvent.ts

@@ -1,4 +1,4 @@
-import {ColumnMetadata} from "../../metadata-builder/metadata/ColumnMetadata";
+import {ColumnMetadata} from "../../metadata/ColumnMetadata";
 
 /**
  * This event is used on update events.

src/typeorm.ts

@@ -6,7 +6,7 @@ import {ConnectionOptions} from "./connection/ConnectionOptions";
 import {ConnectionManager} from "./connection-manager/ConnectionManager";
 import {Connection} from "./connection/Connection";
 import {MysqlDriver} from "./driver/MysqlDriver";
-import {MetadataStorage} from "./metadata-builder/MetadataStorage";
+import {MetadataStorage} from "./metadata-storage/MetadataStorage";
 import {CreateConnectionOptions} from "./connection-manager/CreateConnectionOptions";
 
 // -------------------------------------------------------------------------