haggholm
diff --git a/‎.travis.yml
+1-6 b/‎.travis.yml
+1-6
diff --git a/‎CHANGELOG.md
+32-6 b/‎CHANGELOG.md
+32-6
diff --git a/‎README.md
+2 b/‎README.md
+2
diff --git a/‎docs/active-record-data-mapper.md
+3-3 b/‎docs/active-record-data-mapper.md
+3-3
diff --git a/‎docs/connection-options.md
+6 b/‎docs/connection-options.md
+6
diff --git a/‎docs/entities.md
+48-2 b/‎docs/entities.md
+48-2
diff --git a/‎docs/example-with-express.md
+1-1 b/‎docs/example-with-express.md
+1-1
diff --git a/‎docs/faq.md
+1-1 b/‎docs/faq.md
+1-1
diff --git a/‎docs/many-to-many-relations.md
+47 b/‎docs/many-to-many-relations.md
+47
diff --git a/‎docs/many-to-one-one-to-many-relations.md
+1-1 b/‎docs/many-to-one-one-to-many-relations.md
+1-1
diff --git a/‎docs/relations.md
+1-1 b/‎docs/relations.md
+1-1
diff --git a/‎docs/select-query-builder.md
+1-1 b/‎docs/select-query-builder.md
+1-1
diff --git a/‎docs/separating-entity-definition.md
+1-1 b/‎docs/separating-entity-definition.md
+1-1
diff --git a/‎docs/supported-platforms.md
+1-1 b/‎docs/supported-platforms.md
+1-1
diff --git a/‎docs/transactions.md
+2-2 b/‎docs/transactions.md
+2-2
diff --git a/‎docs/troubleshooting.md
+16 b/‎docs/troubleshooting.md
+16
diff --git a/‎docs/using-cli.md
+2-2 b/‎docs/using-cli.md
+2-2
diff --git a/‎docs/using-ormconfig.md
+2-2 b/‎docs/using-ormconfig.md
+2-2
diff --git a/‎docs/zh_CN/connection-options.md
+2 b/‎docs/zh_CN/connection-options.md
+2
@@ -1,13 +1,8 @@
 language: node_js
 node_js:
-#  - stable
+  - 12
   - 10
-  - 9
   - 8
-#  - 6
-#  - 4
-#  - 0.12
-#  - 0.11
 
 services:
   - docker
 
@@ -1,11 +1,36 @@
-# Changelog
+## [0.2.19](https://github.com/typeorm/typeorm/compare/0.2.18...0.2.19) (2019-09-13)
 
-TypeORM follows a semantic versioning and until `1.0.0` breaking changes may appear in `0.x.x` versions,
-however since API is already quite stable we don't expect too much breaking changes.
-If we missed a note on some change or you have a questions on migrating from old version,
-feel free to ask us and community.
+### Bug Fixes
+
+* "database" option error in driver when use "url" option for connection ([690e6f5](https://github.com/typeorm/typeorm/commit/690e6f5))
+* "hstore injection" & properly handle NULL, empty string, backslashes & quotes in hstore key/value pairs ([#4720](https://github.com/typeorm/typeorm/issues/4720)) ([3abe5b9](https://github.com/typeorm/typeorm/commit/3abe5b9))
+* add SaveOptions and RemoveOptions into ActiveRecord ([#4318](https://github.com/typeorm/typeorm/issues/4318)) ([a6d7ba2](https://github.com/typeorm/typeorm/commit/a6d7ba2))
+* apostrophe in Postgres enum strings breaks query ([#4631](https://github.com/typeorm/typeorm/issues/4631)) ([445c740](https://github.com/typeorm/typeorm/commit/445c740))
+* change PrimaryColumn decorator to clone passed options ([#4571](https://github.com/typeorm/typeorm/issues/4571)) ([3cf470d](https://github.com/typeorm/typeorm/commit/3cf470d)), closes [#4570](https://github.com/typeorm/typeorm/issues/4570)
+* createQueryBuilder relation remove works only if using ID ([#2632](https://github.com/typeorm/typeorm/issues/2632)) ([#4734](https://github.com/typeorm/typeorm/issues/4734)) ([1d73a90](https://github.com/typeorm/typeorm/commit/1d73a90))
+* resolve issue with conversion string to simple-json ([#4476](https://github.com/typeorm/typeorm/issues/4476)) ([d1594f5](https://github.com/typeorm/typeorm/commit/d1594f5)), closes [#4440](https://github.com/typeorm/typeorm/issues/4440)
+* sqlite connections don't ignore the schema property ([#4599](https://github.com/typeorm/typeorm/issues/4599)) ([d8f1c81](https://github.com/typeorm/typeorm/commit/d8f1c81))
+* the excessive stack depth comparing types `FindConditions<?>` and `FindConditions<?>` problem ([#4470](https://github.com/typeorm/typeorm/issues/4470)) ([7a0beed](https://github.com/typeorm/typeorm/commit/7a0beed))
+* views generating broken Migrations ([#4726](https://github.com/typeorm/typeorm/issues/4726)) ([c52b3d2](https://github.com/typeorm/typeorm/commit/c52b3d2)), closes [#4123](https://github.com/typeorm/typeorm/issues/4123)
+
+
+### Features
 
-## 0.2.18 (UNRELEASED)
+* add `set` datatype support for MySQL/MariaDB ([#4538](https://github.com/typeorm/typeorm/issues/4538)) ([19e2179](https://github.com/typeorm/typeorm/commit/19e2179)), closes [#2779](https://github.com/typeorm/typeorm/issues/2779)
+* add materialized View support for Postgres ([#4478](https://github.com/typeorm/typeorm/issues/4478)) ([dacac83](https://github.com/typeorm/typeorm/commit/dacac83)), closes [#4317](https://github.com/typeorm/typeorm/issues/4317) [#3996](https://github.com/typeorm/typeorm/issues/3996)
+* add mongodb `useUnifiedTopology` config parameter ([#4684](https://github.com/typeorm/typeorm/issues/4684)) ([92e4270](https://github.com/typeorm/typeorm/commit/92e4270))
+* add multi-dimensional cube support for PostgreSQL ([#4378](https://github.com/typeorm/typeorm/issues/4378)) ([b6d6278](https://github.com/typeorm/typeorm/commit/b6d6278))
+* add options to input init config for sql.js ([#4560](https://github.com/typeorm/typeorm/issues/4560)) ([5c311ed](https://github.com/typeorm/typeorm/commit/5c311ed))
+* add postgres pool error handler ([#4474](https://github.com/typeorm/typeorm/issues/4474)) ([a925be9](https://github.com/typeorm/typeorm/commit/a925be9))
+* add referenced table metadata to NamingStrategy to resolve foreign key name ([#4274](https://github.com/typeorm/typeorm/issues/4274)) ([0094f61](https://github.com/typeorm/typeorm/commit/0094f61)), closes [#3847](https://github.com/typeorm/typeorm/issues/3847) [#1355](https://github.com/typeorm/typeorm/issues/1355)
+* add support for ON CONFLICT for cockroach ([#4518](https://github.com/typeorm/typeorm/issues/4518)) ([db8074a](https://github.com/typeorm/typeorm/commit/db8074a)), closes [#4513](https://github.com/typeorm/typeorm/issues/4513)
+* Added support for DISTINCT queries ([#4109](https://github.com/typeorm/typeorm/issues/4109)) ([39a8e34](https://github.com/typeorm/typeorm/commit/39a8e34))
+* Aurora Data API ([#4375](https://github.com/typeorm/typeorm/issues/4375)) ([c321562](https://github.com/typeorm/typeorm/commit/c321562))
+* export additional schema builder classes ([#4325](https://github.com/typeorm/typeorm/issues/4325)) ([e589fda](https://github.com/typeorm/typeorm/commit/e589fda))
+* log files loaded from glob patterns ([#4346](https://github.com/typeorm/typeorm/issues/4346)) ([e12479e](https://github.com/typeorm/typeorm/commit/e12479e)), closes [#4162](https://github.com/typeorm/typeorm/issues/4162)
+* UpdateResult returns affected rows in postgresql ([#4432](https://github.com/typeorm/typeorm/issues/4432)) ([7808bba](https://github.com/typeorm/typeorm/commit/7808bba)), closes [#1308](https://github.com/typeorm/typeorm/issues/1308)
+
+## 0.2.18
 
 ### Bug fixes
 
@@ -24,6 +49,7 @@ feel free to ask us and community.
 * extend afterLoad() subscriber interface to take LoadEvent ([issue #4185](https://github.com/typeorm/typeorm/issues/4185))
 * relation decorators (e.g. `@OneToMany`) now also accept `string` instead of `typeFunction`, which prevents circular dependency issues in the frontend/browser ([issue #4190](https://github.com/typeorm/typeorm/issues/4190))
 * added support for metadata reflection in typeorm-class-transformer-shim.js ([issue #4219](https://github.com/typeorm/typeorm/issues/4219))
+* added `sqlJsConfig` to input config when initializing sql.js ([issue #4559](https://github.com/typeorm/typeorm/issues/4559))
 
 ## 0.2.17 (2019-05-01)
 
 
@@ -1261,6 +1261,8 @@ There are a few repositories which you can clone and start with:
 * [Example how to use TypeORM in a Cordova/PhoneGap app](https://github.com/typeorm/cordova-example)
 * [Example how to use TypeORM with an Ionic app](https://github.com/typeorm/ionic-example)
 * [Example how to use TypeORM with React Native](https://github.com/typeorm/react-native-example)
+* [Example how to use TypeORM with Nativescript-Vue](https://github.com/typeorm/nativescript-vue-typeorm-sample)
+* [Example how to use TypeORM with Nativescript-Angular](https://github.com/betov18x/nativescript-angular-typeorm-example)
 * [Example how to use TypeORM with Electron using JavaScript](https://github.com/typeorm/electron-javascript-example)
 * [Example how to use TypeORM with Electron using TypeScript](https://github.com/typeorm/electron-typescript-example)
 
 
@@ -185,7 +185,7 @@ Learn more about [custom repositories](custom-repository.md).
 The decision is up to you.
 Both strategies have their own cons and pros.
 
-One thing we should always keep in mind in software development is how we are going to maintain it.
-The `Data Mapper` approach helps you with maintainability of your software which is more effective in bigger apps.
-The `Active record` approach helps you to keep things simple which works good in small apps.
+One thing we should always keep in mind in with software development is how we are going to maintain our applications.
+The `Data Mapper` approach helps with maintainability, which is more effective in bigger apps.
+The `Active record` approach helps keep things simple which works well in smaller apps.
  And simplicity is always a key to better maintainability.
@@ -180,6 +180,8 @@ See [SSL options](https://github.com/mysqljs/mysql#ssl-options).
 
 * `uuidExtension` - The Postgres extension to use when generating UUIDs. Defaults to `uuid-ossp`. Can be changed to `pgcrypto` if the `uuid-ossp` extension is unavailable.
 
+* `poolErrorHandler` - A function that get's called when underlying pool emits `'error'` event. Takes single parameter (error instance) and defaults to logging with `warn` level.
+
 ## `sqlite` connection options
 
 * `database` - Database path. For example "./mydb.sql"
@@ -258,6 +260,8 @@ See [SSL options](https://github.com/mysqljs/mysql#ssl-options).
 * `pool.idleTimeoutMillis` -  the minimum amount of time that an object may sit idle in the pool before it is eligible for
  eviction due to idle time. Supersedes `softIdleTimeoutMillis`. Default: `30000`.
 
+ * `pool.errorHandler` - A function that get's called when underlying pool emits `'error'` event. Takes single parameter (error instance) and defaults to logging with `warn` level.
+ 
 * `options.fallbackToDefaultDb` - By default, if the database requestion by `options.database` cannot be accessed, the connection
  will fail with an error. However, if `options.fallbackToDefaultDb` is set to `true`, then the user's default database will
   be used instead (Default: `false`).
@@ -461,6 +465,8 @@ See [SSL options](https://github.com/mysqljs/mysql#ssl-options).
 
 * `database`: The raw UInt8Array database that should be imported.
 
+* `sqlJsConfig`: Optional initialize config for sql.js.
+
 * `autoSave`: Whether or not autoSave should be disabled. If set to true the database will be saved to the given file location (Node.js) or LocalStorage element (browser) when a change happens and `location` is specified. Otherwise `autoSaveCallback` can be used.
 
 * `autoSaveCallback`: A function that get's called when changes to the database are made and `autoSave` is enabled. The function gets a `UInt8Array` that represents the database.
 
@@ -294,7 +294,7 @@ or
 `bit`, `int`, `integer`, `tinyint`, `smallint`, `mediumint`, `bigint`, `float`, `double`,
 `double precision`, `dec`, `decimal`, `numeric`, `fixed`, `bool`, `boolean`, `date`, `datetime`,
 `timestamp`, `time`, `year`, `char`, `nchar`, `national char`, `varchar`, `nvarchar`, `national varchar`,
-`text`, `tinytext`, `mediumtext`, `blob`, `longtext`, `tinyblob`, `mediumblob`, `longblob`, `enum`,
+`text`, `tinytext`, `mediumtext`, `blob`, `longtext`, `tinyblob`, `mediumblob`, `longblob`, `enum`, `set`,
 `json`, `binary`, `varbinary`, `geometry`, `point`, `linestring`, `polygon`, `multipoint`, `multilinestring`,
 `multipolygon`, `geometrycollection`
 
@@ -307,7 +307,7 @@ or
 `date`, `time`, `time without time zone`, `time with time zone`, `interval`, `bool`, `boolean`,
 `enum`, `point`, `line`, `lseg`, `box`, `path`, `polygon`, `circle`, `cidr`, `inet`, `macaddr`,
 `tsvector`, `tsquery`, `uuid`, `xml`, `json`, `jsonb`, `int4range`, `int8range`, `numrange`,
-`tsrange`, `tstzrange`, `daterange`, `geometry`, `geography`
+`tsrange`, `tstzrange`, `daterange`, `geometry`, `geography`, `cube`
 
 ### Column types for `cockroachdb`
 
@@ -390,6 +390,52 @@ export class User {
 }
 ```
 
+### `set` column type
+
+`set` column type is supported by `mariadb` and `mysql`. There are various possible column definitions:
+
+Using typescript enums:
+```typescript
+export enum UserRole {
+    ADMIN = "admin",
+    EDITOR = "editor",
+    GHOST = "ghost"
+}
+
+@Entity()
+export class User {
+
+    @PrimaryGeneratedColumn()
+    id: number;
+
+    @Column({
+        type: "set",
+        enum: UserRole,
+        default: [UserRole.GHOST, UserRole.EDITOR]
+    })
+    roles: UserRole[]
+
+}
+```
+
+Using array with `set` values:
+```typescript
+export type UserRoleType = "admin" | "editor" | "ghost",
+
+@Entity()
+export class User {
+
+    @PrimaryGeneratedColumn()
+    id: number;
+
+    @Column({
+        type: "set",
+        enum: ["admin", "editor", "ghost"],
+        default: ["ghost", "editor"]
+    })
+    roles: UserRoleType[]
+}
+```
 
 ### `simple-array` column type
 
 
@@ -233,7 +233,7 @@ createConnection().then(connection => {
     });
 
     app.delete("/users/:id", async function(req: Request, res: Response) {
-        const results = await userRepository.remove(req.params.id);
+        const results = await userRepository.delete(req.params.id);
         return res.send(results);
     });
 
 
@@ -131,7 +131,7 @@ join column / junction table settings, like join column name or junction table n
 It's not possible to add extra columns into a table created by a many-to-many relation.
 You'll need to create a separate entity and bind it using two many-to-one relations with the target entities
 (the effect will be same as creating a many-to-many table), 
-and add extra columns in there.
+and add extra columns in there. You can read more about this in [Many-to-Many relations](./many-to-many-relations.md#many-to-many-relations-with-custom-properties).
 
 ## How to use TypeORM with a dependency injection tool?
 
 
@@ -169,3 +169,50 @@ const categoriesWithQuestions = await connection
     .leftJoinAndSelect("category.questions", "question")
     .getMany();
 ```
+
+## many-to-many relations with custom properties
+
+In case you need to have additional properties to your many-to-many relationship you have to create a new entity yourself. 
+For example if you would like entities `Post` and `Category` to have a many-to-many relationship with a `createdAt` property 
+associated to it you have to create entity `PostToCategory` like the following:
+
+```typescript
+import { Entity, Column, ManyToOne, PrimaryGeneratedColumn } from "typeorm";
+import { Post } from "./post";
+import { Category } from "./category";
+
+@Entity()
+export class PostToCategory {
+    @PrimaryGeneratedColumn()
+    public postToCategoryId!: number;
+
+    @Column()
+    public postId!: number;
+    
+    @Column()
+    public categoryId!: number;
+
+    @Column()
+    public order!: number;
+
+    @ManyToOne(type => Post, post => post.postToCategories)
+    public post!: Post;
+
+    @ManyToOne(type => Category, category => category.postToCategories)
+    public category!: Category;
+}
+```
+
+Additionally you will have to add a relationship like the following to `Post` and `Category`:
+
+```typescript
+// category.ts
+...
+@OneToMany((type) => PostToCategory, (postToCategory) => postToCategory.category)
+public postToCategories!: PostToCategory[];
+
+// post.ts
+...
+@OneToMany((type) => PostToCategory, (postToCategory) => postToCategory.post)
+public postToCategories!: PostToCategory[];
+```
@@ -45,7 +45,7 @@ export class User {
 Here we added `@OneToMany` to the `photos` property and specified the target relation type to be `Photo`.
 You can omit `@JoinColumn` in a `@ManyToOne` / `@OneToMany` relation.
 `@OneToMany` cannot exist without `@ManyToOne`.
-If you want to use `@OneToMany`, `@ManyToOne` is required.
+If you want to use `@OneToMany`, `@ManyToOne` is required. However, the inverse is not required: If you only care about the `@ManyToOne` relationship, you can define it without having `@OneToMany` on the related entity.
 Where you set `@ManyToOne` - its related entity will have "relation id" and foreign key.
 
 This example will produce following tables:
 
@@ -141,7 +141,7 @@ You can also change the name of the generated "junction" table.
 ```typescript
 @ManyToMany(type => Category)
 @JoinTable({
-    name: "question_categories" // table name for the junction table of this relation
+    name: "question_categories", // table name for the junction table of this relation
     joinColumn: {
         name: "question",
         referencedColumnName: "id"
 
@@ -304,7 +304,7 @@ Which will produce:
 SELECT ... FROM users user WHERE user.name = 'Timber'
 ```
 
-You can add `AND` into an exist `WHERE` expression:
+You can add `AND` into an existing `WHERE` expression:
 
 ```typescript
 createQueryBuilder("user")
 
@@ -187,7 +187,7 @@ export const CategoryEntity = new EntitySchema<Category>({
 });
 ```
 
-Be sure to add the `extended` columns also to the `Categeory` interface (e.g., via `export interface Category extend BaseEntity`).
+Be sure to add the `extended` columns also to the `Category` interface (e.g., via `export interface Category extend BaseEntity`).
 
 ## Using Schemas to Query / Insert Data
 
 
@@ -63,7 +63,7 @@ TypeORM is able to on React Native apps using the [react-native-sqlite-storage](
 
 ## Expo
 
-TypeORM is able to run on Expo apps using the [Expo SQLite API](https://docs.expo.io/versions/latest/sdk/sqlite.html). For an example how to use TypeORM in Expo see [typeorm/react-native-example](https://github.com/typeorm/react-native-example).
+TypeORM is able to run on Expo apps using the [Expo SQLite API](https://docs.expo.io/versions/latest/sdk/sqlite/). For an example how to use TypeORM in Expo see [typeorm/expo-example](https://github.com/typeorm/expo-example).
 
 ## NativeScript
 
 
@@ -13,7 +13,7 @@ Examples:
 ```typescript
 import {getConnection} from "typeorm";
 
-await getConnection().transaction(transactionalEntityManager => {
+await getConnection().transaction(async transactionalEntityManager => {
 
 });
 ```
@@ -23,7 +23,7 @@ or
 ```typescript
 import {getManager} from "typeorm";
 
-await getManager().transaction(transactionalEntityManager => {
+await getManager().transaction(async transactionalEntityManager => {
 
 });
 ```
 
@@ -0,0 +1,16 @@
+# Troubleshooting
+
+* [Glob patterns](#glob-patterns)
+
+## Glob Patterns
+
+Glob patterns are used in the TypeOrm to specify the locations of entities, migrations, subscriber and other information. Errors in the patterns can lead to the common `RepositoryNotFoundError` and familiar errors. In order to check if any files were loaded by TypeOrm using the glob patterns, all you need to do is set the logging level to `info` such as explained in the [Logging](./logging.md) section of the documentation. This will allow you to have logs in the console that may look like this:
+
+```bash
+# in case of an error
+ INFO: No classes were found using the provided glob pattern:  "dist/**/*.entity{.ts}"
+```
+```bash
+# when files are found
+INFO: All classes found using provided glob pattern "dist/**/*.entity{.js,.ts}" : "dist/app/user/user.entity.js | dist/app/common/common.entity.js"
+```
@@ -5,7 +5,7 @@
 * [Create a new entity](#create-a-new-entity)
 * [Create a new subscriber](#create-a-new-subscriber)
 * [Create a new migration](#create-a-new-migration)
-* [Generate a migration from exist table schema](#generate-a-migration-from-exist-table-schema)
+* [Generate a migration from existing table schema](#generate-a-migration-from-exist-table-schema)
 * [Run migrations](#run-migrations)
 * [Revert migrations](#revert-migrations)
 * [Show migrations](#show-migrations)
@@ -196,7 +196,7 @@ typeorm migration:create -n UserMigration -d src/user/migration
 
 Learn more about [Migrations](./migrations.md).
 
-## Generate a migration from exist table schema
+## Generate a migration from existing table schema
 
 Automatic migration generation creates a new migration file
 and writes all sql queries that must be executed to update the database.
 
@@ -1,4 +1,4 @@
-# ormconfig.json
+# Using Configuration Sources
 
   - [Creating a new connection from the configuration file](#creating-a-new-connection-from-the-configuration-file)
   - [Using `ormconfig.json`](#using-ormconfigjson)
@@ -96,7 +96,7 @@ TYPEORM_DATABASE = test
 TYPEORM_PORT = 3000
 TYPEORM_SYNCHRONIZE = true
 TYPEORM_LOGGING = true
-TYPEORM_ENTITIES = entity/.*js,modules/**/entity/.*js
+TYPEORM_ENTITIES = entity/*.js,modules/**/entity/*.js
 ```
 
 List of available env variables you can set:
 
@@ -372,6 +372,8 @@
 
 - `database`: 应导入的原始 UInt8Array 数据库。
 
+- `sqlJsConfig`: sql.js可选启动配置
+
 - `autoSave`: 是否应禁用 autoSave。如果设置为 true，则在发生更改并指定`location`时，数据库将保存到给定的文件位置（Node.js）或 LocalStorage（浏览器）。否则可以使用`autoSaveCallback`。
 
 - `autoSaveCallback`: 在对数据库进行更改并启用`autoSave`时调用的函数。该函数获取表示数据库的`UInt8Array`。