diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d250688f..5df13831c 100644 --- a/CHANGELOG.md +++ b/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) diff --git a/extra/browser-shim.js b/extra/browser-shim.js index 9a740b457..407d76dbf 100644 --- a/extra/browser-shim.js +++ b/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) { diff --git a/sample/sample1-simple-entity/entity/Post.ts b/sample/sample1-simple-entity/entity/Post.ts index 4ef770136..493b06804 100644 --- a/sample/sample1-simple-entity/entity/Post.ts +++ b/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 }) diff --git a/sample/sample10-mixed/entity/Category.ts b/sample/sample10-mixed/entity/Category.ts index d04d8affa..8c8e73f3c 100644 --- a/sample/sample10-mixed/entity/Category.ts +++ b/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() diff --git a/sample/sample10-mixed/entity/Chapter.ts b/sample/sample10-mixed/entity/Chapter.ts index 1e6be4fd8..042c7bfab 100644 --- a/sample/sample10-mixed/entity/Chapter.ts +++ b/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() diff --git a/sample/sample10-mixed/entity/Cover.ts b/sample/sample10-mixed/entity/Cover.ts index 2d84632b5..6de74048f 100644 --- a/sample/sample10-mixed/entity/Cover.ts +++ b/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() diff --git a/sample/sample10-mixed/entity/Image.ts b/sample/sample10-mixed/entity/Image.ts index 0af4d9329..dc7e1bdaa 100644 --- a/sample/sample10-mixed/entity/Image.ts +++ b/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() diff --git a/sample/sample10-mixed/entity/ImageDetails.ts b/sample/sample10-mixed/entity/ImageDetails.ts index 906c754fb..d1c8d3747 100644 --- a/sample/sample10-mixed/entity/ImageDetails.ts +++ b/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() diff --git a/sample/sample10-mixed/entity/Post.ts b/sample/sample10-mixed/entity/Post.ts index 52ba2be72..a9f77ce3c 100644 --- a/sample/sample10-mixed/entity/Post.ts +++ b/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() diff --git a/sample/sample10-mixed/entity/PostDetails.ts b/sample/sample10-mixed/entity/PostDetails.ts index 84302fb6c..9810ca158 100644 --- a/sample/sample10-mixed/entity/PostDetails.ts +++ b/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() diff --git a/sample/sample11-all-types-entity/entity/EverythingEntity.ts b/sample/sample11-all-types-entity/entity/EverythingEntity.ts index 77959cb22..a9dbb6829 100644 --- a/sample/sample11-all-types-entity/entity/EverythingEntity.ts +++ b/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() diff --git a/sample/sample12-custom-naming-strategy/entity/Post.ts b/sample/sample12-custom-naming-strategy/entity/Post.ts index 9f25ea47b..9fdb00c76 100644 --- a/sample/sample12-custom-naming-strategy/entity/Post.ts +++ b/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() diff --git a/sample/sample13-everywhere-abstraction/entity/BaseObject.ts b/sample/sample13-everywhere-abstraction/entity/BaseObject.ts index ed3c3d88e..b7ffda5a2 100644 --- a/sample/sample13-everywhere-abstraction/entity/BaseObject.ts +++ b/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 }) diff --git a/sample/sample13-everywhere-abstraction/entity/BasePost.ts b/sample/sample13-everywhere-abstraction/entity/BasePost.ts index cbe8fb2a7..c1e71cd54 100644 --- a/sample/sample13-everywhere-abstraction/entity/BasePost.ts +++ b/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() diff --git a/sample/sample13-everywhere-abstraction/entity/Blog.ts b/sample/sample13-everywhere-abstraction/entity/Blog.ts index 777bd3166..190059418 100644 --- a/sample/sample13-everywhere-abstraction/entity/Blog.ts +++ b/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() diff --git a/sample/sample13-everywhere-abstraction/entity/Post.ts b/sample/sample13-everywhere-abstraction/entity/Post.ts index b9f07bc78..2ba350b36 100644 --- a/sample/sample13-everywhere-abstraction/entity/Post.ts +++ b/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() diff --git a/sample/sample13-everywhere-abstraction/entity/PostAuthor.ts b/sample/sample13-everywhere-abstraction/entity/PostAuthor.ts index 483d173fb..3498fdab9 100644 --- a/sample/sample13-everywhere-abstraction/entity/PostAuthor.ts +++ b/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() diff --git a/sample/sample13-everywhere-abstraction/entity/PostCategory.ts b/sample/sample13-everywhere-abstraction/entity/PostCategory.ts index 9f3422c28..8b151f07f 100644 --- a/sample/sample13-everywhere-abstraction/entity/PostCategory.ts +++ b/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() diff --git a/sample/sample13-everywhere-abstraction/entity/PostUser.ts b/sample/sample13-everywhere-abstraction/entity/PostUser.ts index e0fb78b57..d9613a088 100644 --- a/sample/sample13-everywhere-abstraction/entity/PostUser.ts +++ b/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() diff --git a/sample/sample14-errors-in-wrong-metdata/entity/Post.ts b/sample/sample14-errors-in-wrong-metdata/entity/Post.ts index 8fe4a6e2a..71521eb4d 100644 --- a/sample/sample14-errors-in-wrong-metdata/entity/Post.ts +++ b/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() diff --git a/sample/sample14-errors-in-wrong-metdata/entity/PostAuthor.ts b/sample/sample14-errors-in-wrong-metdata/entity/PostAuthor.ts index 20d79a8b1..9a3210434 100644 --- a/sample/sample14-errors-in-wrong-metdata/entity/PostAuthor.ts +++ b/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() diff --git a/sample/sample16-indexes/entity/Post.ts b/sample/sample16-indexes/entity/Post.ts index a55fbf7e2..451e810bc 100644 --- a/sample/sample16-indexes/entity/Post.ts +++ b/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 { diff --git a/sample/sample17-versioning/entity/Post.ts b/sample/sample17-versioning/entity/Post.ts index 156f3e1b7..ad53add86 100644 --- a/sample/sample17-versioning/entity/Post.ts +++ b/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() diff --git a/sample/sample18-lazy-relations/entity/Author.ts b/sample/sample18-lazy-relations/entity/Author.ts index edfd85b76..824b8a28c 100644 --- a/sample/sample18-lazy-relations/entity/Author.ts +++ b/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() diff --git a/sample/sample18-lazy-relations/entity/Category.ts b/sample/sample18-lazy-relations/entity/Category.ts index 63dcf3130..963c76c7e 100644 --- a/sample/sample18-lazy-relations/entity/Category.ts +++ b/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() diff --git a/sample/sample18-lazy-relations/entity/Post.ts b/sample/sample18-lazy-relations/entity/Post.ts index c858b2c4f..e8a407fcc 100644 --- a/sample/sample18-lazy-relations/entity/Post.ts +++ b/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() diff --git a/sample/sample19-one-side-relations/entity/Author.ts b/sample/sample19-one-side-relations/entity/Author.ts index c90a48004..ade3a31fc 100644 --- a/sample/sample19-one-side-relations/entity/Author.ts +++ b/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() diff --git a/sample/sample19-one-side-relations/entity/Category.ts b/sample/sample19-one-side-relations/entity/Category.ts index 0c7fca0c6..00eae6496 100644 --- a/sample/sample19-one-side-relations/entity/Category.ts +++ b/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() diff --git a/sample/sample19-one-side-relations/entity/Post.ts b/sample/sample19-one-side-relations/entity/Post.ts index 86b913951..97ee3201c 100644 --- a/sample/sample19-one-side-relations/entity/Post.ts +++ b/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() diff --git a/sample/sample19-one-side-relations/entity/PostMetadata.ts b/sample/sample19-one-side-relations/entity/PostMetadata.ts index 6b8d2abd2..cad78005b 100644 --- a/sample/sample19-one-side-relations/entity/PostMetadata.ts +++ b/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() diff --git a/sample/sample2-one-to-one/entity/Post.ts b/sample/sample2-one-to-one/entity/Post.ts index 55a23af15..7920fbc0a 100644 --- a/sample/sample2-one-to-one/entity/Post.ts +++ b/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() diff --git a/sample/sample2-one-to-one/entity/PostAuthor.ts b/sample/sample2-one-to-one/entity/PostAuthor.ts index 51854cc93..517e52d25 100644 --- a/sample/sample2-one-to-one/entity/PostAuthor.ts +++ b/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() diff --git a/sample/sample2-one-to-one/entity/PostCategory.ts b/sample/sample2-one-to-one/entity/PostCategory.ts index 98a2bb1a0..0093e221f 100644 --- a/sample/sample2-one-to-one/entity/PostCategory.ts +++ b/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() diff --git a/sample/sample2-one-to-one/entity/PostDetails.ts b/sample/sample2-one-to-one/entity/PostDetails.ts index 195016236..45ea61e42 100644 --- a/sample/sample2-one-to-one/entity/PostDetails.ts +++ b/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() diff --git a/sample/sample2-one-to-one/entity/PostImage.ts b/sample/sample2-one-to-one/entity/PostImage.ts index c92dc2681..42a1eee15 100644 --- a/sample/sample2-one-to-one/entity/PostImage.ts +++ b/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() diff --git a/sample/sample2-one-to-one/entity/PostInformation.ts b/sample/sample2-one-to-one/entity/PostInformation.ts index 4fbbc8cad..5a27b2d62 100644 --- a/sample/sample2-one-to-one/entity/PostInformation.ts +++ b/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() diff --git a/sample/sample2-one-to-one/entity/PostMetadata.ts b/sample/sample2-one-to-one/entity/PostMetadata.ts index f3d7dc745..6b0a3849c 100644 --- a/sample/sample2-one-to-one/entity/PostMetadata.ts +++ b/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() diff --git a/sample/sample20-join-without-relation/entity/Author.ts b/sample/sample20-join-without-relation/entity/Author.ts index 40b8a573a..75414bbd4 100644 --- a/sample/sample20-join-without-relation/entity/Author.ts +++ b/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() diff --git a/sample/sample20-join-without-relation/entity/Category.ts b/sample/sample20-join-without-relation/entity/Category.ts index 5a9426a71..87f2c5532 100644 --- a/sample/sample20-join-without-relation/entity/Category.ts +++ b/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() diff --git a/sample/sample20-join-without-relation/entity/Post.ts b/sample/sample20-join-without-relation/entity/Post.ts index 0ccfcf6f9..063c23258 100644 --- a/sample/sample20-join-without-relation/entity/Post.ts +++ b/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() diff --git a/sample/sample21-custom-join-table-column/entity/Author.ts b/sample/sample21-custom-join-table-column/entity/Author.ts index ca16e5aa4..1d4b47ef4 100644 --- a/sample/sample21-custom-join-table-column/entity/Author.ts +++ b/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() diff --git a/sample/sample21-custom-join-table-column/entity/Category.ts b/sample/sample21-custom-join-table-column/entity/Category.ts index c68df2ead..753803947 100644 --- a/sample/sample21-custom-join-table-column/entity/Category.ts +++ b/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() diff --git a/sample/sample21-custom-join-table-column/entity/Post.ts b/sample/sample21-custom-join-table-column/entity/Post.ts index d804dc01f..9c6a4aa6b 100644 --- a/sample/sample21-custom-join-table-column/entity/Post.ts +++ b/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() diff --git a/sample/sample22-closure-table/entity/Category.ts b/sample/sample22-closure-table/entity/Category.ts index 607b94936..0a9b40632 100644 --- a/sample/sample22-closure-table/entity/Category.ts +++ b/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() diff --git a/sample/sample23-nested-joins/entity/Author.ts b/sample/sample23-nested-joins/entity/Author.ts index 1e16dc53c..50231a4bf 100644 --- a/sample/sample23-nested-joins/entity/Author.ts +++ b/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() diff --git a/sample/sample23-nested-joins/entity/Category.ts b/sample/sample23-nested-joins/entity/Category.ts index 06bca3526..4b8979493 100644 --- a/sample/sample23-nested-joins/entity/Category.ts +++ b/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() diff --git a/sample/sample23-nested-joins/entity/Post.ts b/sample/sample23-nested-joins/entity/Post.ts index 7be6d88ea..61f860e2c 100644 --- a/sample/sample23-nested-joins/entity/Post.ts +++ b/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() diff --git a/sample/sample25-insert-from-inverse-side/entity/Author.ts b/sample/sample25-insert-from-inverse-side/entity/Author.ts index ef182b33c..136959fef 100644 --- a/sample/sample25-insert-from-inverse-side/entity/Author.ts +++ b/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() diff --git a/sample/sample25-insert-from-inverse-side/entity/Post.ts b/sample/sample25-insert-from-inverse-side/entity/Post.ts index dc66c4bee..74b969291 100644 --- a/sample/sample25-insert-from-inverse-side/entity/Post.ts +++ b/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() diff --git a/sample/sample26-embedded-tables/entity/Counters.ts b/sample/sample26-embedded-tables/entity/Counters.ts index 71e3d241d..3e6f2afab 100644 --- a/sample/sample26-embedded-tables/entity/Counters.ts +++ b/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() diff --git a/sample/sample26-embedded-tables/entity/Post.ts b/sample/sample26-embedded-tables/entity/Post.ts index d2ce57016..e6f2ef1f5 100644 --- a/sample/sample26-embedded-tables/entity/Post.ts +++ b/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() diff --git a/sample/sample26-embedded-tables/entity/Question.ts b/sample/sample26-embedded-tables/entity/Question.ts index b680d2aa8..777799d31 100644 --- a/sample/sample26-embedded-tables/entity/Question.ts +++ b/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() diff --git a/sample/sample27-composite-primary-keys/entity/Post.ts b/sample/sample27-composite-primary-keys/entity/Post.ts index 3ceeb6164..eaae5fc7a 100644 --- a/sample/sample27-composite-primary-keys/entity/Post.ts +++ b/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") diff --git a/sample/sample28-single-table-inheritance/entity/Employee.ts b/sample/sample28-single-table-inheritance/entity/Employee.ts index f8ce9390d..4fa52cf65 100644 --- a/sample/sample28-single-table-inheritance/entity/Employee.ts +++ b/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() diff --git a/sample/sample28-single-table-inheritance/entity/Homesitter.ts b/sample/sample28-single-table-inheritance/entity/Homesitter.ts index cc183f4f6..04cb47f11 100644 --- a/sample/sample28-single-table-inheritance/entity/Homesitter.ts +++ b/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 { diff --git a/sample/sample28-single-table-inheritance/entity/Person.ts b/sample/sample28-single-table-inheritance/entity/Person.ts index a2eeaeab8..0d45de5d5 100644 --- a/sample/sample28-single-table-inheritance/entity/Person.ts +++ b/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 { diff --git a/sample/sample28-single-table-inheritance/entity/Student.ts b/sample/sample28-single-table-inheritance/entity/Student.ts index aecc2aca5..849dfac1c 100644 --- a/sample/sample28-single-table-inheritance/entity/Student.ts +++ b/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() diff --git a/sample/sample29-class-table-inheritance/entity/Employee.ts b/sample/sample29-class-table-inheritance/entity/Employee.ts index d72de6691..fc17976e0 100644 --- a/sample/sample29-class-table-inheritance/entity/Employee.ts +++ b/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() diff --git a/sample/sample29-class-table-inheritance/entity/Homesitter.ts b/sample/sample29-class-table-inheritance/entity/Homesitter.ts index de2e96f0d..aa7d4a207 100644 --- a/sample/sample29-class-table-inheritance/entity/Homesitter.ts +++ b/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 { diff --git a/sample/sample29-class-table-inheritance/entity/Person.ts b/sample/sample29-class-table-inheritance/entity/Person.ts index 2b38ece16..8c7a40e2d 100644 --- a/sample/sample29-class-table-inheritance/entity/Person.ts +++ b/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 { diff --git a/sample/sample29-class-table-inheritance/entity/Student.ts b/sample/sample29-class-table-inheritance/entity/Student.ts index 13c164ecc..4baf7c113 100644 --- a/sample/sample29-class-table-inheritance/entity/Student.ts +++ b/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() diff --git a/sample/sample3-many-to-one/entity/Post.ts b/sample/sample3-many-to-one/entity/Post.ts index 5d8a11c48..81087a813 100644 --- a/sample/sample3-many-to-one/entity/Post.ts +++ b/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() diff --git a/sample/sample3-many-to-one/entity/PostAuthor.ts b/sample/sample3-many-to-one/entity/PostAuthor.ts index 3af28124c..8d72ea981 100644 --- a/sample/sample3-many-to-one/entity/PostAuthor.ts +++ b/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() diff --git a/sample/sample3-many-to-one/entity/PostCategory.ts b/sample/sample3-many-to-one/entity/PostCategory.ts index 2790ff2d8..42974b404 100644 --- a/sample/sample3-many-to-one/entity/PostCategory.ts +++ b/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() diff --git a/sample/sample3-many-to-one/entity/PostDetails.ts b/sample/sample3-many-to-one/entity/PostDetails.ts index f0fb0ec3a..2787dd162 100644 --- a/sample/sample3-many-to-one/entity/PostDetails.ts +++ b/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() diff --git a/sample/sample3-many-to-one/entity/PostImage.ts b/sample/sample3-many-to-one/entity/PostImage.ts index 8880686b1..3d7c54813 100644 --- a/sample/sample3-many-to-one/entity/PostImage.ts +++ b/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() diff --git a/sample/sample3-many-to-one/entity/PostInformation.ts b/sample/sample3-many-to-one/entity/PostInformation.ts index 0676f3dd6..339d3f05a 100644 --- a/sample/sample3-many-to-one/entity/PostInformation.ts +++ b/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() diff --git a/sample/sample3-many-to-one/entity/PostMetadata.ts b/sample/sample3-many-to-one/entity/PostMetadata.ts index 7fa9cb4f4..b2025beae 100644 --- a/sample/sample3-many-to-one/entity/PostMetadata.ts +++ b/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() diff --git a/sample/sample30-default-order-by/entity/Category.ts b/sample/sample30-default-order-by/entity/Category.ts index 92df367d8..debec214c 100644 --- a/sample/sample30-default-order-by/entity/Category.ts +++ b/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() diff --git a/sample/sample30-default-order-by/entity/Post.ts b/sample/sample30-default-order-by/entity/Post.ts index 447979593..d99f2d8d1 100644 --- a/sample/sample30-default-order-by/entity/Post.ts +++ b/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" diff --git a/sample/sample31-table-prefix/entity/Author.ts b/sample/sample31-table-prefix/entity/Author.ts index 912e0d13f..7900b50e2 100644 --- a/sample/sample31-table-prefix/entity/Author.ts +++ b/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() diff --git a/sample/sample31-table-prefix/entity/Category.ts b/sample/sample31-table-prefix/entity/Category.ts index 0a2506e80..b58365aa5 100644 --- a/sample/sample31-table-prefix/entity/Category.ts +++ b/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() diff --git a/sample/sample31-table-prefix/entity/Post.ts b/sample/sample31-table-prefix/entity/Post.ts index 947d090a2..7e969de14 100644 --- a/sample/sample31-table-prefix/entity/Post.ts +++ b/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() diff --git a/sample/sample32-migrations/entity/Author.ts b/sample/sample32-migrations/entity/Author.ts index d90e0bed5..fe617b41f 100644 --- a/sample/sample32-migrations/entity/Author.ts +++ b/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() diff --git a/sample/sample32-migrations/entity/Post.ts b/sample/sample32-migrations/entity/Post.ts index b26af6d5a..b71506acb 100644 --- a/sample/sample32-migrations/entity/Post.ts +++ b/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() diff --git a/sample/sample4-many-to-many/entity/Post.ts b/sample/sample4-many-to-many/entity/Post.ts index 06629f73a..0b2df187e 100644 --- a/sample/sample4-many-to-many/entity/Post.ts +++ b/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() diff --git a/sample/sample4-many-to-many/entity/PostAuthor.ts b/sample/sample4-many-to-many/entity/PostAuthor.ts index 6034b1a63..f117f32a4 100644 --- a/sample/sample4-many-to-many/entity/PostAuthor.ts +++ b/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() diff --git a/sample/sample4-many-to-many/entity/PostCategory.ts b/sample/sample4-many-to-many/entity/PostCategory.ts index adfe98595..c416d7467 100644 --- a/sample/sample4-many-to-many/entity/PostCategory.ts +++ b/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() diff --git a/sample/sample4-many-to-many/entity/PostDetails.ts b/sample/sample4-many-to-many/entity/PostDetails.ts index 3ebc7f4d5..2fe109ccc 100644 --- a/sample/sample4-many-to-many/entity/PostDetails.ts +++ b/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() diff --git a/sample/sample4-many-to-many/entity/PostImage.ts b/sample/sample4-many-to-many/entity/PostImage.ts index 184ef046c..ba73ef5d5 100644 --- a/sample/sample4-many-to-many/entity/PostImage.ts +++ b/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() diff --git a/sample/sample4-many-to-many/entity/PostInformation.ts b/sample/sample4-many-to-many/entity/PostInformation.ts index a9425ce66..ee5c89aa5 100644 --- a/sample/sample4-many-to-many/entity/PostInformation.ts +++ b/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() diff --git a/sample/sample4-many-to-many/entity/PostMetadata.ts b/sample/sample4-many-to-many/entity/PostMetadata.ts index 039519bbf..9f46fe594 100644 --- a/sample/sample4-many-to-many/entity/PostMetadata.ts +++ b/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() diff --git a/sample/sample5-subscribers/entity/Post.ts b/sample/sample5-subscribers/entity/Post.ts index 9d28e68e5..81577d7d1 100644 --- a/sample/sample5-subscribers/entity/Post.ts +++ b/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() diff --git a/sample/sample5-subscribers/entity/PostAuthor.ts b/sample/sample5-subscribers/entity/PostAuthor.ts index 2700aab26..2a9356185 100644 --- a/sample/sample5-subscribers/entity/PostAuthor.ts +++ b/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() diff --git a/sample/sample5-subscribers/entity/PostCategory.ts b/sample/sample5-subscribers/entity/PostCategory.ts index 24e172a55..ffc09111c 100644 --- a/sample/sample5-subscribers/entity/PostCategory.ts +++ b/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() diff --git a/sample/sample6-abstract-table/entity/BasePost.ts b/sample/sample6-abstract-table/entity/BasePost.ts index 0a9a39511..455a73c46 100644 --- a/sample/sample6-abstract-table/entity/BasePost.ts +++ b/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() diff --git a/sample/sample6-abstract-table/entity/Blog.ts b/sample/sample6-abstract-table/entity/Blog.ts index ff57f09cb..e3d4a2bbd 100644 --- a/sample/sample6-abstract-table/entity/Blog.ts +++ b/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() diff --git a/sample/sample6-abstract-table/entity/Post.ts b/sample/sample6-abstract-table/entity/Post.ts index 4ab93b0c2..1753c7948 100644 --- a/sample/sample6-abstract-table/entity/Post.ts +++ b/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() diff --git a/sample/sample6-abstract-table/entity/PostAuthor.ts b/sample/sample6-abstract-table/entity/PostAuthor.ts index fb28ce301..06d9e5f35 100644 --- a/sample/sample6-abstract-table/entity/PostAuthor.ts +++ b/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() diff --git a/sample/sample6-abstract-table/entity/PostCategory.ts b/sample/sample6-abstract-table/entity/PostCategory.ts index a0621b997..ed4b4872c 100644 --- a/sample/sample6-abstract-table/entity/PostCategory.ts +++ b/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() diff --git a/sample/sample7-pagination/entity/Post.ts b/sample/sample7-pagination/entity/Post.ts index bd36a879a..b030350d0 100644 --- a/sample/sample7-pagination/entity/Post.ts +++ b/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() diff --git a/sample/sample7-pagination/entity/PostAuthor.ts b/sample/sample7-pagination/entity/PostAuthor.ts index 04df80216..e65bb0f94 100644 --- a/sample/sample7-pagination/entity/PostAuthor.ts +++ b/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() diff --git a/sample/sample7-pagination/entity/PostCategory.ts b/sample/sample7-pagination/entity/PostCategory.ts index fd89dd124..ae32a8650 100644 --- a/sample/sample7-pagination/entity/PostCategory.ts +++ b/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() diff --git a/sample/sample8-self-referencing/entity/Category.ts b/sample/sample8-self-referencing/entity/Category.ts index 084aa13bf..1d1ed1153 100644 --- a/sample/sample8-self-referencing/entity/Category.ts +++ b/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() diff --git a/sample/sample9-entity-listeners/entity/Post.ts b/sample/sample9-entity-listeners/entity/Post.ts index f6b64c708..3e3a905cb 100644 --- a/sample/sample9-entity-listeners/entity/Post.ts +++ b/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() diff --git a/sample/sample9-entity-listeners/entity/PostAuthor.ts b/sample/sample9-entity-listeners/entity/PostAuthor.ts index 8f087ae9d..753a7b4d9 100644 --- a/sample/sample9-entity-listeners/entity/PostAuthor.ts +++ b/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() diff --git a/sample/sample9-entity-listeners/entity/PostCategory.ts b/sample/sample9-entity-listeners/entity/PostCategory.ts index b98f980ea..e5293134d 100644 --- a/sample/sample9-entity-listeners/entity/PostCategory.ts +++ b/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() diff --git a/src/decorator/entity/AbstractEntity.ts b/src/decorator/entity/AbstractEntity.ts new file mode 100644 index 000000000..45eca36b1 --- /dev/null +++ b/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); + }; +} \ No newline at end of file diff --git a/src/decorator/entity/ClassEntityChild.ts b/src/decorator/entity/ClassEntityChild.ts new file mode 100644 index 000000000..7f7cd4358 --- /dev/null +++ b/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); + }; +} \ No newline at end of file diff --git a/src/decorator/entity/ClosureEntity.ts b/src/decorator/entity/ClosureEntity.ts new file mode 100644 index 000000000..b58f5fc15 --- /dev/null +++ b/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); + }; +} diff --git a/src/decorator/entity/EmbeddableEntity.ts b/src/decorator/entity/EmbeddableEntity.ts new file mode 100644 index 000000000..434ac6c46 --- /dev/null +++ b/src/decorator/entity/EmbeddableEntity.ts @@ -0,0 +1,16 @@ +import {getMetadataArgsStorage} from "../../index"; +import {TableMetadataArgs} from "../../metadata-args/TableMetadataArgs"; + +/** + * This decorator is used on the entities that must be embedded into another entities. + */ +export function EmbeddableEntity(): Function { + return function (target: Function) { + const args: TableMetadataArgs = { + target: target, + type: "embeddable", + orderBy: undefined + }; + getMetadataArgsStorage().tables.add(args); + }; +} diff --git a/src/decorator/entity/Entity.ts b/src/decorator/entity/Entity.ts new file mode 100644 index 000000000..e3b91a04c --- /dev/null +++ b/src/decorator/entity/Entity.ts @@ -0,0 +1,21 @@ +import {getMetadataArgsStorage} from "../../index"; +import {TableMetadataArgs} from "../../metadata-args/TableMetadataArgs"; +import {EntityOptions} from "../options/EntityOptions"; + +/** + * This decorator is used to mark classes that will be an entity (table or document depend on database type). + * Database schema will be created for all classes decorated with it, and Repository can be retrieved and used for it. + */ +export function Entity(name?: string, options?: EntityOptions) { + return function (target: Function) { + const args: TableMetadataArgs = { + target: target, + name: name, + type: "regular", + orderBy: options && options.orderBy ? options.orderBy : undefined, + engine: options && options.engine ? options.engine : undefined, + skipSchemaSync: !!(options && options.skipSchemaSync === true) + }; + getMetadataArgsStorage().tables.add(args); + }; +} diff --git a/src/decorator/entity/SingleEntityChild.ts b/src/decorator/entity/SingleEntityChild.ts new file mode 100644 index 000000000..abb35ec3b --- /dev/null +++ b/src/decorator/entity/SingleEntityChild.ts @@ -0,0 +1,17 @@ +import {getMetadataArgsStorage} from "../../index"; +import {TableMetadataArgs} from "../../metadata-args/TableMetadataArgs"; + +/** + * Special type of the table used in the single-table inherited tables. + */ +export function SingleEntityChild() { + return function (target: Function) { + const args: TableMetadataArgs = { + target: target, + name: undefined, + type: "single-table-child", + orderBy: undefined + }; + getMetadataArgsStorage().tables.add(args); + }; +} \ No newline at end of file diff --git a/src/decorator/tables/TableInheritance.ts b/src/decorator/entity/TableInheritance.ts similarity index 100% rename from src/decorator/tables/TableInheritance.ts rename to src/decorator/entity/TableInheritance.ts diff --git a/src/decorator/options/TableOptions.ts b/src/decorator/options/EntityOptions.ts similarity index 91% rename from src/decorator/options/TableOptions.ts rename to src/decorator/options/EntityOptions.ts index 5df846901..fc51796c8 100644 --- a/src/decorator/options/TableOptions.ts +++ b/src/decorator/options/EntityOptions.ts @@ -1,9 +1,9 @@ import {OrderByCondition} from "../../find-options/OrderByCondition"; /** - * Describes all column's options. + * Describes all entity's options. */ -export interface TableOptions { +export interface EntityOptions { /** * Specifies a default order by used for queries from this table when no explicit order by is specified. diff --git a/src/decorator/tables/AbstractTable.ts b/src/decorator/tables/AbstractTable.ts index b8ae368e0..04eb4aec8 100644 --- a/src/decorator/tables/AbstractTable.ts +++ b/src/decorator/tables/AbstractTable.ts @@ -4,6 +4,8 @@ import {TableMetadataArgs} from "../../metadata-args/TableMetadataArgs"; /** * Abstract table is a table that contains columns and relations for all tables that will inherit this table. * Database table for the abstract table is not created. + * + * @deprecated */ export function AbstractTable() { return function (target: Function) { diff --git a/src/decorator/tables/ClassTableChild.ts b/src/decorator/tables/ClassTableChild.ts index c4045c939..a46950870 100644 --- a/src/decorator/tables/ClassTableChild.ts +++ b/src/decorator/tables/ClassTableChild.ts @@ -1,11 +1,13 @@ import {getMetadataArgsStorage} from "../../index"; import {TableMetadataArgs} from "../../metadata-args/TableMetadataArgs"; -import {TableOptions} from "../options/TableOptions"; +import {EntityOptions} from "../options/EntityOptions"; /** * Special type of the table used in the class-table inherited tables. + * + * @deprecated */ -export function ClassTableChild(tableName?: string, options?: TableOptions) { +export function ClassTableChild(tableName?: string, options?: EntityOptions) { return function (target: Function) { const args: TableMetadataArgs = { target: target, diff --git a/src/decorator/tables/ClosureTable.ts b/src/decorator/tables/ClosureTable.ts index 48cbc7b05..b62a84034 100644 --- a/src/decorator/tables/ClosureTable.ts +++ b/src/decorator/tables/ClosureTable.ts @@ -1,11 +1,13 @@ import {getMetadataArgsStorage} from "../../index"; import {TableMetadataArgs} from "../../metadata-args/TableMetadataArgs"; -import {TableOptions} from "../options/TableOptions"; +import {EntityOptions} from "../options/EntityOptions"; /** * Used on a tables that stores its children in a tree using closure deisgn pattern. + * + * @deprecated */ -export function ClosureTable(name?: string, options?: TableOptions) { +export function ClosureTable(name?: string, options?: EntityOptions) { return function (target: Function) { const args: TableMetadataArgs = { target: target, diff --git a/src/decorator/tables/EmbeddableTable.ts b/src/decorator/tables/EmbeddableTable.ts index b4ac804a4..cf73c708c 100644 --- a/src/decorator/tables/EmbeddableTable.ts +++ b/src/decorator/tables/EmbeddableTable.ts @@ -3,6 +3,8 @@ import {TableMetadataArgs} from "../../metadata-args/TableMetadataArgs"; /** * This decorators is used on the entities that must be embedded into the tables. + * + * @deprecated */ export function EmbeddableTable(): Function { return function (target: Function) { diff --git a/src/decorator/tables/SingleTableChild.ts b/src/decorator/tables/SingleTableChild.ts index 56fa67155..4abcd655a 100644 --- a/src/decorator/tables/SingleTableChild.ts +++ b/src/decorator/tables/SingleTableChild.ts @@ -3,6 +3,8 @@ import {TableMetadataArgs} from "../../metadata-args/TableMetadataArgs"; /** * Special type of the table used in the single-table inherited tables. + * + * @deprecated */ export function SingleTableChild() { return function (target: Function) { diff --git a/src/decorator/tables/Table.ts b/src/decorator/tables/Table.ts index 1731e8638..14144fe9e 100644 --- a/src/decorator/tables/Table.ts +++ b/src/decorator/tables/Table.ts @@ -1,12 +1,14 @@ import {getMetadataArgsStorage} from "../../index"; import {TableMetadataArgs} from "../../metadata-args/TableMetadataArgs"; -import {TableOptions} from "../options/TableOptions"; +import {EntityOptions} from "../options/EntityOptions"; /** * This decorator is used to mark classes that will be a tables. Database schema will be created for all classes * decorated with it, and Repository can be retrieved and used for it. + * + * @deprecated */ -export function Table(name?: string, options?: TableOptions) { +export function Table(name?: string, options?: EntityOptions) { return function (target: Function) { const args: TableMetadataArgs = { target: target, diff --git a/src/index.ts b/src/index.ts index 947f5da14..6d9d7248e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -36,7 +36,7 @@ export * from "./decorator/options/IndexOptions"; export * from "./decorator/options/JoinColumnOptions"; export * from "./decorator/options/JoinTableOptions"; export * from "./decorator/options/RelationOptions"; -export * from "./decorator/options/TableOptions"; +export * from "./decorator/options/EntityOptions"; export * from "./decorator/relations/RelationCount"; export * from "./decorator/relations/JoinColumn"; export * from "./decorator/relations/JoinTable"; @@ -46,19 +46,19 @@ export * from "./decorator/relations/OneToMany"; export * from "./decorator/relations/OneToOne"; export * from "./decorator/relations/RelationCount"; export * from "./decorator/relations/RelationId"; -export * from "./decorator/tables/Table"; -export * from "./decorator/tables/AbstractTable"; -export * from "./decorator/tables/ClassTableChild"; -export * from "./decorator/tables/ClosureTable"; -export * from "./decorator/tables/EmbeddableTable"; -export * from "./decorator/tables/SingleTableChild"; -export * from "./decorator/tables/Table"; +export * from "./decorator/entity/Entity"; +export * from "./decorator/entity/AbstractEntity"; +export * from "./decorator/entity/ClassEntityChild"; +export * from "./decorator/entity/ClosureEntity"; +export * from "./decorator/entity/EmbeddableEntity"; +export * from "./decorator/entity/SingleEntityChild"; +export * from "./decorator/entity/Entity"; +export * from "./decorator/entity/TableInheritance"; export * from "./decorator/tree/TreeLevelColumn"; export * from "./decorator/tree/TreeParent"; export * from "./decorator/tree/TreeChildren"; export * from "./decorator/Index"; export * from "./decorator/NamingStrategy"; -export * from "./decorator/tables/TableInheritance"; export * from "./decorator/Embedded"; export * from "./decorator/DiscriminatorValue"; export * from "./schema-builder/schema/ColumnSchema"; @@ -87,6 +87,18 @@ export {UpdateEvent} from "./subscriber/event/UpdateEvent"; export {RemoveEvent} from "./subscriber/event/RemoveEvent"; export {EntitySubscriberInterface} from "./subscriber/EntitySubscriberInterface"; +// ------------------------------------------------------------------------- +// Deprecated +// ------------------------------------------------------------------------- + +export * from "./decorator/tables/Table"; +export * from "./decorator/tables/AbstractTable"; +export * from "./decorator/tables/ClassTableChild"; +export * from "./decorator/tables/ClosureTable"; +export * from "./decorator/tables/EmbeddableTable"; +export * from "./decorator/tables/SingleTableChild"; +export * from "./decorator/tables/Table"; + // ------------------------------------------------------------------------- // Commonly used functionality // ------------------------------------------------------------------------- diff --git a/test/functional/cascades/cascade-insert-from-both-sides/entity/Post.ts b/test/functional/cascades/cascade-insert-from-both-sides/entity/Post.ts index 298fa8607..802a8f66b 100644 --- a/test/functional/cascades/cascade-insert-from-both-sides/entity/Post.ts +++ b/test/functional/cascades/cascade-insert-from-both-sides/entity/Post.ts @@ -1,11 +1,11 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {Column} from "../../../../../src/decorator/columns/Column"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {PostDetails} from "./PostDetails"; import {OneToOne} from "../../../../../src/decorator/relations/OneToOne"; import {JoinColumn} from "../../../../../src/decorator/relations/JoinColumn"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/functional/cascades/cascade-insert-from-both-sides/entity/PostDetails.ts b/test/functional/cascades/cascade-insert-from-both-sides/entity/PostDetails.ts index 60f076259..54400aeca 100644 --- a/test/functional/cascades/cascade-insert-from-both-sides/entity/PostDetails.ts +++ b/test/functional/cascades/cascade-insert-from-both-sides/entity/PostDetails.ts @@ -1,9 +1,9 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryColumn} from "../../../../../src/decorator/columns/PrimaryColumn"; import {Post} from "./Post"; import {OneToOne} from "../../../../../src/decorator/relations/OneToOne"; -@Table() +@Entity() export class PostDetails { @PrimaryColumn() diff --git a/test/functional/connection-manager/connection-manager.ts b/test/functional/connection-manager/connection-manager.ts index 5cec7ad00..3fd6d1cd1 100644 --- a/test/functional/connection-manager/connection-manager.ts +++ b/test/functional/connection-manager/connection-manager.ts @@ -6,11 +6,11 @@ import {ConnectionManager} from "../../../src/connection/ConnectionManager"; import {MysqlDriver} from "../../../src/driver/mysql/MysqlDriver"; import {PrimaryGeneratedColumn} from "../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../src/decorator/columns/Column"; -import {Table} from "../../../src/decorator/tables/Table"; +import {Entity} from "../../../src/decorator/entity/Entity"; describe("ConnectionManager", () => { - @Table() + @Entity() class Post { @PrimaryGeneratedColumn() diff --git a/test/functional/connection/entity/Category.ts b/test/functional/connection/entity/Category.ts index e2454d395..c3d6f1422 100644 --- a/test/functional/connection/entity/Category.ts +++ b/test/functional/connection/entity/Category.ts @@ -1,11 +1,11 @@ -import {ClosureTable} from "../../../../src/decorator/tables/ClosureTable"; +import {ClosureEntity} from "../../../../src/decorator/entity/ClosureEntity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {TreeParent} from "../../../../src/decorator/tree/TreeParent"; import {TreeChildren} from "../../../../src/decorator/tree/TreeChildren"; import {TreeLevelColumn} from "../../../../src/decorator/tree/TreeLevelColumn"; -@ClosureTable("CaTeGoRy") +@ClosureEntity("CaTeGoRy") export class Category { @PrimaryGeneratedColumn() diff --git a/test/functional/connection/entity/Post.ts b/test/functional/connection/entity/Post.ts index 403f01aac..220070f27 100644 --- a/test/functional/connection/entity/Post.ts +++ b/test/functional/connection/entity/Post.ts @@ -1,8 +1,8 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/functional/connection/entity/View.ts b/test/functional/connection/entity/View.ts index 3227b76bf..5ca3b7b97 100644 --- a/test/functional/connection/entity/View.ts +++ b/test/functional/connection/entity/View.ts @@ -1,8 +1,8 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryColumn} from "../../../../src/decorator/columns/PrimaryColumn"; import {Column} from "../../../../src/decorator/columns/Column"; -@Table("view", {skipSchemaSync: true}) +@Entity("view", {skipSchemaSync: true}) export class View { @PrimaryColumn() diff --git a/test/functional/connection/modules/blog/entity/Blog.ts b/test/functional/connection/modules/blog/entity/Blog.ts index 75fc8e8c8..5dc03829c 100644 --- a/test/functional/connection/modules/blog/entity/Blog.ts +++ b/test/functional/connection/modules/blog/entity/Blog.ts @@ -1,8 +1,8 @@ -import {Table} from "../../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class Blog { @PrimaryGeneratedColumn() diff --git a/test/functional/connection/modules/question/entity/Question.ts b/test/functional/connection/modules/question/entity/Question.ts index d3b9f7ad9..7228209b8 100644 --- a/test/functional/connection/modules/question/entity/Question.ts +++ b/test/functional/connection/modules/question/entity/Question.ts @@ -1,8 +1,8 @@ -import {Table} from "../../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class Question { @PrimaryGeneratedColumn() diff --git a/test/functional/connection/modules/video/entity/Video.ts b/test/functional/connection/modules/video/entity/Video.ts index 000e09347..8215f46f6 100644 --- a/test/functional/connection/modules/video/entity/Video.ts +++ b/test/functional/connection/modules/video/entity/Video.ts @@ -1,8 +1,8 @@ -import {Table} from "../../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class Video { @PrimaryGeneratedColumn() diff --git a/test/functional/decorators/embedded/entity/Counters.ts b/test/functional/decorators/embedded/entity/Counters.ts index 32a11cbd8..7443f9b34 100644 --- a/test/functional/decorators/embedded/entity/Counters.ts +++ b/test/functional/decorators/embedded/entity/Counters.ts @@ -1,7 +1,7 @@ import {Column} from "../../../../../src/decorator/columns/Column"; -import {EmbeddableTable} from "../../../../../src/decorator/tables/EmbeddableTable"; +import {EmbeddableEntity} from "../../../../../src/decorator/entity/EmbeddableEntity"; -@EmbeddableTable() +@EmbeddableEntity() export class Counters { @Column() diff --git a/test/functional/decorators/embedded/entity/Post.ts b/test/functional/decorators/embedded/entity/Post.ts index 885ac1433..15c11d033 100644 --- a/test/functional/decorators/embedded/entity/Post.ts +++ b/test/functional/decorators/embedded/entity/Post.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {Counters} from "./Counters"; import {Embedded} from "../../../../../src/decorator/Embedded"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/functional/decorators/relation-count/entity/Category.ts b/test/functional/decorators/relation-count/entity/Category.ts index 3a0d6b9f2..0095127bd 100644 --- a/test/functional/decorators/relation-count/entity/Category.ts +++ b/test/functional/decorators/relation-count/entity/Category.ts @@ -1,8 +1,8 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/functional/decorators/relation-count/entity/Post.ts b/test/functional/decorators/relation-count/entity/Post.ts index 353480223..e70cd745e 100644 --- a/test/functional/decorators/relation-count/entity/Post.ts +++ b/test/functional/decorators/relation-count/entity/Post.ts @@ -1,6 +1,6 @@ import {Category} from "./Category"; import {ManyToMany} from "../../../../../src/decorator/relations/ManyToMany"; -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {Tag} from "./Tag"; @@ -8,7 +8,7 @@ import {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne"; import {JoinTable} from "../../../../../src/decorator/relations/JoinTable"; import {RelationCount} from "../../../../../src/decorator/relations/RelationCount"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/functional/decorators/relation-count/entity/Tag.ts b/test/functional/decorators/relation-count/entity/Tag.ts index 673412564..a7b2cea4b 100644 --- a/test/functional/decorators/relation-count/entity/Tag.ts +++ b/test/functional/decorators/relation-count/entity/Tag.ts @@ -1,11 +1,11 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {OneToMany} from "../../../../../src/decorator/relations/OneToMany"; import {Post} from "./Post"; import {RelationCount} from "../../../../../src/decorator/relations/RelationCount"; -@Table() +@Entity() export class Tag { @PrimaryGeneratedColumn() diff --git a/test/functional/decorators/relation-id/entity/Category.ts b/test/functional/decorators/relation-id/entity/Category.ts index 3a0d6b9f2..0095127bd 100644 --- a/test/functional/decorators/relation-id/entity/Category.ts +++ b/test/functional/decorators/relation-id/entity/Category.ts @@ -1,8 +1,8 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/functional/decorators/relation-id/entity/Post.ts b/test/functional/decorators/relation-id/entity/Post.ts index 0d47214a8..324e17768 100644 --- a/test/functional/decorators/relation-id/entity/Post.ts +++ b/test/functional/decorators/relation-id/entity/Post.ts @@ -1,6 +1,6 @@ import {Category} from "./Category"; import {ManyToMany} from "../../../../../src/decorator/relations/ManyToMany"; -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {Tag} from "./Tag"; @@ -8,7 +8,7 @@ import {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne"; import {RelationId} from "../../../../../src/decorator/relations/RelationId"; import {JoinTable} from "../../../../../src/decorator/relations/JoinTable"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/functional/decorators/relation-id/entity/Tag.ts b/test/functional/decorators/relation-id/entity/Tag.ts index 672ed2c6a..649ed21d4 100644 --- a/test/functional/decorators/relation-id/entity/Tag.ts +++ b/test/functional/decorators/relation-id/entity/Tag.ts @@ -1,8 +1,8 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class Tag { @PrimaryGeneratedColumn() diff --git a/test/functional/embedded/entity/Counters.ts b/test/functional/embedded/entity/Counters.ts index 4caaf467f..51a319b9c 100644 --- a/test/functional/embedded/entity/Counters.ts +++ b/test/functional/embedded/entity/Counters.ts @@ -1,7 +1,7 @@ -import {EmbeddableTable} from "../../../../src/decorator/tables/EmbeddableTable"; +import {EmbeddableEntity} from "../../../../src/decorator/entity/EmbeddableEntity"; import {Column} from "../../../../src/decorator/columns/Column"; -@EmbeddableTable() +@EmbeddableEntity() export class Counters { @Column() diff --git a/test/functional/embedded/entity/Post.ts b/test/functional/embedded/entity/Post.ts index 684183c50..169c39627 100644 --- a/test/functional/embedded/entity/Post.ts +++ b/test/functional/embedded/entity/Post.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {Embedded} from "../../../../src/decorator/Embedded"; import {Counters} from "./Counters"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/functional/indices/basic-unique-index-test/entity/Customer.ts b/test/functional/indices/basic-unique-index-test/entity/Customer.ts index 0a4233bb2..000d2ee68 100644 --- a/test/functional/indices/basic-unique-index-test/entity/Customer.ts +++ b/test/functional/indices/basic-unique-index-test/entity/Customer.ts @@ -1,9 +1,9 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {Index} from "../../../../../src/decorator/Index"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; -@Table() +@Entity() @Index("index_name_english", ["nameEnglish"], { unique: true }) export class Customer { diff --git a/test/functional/json/entity/Record.ts b/test/functional/json/entity/Record.ts index 439371087..473424417 100644 --- a/test/functional/json/entity/Record.ts +++ b/test/functional/json/entity/Record.ts @@ -1,11 +1,11 @@ -import { Table } from "../../../../src/decorator/tables/Table"; +import { Entity } from "../../../../src/decorator/entity/Entity"; import { PrimaryGeneratedColumn } from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import { Column } from "../../../../src/decorator/columns/Column"; /** * For testing Postgres jsonb */ -@Table() +@Entity() export class Record { @PrimaryGeneratedColumn() diff --git a/test/functional/lazy-relations/entity/Category.ts b/test/functional/lazy-relations/entity/Category.ts index f2b454768..818486488 100644 --- a/test/functional/lazy-relations/entity/Category.ts +++ b/test/functional/lazy-relations/entity/Category.ts @@ -1,11 +1,11 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {Post} from "./Post"; import {ManyToMany} from "../../../../src/decorator/relations/ManyToMany"; import {OneToMany} from "../../../../src/decorator/relations/OneToMany"; -@Table() +@Entity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/functional/lazy-relations/entity/Post.ts b/test/functional/lazy-relations/entity/Post.ts index 96764f43e..84a6a9555 100644 --- a/test/functional/lazy-relations/entity/Post.ts +++ b/test/functional/lazy-relations/entity/Post.ts @@ -1,4 +1,4 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {Category} from "./Category"; @@ -6,7 +6,7 @@ import {ManyToMany} from "../../../../src/decorator/relations/ManyToMany"; import {JoinTable} from "../../../../src/decorator/relations/JoinTable"; import {ManyToOne} from "../../../../src/decorator/relations/ManyToOne"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/functional/persistence/cascade-operations/entity/Category.ts b/test/functional/persistence/cascade-operations/entity/Category.ts index ae8cb62f6..13f38de9a 100644 --- a/test/functional/persistence/cascade-operations/entity/Category.ts +++ b/test/functional/persistence/cascade-operations/entity/Category.ts @@ -1,4 +1,4 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {Post} from "./Post"; @@ -10,7 +10,7 @@ import {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne"; import {OneToOne} from "../../../../../src/decorator/relations/OneToOne"; import {JoinColumn} from "../../../../../src/decorator/relations/JoinColumn"; -@Table() +@Entity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/functional/persistence/cascade-operations/entity/Photo.ts b/test/functional/persistence/cascade-operations/entity/Photo.ts index 6f1ddf8d3..7fd939b7a 100644 --- a/test/functional/persistence/cascade-operations/entity/Photo.ts +++ b/test/functional/persistence/cascade-operations/entity/Photo.ts @@ -1,4 +1,4 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne"; @@ -6,7 +6,7 @@ import {Post} from "../entity/Post"; import {Category} from "../entity/Category"; import {ManyToMany} from "../../../../../src/decorator/relations/ManyToMany"; -@Table() +@Entity() export class Photo { @PrimaryGeneratedColumn() diff --git a/test/functional/persistence/cascade-operations/entity/Post.ts b/test/functional/persistence/cascade-operations/entity/Post.ts index a0723c5f7..579e532fb 100644 --- a/test/functional/persistence/cascade-operations/entity/Post.ts +++ b/test/functional/persistence/cascade-operations/entity/Post.ts @@ -1,4 +1,4 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne"; @@ -8,7 +8,7 @@ import {ManyToMany} from "../../../../../src/decorator/relations/ManyToMany"; import {JoinTable} from "../../../../../src/decorator/relations/JoinTable"; import {OneToOne} from "../../../../../src/decorator/relations/OneToOne"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/functional/persistence/custom-column-name-pk/entity/Category.ts b/test/functional/persistence/custom-column-name-pk/entity/Category.ts index bc2baba5a..fbb72b164 100644 --- a/test/functional/persistence/custom-column-name-pk/entity/Category.ts +++ b/test/functional/persistence/custom-column-name-pk/entity/Category.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryColumn} from "../../../../../src/decorator/columns/PrimaryColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {Post} from "./Post"; import {OneToMany} from "../../../../../src/decorator/relations/OneToMany"; -@Table() +@Entity() export class Category { @PrimaryColumn("int", {generated: true, name: "theId"}) diff --git a/test/functional/persistence/custom-column-name-pk/entity/Post.ts b/test/functional/persistence/custom-column-name-pk/entity/Post.ts index eee108af0..e48d7530d 100644 --- a/test/functional/persistence/custom-column-name-pk/entity/Post.ts +++ b/test/functional/persistence/custom-column-name-pk/entity/Post.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryColumn} from "../../../../../src/decorator/columns/PrimaryColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne"; import {Category} from "./Category"; -@Table() +@Entity() export class Post { @PrimaryColumn("int", {generated: true, name: "theId"}) diff --git a/test/functional/persistence/custom-column-names/entity/Category.ts b/test/functional/persistence/custom-column-names/entity/Category.ts index 7f70b2ea7..9029f0e3a 100644 --- a/test/functional/persistence/custom-column-names/entity/Category.ts +++ b/test/functional/persistence/custom-column-names/entity/Category.ts @@ -1,4 +1,4 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Post} from "./Post"; import {Column} from "../../../../../src/decorator/columns/Column"; @@ -7,7 +7,7 @@ import {OneToOne} from "../../../../../src/decorator/relations/OneToOne"; import {JoinColumn} from "../../../../../src/decorator/relations/JoinColumn"; import {CategoryMetadata} from "./CategoryMetadata"; -@Table() +@Entity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/functional/persistence/custom-column-names/entity/CategoryMetadata.ts b/test/functional/persistence/custom-column-names/entity/CategoryMetadata.ts index 995cfb0a9..d2c789056 100644 --- a/test/functional/persistence/custom-column-names/entity/CategoryMetadata.ts +++ b/test/functional/persistence/custom-column-names/entity/CategoryMetadata.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {OneToOne} from "../../../../../src/decorator/relations/OneToOne"; import {Category} from "./Category"; -@Table() +@Entity() export class CategoryMetadata { @PrimaryGeneratedColumn() diff --git a/test/functional/persistence/custom-column-names/entity/Post.ts b/test/functional/persistence/custom-column-names/entity/Post.ts index 7df8d46be..ec583ef46 100644 --- a/test/functional/persistence/custom-column-names/entity/Post.ts +++ b/test/functional/persistence/custom-column-names/entity/Post.ts @@ -1,11 +1,11 @@ import {Category} from "./Category"; -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne"; import {JoinColumn} from "../../../../../src/decorator/relations/JoinColumn"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/functional/persistence/insert-operations/entity/Category.ts b/test/functional/persistence/insert-operations/entity/Category.ts index 857a93da7..6e5ff92e0 100644 --- a/test/functional/persistence/insert-operations/entity/Category.ts +++ b/test/functional/persistence/insert-operations/entity/Category.ts @@ -1,4 +1,4 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {Post} from "./Post"; @@ -10,7 +10,7 @@ import {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne"; import {OneToOne} from "../../../../../src/decorator/relations/OneToOne"; import {JoinColumn} from "../../../../../src/decorator/relations/JoinColumn"; -@Table() +@Entity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/functional/persistence/insert-operations/entity/Photo.ts b/test/functional/persistence/insert-operations/entity/Photo.ts index 9457694d1..72a7819e9 100644 --- a/test/functional/persistence/insert-operations/entity/Photo.ts +++ b/test/functional/persistence/insert-operations/entity/Photo.ts @@ -1,11 +1,11 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne"; import {Post} from "../entity/Post"; import {ManyToMany} from "../../../../../src/decorator/relations/ManyToMany"; -@Table() +@Entity() export class Photo { @PrimaryGeneratedColumn() diff --git a/test/functional/persistence/insert-operations/entity/Post.ts b/test/functional/persistence/insert-operations/entity/Post.ts index 618fadf4e..bdb037563 100644 --- a/test/functional/persistence/insert-operations/entity/Post.ts +++ b/test/functional/persistence/insert-operations/entity/Post.ts @@ -1,4 +1,4 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne"; @@ -8,7 +8,7 @@ import {ManyToMany} from "../../../../../src/decorator/relations/ManyToMany"; import {JoinTable} from "../../../../../src/decorator/relations/JoinTable"; import {OneToOne} from "../../../../../src/decorator/relations/OneToOne"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/functional/persistence/insert/update-relation-columns-after-insertion/entity/Category.ts b/test/functional/persistence/insert/update-relation-columns-after-insertion/entity/Category.ts index 2490905b9..b8f117810 100644 --- a/test/functional/persistence/insert/update-relation-columns-after-insertion/entity/Category.ts +++ b/test/functional/persistence/insert/update-relation-columns-after-insertion/entity/Category.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../../src/decorator/columns/Column"; import {OneToMany} from "../../../../../../src/decorator/relations/OneToMany"; import {Post} from "./Post"; -@Table() +@Entity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/functional/persistence/insert/update-relation-columns-after-insertion/entity/Post.ts b/test/functional/persistence/insert/update-relation-columns-after-insertion/entity/Post.ts index 2223e6b82..e07e624df 100644 --- a/test/functional/persistence/insert/update-relation-columns-after-insertion/entity/Post.ts +++ b/test/functional/persistence/insert/update-relation-columns-after-insertion/entity/Post.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../../src/decorator/columns/Column"; import {ManyToOne} from "../../../../../../src/decorator/relations/ManyToOne"; import {Category} from "./Category"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/functional/persistence/many-to-many/entity/Category.ts b/test/functional/persistence/many-to-many/entity/Category.ts index 669f21ec2..80f1d8ea3 100644 --- a/test/functional/persistence/many-to-many/entity/Category.ts +++ b/test/functional/persistence/many-to-many/entity/Category.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Post} from "./Post"; import {Column} from "../../../../../src/decorator/columns/Column"; import {ManyToMany} from "../../../../../src/decorator/relations/ManyToMany"; -@Table() +@Entity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/functional/persistence/many-to-many/entity/Post.ts b/test/functional/persistence/many-to-many/entity/Post.ts index ce4f34849..d5ccb5205 100644 --- a/test/functional/persistence/many-to-many/entity/Post.ts +++ b/test/functional/persistence/many-to-many/entity/Post.ts @@ -1,11 +1,11 @@ import {Category} from "./Category"; -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {ManyToMany} from "../../../../../src/decorator/relations/ManyToMany"; import {JoinTable} from "../../../../../src/decorator/relations/JoinTable"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/functional/persistence/many-to-many/entity/User.ts b/test/functional/persistence/many-to-many/entity/User.ts index d86f0c463..53e1923e0 100644 --- a/test/functional/persistence/many-to-many/entity/User.ts +++ b/test/functional/persistence/many-to-many/entity/User.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne"; import {Post} from "./Post"; -@Table() +@Entity() export class User { @PrimaryGeneratedColumn() diff --git a/test/functional/persistence/multi-primary-key-on-both-sides/entity/Category.ts b/test/functional/persistence/multi-primary-key-on-both-sides/entity/Category.ts index 9a9cfd277..a9c8edf0e 100644 --- a/test/functional/persistence/multi-primary-key-on-both-sides/entity/Category.ts +++ b/test/functional/persistence/multi-primary-key-on-both-sides/entity/Category.ts @@ -1,11 +1,11 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryColumn} from "../../../../../src/decorator/columns/PrimaryColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {Post} from "./Post"; import {OneToMany} from "../../../../../src/decorator/relations/OneToMany"; -@Table() +@Entity() export class Category { @PrimaryColumn("int") diff --git a/test/functional/persistence/multi-primary-key-on-both-sides/entity/Post.ts b/test/functional/persistence/multi-primary-key-on-both-sides/entity/Post.ts index a614e9ae3..62d8853b6 100644 --- a/test/functional/persistence/multi-primary-key-on-both-sides/entity/Post.ts +++ b/test/functional/persistence/multi-primary-key-on-both-sides/entity/Post.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryColumn} from "../../../../../src/decorator/columns/PrimaryColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne"; import {Category} from "./Category"; -@Table() +@Entity() export class Post { @PrimaryColumn("int") diff --git a/test/functional/persistence/multi-primary-key/entity/Category.ts b/test/functional/persistence/multi-primary-key/entity/Category.ts index fcce8c1c5..e7ae09185 100644 --- a/test/functional/persistence/multi-primary-key/entity/Category.ts +++ b/test/functional/persistence/multi-primary-key/entity/Category.ts @@ -1,11 +1,11 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryColumn} from "../../../../../src/decorator/columns/PrimaryColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {Post} from "./Post"; import {OneToMany} from "../../../../../src/decorator/relations/OneToMany"; -@Table() +@Entity() export class Category { @PrimaryColumn("int", {generated: true}) diff --git a/test/functional/persistence/multi-primary-key/entity/Post.ts b/test/functional/persistence/multi-primary-key/entity/Post.ts index a614e9ae3..62d8853b6 100644 --- a/test/functional/persistence/multi-primary-key/entity/Post.ts +++ b/test/functional/persistence/multi-primary-key/entity/Post.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryColumn} from "../../../../../src/decorator/columns/PrimaryColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne"; import {Category} from "./Category"; -@Table() +@Entity() export class Post { @PrimaryColumn("int") diff --git a/test/functional/persistence/one-to-many/entity/Category.ts b/test/functional/persistence/one-to-many/entity/Category.ts index c2e79faff..ecc4d78e8 100644 --- a/test/functional/persistence/one-to-many/entity/Category.ts +++ b/test/functional/persistence/one-to-many/entity/Category.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne"; import {Post} from "./Post"; import {Column} from "../../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/functional/persistence/one-to-many/entity/Post.ts b/test/functional/persistence/one-to-many/entity/Post.ts index bcbbe5d5f..546d0bd33 100644 --- a/test/functional/persistence/one-to-many/entity/Post.ts +++ b/test/functional/persistence/one-to-many/entity/Post.ts @@ -1,10 +1,10 @@ import {Category} from "./Category"; -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {OneToMany} from "../../../../../src/decorator/relations/OneToMany"; import {Column} from "../../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/functional/persistence/persistence-order/entity/Category.ts b/test/functional/persistence/persistence-order/entity/Category.ts index 36a3f4561..31f1f6b64 100644 --- a/test/functional/persistence/persistence-order/entity/Category.ts +++ b/test/functional/persistence/persistence-order/entity/Category.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {Post} from "./Post"; import {OneToOne} from "../../../../../src/decorator/relations/OneToOne"; -@Table() +@Entity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/functional/persistence/persistence-order/entity/Details.ts b/test/functional/persistence/persistence-order/entity/Details.ts index d5c16ce2c..1441f1a7a 100644 --- a/test/functional/persistence/persistence-order/entity/Details.ts +++ b/test/functional/persistence/persistence-order/entity/Details.ts @@ -1,4 +1,4 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {OneToOne} from "../../../../../src/decorator/relations/OneToOne"; @@ -6,7 +6,7 @@ import {Post} from "./Post"; import {Photo} from "./Photo"; import {JoinColumn} from "../../../../../src/decorator/relations/JoinColumn"; -@Table() +@Entity() export class Details { @PrimaryGeneratedColumn() diff --git a/test/functional/persistence/persistence-order/entity/Photo.ts b/test/functional/persistence/persistence-order/entity/Photo.ts index 7c02df2f4..508e11707 100644 --- a/test/functional/persistence/persistence-order/entity/Photo.ts +++ b/test/functional/persistence/persistence-order/entity/Photo.ts @@ -1,4 +1,4 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {Post} from "./Post"; @@ -7,7 +7,7 @@ import {JoinColumn} from "../../../../../src/decorator/relations/JoinColumn"; import {Details} from "./Details"; import {Category} from "./Category"; -@Table() +@Entity() export class Photo { @PrimaryGeneratedColumn() diff --git a/test/functional/persistence/persistence-order/entity/Post.ts b/test/functional/persistence/persistence-order/entity/Post.ts index 2924d6c55..04dda0733 100644 --- a/test/functional/persistence/persistence-order/entity/Post.ts +++ b/test/functional/persistence/persistence-order/entity/Post.ts @@ -1,4 +1,4 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {Category} from "./Category"; @@ -7,7 +7,7 @@ import {JoinColumn} from "../../../../../src/decorator/relations/JoinColumn"; import {Details} from "./Details"; import {Photo} from "./Photo"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/functional/relations/relation-mapped-to-different-name-column/entity/Post.ts b/test/functional/relations/relation-mapped-to-different-name-column/entity/Post.ts index f6a623960..62b4206e5 100644 --- a/test/functional/relations/relation-mapped-to-different-name-column/entity/Post.ts +++ b/test/functional/relations/relation-mapped-to-different-name-column/entity/Post.ts @@ -1,11 +1,11 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {Column} from "../../../../../src/decorator/columns/Column"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {PostDetails} from "./PostDetails"; import {OneToOne} from "../../../../../src/decorator/relations/OneToOne"; import {JoinColumn} from "../../../../../src/decorator/relations/JoinColumn"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/functional/relations/relation-mapped-to-different-name-column/entity/PostDetails.ts b/test/functional/relations/relation-mapped-to-different-name-column/entity/PostDetails.ts index c6d682862..f161350e1 100644 --- a/test/functional/relations/relation-mapped-to-different-name-column/entity/PostDetails.ts +++ b/test/functional/relations/relation-mapped-to-different-name-column/entity/PostDetails.ts @@ -1,7 +1,7 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryColumn} from "../../../../../src/decorator/columns/PrimaryColumn"; -@Table() +@Entity() export class PostDetails { @PrimaryColumn() diff --git a/test/functional/relations/relation-with-primary-key/entity/Category.ts b/test/functional/relations/relation-with-primary-key/entity/Category.ts index 217bb654f..02ca57acb 100644 --- a/test/functional/relations/relation-with-primary-key/entity/Category.ts +++ b/test/functional/relations/relation-with-primary-key/entity/Category.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {Post} from "./Post"; import {OneToMany} from "../../../../../src/decorator/relations/OneToMany"; -@Table() +@Entity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/functional/relations/relation-with-primary-key/entity/Post.ts b/test/functional/relations/relation-with-primary-key/entity/Post.ts index c7e9182eb..5141727a6 100644 --- a/test/functional/relations/relation-with-primary-key/entity/Post.ts +++ b/test/functional/relations/relation-with-primary-key/entity/Post.ts @@ -1,9 +1,9 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {Column} from "../../../../../src/decorator/columns/Column"; import {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne"; import {Category} from "./Category"; -@Table() +@Entity() export class Post { @ManyToOne(type => Category, category => category.posts, { diff --git a/test/functional/repository/basic-methods/entity/Blog.ts b/test/functional/repository/basic-methods/entity/Blog.ts index 2048aee0f..5c3324c94 100644 --- a/test/functional/repository/basic-methods/entity/Blog.ts +++ b/test/functional/repository/basic-methods/entity/Blog.ts @@ -1,11 +1,11 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {Category} from "./Category"; import {ManyToMany} from "../../../../../src/decorator/relations/ManyToMany"; import {JoinTable} from "../../../../../src/decorator/relations/JoinTable"; -@Table() +@Entity() export class Blog { @PrimaryGeneratedColumn() diff --git a/test/functional/repository/basic-methods/entity/Category.ts b/test/functional/repository/basic-methods/entity/Category.ts index 3a0d6b9f2..0095127bd 100644 --- a/test/functional/repository/basic-methods/entity/Category.ts +++ b/test/functional/repository/basic-methods/entity/Category.ts @@ -1,8 +1,8 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/functional/repository/basic-methods/entity/Post.ts b/test/functional/repository/basic-methods/entity/Post.ts index 18bd63ee9..259e70279 100644 --- a/test/functional/repository/basic-methods/entity/Post.ts +++ b/test/functional/repository/basic-methods/entity/Post.ts @@ -1,8 +1,8 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/functional/repository/delete-by-id-and-ids/entity/Post.ts b/test/functional/repository/delete-by-id-and-ids/entity/Post.ts index e8b694470..b65476c52 100644 --- a/test/functional/repository/delete-by-id-and-ids/entity/Post.ts +++ b/test/functional/repository/delete-by-id-and-ids/entity/Post.ts @@ -1,8 +1,8 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/functional/repository/find-methods/entity/Post.ts b/test/functional/repository/find-methods/entity/Post.ts index 66926c77e..8507dbfae 100644 --- a/test/functional/repository/find-methods/entity/Post.ts +++ b/test/functional/repository/find-methods/entity/Post.ts @@ -1,8 +1,8 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {Column} from "../../../../../src/decorator/columns/Column"; import {PrimaryColumn} from "../../../../../src/decorator/columns/PrimaryColumn"; -@Table() +@Entity() export class Post { @PrimaryColumn("int") diff --git a/test/functional/repository/set-add-remove-relations/entity/Category.ts b/test/functional/repository/set-add-remove-relations/entity/Category.ts index 5f9e39e47..fbe239011 100644 --- a/test/functional/repository/set-add-remove-relations/entity/Category.ts +++ b/test/functional/repository/set-add-remove-relations/entity/Category.ts @@ -1,11 +1,11 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Post} from "./Post"; import {Column} from "../../../../../src/decorator/columns/Column"; import {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne"; import {ManyToMany} from "../../../../../src/decorator/relations/ManyToMany"; -@Table() +@Entity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/functional/repository/set-add-remove-relations/entity/Post.ts b/test/functional/repository/set-add-remove-relations/entity/Post.ts index ebed4fa88..5f19caae2 100644 --- a/test/functional/repository/set-add-remove-relations/entity/Post.ts +++ b/test/functional/repository/set-add-remove-relations/entity/Post.ts @@ -1,12 +1,12 @@ import {Category} from "./Category"; -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {OneToMany} from "../../../../../src/decorator/relations/OneToMany"; import {ManyToMany} from "../../../../../src/decorator/relations/ManyToMany"; import {JoinTable} from "../../../../../src/decorator/relations/JoinTable"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/functional/transaction/transaction-in-entity-manager/entity/Category.ts b/test/functional/transaction/transaction-in-entity-manager/entity/Category.ts index 3a0d6b9f2..0095127bd 100644 --- a/test/functional/transaction/transaction-in-entity-manager/entity/Category.ts +++ b/test/functional/transaction/transaction-in-entity-manager/entity/Category.ts @@ -1,8 +1,8 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/functional/transaction/transaction-in-entity-manager/entity/Post.ts b/test/functional/transaction/transaction-in-entity-manager/entity/Post.ts index e8b694470..b65476c52 100644 --- a/test/functional/transaction/transaction-in-entity-manager/entity/Post.ts +++ b/test/functional/transaction/transaction-in-entity-manager/entity/Post.ts @@ -1,8 +1,8 @@ -import {Table} from "../../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/functional/tree-tables/closure-table/entity/Category.ts b/test/functional/tree-tables/closure-table/entity/Category.ts index ffb9f34e1..04eca0152 100644 --- a/test/functional/tree-tables/closure-table/entity/Category.ts +++ b/test/functional/tree-tables/closure-table/entity/Category.ts @@ -1,11 +1,11 @@ -import {ClosureTable} from "../../../../../src/decorator/tables/ClosureTable"; +import {ClosureEntity} from "../../../../../src/decorator/entity/ClosureEntity"; import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../../src/decorator/columns/Column"; import {TreeParent} from "../../../../../src/decorator/tree/TreeParent"; import {TreeChildren} from "../../../../../src/decorator/tree/TreeChildren"; import {TreeLevelColumn} from "../../../../../src/decorator/tree/TreeLevelColumn"; -@ClosureTable() +@ClosureEntity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/github-issues/108/entity/Project.ts b/test/github-issues/108/entity/Project.ts index 1f3491612..185f1f424 100644 --- a/test/github-issues/108/entity/Project.ts +++ b/test/github-issues/108/entity/Project.ts @@ -1,8 +1,8 @@ -import { Table } from "../../../../src/decorator/tables/Table"; +import { Entity } from "../../../../src/decorator/entity/Entity"; import { PrimaryGeneratedColumn } from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import { Column } from "../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class Project { @PrimaryGeneratedColumn() diff --git a/test/github-issues/108/entity/User.ts b/test/github-issues/108/entity/User.ts index 7fe82e368..c64ea9192 100644 --- a/test/github-issues/108/entity/User.ts +++ b/test/github-issues/108/entity/User.ts @@ -1,8 +1,8 @@ -import { Table } from "../../../../src/decorator/tables/Table"; +import { Entity } from "../../../../src/decorator/entity/Entity"; import { PrimaryGeneratedColumn } from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import { Column } from "../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class User { @PrimaryGeneratedColumn() diff --git a/test/github-issues/131/entity/Employee.ts b/test/github-issues/131/entity/Employee.ts index 1ad3a3100..ce4009835 100644 --- a/test/github-issues/131/entity/Employee.ts +++ b/test/github-issues/131/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() diff --git a/test/github-issues/131/entity/Person.ts b/test/github-issues/131/entity/Person.ts index 8cb82d18e..f6aca67c7 100644 --- a/test/github-issues/131/entity/Person.ts +++ b/test/github-issues/131/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() +@Entity() @TableInheritance("single-table") @DiscriminatorColumn({ name: "type", type: "string" }) export class Person { diff --git a/test/github-issues/134/entity/Post.ts b/test/github-issues/134/entity/Post.ts index 2889de9f1..44058ab34 100644 --- a/test/github-issues/134/entity/Post.ts +++ b/test/github-issues/134/entity/Post.ts @@ -1,9 +1,9 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {ColumnTypes} from "../../../../src/metadata/types/ColumnTypes"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/github-issues/144/entity/Employee.ts b/test/github-issues/144/entity/Employee.ts index a7e7e5671..43c09850a 100644 --- a/test/github-issues/144/entity/Employee.ts +++ b/test/github-issues/144/entity/Employee.ts @@ -1,8 +1,8 @@ import {Person} from "./Person"; -import {ClassTableChild} from "../../../../src/decorator/tables/ClassTableChild"; +import {ClassEntityChild} from "../../../../src/decorator/entity/ClassEntityChild"; import {Column} from "../../../../src/decorator/columns/Column"; -@ClassTableChild() +@ClassEntityChild() export class Employee extends Person { @Column() diff --git a/test/github-issues/144/entity/Homesitter.ts b/test/github-issues/144/entity/Homesitter.ts index 06cc8b5d1..a5160ef86 100644 --- a/test/github-issues/144/entity/Homesitter.ts +++ b/test/github-issues/144/entity/Homesitter.ts @@ -1,8 +1,8 @@ import {Person} from "./Person"; -import {ClassTableChild} from "../../../../src/decorator/tables/ClassTableChild"; +import {ClassEntityChild} from "../../../../src/decorator/entity/ClassEntityChild"; import {Column} from "../../../../src/decorator/columns/Column"; -@ClassTableChild() +@ClassEntityChild() export class Homesitter extends Person { @Column() diff --git a/test/github-issues/144/entity/Person.ts b/test/github-issues/144/entity/Person.ts index 755086ebc..f16ce574d 100644 --- a/test/github-issues/144/entity/Person.ts +++ b/test/github-issues/144/entity/Person.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../src/decorator/tables/Table"; -import {TableInheritance} from "../../../../src/decorator/tables/TableInheritance"; +import {Entity} from "../../../../src/decorator/entity/Entity"; +import {TableInheritance} from "../../../../src/decorator/entity/TableInheritance"; import {DiscriminatorColumn} from "../../../../src/decorator/columns/DiscriminatorColumn"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; -@Table() +@Entity() @TableInheritance("class-table") @DiscriminatorColumn({ name: "type", type: "string" }) export class Person { diff --git a/test/github-issues/144/entity/Student.ts b/test/github-issues/144/entity/Student.ts index 7091e7fcd..58cb0fcc8 100644 --- a/test/github-issues/144/entity/Student.ts +++ b/test/github-issues/144/entity/Student.ts @@ -1,8 +1,8 @@ import {Person} from "./Person"; -import {ClassTableChild} from "../../../../src/decorator/tables/ClassTableChild"; +import {ClassEntityChild} from "../../../../src/decorator/entity/ClassEntityChild"; import {Column} from "../../../../src/decorator/columns/Column"; -@ClassTableChild() +@ClassEntityChild() export class Student extends Person { @Column() diff --git a/test/github-issues/159/entity/Department.ts b/test/github-issues/159/entity/Department.ts index 59ea25e36..3f70c24d7 100644 --- a/test/github-issues/159/entity/Department.ts +++ b/test/github-issues/159/entity/Department.ts @@ -1,4 +1,4 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {OneToOne} from "../../../../src/decorator/relations/OneToOne"; @@ -6,7 +6,7 @@ import {JoinColumn} from "../../../../src/decorator/relations/JoinColumn"; import {Employee} from "./Employee"; import {ManyToOne} from "../../../../src/decorator/relations/ManyToOne"; -@Table() +@Entity() export class Department { @PrimaryGeneratedColumn() diff --git a/test/github-issues/159/entity/Employee.ts b/test/github-issues/159/entity/Employee.ts index a7e7e5671..43c09850a 100644 --- a/test/github-issues/159/entity/Employee.ts +++ b/test/github-issues/159/entity/Employee.ts @@ -1,8 +1,8 @@ import {Person} from "./Person"; -import {ClassTableChild} from "../../../../src/decorator/tables/ClassTableChild"; +import {ClassEntityChild} from "../../../../src/decorator/entity/ClassEntityChild"; import {Column} from "../../../../src/decorator/columns/Column"; -@ClassTableChild() +@ClassEntityChild() export class Employee extends Person { @Column() diff --git a/test/github-issues/159/entity/Homesitter.ts b/test/github-issues/159/entity/Homesitter.ts index 06cc8b5d1..a5160ef86 100644 --- a/test/github-issues/159/entity/Homesitter.ts +++ b/test/github-issues/159/entity/Homesitter.ts @@ -1,8 +1,8 @@ import {Person} from "./Person"; -import {ClassTableChild} from "../../../../src/decorator/tables/ClassTableChild"; +import {ClassEntityChild} from "../../../../src/decorator/entity/ClassEntityChild"; import {Column} from "../../../../src/decorator/columns/Column"; -@ClassTableChild() +@ClassEntityChild() export class Homesitter extends Person { @Column() diff --git a/test/github-issues/159/entity/Person.ts b/test/github-issues/159/entity/Person.ts index 755086ebc..f16ce574d 100644 --- a/test/github-issues/159/entity/Person.ts +++ b/test/github-issues/159/entity/Person.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../src/decorator/tables/Table"; -import {TableInheritance} from "../../../../src/decorator/tables/TableInheritance"; +import {Entity} from "../../../../src/decorator/entity/Entity"; +import {TableInheritance} from "../../../../src/decorator/entity/TableInheritance"; import {DiscriminatorColumn} from "../../../../src/decorator/columns/DiscriminatorColumn"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; -@Table() +@Entity() @TableInheritance("class-table") @DiscriminatorColumn({ name: "type", type: "string" }) export class Person { diff --git a/test/github-issues/159/entity/Student.ts b/test/github-issues/159/entity/Student.ts index 7091e7fcd..58cb0fcc8 100644 --- a/test/github-issues/159/entity/Student.ts +++ b/test/github-issues/159/entity/Student.ts @@ -1,8 +1,8 @@ import {Person} from "./Person"; -import {ClassTableChild} from "../../../../src/decorator/tables/ClassTableChild"; +import {ClassEntityChild} from "../../../../src/decorator/entity/ClassEntityChild"; import {Column} from "../../../../src/decorator/columns/Column"; -@ClassTableChild() +@ClassEntityChild() export class Student extends Person { @Column() diff --git a/test/github-issues/161/entity/Request.ts b/test/github-issues/161/entity/Request.ts index 1357f4bf6..8e2090a7d 100644 --- a/test/github-issues/161/entity/Request.ts +++ b/test/github-issues/161/entity/Request.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {OneToOne} from "../../../../src/decorator/relations/OneToOne"; import {Ticket} from "./Ticket"; import {Column} from "../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class Request { @PrimaryGeneratedColumn() diff --git a/test/github-issues/161/entity/Ticket.ts b/test/github-issues/161/entity/Ticket.ts index 4190898a3..44122d285 100644 --- a/test/github-issues/161/entity/Ticket.ts +++ b/test/github-issues/161/entity/Ticket.ts @@ -1,11 +1,11 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {OneToOne} from "../../../../src/decorator/relations/OneToOne"; import {Request} from "./Request"; import {JoinColumn} from "../../../../src/decorator/relations/JoinColumn"; import {Column} from "../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class Ticket { @PrimaryGeneratedColumn() diff --git a/test/github-issues/163/entity/Game.ts b/test/github-issues/163/entity/Game.ts index 291a7ad5e..c5b5fc28b 100644 --- a/test/github-issues/163/entity/Game.ts +++ b/test/github-issues/163/entity/Game.ts @@ -1,4 +1,4 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {Index} from "../../../../src/decorator/Index"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; @@ -6,7 +6,7 @@ import {ManyToMany} from "../../../../src/decorator/relations/ManyToMany"; import {JoinTable} from "../../../../src/decorator/relations/JoinTable"; import {Platform} from "./Platform"; -@Table("games") +@Entity("games") @Index("game_name_idx", ["name"], { unique: true }) export class Game { diff --git a/test/github-issues/163/entity/Platform.ts b/test/github-issues/163/entity/Platform.ts index 5176360f6..a3987b65a 100644 --- a/test/github-issues/163/entity/Platform.ts +++ b/test/github-issues/163/entity/Platform.ts @@ -1,11 +1,11 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {Index} from "../../../../src/decorator/Index"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {ManyToMany} from "../../../../src/decorator/relations/ManyToMany"; import {Game} from "./Game"; -@Table("platforms") +@Entity("platforms") @Index("platform_name_idx", ["name"], { unique: true }) export class Platform { diff --git a/test/github-issues/174/entity/Contact.ts b/test/github-issues/174/entity/Contact.ts index 4295b6f8d..0fde1c66c 100644 --- a/test/github-issues/174/entity/Contact.ts +++ b/test/github-issues/174/entity/Contact.ts @@ -1,7 +1,7 @@ import {Column} from "../../../../src/decorator/columns/Column"; -import {EmbeddableTable} from "../../../../src/decorator/tables/EmbeddableTable"; +import {EmbeddableEntity} from "../../../../src/decorator/entity/EmbeddableEntity"; -@EmbeddableTable() +@EmbeddableEntity() export class Contact { @Column() diff --git a/test/github-issues/174/entity/Organisation.ts b/test/github-issues/174/entity/Organisation.ts index 1b3107c21..dfd3114d6 100644 --- a/test/github-issues/174/entity/Organisation.ts +++ b/test/github-issues/174/entity/Organisation.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {Embedded} from "../../../../src/decorator/Embedded"; import {Contact} from "./Contact"; -@Table() +@Entity() export class Organisation { @PrimaryGeneratedColumn() diff --git a/test/github-issues/175/entity/Category.ts b/test/github-issues/175/entity/Category.ts index 52f90a007..61577b85b 100644 --- a/test/github-issues/175/entity/Category.ts +++ b/test/github-issues/175/entity/Category.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {ManyToOne} from "../../../../src/decorator/relations/ManyToOne"; import {Post} from "./Post"; -@Table() +@Entity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/github-issues/175/entity/Post.ts b/test/github-issues/175/entity/Post.ts index c26db0962..a8e1ab161 100644 --- a/test/github-issues/175/entity/Post.ts +++ b/test/github-issues/175/entity/Post.ts @@ -1,4 +1,4 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {Category} from "./Category"; @@ -6,7 +6,7 @@ import {ManyToMany} from "../../../../src/decorator/relations/ManyToMany"; import {JoinTable} from "../../../../src/decorator/relations/JoinTable"; import {OneToMany} from "../../../../src/decorator/relations/OneToMany"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/github-issues/176/entity/Post.ts b/test/github-issues/176/entity/Post.ts index 2668fdb69..20db66acc 100644 --- a/test/github-issues/176/entity/Post.ts +++ b/test/github-issues/176/entity/Post.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {CreateDateColumn} from "../../../../src/decorator/columns/CreateDateColumn"; import {UpdateDateColumn} from "../../../../src/decorator/columns/UpdateDateColumn"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/github-issues/182/entity/Post.ts b/test/github-issues/182/entity/Post.ts index 33aea2183..edee3d333 100644 --- a/test/github-issues/182/entity/Post.ts +++ b/test/github-issues/182/entity/Post.ts @@ -1,9 +1,9 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {PostStatus} from "../model/PostStatus"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/github-issues/190/entity/Category.ts b/test/github-issues/190/entity/Category.ts index f28de51df..fbefef270 100644 --- a/test/github-issues/190/entity/Category.ts +++ b/test/github-issues/190/entity/Category.ts @@ -1,8 +1,8 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/github-issues/190/entity/Post.ts b/test/github-issues/190/entity/Post.ts index 8b55e76a2..5650dd4d5 100644 --- a/test/github-issues/190/entity/Post.ts +++ b/test/github-issues/190/entity/Post.ts @@ -1,11 +1,11 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {Category} from "./Category"; import {ManyToMany} from "../../../../src/decorator/relations/ManyToMany"; import {JoinTable} from "../../../../src/decorator/relations/JoinTable"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/github-issues/47/entity/Category.ts b/test/github-issues/47/entity/Category.ts index 02ae73ada..644d009a4 100644 --- a/test/github-issues/47/entity/Category.ts +++ b/test/github-issues/47/entity/Category.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {Post} from "./Post"; import {OneToMany} from "../../../../src/decorator/relations/OneToMany"; -@Table() +@Entity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/github-issues/47/entity/Post.ts b/test/github-issues/47/entity/Post.ts index 55ccba52f..fe0b46559 100644 --- a/test/github-issues/47/entity/Post.ts +++ b/test/github-issues/47/entity/Post.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {Category} from "./Category"; import {ManyToOne} from "../../../../src/decorator/relations/ManyToOne"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/github-issues/56/entity/AccessToken.ts b/test/github-issues/56/entity/AccessToken.ts index 4adecf57c..4e2ec4777 100644 --- a/test/github-issues/56/entity/AccessToken.ts +++ b/test/github-issues/56/entity/AccessToken.ts @@ -1,7 +1,7 @@ import {PrimaryColumn} from "../../../../src/decorator/columns/PrimaryColumn"; -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; -@Table() +@Entity() export class AccessToken { @PrimaryColumn() diff --git a/test/github-issues/56/entity/User.ts b/test/github-issues/56/entity/User.ts index c32787507..a0236ee9e 100644 --- a/test/github-issues/56/entity/User.ts +++ b/test/github-issues/56/entity/User.ts @@ -3,9 +3,9 @@ import {JoinColumn} from "../../../../src/decorator/relations/JoinColumn"; import {OneToOne} from "../../../../src/decorator/relations/OneToOne"; import {Column} from "../../../../src/decorator/columns/Column"; import {PrimaryColumn} from "../../../../src/decorator/columns/PrimaryColumn"; -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; -@Table() +@Entity() export class User { @PrimaryColumn("int", { generated: true }) diff --git a/test/github-issues/57/entity/AccessToken.ts b/test/github-issues/57/entity/AccessToken.ts index 948d0ed38..5d49710c8 100644 --- a/test/github-issues/57/entity/AccessToken.ts +++ b/test/github-issues/57/entity/AccessToken.ts @@ -1,9 +1,9 @@ import {PrimaryColumn} from "../../../../src/decorator/columns/PrimaryColumn"; -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {OneToOne} from "../../../../src/decorator/relations/OneToOne"; import {User} from "./User"; -@Table() +@Entity() export class AccessToken { @PrimaryColumn("int", { generated: true }) diff --git a/test/github-issues/57/entity/User.ts b/test/github-issues/57/entity/User.ts index c99bc269e..190cdae7b 100644 --- a/test/github-issues/57/entity/User.ts +++ b/test/github-issues/57/entity/User.ts @@ -3,9 +3,9 @@ import {JoinColumn} from "../../../../src/decorator/relations/JoinColumn"; import {OneToOne} from "../../../../src/decorator/relations/OneToOne"; import {Column} from "../../../../src/decorator/columns/Column"; import {PrimaryColumn} from "../../../../src/decorator/columns/PrimaryColumn"; -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; -@Table() +@Entity() export class User { @PrimaryColumn("int", { diff --git a/test/github-issues/58/entity/Category.ts b/test/github-issues/58/entity/Category.ts index 9ce60e11c..b560fe0eb 100644 --- a/test/github-issues/58/entity/Category.ts +++ b/test/github-issues/58/entity/Category.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {OneToMany} from "../../../../src/decorator/relations/OneToMany"; import {PostCategory} from "./PostCategory"; -@Table() +@Entity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/github-issues/58/entity/Post.ts b/test/github-issues/58/entity/Post.ts index 45008af09..ce3f13a81 100644 --- a/test/github-issues/58/entity/Post.ts +++ b/test/github-issues/58/entity/Post.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {OneToMany} from "../../../../src/decorator/relations/OneToMany"; import {PostCategory} from "./PostCategory"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/github-issues/58/entity/PostCategory.ts b/test/github-issues/58/entity/PostCategory.ts index d05fd86ef..6b6616139 100644 --- a/test/github-issues/58/entity/PostCategory.ts +++ b/test/github-issues/58/entity/PostCategory.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {Column} from "../../../../src/decorator/columns/Column"; import {Post} from "./Post"; import {ManyToOne} from "../../../../src/decorator/relations/ManyToOne"; import {Category} from "./Category"; -@Table() +@Entity() export class PostCategory { @ManyToOne(type => Post, post => post.categories, { diff --git a/test/github-issues/70/entity/Category.ts b/test/github-issues/70/entity/Category.ts index c22969b28..1db6ef177 100644 --- a/test/github-issues/70/entity/Category.ts +++ b/test/github-issues/70/entity/Category.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {Post} from "./Post"; import {ManyToOne} from "../../../../src/decorator/relations/ManyToOne"; -@Table() +@Entity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/github-issues/70/entity/Post.ts b/test/github-issues/70/entity/Post.ts index aeed00a45..5e83680fa 100644 --- a/test/github-issues/70/entity/Post.ts +++ b/test/github-issues/70/entity/Post.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {Category} from "./Category"; import {OneToMany} from "../../../../src/decorator/relations/OneToMany"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/github-issues/71/entity/Artikel.ts b/test/github-issues/71/entity/Artikel.ts index a844eaaf2..868f29570 100644 --- a/test/github-issues/71/entity/Artikel.ts +++ b/test/github-issues/71/entity/Artikel.ts @@ -1,11 +1,11 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryColumn} from "../../../../src/decorator/columns/PrimaryColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {ManyToOne} from "../../../../src/decorator/relations/ManyToOne"; import {Kollektion} from "./Kollektion"; import {JoinColumn} from "../../../../src/decorator/relations/JoinColumn"; -@Table("artikel") +@Entity("artikel") export class Artikel { @PrimaryColumn("int", { generated: true, name: "artikel_id" }) diff --git a/test/github-issues/71/entity/Kollektion.ts b/test/github-issues/71/entity/Kollektion.ts index e2c515197..3986b9f1a 100644 --- a/test/github-issues/71/entity/Kollektion.ts +++ b/test/github-issues/71/entity/Kollektion.ts @@ -1,8 +1,8 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryColumn} from "../../../../src/decorator/columns/PrimaryColumn"; import {Column} from "../../../../src/decorator/columns/Column"; -@Table("kollektion") +@Entity("kollektion") export class Kollektion { @PrimaryColumn("int", { generated: true, name: "kollektion_id" }) diff --git a/test/github-issues/78/entity/DeliveryNote.ts b/test/github-issues/78/entity/DeliveryNote.ts index 9cd24e74e..26b95d916 100644 --- a/test/github-issues/78/entity/DeliveryNote.ts +++ b/test/github-issues/78/entity/DeliveryNote.ts @@ -1,8 +1,8 @@ import {Column} from "../../../../src/decorator/columns/Column"; import {Document} from "./Document"; -import {ClassTableChild} from "../../../../src/decorator/tables/ClassTableChild"; +import {ClassEntityChild} from "../../../../src/decorator/entity/ClassEntityChild"; -@ClassTableChild() +@ClassEntityChild() export class DeliveryNote extends Document { @Column() diff --git a/test/github-issues/78/entity/Document.ts b/test/github-issues/78/entity/Document.ts index 4c3901cd2..d4f97498d 100644 --- a/test/github-issues/78/entity/Document.ts +++ b/test/github-issues/78/entity/Document.ts @@ -1,11 +1,11 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; -import {TableInheritance} from "../../../../src/decorator/tables/TableInheritance"; +import {TableInheritance} from "../../../../src/decorator/entity/TableInheritance"; import {CreateDateColumn} from "../../../../src/decorator/columns/CreateDateColumn"; import {UpdateDateColumn} from "../../../../src/decorator/columns/UpdateDateColumn"; -@Table() +@Entity() @TableInheritance("class-table") export class Document { diff --git a/test/github-issues/80/entity/Post.ts b/test/github-issues/80/entity/Post.ts index 403f01aac..220070f27 100644 --- a/test/github-issues/80/entity/Post.ts +++ b/test/github-issues/80/entity/Post.ts @@ -1,8 +1,8 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/other-issues/entity-change-in-listeners/entity/Post.ts b/test/other-issues/entity-change-in-listeners/entity/Post.ts index ce45af89f..ec2817017 100644 --- a/test/other-issues/entity-change-in-listeners/entity/Post.ts +++ b/test/other-issues/entity-change-in-listeners/entity/Post.ts @@ -1,10 +1,10 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {BeforeUpdate} from "../../../../src/decorator/listeners/BeforeUpdate"; import {BeforeInsert} from "../../../../src/decorator/listeners/BeforeInsert"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn() diff --git a/test/other-issues/limit-with-order-by/entity/Category.ts b/test/other-issues/limit-with-order-by/entity/Category.ts index f28de51df..fbefef270 100644 --- a/test/other-issues/limit-with-order-by/entity/Category.ts +++ b/test/other-issues/limit-with-order-by/entity/Category.ts @@ -1,8 +1,8 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; -@Table() +@Entity() export class Category { @PrimaryGeneratedColumn() diff --git a/test/other-issues/limit-with-order-by/entity/Post.ts b/test/other-issues/limit-with-order-by/entity/Post.ts index 54e72a47b..beb039303 100644 --- a/test/other-issues/limit-with-order-by/entity/Post.ts +++ b/test/other-issues/limit-with-order-by/entity/Post.ts @@ -1,11 +1,11 @@ -import {Table} from "../../../../src/decorator/tables/Table"; +import {Entity} from "../../../../src/decorator/entity/Entity"; import {PrimaryGeneratedColumn} from "../../../../src/decorator/columns/PrimaryGeneratedColumn"; import {Column} from "../../../../src/decorator/columns/Column"; import {Category} from "./Category"; import {ManyToMany} from "../../../../src/decorator/relations/ManyToMany"; import {JoinTable} from "../../../../src/decorator/relations/JoinTable"; -@Table() +@Entity() export class Post { @PrimaryGeneratedColumn()