renamed GeneratedIdColumn to GeneratedPrimaryColumn

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

@@ -1,9 +1,9 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 
 @Table("sample1_post")
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

sample/sample10-mixed/entity/Category.ts

@@ -1,11 +1,11 @@
-import {GeneratedIdColumn, Column, Table, ManyToOne, ManyToMany} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, ManyToOne, ManyToMany} from "../../../src/index";
 import {Post} from "./Post";
 import {PostDetails} from "./PostDetails";
 
 @Table("sample10_category")
 export class Category {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

sample/sample10-mixed/entity/Chapter.ts

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column, Table, OneToMany} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, OneToMany} from "../../../src/index";
 import {PostDetails} from "./PostDetails";
 
 @Table("sample10_chapter")
 export class Chapter {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

sample/sample10-mixed/entity/Cover.ts

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column, Table, OneToMany} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, OneToMany} from "../../../src/index";
 import {Post} from "./Post";
 
 @Table("sample10_cover")
 export class Cover {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

sample/sample10-mixed/entity/Image.ts

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table, ManyToOne, OneToOne} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, ManyToOne, OneToOne} from "../../../src/index";
 import {Post} from "./Post";
 import {ImageDetails} from "./ImageDetails";
 import {JoinColumn} from "../../../src/decorator/relations/JoinColumn";
@@ -6,7 +6,7 @@ import {JoinColumn} from "../../../src/decorator/relations/JoinColumn";
 @Table("sample10_image")
 export class Image {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

sample/sample10-mixed/entity/ImageDetails.ts

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column, Table, OneToOne} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, OneToOne} from "../../../src/index";
 import {Image} from "./Image";
 
 @Table("sample10_image_details")
 export class ImageDetails {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

sample/sample10-mixed/entity/Post.ts

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table, OneToMany, ManyToOne, ManyToMany, OneToOne} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, OneToMany, ManyToOne, ManyToMany, OneToOne} from "../../../src/index";
 import {Image} from "./Image";
 import {Cover} from "./Cover";
 import {Category} from "./Category";
@@ -9,7 +9,7 @@ import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 @Table("sample10_post")
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column({

sample/sample10-mixed/entity/PostDetails.ts

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table, OneToOne, OneToMany, ManyToOne} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, OneToOne, OneToMany, ManyToOne} from "../../../src/index";
 import {Post} from "./Post";
 import {Chapter} from "./Chapter";
 import {Category} from "./Category";
@@ -6,7 +6,7 @@ import {Category} from "./Category";
 @Table("sample10_post_details")
 export class PostDetails {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,11 +1,11 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {CreateDateColumn} from "../../../src/decorator/columns/CreateDateColumn";
 import {UpdateDateColumn} from "../../../src/decorator/columns/UpdateDateColumn";
 
 @Table("sample11_everything_entity")
 export class EverythingEntity {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,9 +1,9 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 
 @Table("sample1_post")
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column} from "../../../src/index";
 import {AbstractTable} from "../../../src/decorator/tables/AbstractTable";
 
 @AbstractTable()
 export class BasePost {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Post} from "./Post";
 import {OneToMany} from "../../../src/decorator/relations/OneToMany";
 import {PostUser} from "./PostUser";
@@ -6,7 +6,7 @@ import {PostUser} from "./PostUser";
 @Table("sample13_post_author")
 export class PostAuthor extends PostUser {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,11 +1,11 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Post} from "./Post";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 
 @Table("sample13_post_category")
 export class PostCategory {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,9 +1,9 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 
 @Table("sample13_post_user")
 export class PostUser {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column("int")

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

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table, OneToOne} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, OneToOne} from "../../../src/index";
 import {PostAuthor} from "./PostAuthor";
 import {JoinColumn} from "../../../src/decorator/relations/JoinColumn";
 import {OneToMany} from "../../../src/decorator/relations/OneToMany";
@@ -8,7 +8,7 @@ import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 @Table("sample14_post")
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table, OneToOne} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, OneToOne} from "../../../src/index";
 import {Post} from "./Post";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
@@ -6,7 +6,7 @@ import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 @Table("sample14_post_author")
 export class PostAuthor {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

sample/sample16-indexes/entity/Post.ts

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Index} from "../../../src/decorator/Index";
 
 @Table("sample16_post")
@@ -6,7 +6,7 @@ import {Index} from "../../../src/decorator/Index";
 @Index("my_index_with_id_and_title", (post: Post) => [post.id, post.title])
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

sample/sample17-versioning/entity/Post.ts

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {VersionColumn} from "../../../src/decorator/columns/VersionColumn";
 
 @Table("sample17_post")
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,11 +1,11 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Post} from "./Post";
 import {OneToMany} from "../../../src/decorator/relations/OneToMany";
 
 @Table("sample18_author")
 export class Author {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,11 +1,11 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 import {Post} from "./Post";
 
 @Table("sample18_category")
 export class Category {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Author} from "./Author";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
 import {Category} from "./Category";
@@ -8,7 +8,7 @@ import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 @Table("sample18_post")
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,9 +1,9 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 
 @Table("sample19_author")
 export class Author {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,9 +1,9 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 
 @Table("sample19_category")
 export class Category {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Author} from "./Author";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
 import {Category} from "./Category";
@@ -11,7 +11,7 @@ import {PostMetadata} from "./PostMetadata";
 @Table("sample19_post")
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,9 +1,9 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 
 @Table("sample19_post_metadata")
 export class PostMetadata {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column("text")

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

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table, OneToOne} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, OneToOne} from "../../../src/index";
 import {PostDetails} from "./PostDetails";
 import {PostCategory} from "./PostCategory";
 import {PostAuthor} from "./PostAuthor";
@@ -10,7 +10,7 @@ import {JoinColumn} from "../../../src/decorator/relations/JoinColumn";
 @Table("sample2_post")
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column, Table, OneToOne} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, OneToOne} from "../../../src/index";
 import {Post} from "./Post";
 
 @Table("sample2_post_author")
 export class PostAuthor {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,9 +1,9 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 
 @Table("sample2_post_category")
 export class PostCategory {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column, Table, OneToOne} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, OneToOne} from "../../../src/index";
 import {Post} from "./Post";
 
 @Table("sample2_post_details")
 export class PostDetails {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column, Table, OneToOne} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, OneToOne} from "../../../src/index";
 import {Post} from "./Post";
 
 @Table("sample2_post_image")
 export class PostImage {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column, Table, OneToOne} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, OneToOne} from "../../../src/index";
 import {Post} from "./Post";
 
 @Table("sample2_post_information")
 export class PostInformation {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column, Table, OneToOne} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, OneToOne} from "../../../src/index";
 import {Post} from "./Post";
 
 @Table("sample2_post_metadata")
 export class PostMetadata {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,9 +1,9 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 
 @Table("sample20_author")
 export class Author {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,9 +1,9 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 
 @Table("sample20_category")
 export class Category {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Author} from "./Author";
 import {Category} from "./Category";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
@@ -7,7 +7,7 @@ import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 @Table("sample20_post")
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,11 +1,11 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Post} from "./Post";
 import {OneToMany} from "../../../src/decorator/relations/OneToMany";
 
 @Table("sample21_author")
 export class Author {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,11 +1,11 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 import {Post} from "./Post";
 
 @Table("sample21_category")
 export class Category {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Author} from "./Author";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
 import {Category} from "./Category";
@@ -9,7 +9,7 @@ import {JoinColumn} from "../../../src/decorator/relations/JoinColumn";
 @Table("sample21_post")
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column} from "../../../src/index";
 import {TreeLevelColumn} from "../../../src/decorator/tree/TreeLevelColumn";
 import {ClosureTable} from "../../../src/decorator/tables/ClosureTable";
 import {TreeParent} from "../../../src/decorator/tree/TreeParent";
@@ -7,7 +7,7 @@ import {TreeChildren} from "../../../src/decorator/tree/TreeChildren";
 @ClosureTable("sample22_category")
 export class Category {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,9 +1,9 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 
 @Table("sample23_author")
 export class Author {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Author} from "./Author";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
@@ -6,7 +6,7 @@ import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 @Table("sample23_category")
 export class Category {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Category} from "./Category";
 import {Author} from "./Author";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
@@ -8,7 +8,7 @@ import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
 @Table("sample23_post")
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,11 +1,11 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {OneToMany} from "../../../src/decorator/relations/OneToMany";
 import {Post} from "./Post";
 
 @Table("sample25_author")
 export class Author {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,11 +1,11 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Author} from "./Author";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
 
 @Table("sample25_post")
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,11 +1,11 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Counters} from "./Counters";
 import {Embedded} from "../../../src/decorator/Embedded";
 
 @Table("sample26_post")
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,11 +1,11 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Counters} from "./Counters";
 import {Embedded} from "../../../src/decorator/Embedded";
 
 @Table("sample26_question")
 export class Question {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table, ManyToOne} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, ManyToOne} from "../../../src/index";
 import {PostDetails} from "./PostDetails";
 import {PostCategory} from "./PostCategory";
 import {PostAuthor} from "./PostAuthor";
@@ -9,7 +9,7 @@ import {PostMetadata} from "./PostMetadata";
 @Table("sample3_post")
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column, Table, OneToMany} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, OneToMany} from "../../../src/index";
 import {Post} from "./Post";
 
 @Table("sample3_post_author")
 export class PostAuthor {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,9 +1,9 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 
 @Table("sample3_post_category")
 export class PostCategory {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column, Table, OneToMany} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, OneToMany} from "../../../src/index";
 import {Post} from "./Post";
 
 @Table("sample3_post_details")
 export class PostDetails {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column({

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

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column, Table, OneToMany} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, OneToMany} from "../../../src/index";
 import {Post} from "./Post";
 
 @Table("sample3_post_image")
 export class PostImage {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column, Table, OneToMany} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, OneToMany} from "../../../src/index";
 import {Post} from "./Post";
 
 @Table("sample3_post_information")
 export class PostInformation {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column, Table, OneToMany} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, OneToMany} from "../../../src/index";
 import {Post} from "./Post";
 
 @Table("sample3_post_metadata")
 export class PostMetadata {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,9 +1,9 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 
 @Table("sample30_category")
 export class Category {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 import {Category} from "./Category";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
@@ -11,7 +11,7 @@ import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 })
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,9 +1,9 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 
 @Table("sample31_author")
 export class Author {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,9 +1,9 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 
 @Table("sample31_category")
 export class Category {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table, ManyToOne} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, ManyToOne} from "../../../src/index";
 import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 import {Author} from "./Author";
@@ -7,7 +7,7 @@ import {Category} from "./Category";
 @Table("sample31_post")
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, ManyToMany} from "../../../src/index";
 import {PostDetails} from "./PostDetails";
 import {PostCategory} from "./PostCategory";
 import {PostAuthor} from "./PostAuthor";
@@ -10,7 +10,7 @@ import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 @Table("sample4_post")
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, ManyToMany} from "../../../src/index";
 import {Post} from "./Post";
 
 @Table("sample4_post_author")
 export class PostAuthor {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,9 +1,9 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 
 @Table("sample4_post_category")
 export class PostCategory {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, ManyToMany} from "../../../src/index";
 import {Post} from "./Post";
 
 @Table("sample4_post_details")
 export class PostDetails {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column({

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

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, ManyToMany} from "../../../src/index";
 import {Post} from "./Post";
 
 @Table("sample4_post_image")
 export class PostImage {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, ManyToMany} from "../../../src/index";
 import {Post} from "./Post";
 
 @Table("sample4_post_information")
 export class PostInformation {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, ManyToMany} from "../../../src/index";
 import {Post} from "./Post";
 
 @Table("sample4_post_metadata")
 export class PostMetadata {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

sample/sample5-subscribers/entity/Post.ts

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, ManyToMany} from "../../../src/index";
 import {PostCategory} from "./PostCategory";
 import {PostAuthor} from "./PostAuthor";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
@@ -7,7 +7,7 @@ import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 @Table("sample5_post")
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

sample/sample5-subscribers/entity/PostAuthor.ts

@@ -1,11 +1,11 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Post} from "./Post";
 import {OneToMany} from "../../../src/decorator/relations/OneToMany";
 
 @Table("sample5_post_author")
 export class PostAuthor {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

sample/sample5-subscribers/entity/PostCategory.ts

@@ -1,11 +1,11 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Post} from "./Post";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 
 @Table("sample5_post_category")
 export class PostCategory {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,10 +1,10 @@
-import {GeneratedIdColumn, Column} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column} from "../../../src/index";
 import {AbstractTable} from "../../../src/decorator/tables/AbstractTable";
 
 @AbstractTable()
 export class BasePost {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,11 +1,11 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Post} from "./Post";
 import {OneToMany} from "../../../src/decorator/relations/OneToMany";
 
 @Table("sample6_post_author")
 export class PostAuthor {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,11 +1,11 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Post} from "./Post";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 
 @Table("sample6_post_category")
 export class PostCategory {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

sample/sample7-pagination/entity/Post.ts

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, ManyToMany} from "../../../src/index";
 import {PostCategory} from "./PostCategory";
 import {PostAuthor} from "./PostAuthor";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
@@ -7,7 +7,7 @@ import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 @Table("sample7_post")
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

sample/sample7-pagination/entity/PostAuthor.ts

@@ -1,11 +1,11 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Post} from "./Post";
 import {OneToMany} from "../../../src/decorator/relations/OneToMany";
 
 @Table("sample7_post_author")
 export class PostAuthor {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

sample/sample7-pagination/entity/PostCategory.ts

@@ -1,11 +1,11 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Post} from "./Post";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 
 @Table("sample7_post_category")
 export class PostCategory {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, 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";
@@ -8,7 +8,7 @@ import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 @Table("sample8_category")
 export class Category {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table, ManyToMany} from "../../../src/index";
 import {PostCategory} from "./PostCategory";
 import {PostAuthor} from "./PostAuthor";
 import {ManyToOne} from "../../../src/decorator/relations/ManyToOne";
@@ -14,7 +14,7 @@ import {JoinTable} from "../../../src/decorator/relations/JoinTable";
 @Table("sample9_post")
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Post} from "./Post";
 import {OneToMany} from "../../../src/decorator/relations/OneToMany";
 import {AfterRemove} from "../../../src/decorator/listeners/AfterRemove";
@@ -11,7 +11,7 @@ import {BeforeInsert} from "../../../src/decorator/listeners/BeforeInsert";
 @Table("sample9_post_author")
 export class PostAuthor {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedIdColumn, Column, Table} from "../../../src/index";
+import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
 import {Post} from "./Post";
 import {ManyToMany} from "../../../src/decorator/relations/ManyToMany";
 import {AfterRemove} from "../../../src/decorator/listeners/AfterRemove";
@@ -11,7 +11,7 @@ import {BeforeInsert} from "../../../src/decorator/listeners/BeforeInsert";
 @Table("sample9_post_category")
 export class PostCategory {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

src/decorator/columns/GeneratedPrimaryColumn.ts

@@ -10,7 +10,7 @@ import {ColumnMetadataArgs} from "../../metadata-args/ColumnMetadataArgs";
  * This column creates an integer PRIMARY COLUMN with generated set to true.
  * This column creates is an alias for @PrimaryColumn("int", { generated: true }).
  */
-export function GeneratedIdColumn(options?: ColumnOptions): Function {
+export function GeneratedPrimaryColumn(options?: ColumnOptions): Function {
     return function (object: Object, propertyName: string) {
 
         const reflectedType = ColumnTypes.typeToString((Reflect as any).getMetadata("design:type", object, propertyName));

src/index.ts

@@ -16,7 +16,7 @@ export * from "./container";
 export * from "./decorator/columns/Column";
 export * from "./decorator/columns/CreateDateColumn";
 export * from "./decorator/columns/DiscriminatorColumn";
-export * from "./decorator/columns/GeneratedIdColumn";
+export * from "./decorator/columns/GeneratedPrimaryColumn";
 export * from "./decorator/columns/PrimaryColumn";
 export * from "./decorator/columns/UpdateDateColumn";
 export * from "./decorator/columns/VersionColumn";

test/functional/connection-manager/connection-manager.ts

@@ -6,7 +6,7 @@ import {ConnectionManager} from "../../../src/connection/ConnectionManager";
 import {MysqlDriver} from "../../../src/driver/mysql/MysqlDriver";
 import {PostgresDriver} from "../../../src/driver/postgres/PostgresDriver";
 import {ConnectionNotFoundError} from "../../../src/connection/error/ConnectionNotFoundError";
-import {GeneratedIdColumn} from "../../../src/decorator/columns/GeneratedIdColumn";
+import {GeneratedPrimaryColumn} from "../../../src/decorator/columns/GeneratedPrimaryColumn";
 import {Column} from "../../../src/decorator/columns/Column";
 import {Table} from "../../../src/decorator/tables/Table";
 
@@ -15,7 +15,7 @@ describe("ConnectionManager", () => {
     @Table()
     class Post {
 
-        @GeneratedIdColumn()
+        @GeneratedPrimaryColumn()
         id: number;
 
         @Column()

test/functional/connection/entity/Category.ts

@@ -1,5 +1,5 @@
 import {ClosureTable} from "../../../../src/decorator/tables/ClosureTable";
-import {GeneratedIdColumn} from "../../../../src/decorator/columns/GeneratedIdColumn";
+import {GeneratedPrimaryColumn} from "../../../../src/decorator/columns/GeneratedPrimaryColumn";
 import {Column} from "../../../../src/decorator/columns/Column";
 import {TreeParent} from "../../../../src/decorator/tree/TreeParent";
 import {TreeChildren} from "../../../../src/decorator/tree/TreeChildren";
@@ -8,7 +8,7 @@ import {TreeLevelColumn} from "../../../../src/decorator/tree/TreeLevelColumn";
 @ClosureTable("CaTeGoRy")
 export class Category {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

test/functional/connection/entity/Post.ts

@@ -1,11 +1,11 @@
 import {Table} from "../../../../src/decorator/tables/Table";
-import {GeneratedIdColumn} from "../../../../src/decorator/columns/GeneratedIdColumn";
+import {GeneratedPrimaryColumn} from "../../../../src/decorator/columns/GeneratedPrimaryColumn";
 import {Column} from "../../../../src/decorator/columns/Column";
 
 @Table()
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

test/functional/connection/modules/blog/entity/Blog.ts

@@ -1,11 +1,11 @@
 import {Table} from "../../../../../../src/decorator/tables/Table";
-import {GeneratedIdColumn} from "../../../../../../src/decorator/columns/GeneratedIdColumn";
+import {GeneratedPrimaryColumn} from "../../../../../../src/decorator/columns/GeneratedPrimaryColumn";
 import {Column} from "../../../../../../src/decorator/columns/Column";
 
 @Table()
 export class Blog {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

test/functional/connection/modules/question/entity/Question.ts

@@ -1,11 +1,11 @@
 import {Table} from "../../../../../../src/decorator/tables/Table";
-import {GeneratedIdColumn} from "../../../../../../src/decorator/columns/GeneratedIdColumn";
+import {GeneratedPrimaryColumn} from "../../../../../../src/decorator/columns/GeneratedPrimaryColumn";
 import {Column} from "../../../../../../src/decorator/columns/Column";
 
 @Table()
 export class Question {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

test/functional/connection/modules/video/entity/Video.ts

@@ -1,11 +1,11 @@
 import {Table} from "../../../../../../src/decorator/tables/Table";
-import {GeneratedIdColumn} from "../../../../../../src/decorator/columns/GeneratedIdColumn";
+import {GeneratedPrimaryColumn} from "../../../../../../src/decorator/columns/GeneratedPrimaryColumn";
 import {Column} from "../../../../../../src/decorator/columns/Column";
 
 @Table()
 export class Video {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

test/functional/decorators/embedded/entity/Post.ts

@@ -1,5 +1,5 @@
 import {Table} from "../../../../../src/decorator/tables/Table";
-import {GeneratedIdColumn} from "../../../../../src/decorator/columns/GeneratedIdColumn";
+import {GeneratedPrimaryColumn} from "../../../../../src/decorator/columns/GeneratedPrimaryColumn";
 import {Column} from "../../../../../src/decorator/columns/Column";
 import {Counters} from "./Counters";
 import {Embedded} from "../../../../../src/decorator/Embedded";
@@ -7,7 +7,7 @@ import {Embedded} from "../../../../../src/decorator/Embedded";
 @Table()
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

test/functional/decorators/relation-count/entity/Category.ts

@@ -1,11 +1,11 @@
 import {Table} from "../../../../../src/decorator/tables/Table";
-import {GeneratedIdColumn} from "../../../../../src/decorator/columns/GeneratedIdColumn";
+import {GeneratedPrimaryColumn} from "../../../../../src/decorator/columns/GeneratedPrimaryColumn";
 import {Column} from "../../../../../src/decorator/columns/Column";
 
 @Table()
 export class Category {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

test/functional/decorators/relation-count/entity/Post.ts

@@ -1,7 +1,7 @@
 import {Category} from "./Category";
 import {ManyToMany} from "../../../../../src/decorator/relations/ManyToMany";
 import {Table} from "../../../../../src/decorator/tables/Table";
-import {GeneratedIdColumn} from "../../../../../src/decorator/columns/GeneratedIdColumn";
+import {GeneratedPrimaryColumn} from "../../../../../src/decorator/columns/GeneratedPrimaryColumn";
 import {Column} from "../../../../../src/decorator/columns/Column";
 import {Tag} from "./Tag";
 import {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne";
@@ -11,7 +11,7 @@ import {RelationCount} from "../../../../../src/decorator/relations/RelationCoun
 @Table()
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

test/functional/decorators/relation-count/entity/Tag.ts

@@ -1,5 +1,5 @@
 import {Table} from "../../../../../src/decorator/tables/Table";
-import {GeneratedIdColumn} from "../../../../../src/decorator/columns/GeneratedIdColumn";
+import {GeneratedPrimaryColumn} from "../../../../../src/decorator/columns/GeneratedPrimaryColumn";
 import {Column} from "../../../../../src/decorator/columns/Column";
 import {OneToMany} from "../../../../../src/decorator/relations/OneToMany";
 import {Post} from "./Post";
@@ -8,7 +8,7 @@ import {RelationCount} from "../../../../../src/decorator/relations/RelationCoun
 @Table()
 export class Tag {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

test/functional/decorators/relation-id/entity/Category.ts

@@ -1,11 +1,11 @@
 import {Table} from "../../../../../src/decorator/tables/Table";
-import {GeneratedIdColumn} from "../../../../../src/decorator/columns/GeneratedIdColumn";
+import {GeneratedPrimaryColumn} from "../../../../../src/decorator/columns/GeneratedPrimaryColumn";
 import {Column} from "../../../../../src/decorator/columns/Column";
 
 @Table()
 export class Category {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

test/functional/decorators/relation-id/entity/Post.ts

@@ -1,7 +1,7 @@
 import {Category} from "./Category";
 import {ManyToMany} from "../../../../../src/decorator/relations/ManyToMany";
 import {Table} from "../../../../../src/decorator/tables/Table";
-import {GeneratedIdColumn} from "../../../../../src/decorator/columns/GeneratedIdColumn";
+import {GeneratedPrimaryColumn} from "../../../../../src/decorator/columns/GeneratedPrimaryColumn";
 import {Column} from "../../../../../src/decorator/columns/Column";
 import {Tag} from "./Tag";
 import {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne";
@@ -11,7 +11,7 @@ import {JoinTable} from "../../../../../src/decorator/relations/JoinTable";
 @Table()
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

test/functional/decorators/relation-id/entity/Tag.ts

@@ -1,11 +1,11 @@
 import {Table} from "../../../../../src/decorator/tables/Table";
-import {GeneratedIdColumn} from "../../../../../src/decorator/columns/GeneratedIdColumn";
+import {GeneratedPrimaryColumn} from "../../../../../src/decorator/columns/GeneratedPrimaryColumn";
 import {Column} from "../../../../../src/decorator/columns/Column";
 
 @Table()
 export class Tag {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

test/functional/lazy-relations/entity/Category.ts

@@ -1,5 +1,5 @@
 import {Table} from "../../../../src/decorator/tables/Table";
-import {GeneratedIdColumn} from "../../../../src/decorator/columns/GeneratedIdColumn";
+import {GeneratedPrimaryColumn} from "../../../../src/decorator/columns/GeneratedPrimaryColumn";
 import {Column} from "../../../../src/decorator/columns/Column";
 import {Post} from "./Post";
 import {ManyToMany} from "../../../../src/decorator/relations/ManyToMany";
@@ -7,7 +7,7 @@ import {ManyToMany} from "../../../../src/decorator/relations/ManyToMany";
 @Table()
 export class Category {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

test/functional/lazy-relations/entity/Post.ts

@@ -1,5 +1,5 @@
 import {Table} from "../../../../src/decorator/tables/Table";
-import {GeneratedIdColumn} from "../../../../src/decorator/columns/GeneratedIdColumn";
+import {GeneratedPrimaryColumn} from "../../../../src/decorator/columns/GeneratedPrimaryColumn";
 import {Column} from "../../../../src/decorator/columns/Column";
 import {Category} from "./Category";
 import {ManyToMany} from "../../../../src/decorator/relations/ManyToMany";
@@ -8,7 +8,7 @@ import {JoinTable} from "../../../../src/decorator/relations/JoinTable";
 @Table()
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

test/functional/persistence/custom-column-names/entity/Category.ts

@@ -1,5 +1,5 @@
 import {Table} from "../../../../../src/decorator/tables/Table";
-import {GeneratedIdColumn} from "../../../../../src/decorator/columns/GeneratedIdColumn";
+import {GeneratedPrimaryColumn} from "../../../../../src/decorator/columns/GeneratedPrimaryColumn";
 import {Post} from "./Post";
 import {Column} from "../../../../../src/decorator/columns/Column";
 import {OneToMany} from "../../../../../src/decorator/relations/OneToMany";
@@ -10,7 +10,7 @@ import {CategoryMetadata} from "./CategoryMetadata";
 @Table()
 export class Category {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @OneToMany(type => Post, post => post.category)

test/functional/persistence/custom-column-names/entity/CategoryMetadata.ts

@@ -1,5 +1,5 @@
 import {Table} from "../../../../../src/decorator/tables/Table";
-import {GeneratedIdColumn} from "../../../../../src/decorator/columns/GeneratedIdColumn";
+import {GeneratedPrimaryColumn} from "../../../../../src/decorator/columns/GeneratedPrimaryColumn";
 import {Column} from "../../../../../src/decorator/columns/Column";
 import {OneToOne} from "../../../../../src/decorator/relations/OneToOne";
 import {Category} from "./Category";
@@ -7,7 +7,7 @@ import {Category} from "./Category";
 @Table()
 export class CategoryMetadata {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
     
     @Column()

test/functional/persistence/custom-column-names/entity/Post.ts

@@ -1,6 +1,6 @@
 import {Category} from "./Category";
 import {Table} from "../../../../../src/decorator/tables/Table";
-import {GeneratedIdColumn} from "../../../../../src/decorator/columns/GeneratedIdColumn";
+import {GeneratedPrimaryColumn} from "../../../../../src/decorator/columns/GeneratedPrimaryColumn";
 import {Column} from "../../../../../src/decorator/columns/Column";
 import {ManyToOne} from "../../../../../src/decorator/relations/ManyToOne";
 import {JoinColumn} from "../../../../../src/decorator/relations/JoinColumn";
@@ -8,7 +8,7 @@ import {JoinColumn} from "../../../../../src/decorator/relations/JoinColumn";
 @Table()
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

test/functional/persistence/many-to-many/entity/Category.ts

@@ -1,5 +1,5 @@
 import {Table} from "../../../../../src/decorator/tables/Table";
-import {GeneratedIdColumn} from "../../../../../src/decorator/columns/GeneratedIdColumn";
+import {GeneratedPrimaryColumn} from "../../../../../src/decorator/columns/GeneratedPrimaryColumn";
 import {Post} from "./Post";
 import {Column} from "../../../../../src/decorator/columns/Column";
 import {ManyToMany} from "../../../../../src/decorator/relations/ManyToMany";
@@ -7,7 +7,7 @@ import {ManyToMany} from "../../../../../src/decorator/relations/ManyToMany";
 @Table()
 export class Category {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()

test/functional/persistence/many-to-many/entity/Post.ts

@@ -1,6 +1,6 @@
 import {Category} from "./Category";
 import {Table} from "../../../../../src/decorator/tables/Table";
-import {GeneratedIdColumn} from "../../../../../src/decorator/columns/GeneratedIdColumn";
+import {GeneratedPrimaryColumn} from "../../../../../src/decorator/columns/GeneratedPrimaryColumn";
 import {Column} from "../../../../../src/decorator/columns/Column";
 import {ManyToMany} from "../../../../../src/decorator/relations/ManyToMany";
 import {JoinTable} from "../../../../../src/decorator/relations/JoinTable";
@@ -8,7 +8,7 @@ import {JoinTable} from "../../../../../src/decorator/relations/JoinTable";
 @Table()
 export class Post {
 
-    @GeneratedIdColumn()
+    @GeneratedPrimaryColumn()
     id: number;
 
     @Column()