renamed all tables into entities and deprecated table decorator

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 * fixed bug when new column was'nt added properly in sqlite [#157](https://github.com/typeorm/typeorm/issues/157)
 * added ability to set different types of values for DEFAULT value of the column [#150](https://github.com/typeorm/typeorm/issues/150)
+* all table decorators are renamed to `Entity` (`Table` => `Entity`, `AbstractTable` => `AbstractEntity`, 
+`ClassTableChild` => `ClassEntityChild`, `ClosureTable` => `ClosureEntity`, `EmbeddableTable` => `EmbeddableEntity`, 
+`SingleTableChild` => `SingleEntityChild`). This change is required because upcoming versions of orm will work
+not only with tables, but also with documents and other database-specific "tables".
 
 # 0.0.6 (latest)
 

extra/browser-shim.js

@@ -145,7 +145,51 @@ exports.RelationCount = RelationCount;
 }
 exports.RelationId = RelationId;
 
-// tables
+// entities
+
+/* export */ function AbstractEntity() {
+    return function (object) {
+    };
+}
+exports.AbstractEntity = AbstractEntity;
+
+/* export */ function ClassEntityChild(tableName, options) {
+    return function (object) {
+    };
+}
+exports.ClassEntityChild = ClassEntityChild;
+
+/* export */ function ClosureEntity(name, options) {
+    return function (object) {
+    };
+}
+exports.ClosureEntity = ClosureEntity;
+
+/* export */ function EmbeddableEntity() {
+    return function (object) {
+    };
+}
+exports.EmbeddableEntity = EmbeddableEntity;
+
+/* export */ function SingleEntityChild() {
+    return function (object) {
+    };
+}
+exports.SingleEntityChild = SingleEntityChild;
+
+/* export */ function Entity(name, options) {
+    return function (object) {
+    };
+}
+exports.Entity = Entity;
+
+/* export */ function TableInheritance(type) {
+    return function (object) {
+    };
+}
+exports.TableInheritance = TableInheritance;
+
+// tables (deprecated)
 
 /* export */ function AbstractTable() {
     return function (object) {
@@ -183,12 +227,6 @@ exports.SingleTableChild = SingleTableChild;
 }
 exports.Table = Table;
 
-/* export */ function TableInheritance(type) {
-    return function (object) {
-    };
-}
-exports.TableInheritance = TableInheritance;
-
 // tree
 
 /* export */ function TreeChildren(options) {

sample/sample1-simple-entity/entity/Post.ts

@@ -1,7 +1,7 @@
-import {Column, Table} from "../../../src/index";
+import {Column, Entity} from "../../../src/index";
 import {PrimaryColumn} from "../../../src/decorator/columns/PrimaryColumn";
 
-@Table("sample01_post")
+@Entity("sample01_post")
 export class Post {
 
     @PrimaryColumn("int", { generated: true })

sample/sample10-mixed/entity/Category.ts

@@ -1,8 +1,8 @@
-import {PrimaryGeneratedColumn, Column, Table, ManyToOne, ManyToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, ManyToOne, ManyToMany} from "../../../src/index";
 import {Post} from "./Post";
 import {PostDetails} from "./PostDetails";
 
-@Table("sample10_category")
+@Entity("sample10_category")
 export class Category {
 
     @PrimaryGeneratedColumn()

sample/sample10-mixed/entity/Chapter.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table, OneToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, OneToMany} from "../../../src/index";
 import {PostDetails} from "./PostDetails";
 
-@Table("sample10_chapter")
+@Entity("sample10_chapter")
 export class Chapter {
 
     @PrimaryGeneratedColumn()

sample/sample10-mixed/entity/Cover.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table, OneToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, OneToMany} from "../../../src/index";
 import {Post} from "./Post";
 
-@Table("sample10_cover")
+@Entity("sample10_cover")
 export class Cover {
 
     @PrimaryGeneratedColumn()

sample/sample10-mixed/entity/Image.ts

@@ -1,9 +1,9 @@
-import {PrimaryGeneratedColumn, Column, Table, ManyToOne, OneToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, ManyToOne, OneToOne} from "../../../src/index";
 import {Post} from "./Post";
 import {ImageDetails} from "./ImageDetails";
 import {JoinColumn} from "../../../src/decorator/relations/JoinColumn";
 
-@Table("sample10_image")
+@Entity("sample10_image")
 export class Image {
 
     @PrimaryGeneratedColumn()

sample/sample10-mixed/entity/ImageDetails.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table, OneToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, OneToOne} from "../../../src/index";
 import {Image} from "./Image";
 
-@Table("sample10_image_details")
+@Entity("sample10_image_details")
 export class ImageDetails {
 
     @PrimaryGeneratedColumn()

sample/sample10-mixed/entity/Post.ts

@@ -1,4 +1,4 @@
-import {PrimaryGeneratedColumn, Column, Table, OneToMany, ManyToOne, ManyToMany, OneToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, OneToMany, ManyToOne, ManyToMany, OneToOne} from "../../../src/index";
 import {Image} from "./Image";
 import {Cover} from "./Cover";
 import {Category} from "./Category";
@@ -6,7 +6,7 @@ import {PostDetails} from "./PostDetails";
 import {JoinColumn} from "../../../src/decorator/relations/JoinColumn";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 
-@Table("sample10_post")
+@Entity("sample10_post")
 export class Post {
 
     @PrimaryGeneratedColumn()

sample/sample10-mixed/entity/PostDetails.ts

@@ -1,9 +1,9 @@
-import {PrimaryGeneratedColumn, Column, Table, OneToOne, OneToMany, ManyToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, OneToOne, OneToMany, ManyToOne} from "../../../src/index";
 import {Post} from "./Post";
 import {Chapter} from "./Chapter";
 import {Category} from "./Category";
 
-@Table("sample10_post_details")
+@Entity("sample10_post_details")
 export class PostDetails {
 
     @PrimaryGeneratedColumn()

sample/sample11-all-types-entity/entity/EverythingEntity.ts

@@ -1,8 +1,8 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {CreateDateColumn} from "../../../src/decorator/columns/CreateDateColumn";
 import {UpdateDateColumn} from "../../../src/decorator/columns/UpdateDateColumn";
 
-@Table("sample11_everything_entity")
+@Entity("sample11_everything_entity")
 export class EverythingEntity {
 
     @PrimaryGeneratedColumn()

sample/sample12-custom-naming-strategy/entity/Post.ts

@@ -1,6 +1,6 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 
-@Table("sample1_post")
+@Entity("sample1_post")
 export class Post {
 
     @PrimaryGeneratedColumn()

sample/sample13-everywhere-abstraction/entity/BaseObject.ts

@@ -1,11 +1,11 @@
 import {Column} from "../../../src/index";
-import {AbstractTable} from "../../../src/decorator/tables/AbstractTable";
+import {AbstractEntity} from "../../../src/decorator/entity/AbstractEntity";
 import {BasePost} from "./BasePost";
 import {PostAuthor} from "./PostAuthor";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
 import {PrimaryColumn} from "../../../src/decorator/columns/PrimaryColumn";
 
-@AbstractTable()
+@AbstractEntity()
 export class BaseObject extends BasePost {
 
     @PrimaryColumn("double", { generated: true })

sample/sample13-everywhere-abstraction/entity/BasePost.ts

@@ -1,7 +1,7 @@
 import {PrimaryGeneratedColumn, Column} from "../../../src/index";
-import {AbstractTable} from "../../../src/decorator/tables/AbstractTable";
+import {AbstractEntity} from "../../../src/decorator/entity/AbstractEntity";
 
-@AbstractTable()
+@AbstractEntity()
 export class BasePost {
 
     @PrimaryGeneratedColumn()

sample/sample13-everywhere-abstraction/entity/Blog.ts

@@ -1,10 +1,10 @@
-import {Column, Table} from "../../../src/index";
+import {Column, Entity} from "../../../src/index";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 import {PostCategory} from "./PostCategory";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 import {BaseObject} from "./BaseObject";
 
-@Table("sample13_blog")
+@Entity("sample13_blog")
 export class Blog extends BaseObject {
 
     @Column()

sample/sample13-everywhere-abstraction/entity/Post.ts

@@ -1,10 +1,10 @@
-import {Column, Table} from "../../../src/index";
+import {Column, Entity} from "../../../src/index";
 import {PostCategory} from "./PostCategory";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 import {BaseObject} from "./BaseObject";
 
-@Table("sample13_post")
+@Entity("sample13_post")
 export class Post extends BaseObject {
 
     @Column()

sample/sample13-everywhere-abstraction/entity/PostAuthor.ts

@@ -1,9 +1,9 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Post} from "./Post";
 import {OneToMany} from "../../../src/decorator/relations/OneToMany";
 import {PostUser} from "./PostUser";
 
-@Table("sample13_post_author")
+@Entity("sample13_post_author")
 export class PostAuthor extends PostUser {
 
     @PrimaryGeneratedColumn()

sample/sample13-everywhere-abstraction/entity/PostCategory.ts

@@ -1,8 +1,8 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Post} from "./Post";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 
-@Table("sample13_post_category")
+@Entity("sample13_post_category")
 export class PostCategory {
 
     @PrimaryGeneratedColumn()

sample/sample13-everywhere-abstraction/entity/PostUser.ts

@@ -1,6 +1,6 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 
-@Table("sample13_post_user")
+@Entity("sample13_post_user")
 export class PostUser {
 
     @PrimaryGeneratedColumn()

sample/sample14-errors-in-wrong-metdata/entity/Post.ts

@@ -1,11 +1,11 @@
-import {PrimaryGeneratedColumn, Column, Table, OneToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, OneToOne} from "../../../src/index";
 import {PostAuthor} from "./PostAuthor";
 import {JoinColumn} from "../../../src/decorator/relations/JoinColumn";
 import {OneToMany} from "../../../src/decorator/relations/OneToMany";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 
-@Table("sample14_post")
+@Entity("sample14_post")
 export class Post {
 
     @PrimaryGeneratedColumn()

sample/sample14-errors-in-wrong-metdata/entity/PostAuthor.ts

@@ -1,9 +1,9 @@
-import {PrimaryGeneratedColumn, Column, Table, OneToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, OneToOne} from "../../../src/index";
 import {Post} from "./Post";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 
-@Table("sample14_post_author")
+@Entity("sample14_post_author")
 export class PostAuthor {
 
     @PrimaryGeneratedColumn()

sample/sample16-indexes/entity/Post.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Index} from "../../../src/decorator/Index";
 
-@Table("sample16_post")
+@Entity("sample16_post")
 @Index("my_index_with_id_and_text", ["id", "text"])
 @Index("my_index_with_id_and_title", (post: Post) => [post.id, post.title])
 export class Post {

sample/sample17-versioning/entity/Post.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {VersionColumn} from "../../../src/decorator/columns/VersionColumn";
 
-@Table("sample17_post")
+@Entity("sample17_post")
 export class Post {
 
     @PrimaryGeneratedColumn()

sample/sample18-lazy-relations/entity/Author.ts

@@ -1,8 +1,8 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Post} from "./Post";
 import {OneToMany} from "../../../src/decorator/relations/OneToMany";
 
-@Table("sample18_author")
+@Entity("sample18_author")
 export class Author {
 
     @PrimaryGeneratedColumn()

sample/sample18-lazy-relations/entity/Category.ts

@@ -1,8 +1,8 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 import {Post} from "./Post";
 
-@Table("sample18_category")
+@Entity("sample18_category")
 export class Category {
 
     @PrimaryGeneratedColumn()

sample/sample18-lazy-relations/entity/Post.ts

@@ -1,11 +1,11 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Author} from "./Author";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
 import {Category} from "./Category";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 
-@Table("sample18_post")
+@Entity("sample18_post")
 export class Post {
 
     @PrimaryGeneratedColumn()

sample/sample19-one-side-relations/entity/Author.ts

@@ -1,6 +1,6 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 
-@Table("sample19_author")
+@Entity("sample19_author")
 export class Author {
 
     @PrimaryGeneratedColumn()

sample/sample19-one-side-relations/entity/Category.ts

@@ -1,6 +1,6 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 
-@Table("sample19_category")
+@Entity("sample19_category")
 export class Category {
 
     @PrimaryGeneratedColumn()

sample/sample19-one-side-relations/entity/Post.ts

@@ -1,4 +1,4 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Author} from "./Author";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
 import {Category} from "./Category";
@@ -8,7 +8,7 @@ import {OneToOne} from "../../../src/decorator/relations/OneToOne";
 import {JoinColumn} from "../../../src/decorator/relations/JoinColumn";
 import {PostMetadata} from "./PostMetadata";
 
-@Table("sample19_post")
+@Entity("sample19_post")
 export class Post {
 
     @PrimaryGeneratedColumn()

sample/sample19-one-side-relations/entity/PostMetadata.ts

@@ -1,6 +1,6 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 
-@Table("sample19_post_metadata")
+@Entity("sample19_post_metadata")
 export class PostMetadata {
 
     @PrimaryGeneratedColumn()

sample/sample2-one-to-one/entity/Post.ts

@@ -1,4 +1,4 @@
-import {PrimaryGeneratedColumn, Column, Table, OneToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, OneToOne} from "../../../src/index";
 import {PostDetails} from "./PostDetails";
 import {PostCategory} from "./PostCategory";
 import {PostAuthor} from "./PostAuthor";
@@ -7,7 +7,7 @@ import {PostImage} from "./PostImage";
 import {PostMetadata} from "./PostMetadata";
 import {JoinColumn} from "../../../src/decorator/relations/JoinColumn";
 
-@Table("sample2_post")
+@Entity("sample2_post")
 export class Post {
 
     @PrimaryGeneratedColumn()

sample/sample2-one-to-one/entity/PostAuthor.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table, OneToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, OneToOne} from "../../../src/index";
 import {Post} from "./Post";
 
-@Table("sample2_post_author")
+@Entity("sample2_post_author")
 export class PostAuthor {
 
     @PrimaryGeneratedColumn()

sample/sample2-one-to-one/entity/PostCategory.ts

@@ -1,6 +1,6 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 
-@Table("sample2_post_category")
+@Entity("sample2_post_category")
 export class PostCategory {
 
     @PrimaryGeneratedColumn()

sample/sample2-one-to-one/entity/PostDetails.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table, OneToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, OneToOne} from "../../../src/index";
 import {Post} from "./Post";
 
-@Table("sample2_post_details")
+@Entity("sample2_post_details")
 export class PostDetails {
 
     @PrimaryGeneratedColumn()

sample/sample2-one-to-one/entity/PostImage.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table, OneToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, OneToOne} from "../../../src/index";
 import {Post} from "./Post";
 
-@Table("sample2_post_image")
+@Entity("sample2_post_image")
 export class PostImage {
 
     @PrimaryGeneratedColumn()

sample/sample2-one-to-one/entity/PostInformation.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table, OneToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, OneToOne} from "../../../src/index";
 import {Post} from "./Post";
 
-@Table("sample2_post_information")
+@Entity("sample2_post_information")
 export class PostInformation {
 
     @PrimaryGeneratedColumn()

sample/sample2-one-to-one/entity/PostMetadata.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table, OneToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, OneToOne} from "../../../src/index";
 import {Post} from "./Post";
 
-@Table("sample2_post_metadata")
+@Entity("sample2_post_metadata")
 export class PostMetadata {
 
     @PrimaryGeneratedColumn()

sample/sample20-join-without-relation/entity/Author.ts

@@ -1,6 +1,6 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 
-@Table("sample20_author")
+@Entity("sample20_author")
 export class Author {
 
     @PrimaryGeneratedColumn()

sample/sample20-join-without-relation/entity/Category.ts

@@ -1,6 +1,6 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 
-@Table("sample20_category")
+@Entity("sample20_category")
 export class Category {
 
     @PrimaryGeneratedColumn()

sample/sample20-join-without-relation/entity/Post.ts

@@ -1,10 +1,10 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Author} from "./Author";
 import {Category} from "./Category";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 
-@Table("sample20_post")
+@Entity("sample20_post")
 export class Post {
 
     @PrimaryGeneratedColumn()

sample/sample21-custom-join-table-column/entity/Author.ts

@@ -1,8 +1,8 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Post} from "./Post";
 import {OneToMany} from "../../../src/decorator/relations/OneToMany";
 
-@Table("sample21_author")
+@Entity("sample21_author")
 export class Author {
 
     @PrimaryGeneratedColumn()

sample/sample21-custom-join-table-column/entity/Category.ts

@@ -1,8 +1,8 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 import {Post} from "./Post";
 
-@Table("sample21_category")
+@Entity("sample21_category")
 export class Category {
 
     @PrimaryGeneratedColumn()

sample/sample21-custom-join-table-column/entity/Post.ts

@@ -1,4 +1,4 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Author} from "./Author";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
 import {Category} from "./Category";
@@ -6,7 +6,7 @@ import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 import {JoinColumn} from "../../../src/decorator/relations/JoinColumn";
 
-@Table("sample21_post")
+@Entity("sample21_post")
 export class Post {
 
     @PrimaryGeneratedColumn()

sample/sample22-closure-table/entity/Category.ts

@@ -1,10 +1,10 @@
 import {PrimaryGeneratedColumn, Column} from "../../../src/index";
 import {TreeLevelColumn} from "../../../src/decorator/tree/TreeLevelColumn";
-import {ClosureTable} from "../../../src/decorator/tables/ClosureTable";
+import {ClosureEntity} from "../../../src/decorator/entity/ClosureEntity";
 import {TreeParent} from "../../../src/decorator/tree/TreeParent";
 import {TreeChildren} from "../../../src/decorator/tree/TreeChildren";
 
-@ClosureTable("sample22_category")
+@ClosureEntity("sample22_category")
 export class Category {
 
     @PrimaryGeneratedColumn()

sample/sample23-nested-joins/entity/Author.ts

@@ -1,6 +1,6 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 
-@Table("sample23_author")
+@Entity("sample23_author")
 export class Author {
 
     @PrimaryGeneratedColumn()

sample/sample23-nested-joins/entity/Category.ts

@@ -1,9 +1,9 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Author} from "./Author";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 
-@Table("sample23_category")
+@Entity("sample23_category")
 export class Category {
 
     @PrimaryGeneratedColumn()

sample/sample23-nested-joins/entity/Post.ts

@@ -1,11 +1,11 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Category} from "./Category";
 import {Author} from "./Author";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
 
-@Table("sample23_post")
+@Entity("sample23_post")
 export class Post {
 
     @PrimaryGeneratedColumn()

sample/sample25-insert-from-inverse-side/entity/Author.ts

@@ -1,8 +1,8 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {OneToMany} from "../../../src/decorator/relations/OneToMany";
 import {Post} from "./Post";
 
-@Table("sample25_author")
+@Entity("sample25_author")
 export class Author {
 
     @PrimaryGeneratedColumn()

sample/sample25-insert-from-inverse-side/entity/Post.ts

@@ -1,8 +1,8 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Author} from "./Author";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
 
-@Table("sample25_post")
+@Entity("sample25_post")
 export class Post {
 
     @PrimaryGeneratedColumn()

sample/sample26-embedded-tables/entity/Counters.ts

@@ -1,7 +1,7 @@
 import {Column} from "../../../src/index";
-import {EmbeddableTable} from "../../../src/decorator/tables/EmbeddableTable";
+import {EmbeddableEntity} from "../../../src/decorator/entity/EmbeddableEntity";
 
-@EmbeddableTable()
+@EmbeddableEntity()
 export class Counters {
 
     @Column()

sample/sample26-embedded-tables/entity/Post.ts

@@ -1,8 +1,8 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Counters} from "./Counters";
 import {Embedded} from "../../../src/decorator/Embedded";
 
-@Table("sample26_post")
+@Entity("sample26_post")
 export class Post {
 
     @PrimaryGeneratedColumn()

sample/sample26-embedded-tables/entity/Question.ts

@@ -1,8 +1,8 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Counters} from "./Counters";
 import {Embedded} from "../../../src/decorator/Embedded";
 
-@Table("sample26_question")
+@Entity("sample26_question")
 export class Question {
 
     @PrimaryGeneratedColumn()

sample/sample27-composite-primary-keys/entity/Post.ts

@@ -1,7 +1,7 @@
-import {Column, Table} from "../../../src/index";
+import {Column, Entity} from "../../../src/index";
 import {PrimaryColumn} from "../../../src/decorator/columns/PrimaryColumn";
 
-@Table("sample27_composite_primary_keys")
+@Entity("sample27_composite_primary_keys")
 export class Post {
 
     @PrimaryColumn("int")

sample/sample28-single-table-inheritance/entity/Employee.ts

@@ -1,8 +1,8 @@
 import {Column} from "../../../src/decorator/columns/Column";
 import {Person} from "./Person";
-import {SingleTableChild} from "../../../src/decorator/tables/SingleTableChild";
+import {SingleEntityChild} from "../../../src/decorator/entity/SingleEntityChild";
 
-@SingleTableChild()
+@SingleEntityChild()
 export class Employee extends Person {
 
     @Column()

sample/sample28-single-table-inheritance/entity/Homesitter.ts

@@ -1,9 +1,9 @@
 import {Column} from "../../../src/decorator/columns/Column";
 import {Person} from "./Person";
 import {DiscriminatorValue} from "../../../src/decorator/DiscriminatorValue";
-import {SingleTableChild} from "../../../src/decorator/tables/SingleTableChild";
+import {SingleEntityChild} from "../../../src/decorator/entity/SingleEntityChild";
 
-@SingleTableChild()
+@SingleEntityChild()
 @DiscriminatorValue("home-sitter") // can be omitted
 export class Homesitter extends Person {
 

sample/sample28-single-table-inheritance/entity/Person.ts

@@ -1,13 +1,13 @@
 import {Column} from "../../../src/decorator/columns/Column";
-import {TableInheritance} from "../../../src/decorator/tables/TableInheritance";
+import {TableInheritance} from "../../../src/decorator/entity/TableInheritance";
 import {DiscriminatorColumn} from "../../../src/decorator/columns/DiscriminatorColumn";
-import {Table} from "../../../src/decorator/tables/Table";
+import {Entity} from "../../../src/decorator/entity/Entity";
 import {PrimaryColumn} from "../../../src/decorator/columns/PrimaryColumn";
 
 // todo: some things left to do:
 // * check how it works when is join (conditions are not added in the joins right now)
 
-@Table("sample28_person")
+@Entity("sample28_person")
 @TableInheritance("single-table")
 @DiscriminatorColumn({ name: "type", type: "string"})
 export abstract class Person {

sample/sample28-single-table-inheritance/entity/Student.ts

@@ -1,8 +1,8 @@
 import {Column} from "../../../src/decorator/columns/Column";
 import {Person} from "./Person";
-import {SingleTableChild} from "../../../src/decorator/tables/SingleTableChild";
+import {SingleEntityChild} from "../../../src/decorator/entity/SingleEntityChild";
 
-@SingleTableChild()
+@SingleEntityChild()
 export class Student extends Person {
 
     @Column()

sample/sample29-class-table-inheritance/entity/Employee.ts

@@ -1,8 +1,8 @@
 import {Column} from "../../../src/decorator/columns/Column";
 import {Person} from "./Person";
-import {ClassTableChild} from "../../../src/decorator/tables/ClassTableChild";
+import {ClassEntityChild} from "../../../src/decorator/entity/ClassEntityChild";
 
-@ClassTableChild("sample29_employee")
+@ClassEntityChild("sample29_employee")
 export class Employee extends Person {
 
     @Column()

sample/sample29-class-table-inheritance/entity/Homesitter.ts

@@ -1,9 +1,9 @@
 import {Column} from "../../../src/decorator/columns/Column";
 import {Person} from "./Person";
 import {DiscriminatorValue} from "../../../src/decorator/DiscriminatorValue";
-import {ClassTableChild} from "../../../src/decorator/tables/ClassTableChild";
+import {ClassEntityChild} from "../../../src/decorator/entity/ClassEntityChild";
 
-@ClassTableChild("sample29_homesitter")
+@ClassEntityChild("sample29_homesitter")
 @DiscriminatorValue("home-sitter") // can be omitted
 export class Homesitter extends Person {
 

sample/sample29-class-table-inheritance/entity/Person.ts

@@ -1,10 +1,10 @@
 import {Column} from "../../../src/decorator/columns/Column";
-import {TableInheritance} from "../../../src/decorator/tables/TableInheritance";
+import {TableInheritance} from "../../../src/decorator/entity/TableInheritance";
 import {DiscriminatorColumn} from "../../../src/decorator/columns/DiscriminatorColumn";
-import {Table} from "../../../src/decorator/tables/Table";
+import {Entity} from "../../../src/decorator/entity/Entity";
 import {PrimaryColumn} from "../../../src/decorator/columns/PrimaryColumn";
 
-@Table("sample29_person")
+@Entity("sample29_person")
 @TableInheritance("class-table")
 @DiscriminatorColumn({ name: "type", type: "string"})
 export abstract class Person {

sample/sample29-class-table-inheritance/entity/Student.ts

@@ -1,9 +1,9 @@
 import {Column} from "../../../src/decorator/columns/Column";
 import {Person} from "./Person";
-import {ClassTableChild} from "../../../src/decorator/tables/ClassTableChild";
+import {ClassEntityChild} from "../../../src/decorator/entity/ClassEntityChild";
 
-@ClassTableChild("sample29_student")
-@ClassTableChild()
+@ClassEntityChild("sample29_student")
+@ClassEntityChild()
 export class Student extends Person {
 
     @Column()

sample/sample3-many-to-one/entity/Post.ts

@@ -1,4 +1,4 @@
-import {PrimaryGeneratedColumn, Column, Table, ManyToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, ManyToOne} from "../../../src/index";
 import {PostDetails} from "./PostDetails";
 import {PostCategory} from "./PostCategory";
 import {PostAuthor} from "./PostAuthor";
@@ -6,7 +6,7 @@ import {PostInformation} from "./PostInformation";
 import {PostImage} from "./PostImage";
 import {PostMetadata} from "./PostMetadata";
 
-@Table("sample3_post")
+@Entity("sample3_post")
 export class Post {
 
     @PrimaryGeneratedColumn()

sample/sample3-many-to-one/entity/PostAuthor.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table, OneToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, OneToMany} from "../../../src/index";
 import {Post} from "./Post";
 
-@Table("sample3_post_author")
+@Entity("sample3_post_author")
 export class PostAuthor {
 
     @PrimaryGeneratedColumn()

sample/sample3-many-to-one/entity/PostCategory.ts

@@ -1,6 +1,6 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 
-@Table("sample3_post_category")
+@Entity("sample3_post_category")
 export class PostCategory {
 
     @PrimaryGeneratedColumn()

sample/sample3-many-to-one/entity/PostDetails.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table, OneToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, OneToMany} from "../../../src/index";
 import {Post} from "./Post";
 
-@Table("sample3_post_details")
+@Entity("sample3_post_details")
 export class PostDetails {
 
     @PrimaryGeneratedColumn()

sample/sample3-many-to-one/entity/PostImage.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table, OneToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, OneToMany} from "../../../src/index";
 import {Post} from "./Post";
 
-@Table("sample3_post_image")
+@Entity("sample3_post_image")
 export class PostImage {
 
     @PrimaryGeneratedColumn()

sample/sample3-many-to-one/entity/PostInformation.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table, OneToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, OneToMany} from "../../../src/index";
 import {Post} from "./Post";
 
-@Table("sample3_post_information")
+@Entity("sample3_post_information")
 export class PostInformation {
 
     @PrimaryGeneratedColumn()

sample/sample3-many-to-one/entity/PostMetadata.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table, OneToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, OneToMany} from "../../../src/index";
 import {Post} from "./Post";
 
-@Table("sample3_post_metadata")
+@Entity("sample3_post_metadata")
 export class PostMetadata {
 
     @PrimaryGeneratedColumn()

sample/sample30-default-order-by/entity/Category.ts

@@ -1,6 +1,6 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 
-@Table("sample30_category")
+@Entity("sample30_category")
 export class Category {
 
     @PrimaryGeneratedColumn()

sample/sample30-default-order-by/entity/Post.ts

@@ -1,9 +1,9 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 import {Category} from "./Category";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 
-@Table("sample30_post", {
+@Entity("sample30_post", {
     orderBy: {
         title: "ASC",
         id: "DESC"

sample/sample31-table-prefix/entity/Author.ts

@@ -1,6 +1,6 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 
-@Table("sample31_author")
+@Entity("sample31_author")
 export class Author {
 
     @PrimaryGeneratedColumn()

sample/sample31-table-prefix/entity/Category.ts

@@ -1,6 +1,6 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 
-@Table("sample31_category")
+@Entity("sample31_category")
 export class Category {
 
     @PrimaryGeneratedColumn()

sample/sample31-table-prefix/entity/Post.ts

@@ -1,10 +1,10 @@
-import {PrimaryGeneratedColumn, Column, Table, ManyToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, ManyToOne} from "../../../src/index";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 import {Author} from "./Author";
 import {Category} from "./Category";
 
-@Table("sample31_post")
+@Entity("sample31_post")
 export class Post {
 
     @PrimaryGeneratedColumn()

sample/sample32-migrations/entity/Author.ts

@@ -1,6 +1,6 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 
-@Table()
+@Entity()
 export class Author {
 
     @PrimaryGeneratedColumn()

sample/sample32-migrations/entity/Post.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table, ManyToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, ManyToOne} from "../../../src/index";
 import {Author} from "./Author";
 
-@Table()
+@Entity()
 export class Post {
 
     @PrimaryGeneratedColumn()

sample/sample4-many-to-many/entity/Post.ts

@@ -1,4 +1,4 @@
-import {PrimaryGeneratedColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, ManyToMany} from "../../../src/index";
 import {PostDetails} from "./PostDetails";
 import {PostCategory} from "./PostCategory";
 import {PostAuthor} from "./PostAuthor";
@@ -7,7 +7,7 @@ import {PostImage} from "./PostImage";
 import {PostMetadata} from "./PostMetadata";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 
-@Table("sample4_post")
+@Entity("sample4_post")
 export class Post {
 
     @PrimaryGeneratedColumn()

sample/sample4-many-to-many/entity/PostAuthor.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, ManyToMany} from "../../../src/index";
 import {Post} from "./Post";
 
-@Table("sample4_post_author")
+@Entity("sample4_post_author")
 export class PostAuthor {
 
     @PrimaryGeneratedColumn()

sample/sample4-many-to-many/entity/PostCategory.ts

@@ -1,6 +1,6 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 
-@Table("sample4_post_category")
+@Entity("sample4_post_category")
 export class PostCategory {
 
     @PrimaryGeneratedColumn()

sample/sample4-many-to-many/entity/PostDetails.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, ManyToMany} from "../../../src/index";
 import {Post} from "./Post";
 
-@Table("sample4_post_details")
+@Entity("sample4_post_details")
 export class PostDetails {
 
     @PrimaryGeneratedColumn()

sample/sample4-many-to-many/entity/PostImage.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, ManyToMany} from "../../../src/index";
 import {Post} from "./Post";
 
-@Table("sample4_post_image")
+@Entity("sample4_post_image")
 export class PostImage {
 
     @PrimaryGeneratedColumn()

sample/sample4-many-to-many/entity/PostInformation.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, ManyToMany} from "../../../src/index";
 import {Post} from "./Post";
 
-@Table("sample4_post_information")
+@Entity("sample4_post_information")
 export class PostInformation {
 
     @PrimaryGeneratedColumn()

sample/sample4-many-to-many/entity/PostMetadata.ts

@@ -1,7 +1,7 @@
-import {PrimaryGeneratedColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, ManyToMany} from "../../../src/index";
 import {Post} from "./Post";
 
-@Table("sample4_post_metadata")
+@Entity("sample4_post_metadata")
 export class PostMetadata {
 
     @PrimaryGeneratedColumn()

sample/sample5-subscribers/entity/Post.ts

@@ -1,10 +1,10 @@
-import {PrimaryGeneratedColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, ManyToMany} from "../../../src/index";
 import {PostCategory} from "./PostCategory";
 import {PostAuthor} from "./PostAuthor";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 
-@Table("sample5_post")
+@Entity("sample5_post")
 export class Post {
 
     @PrimaryGeneratedColumn()

sample/sample5-subscribers/entity/PostAuthor.ts

@@ -1,8 +1,8 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Post} from "./Post";
 import {OneToMany} from "../../../src/decorator/relations/OneToMany";
 
-@Table("sample5_post_author")
+@Entity("sample5_post_author")
 export class PostAuthor {
 
     @PrimaryGeneratedColumn()

sample/sample5-subscribers/entity/PostCategory.ts

@@ -1,8 +1,8 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Post} from "./Post";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 
-@Table("sample5_post_category")
+@Entity("sample5_post_category")
 export class PostCategory {
 
     @PrimaryGeneratedColumn()

sample/sample6-abstract-table/entity/BasePost.ts

@@ -1,7 +1,7 @@
 import {PrimaryGeneratedColumn, Column} from "../../../src/index";
-import {AbstractTable} from "../../../src/decorator/tables/AbstractTable";
+import {AbstractEntity} from "../../../src/decorator/entity/AbstractEntity";
 
-@AbstractTable()
+@AbstractEntity()
 export class BasePost {
 
     @PrimaryGeneratedColumn()

sample/sample6-abstract-table/entity/Blog.ts

@@ -1,4 +1,4 @@
-import {Column, Table} from "../../../src/index";
+import {Column, Entity} from "../../../src/index";
 import {BasePost} from "./BasePost";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
 import {PostAuthor} from "./PostAuthor";
@@ -6,7 +6,7 @@ import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 import {PostCategory} from "./PostCategory";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 
-@Table("sample6_blog")
+@Entity("sample6_blog")
 export class Blog extends BasePost {
 
     @Column()

sample/sample6-abstract-table/entity/Post.ts

@@ -1,4 +1,4 @@
-import {Column, Table} from "../../../src/index";
+import {Column, Entity} from "../../../src/index";
 import {BasePost} from "./BasePost";
 import {PostCategory} from "./PostCategory";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
@@ -6,7 +6,7 @@ import {PostAuthor} from "./PostAuthor";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 
-@Table("sample6_post")
+@Entity("sample6_post")
 export class Post extends BasePost {
 
     @Column()

sample/sample6-abstract-table/entity/PostAuthor.ts

@@ -1,8 +1,8 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Post} from "./Post";
 import {OneToMany} from "../../../src/decorator/relations/OneToMany";
 
-@Table("sample6_post_author")
+@Entity("sample6_post_author")
 export class PostAuthor {
 
     @PrimaryGeneratedColumn()

sample/sample6-abstract-table/entity/PostCategory.ts

@@ -1,8 +1,8 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Post} from "./Post";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 
-@Table("sample6_post_category")
+@Entity("sample6_post_category")
 export class PostCategory {
 
     @PrimaryGeneratedColumn()

sample/sample7-pagination/entity/Post.ts

@@ -1,10 +1,10 @@
-import {PrimaryGeneratedColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, ManyToMany} from "../../../src/index";
 import {PostCategory} from "./PostCategory";
 import {PostAuthor} from "./PostAuthor";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 
-@Table("sample7_post")
+@Entity("sample7_post")
 export class Post {
 
     @PrimaryGeneratedColumn()

sample/sample7-pagination/entity/PostAuthor.ts

@@ -1,8 +1,8 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Post} from "./Post";
 import {OneToMany} from "../../../src/decorator/relations/OneToMany";
 
-@Table("sample7_post_author")
+@Entity("sample7_post_author")
 export class PostAuthor {
 
     @PrimaryGeneratedColumn()

sample/sample7-pagination/entity/PostCategory.ts

@@ -1,8 +1,8 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Post} from "./Post";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 
-@Table("sample7_post_category")
+@Entity("sample7_post_category")
 export class PostCategory {
 
     @PrimaryGeneratedColumn()

sample/sample8-self-referencing/entity/Category.ts

@@ -1,11 +1,11 @@
-import {PrimaryGeneratedColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, ManyToMany} from "../../../src/index";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
 import {OneToMany} from "../../../src/decorator/relations/OneToMany";
 import {OneToOne} from "../../../src/decorator/relations/OneToOne";
 import {JoinColumn} from "../../../src/decorator/relations/JoinColumn";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 
-@Table("sample8_category")
+@Entity("sample8_category")
 export class Category {
 
     @PrimaryGeneratedColumn()

sample/sample9-entity-listeners/entity/Post.ts

@@ -1,4 +1,4 @@
-import {PrimaryGeneratedColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity, ManyToMany} from "../../../src/index";
 import {PostCategory} from "./PostCategory";
 import {PostAuthor} from "./PostAuthor";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
@@ -11,7 +11,7 @@ import {BeforeRemove} from "../../../src/decorator/listeners/BeforeRemove";
 import {AfterRemove} from "../../../src/decorator/listeners/AfterRemove";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 
-@Table("sample9_post")
+@Entity("sample9_post")
 export class Post {
 
     @PrimaryGeneratedColumn()

sample/sample9-entity-listeners/entity/PostAuthor.ts

@@ -1,4 +1,4 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Post} from "./Post";
 import {OneToMany} from "../../../src/decorator/relations/OneToMany";
 import {AfterRemove} from "../../../src/decorator/listeners/AfterRemove";
@@ -8,7 +8,7 @@ import {BeforeUpdate} from "../../../src/decorator/listeners/BeforeUpdate";
 import {AfterInsert} from "../../../src/decorator/listeners/AfterInsert";
 import {BeforeInsert} from "../../../src/decorator/listeners/BeforeInsert";
 
-@Table("sample9_post_author")
+@Entity("sample9_post_author")
 export class PostAuthor {
 
     @PrimaryGeneratedColumn()

sample/sample9-entity-listeners/entity/PostCategory.ts

@@ -1,4 +1,4 @@
-import {PrimaryGeneratedColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, Column, Entity} from "../../../src/index";
 import {Post} from "./Post";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 import {AfterRemove} from "../../../src/decorator/listeners/AfterRemove";
@@ -8,7 +8,7 @@ import {BeforeUpdate} from "../../../src/decorator/listeners/BeforeUpdate";
 import {AfterInsert} from "../../../src/decorator/listeners/AfterInsert";
 import {BeforeInsert} from "../../../src/decorator/listeners/BeforeInsert";
 
-@Table("sample9_post_category")
+@Entity("sample9_post_category")
 export class PostCategory {
 
     @PrimaryGeneratedColumn()

src/decorator/entity/AbstractEntity.ts

@@ -0,0 +1,17 @@
+import {getMetadataArgsStorage} from "../../index";
+import {TableMetadataArgs} from "../../metadata-args/TableMetadataArgs";
+
+/**
+ * Abstract entity is a class that contains columns and relations for all entities that will inherit this entity.
+ * Database table for the abstract entity is not created.
+ */
+export function AbstractEntity() {
+    return function (target: Function) {
+        const args: TableMetadataArgs = {
+            target: target,
+            name: undefined,
+            type: "abstract"
+        };
+        getMetadataArgsStorage().tables.add(args);
+    };
+}

src/decorator/entity/ClassEntityChild.ts

@@ -0,0 +1,19 @@
+import {getMetadataArgsStorage} from "../../index";
+import {TableMetadataArgs} from "../../metadata-args/TableMetadataArgs";
+import {EntityOptions} from "../options/EntityOptions";
+
+/**
+ * Special type of the entity used in the class-table inherited tables.
+ */
+export function ClassEntityChild(tableName?: string, options?: EntityOptions) {
+    return function (target: Function) {
+        const args: TableMetadataArgs = {
+            target: target,
+            name: tableName,
+            type: "class-table-child",
+            orderBy: options && options.orderBy ? options.orderBy : undefined,
+            skipSchemaSync: !!(options && options.skipSchemaSync === true)
+        };
+        getMetadataArgsStorage().tables.add(args);
+    };
+}

src/decorator/entity/ClosureEntity.ts

@@ -0,0 +1,19 @@
+import {getMetadataArgsStorage} from "../../index";
+import {TableMetadataArgs} from "../../metadata-args/TableMetadataArgs";
+import {EntityOptions} from "../options/EntityOptions";
+
+/**
+ * Used on a entities that stores its children in a tree using closure design pattern.
+ */
+export function ClosureEntity(name?: string, options?: EntityOptions) {
+    return function (target: Function) {
+        const args: TableMetadataArgs = {
+            target: target,
+            name: name,
+            type: "closure",
+            orderBy: options && options.orderBy ? options.orderBy : undefined,
+            skipSchemaSync: !!(options && options.skipSchemaSync === true)
+        };
+        getMetadataArgsStorage().tables.add(args);
+    };
+}