renamed GeneratedPrimaryColumn to PrimaryGeneratedColumn

sample/sample1-simple-entity/app.ts

@@ -29,7 +29,7 @@ const options: ConnectionOptions = {
         logQueries: true,
         logSchemaCreation: true
     },
-    autoSchemaSync: false,
+    autoSchemaSync: true,
     entities: [Post]
 };
 /*const options: CreateConnectionOptions = {

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

@@ -1,9 +1,10 @@
-import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
+import {Column, Table} from "../../../src/index";
+import {PrimaryColumn} from "../../../src/decorator/columns/PrimaryColumn";
 
-@Table("sample1_post")
+@Table("sample01_post")
 export class Post {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryColumn("int")
     id: number;
 
     @Column()
@@ -12,7 +13,9 @@ export class Post {
     @Column()
     text: string;
 
-    @Column()
+    @Column("int", {
+        nullable: false
+    })
     likesCount: number;
 
 }

sample/sample10-mixed/entity/Category.ts

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

sample/sample10-mixed/entity/Chapter.ts

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

sample/sample10-mixed/entity/Cover.ts

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

sample/sample10-mixed/entity/Image.ts

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table, ManyToOne, OneToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

sample/sample10-mixed/entity/ImageDetails.ts

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

sample/sample10-mixed/entity/Post.ts

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table, OneToMany, ManyToOne, ManyToMany, OneToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column({

sample/sample10-mixed/entity/PostDetails.ts

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table, OneToOne, OneToMany, ManyToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

@@ -1,11 +1,11 @@
-import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

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

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

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

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

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

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

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

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

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

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table, OneToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table, OneToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

sample/sample16-indexes/entity/Post.ts

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

sample/sample17-versioning/entity/Post.ts

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

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

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

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

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

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

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

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

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table, OneToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

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

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

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

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

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

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

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

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table, ManyToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

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

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

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

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

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table, ManyToOne} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

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

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

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

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

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

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

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

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

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

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

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

sample/sample5-subscribers/entity/Post.ts

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

sample/sample5-subscribers/entity/PostAuthor.ts

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

sample/sample5-subscribers/entity/PostCategory.ts

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

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

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

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

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

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

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

sample/sample7-pagination/entity/Post.ts

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

sample/sample7-pagination/entity/PostAuthor.ts

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

sample/sample7-pagination/entity/PostCategory.ts

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

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

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table, ManyToMany} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

@@ -1,4 +1,4 @@
-import {GeneratedPrimaryColumn, Column, Table} from "../../../src/index";
+import {PrimaryGeneratedColumn, 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

src/connection/Connection.ts

@@ -32,8 +32,8 @@ import {Logger} from "../logger/Logger";
 import {QueryRunnerProvider} from "../query-runner/QueryRunnerProvider";
 
 /**
- * A single connection instance to the database. 
- * Each connection has its own entity manager, repositories, broadcaster and entity metadatas.
+ * Connection is a single database connection to a specific database of a database management system.
+ * You can have multiple connections to multiple databases in your application.
  */
 export class Connection {
 
@@ -408,7 +408,7 @@ export class Connection {
      * This may be useful if you want to perform all db queries within one connection.
      * After finishing with entity manager, don't forget to release it, to release connection back to pool.
      */
-    createEntityManagerWithSingleDatabaseConnection() {
+    createEntityManagerWithSingleDatabaseConnection(): EntityManager {
         const queryRunnerProvider = new QueryRunnerProvider(this.driver, true);
         return new EntityManager(this, queryRunnerProvider);
     }

src/connection/ConnectionManager.ts

@@ -16,8 +16,8 @@ import {OrmUtils} from "../util/OrmUtils";
 import {CannotDetermineConnectionOptionsError} from "./error/CannotDetermineConnectionOptionsError";
 
 /**
- * Connection manager holds all connections made to the databases
- * and provides functions to easily create new connections.
+ * ConnectionManager is used to store and manage all these different connections.
+ * It also provides useful factory methods to simplify connection creation.
  */
 export class ConnectionManager {
 
@@ -118,7 +118,7 @@ export class ConnectionManager {
      * it will try to create connection from environment variables.
      * There are several environment variables you can set:
      *
-     * - TYPEORM_DRIVER_TYPE - driver type. Can be "mysql", "postgres", "mariadb", "sqlite", "oracle" or "mssql".
+     * - TYPEORM_DRIVER_TYPE - driver type. Can be "mysql", "mysql2", "postgres", "mariadb", "sqlite", "oracle" or "mssql".
      * - TYPEORM_URL - database connection url. Should be a string.
      * - TYPEORM_HOST - database host. Should be a string.
      * - TYPEORM_PORT - database access port. Should be a number.
@@ -144,7 +144,7 @@ export class ConnectionManager {
     /**
      * Creates connection from the given connection options and registers it in the manager.
      */
-    async createAndConnect(options?: ConnectionOptions): Promise<Connection>;
+    async createAndConnect(options: ConnectionOptions): Promise<Connection>;
 
     /**
      * Creates connection with the given connection name from the ormconfig.json file and registers it in the manager.
@@ -186,7 +186,7 @@ export class ConnectionManager {
      * it will try to create connection from environment variables.
      * There are several environment variables you can set:
      *
-     * - TYPEORM_DRIVER_TYPE - driver type. Can be "mysql", "postgres", "mariadb", "sqlite", "oracle" or "mssql".
+     * - TYPEORM_DRIVER_TYPE - driver type. Can be "mysql", "mysql2", "postgres", "mariadb", "sqlite", "oracle" or "mssql".
      * - TYPEORM_URL - database connection url. Should be a string.
      * - TYPEORM_HOST - database host. Should be a string.
      * - TYPEORM_PORT - database access port. Should be a number.
@@ -221,7 +221,7 @@ export class ConnectionManager {
     async createAndConnectToAll(ormConfigPath?: string): Promise<Connection[]>;
 
     /**
-     * Creates connection and and registers them in the manager.
+     * Creates connections and and registers them in the manager.
      */
     async createAndConnectToAll(optionsOrOrmConfigFilePath?: ConnectionOptions[]|string): Promise<Connection[]> {
 

src/connection/ConnectionOptions.ts

@@ -3,7 +3,9 @@ import {EntitySchema} from "../entity-schema/EntitySchema";
 import {LoggerOptions} from "../logger/LoggerOptions";
 
 /**
- * Connection's options.
+ * ConnectionOptions is an interface with settings and options for specific connection.
+ * Options contain database and other connection-related settings.
+ * Consumer must provide connection options for each of your connections.
  */
 export interface ConnectionOptions {
 
@@ -26,28 +28,28 @@ export interface ConnectionOptions {
     /**
      * Entities to be loaded for this connection.
      * Accepts both entity classes and directories where from entities need to be loaded.
-     * Directories supports glob patterns.
+     * Directories support glob patterns.
      */
     readonly entities?: Function[]|string[];
 
     /**
      * Subscribers to be loaded for this connection.
      * Accepts both subscriber classes and directories where from subscribers need to be loaded.
-     * Directories supports glob patterns.
+     * Directories support glob patterns.
      */
     readonly subscribers?: Function[]|string[];
 
     /**
      * Naming strategies to be loaded for this connection.
      * Accepts both naming strategy classes and directories where from naming strategies need to be loaded.
-     * Directories supports glob patterns.
+     * Directories support glob patterns.
      */
     readonly namingStrategies?: Function[]|string[];
 
     /**
      * Entity schemas to be loaded for this connection.
      * Accepts both entity schema classes and directories where from entity schemas need to be loaded.
-     * Directories supports glob patterns.
+     * Directories support glob patterns.
      */
     readonly entitySchemas?: EntitySchema[]|string[];
 

src/decorator/columns/PrimaryGeneratedColumn.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 GeneratedPrimaryColumn(options?: ColumnOptions): Function {
+export function PrimaryGeneratedColumn(options?: ColumnOptions): Function {
     return function (object: Object, propertyName: string) {
 
         const reflectedType = ColumnTypes.typeToString((Reflect as any).getMetadata("design:type", object, propertyName));

src/driver/DriverOptions.ts

@@ -4,7 +4,7 @@
 export interface DriverOptions {
 
     /**
-     * Database type.
+     * Database type. This value is required.
      */
     readonly type: "mysql"|"mysql2"|"postgres"|"mariadb"|"sqlite"|"oracle"|"mssql";
 

src/driver/oracle/OracleQueryRunner.ts

@@ -161,13 +161,7 @@ export class OracleQueryRunner implements QueryRunner {
         const parameters = keys.map(key => keyValues[key]);
         const insertSql = `INSERT INTO ${this.driver.escapeTableName(tableName)}(${columns}) VALUES (${values})`;
         if (generatedColumn) {
-            const sql2 = `
-declare lastId number; 
-begin ${insertSql} returning "id" into lastId;
-    dbms_output.enable;
-    dbms_output.put_line(lastId);
-    dbms_output.get_line(:ln, :st);
-end;`;
+            const sql2 = `declare lastId number; begin ${insertSql} returning "id" into lastId; dbms_output.enable; dbms_output.put_line(lastId); dbms_output.get_line(:ln, :st); end;`;
             const saveResult = await this.query(sql2, parameters.concat([
                 { dir: this.driver.oracle.BIND_OUT, type: this.driver.oracle.STRING, maxSize: 32767 },
                 { dir: this.driver.oracle.BIND_OUT, type: this.driver.oracle.NUMBER }
@@ -286,7 +280,7 @@ AND cons.constraint_name = cols.constraint_name AND cons.owner = cols.owner ORDE
                     } else if (dbColumn["DATA_SCALE"] !== null) {
                         columnType += "(0," + dbColumn["DATA_SCALE"] + ")";
                     } else if (dbColumn["DATA_PRECISION"] !== null) {
-                        columnType += "(" + dbColumn["DATA_PRECISION"] + ",0)";
+                        columnType += "(" + dbColumn["DATA_PRECISION"] + ")";
                     }
 
                     const columnSchema = new ColumnSchema();
@@ -340,7 +334,7 @@ AND cons.constraint_name = cols.constraint_name AND cons.owner = cols.owner ORDE
         if (this.isReleased)
             throw new QueryRunnerAlreadyReleasedError();
 
-        const columnDefinitions = table.columns.map(column => this.buildCreateColumnSql(column, false)).join(", ");
+        const columnDefinitions = table.columns.map(column => this.buildCreateColumnSql(column)).join(", ");
         let sql = `CREATE TABLE "${table.name}" (${columnDefinitions}`;
         const primaryKeyColumns = table.columns.filter(column => column.isPrimary);
         if (primaryKeyColumns.length > 0)
@@ -357,7 +351,7 @@ AND cons.constraint_name = cols.constraint_name AND cons.owner = cols.owner ORDE
             throw new QueryRunnerAlreadyReleasedError();
 
         const queries = columns.map(column => {
-            const sql = `ALTER TABLE "${tableSchema.name}" ADD ${this.buildCreateColumnSql(column, false)}`;
+            const sql = `ALTER TABLE "${tableSchema.name}" ADD ${this.buildCreateColumnSql(column)}`;
             return this.query(sql);
         });
         await Promise.all(queries);
@@ -370,9 +364,39 @@ AND cons.constraint_name = cols.constraint_name AND cons.owner = cols.owner ORDE
         if (this.isReleased)
             throw new QueryRunnerAlreadyReleasedError();
 
-        const updatePromises = changedColumns.map(changedColumn => {
-            const sql = `ALTER TABLE "${tableSchema.name}" CHANGE "${changedColumn.oldColumn.name}" ${this.buildCreateColumnSql(changedColumn.newColumn, changedColumn.oldColumn.isPrimary)}`; // todo: CHANGE OR MODIFY COLUMN ????
-            return this.query(sql);
+        const updatePromises = changedColumns.map(async changedColumn => {
+
+            if (changedColumn.newColumn.isGenerated !== changedColumn.oldColumn.isGenerated) {
+
+                if (changedColumn.newColumn.isGenerated) {
+                    if (tableSchema.primaryKeys.length > 0 && changedColumn.oldColumn.isPrimary) {
+                        console.log(tableSchema.primaryKeys);
+                        const dropPrimarySql = `ALTER TABLE "${tableSchema.name}" DROP CONSTRAINT "${tableSchema.primaryKeys[0].name}"`;
+                        await this.query(dropPrimarySql);
+                    }
+
+                    // since modifying identity column is not supported yet, we need to recreate this column
+                    const dropSql = `ALTER TABLE "${tableSchema.name}" DROP COLUMN "${changedColumn.newColumn.name}"`;
+                    await this.query(dropSql);
+
+                    const createSql = `ALTER TABLE "${tableSchema.name}" ADD ${this.buildCreateColumnSql(changedColumn.newColumn)}`;
+                    await this.query(createSql);
+
+                } else {
+                    const sql = `ALTER TABLE "${tableSchema.name}" MODIFY "${changedColumn.newColumn.name}" DROP IDENTITY`;
+                    await this.query(sql);
+
+                }
+            }
+
+            if (changedColumn.newColumn.isNullable !== changedColumn.oldColumn.isNullable) {
+                const sql = `ALTER TABLE "${tableSchema.name}" MODIFY "${changedColumn.newColumn.name}" ${changedColumn.newColumn.type} ${changedColumn.newColumn.isNullable ? "NULL" : "NOT NULL"}`;
+                await this.query(sql);
+
+            } else if (changedColumn.newColumn.type !== changedColumn.oldColumn.type) { // elseif is used because
+                const sql = `ALTER TABLE "${tableSchema.name}" MODIFY "${changedColumn.newColumn.name}" ${changedColumn.newColumn.type}`;
+                await this.query(sql);
+            }
         });
 
         await Promise.all(updatePromises);
@@ -386,7 +410,7 @@ AND cons.constraint_name = cols.constraint_name AND cons.owner = cols.owner ORDE
             throw new QueryRunnerAlreadyReleasedError();
 
         const dropPromises = columns.map(column => {
-            return this.query(`ALTER TABLE "${dbTable.name}" DROP "${column.name}"`);
+            return this.query(`ALTER TABLE "${dbTable.name}" DROP COLUMN "${column.name}"`);
         });
 
         await Promise.all(dropPromises);
@@ -400,7 +424,9 @@ AND cons.constraint_name = cols.constraint_name AND cons.owner = cols.owner ORDE
             throw new QueryRunnerAlreadyReleasedError();
 
         const primaryColumnNames = dbTable.primaryKeys.map(primaryKey => "\"" + primaryKey.columnName + "\"");
-        await this.query(`ALTER TABLE "${dbTable.name}" DROP PRIMARY KEY`);
+        console.log(dbTable.primaryKeys);
+        if (dbTable.primaryKeys.length > 0 && dbTable.primaryKeys[0].name)
+            await this.query(`ALTER TABLE "${dbTable.name}" DROP CONSTRAINT "${dbTable.primaryKeys[0].name}"`);
         if (primaryColumnNames.length > 0)
             await this.query(`ALTER TABLE "${dbTable.name}" ADD PRIMARY KEY (${primaryColumnNames.join(", ")})`);
     }
@@ -491,10 +517,17 @@ AND cons.constraint_name = cols.constraint_name AND cons.owner = cols.owner ORDE
             case "bigint":
                 return "number(20)";
             case "float":
-                return "float";
+                if (column.precision && column.scale)
+                    return `float(${column.precision},${column.scale})`;
+                if (column.precision)
+                    return `float(${column.precision},0)`;
+                if (column.scale)
+                    return `float(0,${column.scale})`;
+
+                return `float(126)`;
             case "double":
             case "number":
-                return "double precision";
+                return "float(126)";
             case "decimal":
                 if (column.precision && column.scale) {
                     return `decimal(${column.precision},${column.scale})`;
@@ -503,7 +536,7 @@ AND cons.constraint_name = cols.constraint_name AND cons.owner = cols.owner ORDE
                     return `decimal(0,${column.scale})`;
 
                 } else if (column.precision) {
-                    return `decimal(${column.precision},0)`;
+                    return `decimal(${column.precision})`;
 
                 } else {
                     return "decimal";
@@ -544,11 +577,11 @@ AND cons.constraint_name = cols.constraint_name AND cons.owner = cols.owner ORDE
     /**
      * Builds a query for create column.
      */
-    protected buildCreateColumnSql(column: ColumnSchema, skipPrimary: boolean) {
+    protected buildCreateColumnSql(column: ColumnSchema) {
         let c = `"${column.name}" ` + column.type;
         if (column.isNullable !== true && !column.isGenerated) // NOT NULL is not supported with GENERATED
             c += " NOT NULL";
-        // if (column.isPrimary === true && !skipPrimary)
+        // if (column.isPrimary === true && addPrimary)
         //     c += " PRIMARY KEY";
         if (column.isGenerated === true) // don't use skipPrimary here since updates can update already exist primary without auto inc.
             c += " GENERATED BY DEFAULT ON NULL AS IDENTITY";

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/GeneratedPrimaryColumn";
+export * from "./decorator/columns/PrimaryGeneratedColumn";
 export * from "./decorator/columns/PrimaryColumn";
 export * from "./decorator/columns/UpdateDateColumn";
 export * from "./decorator/columns/VersionColumn";
@@ -110,7 +110,7 @@ export function getConnectionManager(): ConnectionManager {
  * it will try to create connection from environment variables.
  * There are several environment variables you can set:
  *
- * - TYPEORM_DRIVER_TYPE - driver type. Can be "mysql", "postgres", "mariadb", "sqlite", "oracle" or "mssql".
+ * - TYPEORM_DRIVER_TYPE - driver type. Can be "mysql", "mysql2", "postgres", "mariadb", "sqlite", "oracle" or "mssql".
  * - TYPEORM_URL - database connection url. Should be a string.
  * - TYPEORM_HOST - database host. Should be a string.
  * - TYPEORM_PORT - database access port. Should be a number.
@@ -161,7 +161,7 @@ export function createConnection(optionsOrConnectionNameFromConfig?: ConnectionO
  * it will try to create connection from environment variables.
  * There are several environment variables you can set:
  *
- * - TYPEORM_DRIVER_TYPE - driver type. Can be "mysql", "postgres", "mariadb", "sqlite", "oracle" or "mssql".
+ * - TYPEORM_DRIVER_TYPE - driver type. Can be "mysql", "mysql2", "postgres", "mariadb", "sqlite", "oracle" or "mssql".
  * - TYPEORM_URL - database connection url. Should be a string.
  * - TYPEORM_HOST - database host. Should be a string.
  * - TYPEORM_PORT - database access port. Should be a number.

src/logger/Logger.ts

@@ -22,7 +22,7 @@ export class Logger {
     logQuery(query: string, parameters?: any[]) {
         if (this.options.logQueries ||
             process.env.LOGGER_CLI_SCHEMA_SYNC)
-            this.log("log", `executing query: ${query}${parameters && parameters.length ? "; PARAMETERS: " + JSON.stringify(parameters) : ""}`);
+            this.log("log", `executing query: ${query}${parameters && parameters.length ? " -- PARAMETERS: " + JSON.stringify(parameters) : ""}`);
     }
 
     /**
@@ -32,7 +32,7 @@ export class Logger {
         if (this.options.logQueries ||
             this.options.logOnlyFailedQueries ||
             process.env.LOGGER_CLI_SCHEMA_SYNC)
-            this.log("error", `query failed: ${query}${parameters && parameters.length ? "; PARAMETERS: " + JSON.stringify(parameters) : ""}`);
+            this.log("error", `query failed: ${query}${parameters && parameters.length ? " -- PARAMETERS: " + JSON.stringify(parameters) : ""}`);
     }
 
     /**

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 {GeneratedPrimaryColumn} from "../../../src/decorator/columns/GeneratedPrimaryColumn";
+import {PrimaryGeneratedColumn} from "../../../src/decorator/columns/PrimaryGeneratedColumn";
 import {Column} from "../../../src/decorator/columns/Column";
 import {Table} from "../../../src/decorator/tables/Table";
 
@@ -15,7 +15,7 @@ describe("ConnectionManager", () => {
     @Table()
     class Post {
 
-        @GeneratedPrimaryColumn()
+        @PrimaryGeneratedColumn()
         id: number;
 
         @Column()

test/functional/connection/entity/Category.ts

@@ -1,5 +1,5 @@
 import {ClosureTable} from "../../../../src/decorator/tables/ClosureTable";
-import {GeneratedPrimaryColumn} from "../../../../src/decorator/columns/GeneratedPrimaryColumn";
+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";
@@ -8,7 +8,7 @@ import {TreeLevelColumn} from "../../../../src/decorator/tree/TreeLevelColumn";
 @ClosureTable("CaTeGoRy")
 export class Category {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

test/functional/connection/entity/Post.ts

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 import {Table} from "../../../../../src/decorator/tables/Table";
-import {GeneratedPrimaryColumn} from "../../../../../src/decorator/columns/GeneratedPrimaryColumn";
+import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn";
 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

@@ -1,11 +1,11 @@
 import {Table} from "../../../../../src/decorator/tables/Table";
-import {GeneratedPrimaryColumn} from "../../../../../src/decorator/columns/GeneratedPrimaryColumn";
+import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn";
 import {Column} from "../../../../../src/decorator/columns/Column";
 
 @Table()
 export class Category {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     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 {GeneratedPrimaryColumn} from "../../../../../src/decorator/columns/GeneratedPrimaryColumn";
+import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn";
 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

@@ -1,5 +1,5 @@
 import {Table} from "../../../../../src/decorator/tables/Table";
-import {GeneratedPrimaryColumn} from "../../../../../src/decorator/columns/GeneratedPrimaryColumn";
+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";
@@ -8,7 +8,7 @@ import {RelationCount} from "../../../../../src/decorator/relations/RelationCoun
 @Table()
 export class Tag {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

@@ -1,11 +1,11 @@
 import {Table} from "../../../../../src/decorator/tables/Table";
-import {GeneratedPrimaryColumn} from "../../../../../src/decorator/columns/GeneratedPrimaryColumn";
+import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn";
 import {Column} from "../../../../../src/decorator/columns/Column";
 
 @Table()
 export class Category {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     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 {GeneratedPrimaryColumn} from "../../../../../src/decorator/columns/GeneratedPrimaryColumn";
+import {PrimaryGeneratedColumn} from "../../../../../src/decorator/columns/PrimaryGeneratedColumn";
 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 {
 
-    @GeneratedPrimaryColumn()
+    @PrimaryGeneratedColumn()
     id: number;
 
     @Column()

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

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