diff --git a/.circleci/config.yml b/.circleci/config.yml
index bc4b58c631..58256e0dd9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,114 +1,215 @@
-# Javascript Node CircleCI 2.0 configuration file
-# Check https://circleci.com/docs/2.0/language-javascript/ for more details
-version: 2
-jobs:
- common:
- working_directory: ~/typeorm
- docker:
- - image: circleci/node:10.16.0
- - image: mysql:5.7.24
- environment:
- MYSQL_ROOT_PASSWORD: "admin"
- MYSQL_DATABASE: "test"
- - image: mariadb:10.1.37
- name: mariadb
- environment:
- MYSQL_ROOT_PASSWORD: "admin"
- MYSQL_DATABASE: "test"
- - image: circleci/postgres:9.6.11-postgis
- environment:
- POSTGRES_USER: "test"
- POSTGRES_PASSWORD: "test"
- POSTGRES_DB: "test"
- - image: circleci/mongo:3.4.18
- # - image: mcr.microsoft.com/mssql/server:2017-latest-ubuntu
- # environment:
- # SA_PASSWORD: "Admin12345"
- # ACCEPT_EULA: "Y"
+version: 2.1
+orbs:
+ codecov: codecov/codecov@1.1.1
+
+commands:
+ create-typeorm-config:
+ parameters:
+ databases:
+ type: string
+ default: ""
+ steps:
+ - when:
+ condition:
+ equal: [ << parameters.databases >>, "" ]
+ steps:
+ - run:
+ name: "Enabling Databases in ORM config"
+ command: cp ormconfig.circleci-common.json ./ormconfig.json
+ - unless:
+ condition:
+ equal: [ << parameters.databases >>, "" ]
+ steps:
+ - run:
+ name: "Enabling Databases in ORM config"
+ command: >
+ cat ormconfig.circleci-common.json \
+ | jq 'map(.skip = if (.name | IN($ARGS.positional[])) then false else true end)' --args << parameters.databases >> \
+ > ormconfig.json
+ - run:
+ name: Check ORMConfig
+ command: cat ormconfig.json
+
+ install-packages:
+ parameters:
+ cache-key:
+ type: string
+ default: ""
steps:
- - checkout
- - run: cp ormconfig.circleci-common.json ormconfig.json
- # Download and cache dependencies
- restore_cache:
- keys:
- - v1-dependencies-{{ checksum "package.json" }}
- # fallback to using the latest cache if no exact match is found
- - v1-dependencies-
- - run: npm install
+ name: Restore node_modules cache
+ key: node_modules-<< parameters.cache-key >>-{{ checksum "package-lock.json" }}
+ - run:
+ name: Verify `package.json` and `package-lock.json` are in sync
+ command: npx lock-verify
+ - run:
+ # This uses `npm install` instead of `npm ci`
+ # because of https://github.com/npm/cli/issues/558
+ name: Install Node Packages
+ command: |
+ if [ ! -d node_modules ]; then
+ npm install
+ fi
+ - run:
+ # This is pretty terrible but OracleDB requires you to grab the binaries OOB
+ # from the normal installation, place them in the LD Path
+ # also - not super well documented - grab `libaio` as well
+ # Because this is technically the same image as the runner we'll snag
+ # the libaio1 and place them in the same instantclient directory.
+ name: Download Required OracleDB Binaries
+ command: |
+ if [ ! -d node_modules/oracledb/instantclient_19_8 ]; then
+ curl -sf -o node_modules/oracledb/instantclient.zip $BLOB_URL
+ unzip -qqo node_modules/oracledb/instantclient.zip -d node_modules/oracledb/
+ rm node_modules/oracledb/instantclient.zip
+
+ DEBIAN_FRONTEND=noninteractive sudo apt-get -qq -y install libaio1
+ cp /lib/*/libaio.so.* node_modules/oracledb/instantclient_19_8/
+ fi
+ environment:
+ BLOB_URL: https://download.oracle.com/otn_software/linux/instantclient/19800/instantclient-basiclite-linux.x64-19.8.0.0.0dbru.zip
- save_cache:
+ name: Save node_modules cache
+ key: node_modules-{{ checksum "package-lock.json" }}
paths:
- node_modules
- key: v1-dependencies-{{ checksum "package.json" }}
+
+jobs:
+ lint:
+ working_directory: ~/typeorm
+ docker:
+ - image: circleci/node:12
+ steps:
+ - checkout
+ - install-packages:
+ cache-key: node12
- run: npm run lint
- - run: npm test
- cockroachdb:
+ build:
working_directory: ~/typeorm
docker:
- - image: circleci/node:10.15.0
- - image: cockroachdb/cockroach:latest
- command: start --insecure
+ - image: circleci/node:12
steps:
- checkout
- - run: cp ormconfig.circleci-cockroach.json ormconfig.json
- # Download and cache dependencies
- - restore_cache:
- keys:
- - v1-dependencies-{{ checksum "package.json" }}
- # fallback to using the latest cache if no exact match is found
- - v1-dependencies-
- - run: npm install
- - save_cache:
+ - install-packages:
+ cache-key: node12
+ - run: npm run compile
+ - persist_to_workspace:
+ root: ~/typeorm
paths:
- - node_modules
- key: v1-dependencies-{{ checksum "package.json" }}
- - run: npm run lint
- - run:
- npm test
- oracle:
+ - build/
+
+ test:
+ parameters:
+ databases:
+ type: string
+ default: ""
+ node-version:
+ type: string
+ default: "10"
working_directory: ~/typeorm
docker:
- - image: circleci/node:10.16.0
- - image: "store/oracle/database-enterprise:12.2.0.1-slim"
- auth:
- username: $DOCKER_USER
- password: $DOCKER_PASSWORD
- environment:
- DB_SID: "sys"
- SYS_PASSWORD: "ORCLCDB"
+ - image: circleci/node:<< parameters.node-version >>
steps:
- - run: if [ -z "$DOCKER_USER" ]; then echo "DOCKER_USER is unset"; circleci step halt; fi
- checkout
- - run: sudo npm install -g npm@latest
- - run: cp ormconfig.circleci-oracle.json ormconfig.json
+ - setup_remote_docker
+ - attach_workspace:
+ at: ~/typeorm
+ - create-typeorm-config:
+ databases: << parameters.databases >>
+ - run:
+ name: Start all Relevant Services
+ command: |
+ SERVICES=$(
+ npx js-yaml ./docker-compose.yml \
+ | jq -r '.services | keys | map(select(. | IN($ARGS.positional[]))) | join(" ")' --args << parameters.databases >>
+ )
+
+ docker-compose --project-name typeorm --no-ansi up --detach $SERVICES
+ - install-packages:
+ cache-key: node<< parameters.node-version >>
+ - run:
+ name: Set up TypeORM Test Runner
+ command: |
+ docker run \
+ --volume /typeorm \
+ --name typeorm-code \
+ --workdir /typeorm \
+ circleci/node:<< parameters.node-version >> \
+ /bin/bash -c "sudo chmod 777 /typeorm && sudo chown circleci /typeorm"
+ docker cp ./ typeorm-code:/typeorm
+ - run:
+ name: Wait for Services to be Available
+ command: |
+ COMMANDS=$(
+ cat ormconfig.json \
+ | jq -r '
+ map(select(.skip == false)
+ | select(.host)
+ | select(.port)
+ | "nc -z " + .host + " " + (.port|tostring) + " && echo " + .host + " " + (.port|tostring) + " is up")
+ | join(" && ")
+ '
+ )
+ echo "Running '$COMMANDS'"
+
+ docker run \
+ --network typeorm_default \
+ --tty \
+ ubuntu:trusty \
+ timeout 60 sh -c "until ($COMMANDS); do echo \"Waiting for Services to be Available ...\"; sleep 5; done"
# Download and cache dependencies
- - restore_cache:
- keys:
- - v1-dependencies-{{ checksum "package.json" }}
- # fallback to using the latest cache if no exact match is found
- - v1-dependencies-
- - run: npm install
- - save_cache:
- paths:
- - node_modules
- key: v1-dependencies-{{ checksum "package.json" }}
- - run: wget https://download.oracle.com/otn_software/linux/instantclient/195000/instantclient-basiclite-linux.x64-19.5.0.0.0dbru.zip
- - run: unzip instantclient-basiclite-linux.x64-19.5.0.0.0dbru.zip -d /tmp/oracle
- - run: wget https://download.oracle.com/otn_software/linux/instantclient/195000/instantclient-sqlplus-linux.x64-19.5.0.0.0dbru.zip
- - run: unzip instantclient-sqlplus-linux.x64-19.5.0.0.0dbru.zip -d /tmp/oracle
- - run: echo "export LD_LIBRARY_PATH=/tmp/oracle/instantclient_19_5" >> $BASH_ENV
- - run: sudo sh -c "echo /tmp/oracle/instantclient_19_5 > /etc/ld.so.conf.d/oracle-instantclient.conf";sudo ldconfig
- - run: sh -c 'echo WHENEVER SQLERROR EXIT FAILURE > /tmp/user.sql; echo CREATE USER typeorm IDENTIFIED BY Passw0rd\; >> /tmp/user.sql; echo GRANT CONNECT TO typeorm\; >> /tmp/user.sql; echo GRANT UNLIMITED TABLESPACE TO typeorm\; >> /tmp/user.sql; echo exit >> /tmp/user.sql'
- - run: sudo apt install libaio1
- - run: until /tmp/oracle/instantclient_19_5/sqlplus -L -S sys/Oradoc_db1@//localhost:1521/orclpdb1.localdomain as sysdba @/tmp/user.sql ; do echo waiting for oracle; sleep 10; done;
- - run: npm install oracledb --no-save
- - run: npm run lint
- - run: npm test
+ - run:
+ name: "Run Tests with Coverage"
+ command: |
+ docker run \
+ --env LD_LIBRARY_PATH='/typeorm/node_modules/oracledb/instantclient_19_8/:$LD_LIBRARY_PATH' \
+ --volumes-from typeorm-code \
+ --network typeorm_default \
+ --tty \
+ --workdir /typeorm \
+ --name typeorm-testrunner \
+ circleci/node:<< parameters.node-version >> \
+ npx nyc npm run test-fast
+
+ docker cp typeorm-testrunner:/typeorm/coverage/ ./
+ - run:
+ name: Stop all Relevant Services
+ command: docker-compose down
+ - store_artifacts:
+ path: coverage
+ - codecov/upload
+
workflows:
version: 2
test:
jobs:
- - common
- - cockroachdb
- # - oracle
+ - lint
+ - build
+ - test:
+ name: test (mysql mariadb postgres mssql mongodb sqlite better-sqlite3 sqljs) - Node v<< matrix.node-version >>
+ requires:
+ - lint
+ - build
+ databases: "mysql mariadb postgres mssql mongodb sqlite better-sqlite3 sqljs"
+ matrix:
+ parameters:
+ node-version:
+ - "10"
+ - "12"
+ - "13"
+ - test:
+ name: test (cockroachdb) - Node v12
+ requires:
+ - lint
+ - build
+ databases: "cockroachdb"
+ node-version: "12"
+ - test:
+ name: test (oracle) - Node v12
+ requires:
+ - lint
+ - build
+ databases: "oracle"
+ node-version: "12"
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 0000000000..06473d20bf
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,54 @@
+module.exports = {
+ "env": {
+ "node": true
+ },
+ "parser": "@typescript-eslint/parser",
+ "parserOptions": {
+ "project": "tsconfig.json",
+ "sourceType": "module"
+ },
+ "plugins": [
+ "@typescript-eslint"
+ ],
+ "rules": {
+ "@typescript-eslint/no-unused-vars": [
+ "error",
+ {
+ "args": "none"
+ }
+ ],
+ "@typescript-eslint/prefer-namespace-keyword": "error",
+ "@typescript-eslint/quotes": [
+ "error",
+ "double",
+ {
+ "avoidEscape": true,
+ "allowTemplateLiterals": true
+ }
+ ],
+ "@typescript-eslint/semi": [
+ "error"
+ ],
+ "@typescript-eslint/type-annotation-spacing": "error",
+ "@typescript-eslint/no-redeclare": "error",
+ "eqeqeq": [
+ "error",
+ "smart"
+ ],
+ "id-blacklist": [
+ "error",
+ "any",
+ "Number",
+ "number",
+ "String",
+ "string",
+ "Boolean",
+ "boolean",
+ "Undefined",
+ "undefined"
+ ],
+ "id-match": "error",
+ "no-eval": "error",
+ "no-var": "error"
+ }
+};
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 3fa8b1987b..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-language: node_js
-node_js:
- - 13
- - 12
- - 10
-
-services:
- - docker
-
-before_script:
- - sudo service mysql stop
- - sudo service postgresql stop
- - docker-compose up -d
- - cp ormconfig.travis.json ormconfig.json
-
-script:
- - npm run lint
- - npx nyc npm test
-
-after_success:
- - bash <(curl -s https://codecov.io/bash)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68ff8aee7d..676a6c4ec1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,89 @@
+## [0.2.26](https://github.com/typeorm/typeorm/compare/0.2.25...0.2.26) (2020-09-10)
-## 0.3.0 (next)
+### Bug Fixes
+
+* @JoinTable does not respect inverseJoinColumns referenced column width ([#6444](https://github.com/typeorm/typeorm/issues/6444)) ([f642a9e](https://github.com/typeorm/typeorm/commit/f642a9e)), closes [#6442](https://github.com/typeorm/typeorm/issues/6442)
+* add missing schema for OracleDriver ([#6673](https://github.com/typeorm/typeorm/issues/6673)) ([8b8bc35](https://github.com/typeorm/typeorm/commit/8b8bc35))
+* change InsertQueryBuilder.values() with an empty array into a no-op ([#6584](https://github.com/typeorm/typeorm/issues/6584)) ([9d2df28](https://github.com/typeorm/typeorm/commit/9d2df28)), closes [#3111](https://github.com/typeorm/typeorm/issues/3111)
+* Child entities not being saved correctly with cascade actions ([#6219](https://github.com/typeorm/typeorm/issues/6219)) ([16a2d80](https://github.com/typeorm/typeorm/commit/16a2d80))
+* correctly parse connection URI with query params ([#6390](https://github.com/typeorm/typeorm/issues/6390)) ([54a3a15](https://github.com/typeorm/typeorm/commit/54a3a15)), closes [#6389](https://github.com/typeorm/typeorm/issues/6389)
+* decorators should implement the official TypeScript interface ([#6398](https://github.com/typeorm/typeorm/issues/6398)) ([c23c888](https://github.com/typeorm/typeorm/commit/c23c888)), closes [#5922](https://github.com/typeorm/typeorm/issues/5922)
+* DeepPartial with any and {[k: string]: any} ([#6581](https://github.com/typeorm/typeorm/issues/6581)) ([8d90d40](https://github.com/typeorm/typeorm/commit/8d90d40)), closes [#6580](https://github.com/typeorm/typeorm/issues/6580) [#6580](https://github.com/typeorm/typeorm/issues/6580)
+* exporting missing load event ([#6396](https://github.com/typeorm/typeorm/issues/6396)) ([c6336aa](https://github.com/typeorm/typeorm/commit/c6336aa))
+* get correct insert ids for multiple entities inserted ([#6668](https://github.com/typeorm/typeorm/issues/6668)) ([ef2011d](https://github.com/typeorm/typeorm/commit/ef2011d)), closes [#2131](https://github.com/typeorm/typeorm/issues/2131) [#5973](https://github.com/typeorm/typeorm/issues/5973) [#2131](https://github.com/typeorm/typeorm/issues/2131)
+* getPendingMigrations isn't properly working ([#6372](https://github.com/typeorm/typeorm/issues/6372)) ([7c0da1c](https://github.com/typeorm/typeorm/commit/7c0da1c))
+* handle 'error' events from pool connection ([#6262](https://github.com/typeorm/typeorm/issues/6262)) ([ae3cf0e](https://github.com/typeorm/typeorm/commit/ae3cf0e))
+* insert IN(null) instead of IN() when In([]) empty array for mysqlDriver ([#6237](https://github.com/typeorm/typeorm/issues/6237)) ([6f6bdbd](https://github.com/typeorm/typeorm/commit/6f6bdbd))
+* make only a single SELECT to get inserted default and generated values of multiple entities ([#6669](https://github.com/typeorm/typeorm/issues/6669)) ([4fc4a1b](https://github.com/typeorm/typeorm/commit/4fc4a1b)), closes [#6266](https://github.com/typeorm/typeorm/issues/6266) [#6266](https://github.com/typeorm/typeorm/issues/6266)
+* Migration issues with scale & precision in sqlite/sql.js ([#6638](https://github.com/typeorm/typeorm/issues/6638)) ([0397e44](https://github.com/typeorm/typeorm/commit/0397e44)), closes [#6636](https://github.com/typeorm/typeorm/issues/6636)
+* mysql migration: make sure the indices sql which left-join be the same database ([#6426](https://github.com/typeorm/typeorm/issues/6426)) ([906d97f](https://github.com/typeorm/typeorm/commit/906d97f))
+* pass `ids_` to alias builder to prevent length overflow ([#6624](https://github.com/typeorm/typeorm/issues/6624)) ([cf3ad62](https://github.com/typeorm/typeorm/commit/cf3ad62))
+* pass formatOptions to Data API Client, fix extensions ([#6404](https://github.com/typeorm/typeorm/issues/6404)) ([9abab82](https://github.com/typeorm/typeorm/commit/9abab82)), closes [#1](https://github.com/typeorm/typeorm/issues/1)
+* Query builder makes query with joins, without limit for inherited entities ([#6402](https://github.com/typeorm/typeorm/issues/6402)) ([874e573](https://github.com/typeorm/typeorm/commit/874e573)), closes [#6399](https://github.com/typeorm/typeorm/issues/6399)
+* remove unnecessary optionality from Raw operator's columnAlias argument ([#6321](https://github.com/typeorm/typeorm/issues/6321)) ([0d99b46](https://github.com/typeorm/typeorm/commit/0d99b46))
+* resolve missing decorators on shim ([#6354](https://github.com/typeorm/typeorm/issues/6354)) ([8e2d97d](https://github.com/typeorm/typeorm/commit/8e2d97d)), closes [#6093](https://github.com/typeorm/typeorm/issues/6093)
+* revert fix handle URL objects as column field values ([#6145](https://github.com/typeorm/typeorm/issues/6145)) ([e073e02](https://github.com/typeorm/typeorm/commit/e073e02))
+* SqlQueryRunner.hasColumn was not working ([#6146](https://github.com/typeorm/typeorm/issues/6146)) ([a595fed](https://github.com/typeorm/typeorm/commit/a595fed)), closes [#5718](https://github.com/typeorm/typeorm/issues/5718)
+* support multiple `JoinColumn`s in EntitySchema ([#6397](https://github.com/typeorm/typeorm/issues/6397)) ([298a3b9](https://github.com/typeorm/typeorm/commit/298a3b9)), closes [#5444](https://github.com/typeorm/typeorm/issues/5444)
+* Unnecessary migrations for fulltext indices ([#6634](https://github.com/typeorm/typeorm/issues/6634)) ([c81b405](https://github.com/typeorm/typeorm/commit/c81b405)), closes [#6633](https://github.com/typeorm/typeorm/issues/6633)
+* unnecessary migrations for unsigned numeric types ([#6632](https://github.com/typeorm/typeorm/issues/6632)) ([7ddaf23](https://github.com/typeorm/typeorm/commit/7ddaf23)), closes [#2943](https://github.com/typeorm/typeorm/issues/2943) [/github.com/typeorm/typeorm/pull/6632#pullrequestreview-480932808](https://github.com//github.com/typeorm/typeorm/pull/6632/issues/pullrequestreview-480932808)
+* update query deep partial TypeScript definition ([#6085](https://github.com/typeorm/typeorm/issues/6085)) ([23110d1](https://github.com/typeorm/typeorm/commit/23110d1))
+
+### Features
+
+* add AWS configurationOptions to aurora-data-api-pg connector ([#6106](https://github.com/typeorm/typeorm/issues/6106)) ([203f51d](https://github.com/typeorm/typeorm/commit/203f51d))
+* add better-sqlite3 driver ([#6224](https://github.com/typeorm/typeorm/issues/6224)) ([2241451](https://github.com/typeorm/typeorm/commit/2241451))
+* add postgres connection timeout option ([#6160](https://github.com/typeorm/typeorm/issues/6160)) ([0072149](https://github.com/typeorm/typeorm/commit/0072149))
+* FileLogger accepts custom file path ([#6642](https://github.com/typeorm/typeorm/issues/6642)) ([c99ba40](https://github.com/typeorm/typeorm/commit/c99ba40)), closes [#4410](https://github.com/typeorm/typeorm/issues/4410)
+* implement postgres ltree ([#6480](https://github.com/typeorm/typeorm/issues/6480)) ([43a7386](https://github.com/typeorm/typeorm/commit/43a7386)), closes [#4193](https://github.com/typeorm/typeorm/issues/4193)
+* support absolute paths in migrationsDir for the CLI ([#6660](https://github.com/typeorm/typeorm/issues/6660)) ([2b5f139](https://github.com/typeorm/typeorm/commit/2b5f139))
+* support cjs extension for ormconfig ([#6285](https://github.com/typeorm/typeorm/issues/6285)) ([6eeb03a](https://github.com/typeorm/typeorm/commit/6eeb03a))
-* find options interface was completely re-written (find options is parameter passed to find* methods)
-* now query builder adds joins to eager relations by default (previously only find methods did that)
-* `primary` flag has been removed from relation decorators. Now if you want to make a relation primary you must define a primary column with the same name relation uses
-* added observer methods to repositories and entity manager
-* `findOne` now throws error if no (or wrong) criteria supplied
+## [0.2.25](https://github.com/typeorm/typeorm/compare/0.2.24...0.2.25) (2020-05-19)
+
+### Bug Fixes
+
+* 'in' clause case for ORACLE ([#5345](https://github.com/typeorm/typeorm/issues/5345)) ([8977365](https://github.com/typeorm/typeorm/commit/8977365))
+* calling EntityManager.insert() with an empty array of entities ([#5745](https://github.com/typeorm/typeorm/issues/5745)) ([f8c52f3](https://github.com/typeorm/typeorm/commit/f8c52f3)), closes [#5734](https://github.com/typeorm/typeorm/issues/5734) [#5734](https://github.com/typeorm/typeorm/issues/5734) [#5734](https://github.com/typeorm/typeorm/issues/5734)
+* columns with transformer should be normalized for update ([#5700](https://github.com/typeorm/typeorm/issues/5700)) ([4ef6b65](https://github.com/typeorm/typeorm/commit/4ef6b65)), closes [#2703](https://github.com/typeorm/typeorm/issues/2703)
+* escape column comment in mysql driver ([#6056](https://github.com/typeorm/typeorm/issues/6056)) ([5fc802d](https://github.com/typeorm/typeorm/commit/5fc802d))
+* expo sqlite driver disconnect() ([#6027](https://github.com/typeorm/typeorm/issues/6027)) ([61d59ca](https://github.com/typeorm/typeorm/commit/61d59ca))
+* HANA - SSL options, column delta detection mechanism ([#5938](https://github.com/typeorm/typeorm/issues/5938)) ([2fd0a8a](https://github.com/typeorm/typeorm/commit/2fd0a8a))
+* handle URL objects as column field values ([#5771](https://github.com/typeorm/typeorm/issues/5771)) ([50a0641](https://github.com/typeorm/typeorm/commit/50a0641)), closes [#5762](https://github.com/typeorm/typeorm/issues/5762) [#5762](https://github.com/typeorm/typeorm/issues/5762)
+* insert and update query builder to handle mssql geometry column correctly ([#5947](https://github.com/typeorm/typeorm/issues/5947)) ([87cc6f4](https://github.com/typeorm/typeorm/commit/87cc6f4))
+* migrations being generated for FK even if there are no changes ([#5869](https://github.com/typeorm/typeorm/issues/5869)) ([416e419](https://github.com/typeorm/typeorm/commit/416e419))
+* multiple assignments to same column on UPDATE [#2651](https://github.com/typeorm/typeorm/issues/2651) ([#5598](https://github.com/typeorm/typeorm/issues/5598)) ([334e17e](https://github.com/typeorm/typeorm/commit/334e17e))
+* prevent TypeError when calling bind function with sql.js 1.2.X ([#5789](https://github.com/typeorm/typeorm/issues/5789)) ([c6cbddc](https://github.com/typeorm/typeorm/commit/c6cbddc))
+* prototype pollution issue ([#6096](https://github.com/typeorm/typeorm/issues/6096)) ([db9d0fa](https://github.com/typeorm/typeorm/commit/db9d0fa))
+* provide a default empty array for parameters. ([#5677](https://github.com/typeorm/typeorm/issues/5677)) ([9e8a8cf](https://github.com/typeorm/typeorm/commit/9e8a8cf))
+* redundant undefined parameters are not generated in migration files anymore ([#5690](https://github.com/typeorm/typeorm/issues/5690)) ([d5cde49](https://github.com/typeorm/typeorm/commit/d5cde49))
+* replacing instanceof Array checks to Array.isArray because instanceof Array seems to be problematic on some platforms ([#5606](https://github.com/typeorm/typeorm/issues/5606)) ([b99b4ad](https://github.com/typeorm/typeorm/commit/b99b4ad))
+* respect database from connection urls ([#5640](https://github.com/typeorm/typeorm/issues/5640)) ([ed75d59](https://github.com/typeorm/typeorm/commit/ed75d59)), closes [#2096](https://github.com/typeorm/typeorm/issues/2096)
+* sha.js import ([#5728](https://github.com/typeorm/typeorm/issues/5728)) ([8c3f48a](https://github.com/typeorm/typeorm/commit/8c3f48a))
+* Unknown fields are stripped from WHERE clause (issue [#3416](https://github.com/typeorm/typeorm/issues/3416)) ([#5603](https://github.com/typeorm/typeorm/issues/5603)) ([215f106](https://github.com/typeorm/typeorm/commit/215f106))
+* update dependency mkdirp to 1.x ([#5748](https://github.com/typeorm/typeorm/issues/5748)) ([edeb561](https://github.com/typeorm/typeorm/commit/edeb561))
+* update Entity decorator return type to ClassDecorator ([#5776](https://github.com/typeorm/typeorm/issues/5776)) ([7d8a1ca](https://github.com/typeorm/typeorm/commit/7d8a1ca))
+* use an empty string enum as the type of a primary key column ([#6063](https://github.com/typeorm/typeorm/issues/6063)) ([8e0d817](https://github.com/typeorm/typeorm/commit/8e0d817)), closes [#3874](https://github.com/typeorm/typeorm/issues/3874)
+* use correct typings for the result of `getUpsertedIds()` ([#5878](https://github.com/typeorm/typeorm/issues/5878)) ([2ab88c2](https://github.com/typeorm/typeorm/commit/2ab88c2))
+* wrong table name parameter when not using default schema ([#5801](https://github.com/typeorm/typeorm/issues/5801)) ([327144a](https://github.com/typeorm/typeorm/commit/327144a))
+
+### Features
+
+* add FOR NO KEY UPDATE lock mode for postgresql ([#5971](https://github.com/typeorm/typeorm/issues/5971)) ([360122f](https://github.com/typeorm/typeorm/commit/360122f))
+* add name option to view column ([#5962](https://github.com/typeorm/typeorm/issues/5962)) ([3cfcc50](https://github.com/typeorm/typeorm/commit/3cfcc50)), closes [#5708](https://github.com/typeorm/typeorm/issues/5708)
+* Add soft remove and recover methods to entity ([#5854](https://github.com/typeorm/typeorm/issues/5854)) ([9d2b8e0](https://github.com/typeorm/typeorm/commit/9d2b8e0))
+* added support for NOWAIT & SKIP LOCKED in Postgres ([#5927](https://github.com/typeorm/typeorm/issues/5927)) ([2c90e1c](https://github.com/typeorm/typeorm/commit/2c90e1c))
+* Aurora Data API - Postgres Support ([#5651](https://github.com/typeorm/typeorm/issues/5651)) ([e584297](https://github.com/typeorm/typeorm/commit/e584297))
+* aurora Data API - Support for AWS configuration options through aurora driver ([#5754](https://github.com/typeorm/typeorm/issues/5754)) ([1829f96](https://github.com/typeorm/typeorm/commit/1829f96))
+* create-column, update-column, version-column column kinds now support user specified values ([#5867](https://github.com/typeorm/typeorm/issues/5867)) ([5a2eb30](https://github.com/typeorm/typeorm/commit/5a2eb30)), closes [#3271](https://github.com/typeorm/typeorm/issues/3271)
+* names of extra columns for specific tree types moved to NamingStrategy ([#5737](https://github.com/typeorm/typeorm/issues/5737)) ([ec3be41](https://github.com/typeorm/typeorm/commit/ec3be41))
+* PG allow providing a function for password ([#5673](https://github.com/typeorm/typeorm/issues/5673)) ([265d1ae](https://github.com/typeorm/typeorm/commit/265d1ae))
+* update cli migration up and down from any to void ([#5630](https://github.com/typeorm/typeorm/issues/5630)) ([76e165d](https://github.com/typeorm/typeorm/commit/76e165d))
+* UpdateResult returns affected rows in mysql ([#5628](https://github.com/typeorm/typeorm/issues/5628)) ([17f2fff](https://github.com/typeorm/typeorm/commit/17f2fff)), closes [#1308](https://github.com/typeorm/typeorm/issues/1308)
+
+### Performance Improvements
+
+* An optimized version of EntityMetadata#compareIds() for the common case ([#5419](https://github.com/typeorm/typeorm/issues/5419)) ([a9bdb37](https://github.com/typeorm/typeorm/commit/a9bdb37))
## [0.2.23](https://github.com/typeorm/typeorm/compare/0.2.22...0.2.23), [0.2.24](https://github.com/typeorm/typeorm/compare/0.2.23...0.2.24) (2020-02-28)
@@ -34,7 +112,6 @@
## [0.2.22](https://github.com/typeorm/typeorm/compare/0.2.21...0.2.22) (2019-12-23)
-
### Bug Fixes
* use a prefix on SelectQueryBuilder internal parameters ([#5178](https://github.com/typeorm/typeorm/issues/5178)) ([cacb08b](https://github.com/typeorm/typeorm/commit/cacb08b)), closes [#5174](https://github.com/typeorm/typeorm/issues/5174) [#5174](https://github.com/typeorm/typeorm/issues/5174)
@@ -190,7 +267,11 @@
* fixed: changes in enum type is not reflected when generating migration (in definition file) ([#3244](https://github.com/typeorm/typeorm/issues/3244))
* fixed: migration will keep create and drop indexes if index name is the same across tables ([#3379](https://github.com/typeorm/typeorm/issues/3379))
-## 0.2.15
+### Features
+
+* added `lock` option in `FindOptions`
+
+## 0.2.15 (2019-03-14)
### Bug fixes
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3c619c186f..e92a577913 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,7 +14,7 @@ As a contributor, here are the guidelines we would like you to follow:
There are several ways how you can ask your question:
* You can create a question on [StackOverflow](https://stackoverflow.com/questions/tagged/typeorm) where the questions should be tagged with tag `typeorm`.
-* You can ask on [Slack](https://join.slack.com/t/typeorm/shared_invite/enQtNDQ1MzA3MDA5MTExLTUxNTZhM2Q4NDNhMjMzNjQ2NGM1ZjI1ZGRkNjJjYzI4OTZjMGYyYTc0MzAxYTdjMWE3ZDIxOWUzZTdlM2QxNTY)
+* You can ask on [Slack](https://join.slack.com/t/typeorm/shared_invite/zt-gej3gc00-hR~L~DqGUJ7qOpGy4SSq3g)
* You can create issue on [github](https://github.com/typeorm/typeorm/issues)
* If you have a Skype then try to find me there (`Umed Khudoiberdiev`)
diff --git a/DEVELOPER.md b/DEVELOPER.md
index 90bb338568..b365fbcda1 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -69,23 +69,6 @@ To create an initial `ormconfig.json` file, run the following command:
cp ormconfig.json.dist ormconfig.json
```
-## Compiling
-
-To transpile for running tests, run
-
-```shell
-npm run compile
-```
-
->**Hint:** because transpiling the full project can take a while, you can set typescript to
->compile in 'watch' mode, where it will only compile modified files when they are saved.
->
->```shell
->npm run compile -- -w
->```
->
->This is useful when you are making changes to either production code or tests and iterating.
-
## Building
To build a distribution package of TypeORM run:
@@ -148,15 +131,6 @@ Then run tests:
npm test
```
->**Hint:** running ```npm test``` will transpile before running tests. If you have already compiled, or are
->letting typescript run in watch mode, you can execute:
->
->```shell
->npm run test-no-compile
->```
->
->which omits the compile step.
-
You should execute test suites before submitting a PR to github.
All the tests are executed on our Continuous Integration infrastructure and a PR could only be merged once the tests pass.
@@ -179,7 +153,7 @@ describe.only('your describe test', ....)
The `npm test` script works by deleting built TypeScript code, rebuilding the codebase, and then running tests. This can take a long time.
-Instead, for a quicker feedback cycle, you can run `npm run compile --watch` to make a fresh build and instruct TypeScript to watch for changes and only compile what code you've changed.
+Instead, for a quicker feedback cycle, you can run `npm run compile -- --watch` to make a fresh build and instruct TypeScript to watch for changes and only compile what code you've changed.
Once TypeScript finishes compiling your changes, you can run `npm run test-fast` (instead of `test`), to trigger a test without causing a full recompile, which allows you to edit and check your changes much faster.
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 8e96c64ffa..7dc654f615 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,6 +1,12 @@
**Issue type:**
-[ ] question
+
+
[ ] bug report
[ ] feature request
[ ] documentation issue
diff --git a/README-zh_CN.md b/README-zh_CN.md
index 2c6f2e2806..4b7dc796d9 100644
--- a/README-zh_CN.md
+++ b/README-zh_CN.md
@@ -4,8 +4,8 @@
-
+
-
+
-
+
migration:{run|revert}
+```
## Using migration API to write migrations
@@ -239,6 +246,11 @@ export class QuestionRefactoringTIMESTAMP implements MigrationInterface {
{
name: "name",
type: "varchar",
+ },
+ {
+ name: 'created_at',
+ type: 'timestamp',
+ default: 'now()'
}
]
}), true);
@@ -376,7 +388,7 @@ Drops database.
createSchema(schemaPath: string, ifNotExist?: boolean): Promise
```
-- `schemaPath` - schema name. For SqlServer can accept schema path (e.g. 'dbName.schemaName') as parameter.
+- `schemaPath` - schema name. For SqlServer can accept schema path (e.g. 'dbName.schemaName') as parameter.
If schema path passed, it will create schema in specified database
- `ifNotExist` - skips creation if `true`, otherwise throws error if schema already exist
@@ -388,7 +400,7 @@ Creates a new table schema.
dropSchema(schemaPath: string, ifExist?: boolean, isCascade?: boolean): Promise
```
-- `schemaPath` - schema name. For SqlServer can accept schema path (e.g. 'dbName.schemaName') as parameter.
+- `schemaPath` - schema name. For SqlServer can accept schema path (e.g. 'dbName.schemaName') as parameter.
If schema path passed, it will drop schema in specified database
- `ifExist` - skips deletion if `true`, otherwise throws error if schema was not found
- `isCascade` - If `true`, automatically drop objects (tables, functions, etc.) that are contained in the schema.
diff --git a/docs/mongodb.md b/docs/mongodb.md
index f8437b9d82..d3b26ed775 100644
--- a/docs/mongodb.md
+++ b/docs/mongodb.md
@@ -266,6 +266,35 @@ const timber = await userRepository.find({
});
```
+Querying subdocuments
+
+```typescript
+import {getMongoRepository} from "typeorm";
+
+const userRepository = getMongoRepository(User);
+// Query users with education Tree School
+const users = await userRepository.find({
+ where: {
+ 'profile.education': { $eq: "Tree School"}
+ }
+});
+```
+
+Querying Array of subdocuments
+
+```typescript
+import {getMongoRepository} from "typeorm";
+
+const userRepository = getMongoRepository(User);
+// Query users with photos of size less than 500
+const users = await userRepository.find({
+ where: {
+ 'photos.size': { $lt: 500}
+ }
+});
+
+```
+
Both `MongoEntityManager` and `MongoRepository` contain lot of useful MongoDB-specific methods:
@@ -309,7 +338,7 @@ Delete a document on MongoDB.
#### `distinct`
-The distinct command returns returns a list of distinct values for the given key across a collection.
+The distinct command returns a list of distinct values for the given key across a collection.
#### `dropCollectionIndex`
diff --git a/docs/one-to-one-relations.md b/docs/one-to-one-relations.md
index acb87e0bf6..ee5c86774f 100644
--- a/docs/one-to-one-relations.md
+++ b/docs/one-to-one-relations.md
@@ -82,7 +82,7 @@ user.profile = profile;
await connection.manager.save(user);
```
-With cascades enabled you can save this relation with only one `save` call.
+With [cascades](https://github.com/typeorm/typeorm/blob/master/docs/relations.md#cascades) enabled you can save this relation with only one `save` call.
To load user with profile inside you must specify relation in `FindOptions`:
diff --git a/docs/relational-query-builder.md b/docs/relational-query-builder.md
index 247c41a576..0e2e69a98b 100644
--- a/docs/relational-query-builder.md
+++ b/docs/relational-query-builder.md
@@ -3,7 +3,6 @@
`RelationQueryBuilder` is a special type of `QueryBuilder` which allows you to work with your relations.
Using it, you can bind entities to each other in the database without the need to load any entities,
or you can load related entities easily.
-Examples:
For example, we have a `Post` entity and it has a many-to-many relation to `Category` called `categories`.
Let's add a new category to this many-to-many relation:
diff --git a/docs/relations-faq.md b/docs/relations-faq.md
index 2eb89327de..8ae6469c9f 100644
--- a/docs/relations-faq.md
+++ b/docs/relations-faq.md
@@ -9,7 +9,7 @@
Self-referencing relations are relations which have a relation to themself.
This is useful when you are storing entities in a tree-like structures.
-Also "adjacency list" pattern is implemented used self-referenced relations.
+Also "adjacency list" pattern is implemented using self-referenced relations.
For example, you want to create categories tree in your application.
Categories can nest categories, nested categories can nest other categories, etc.
Self-referencing relations come handy here.
diff --git a/docs/repository-api.md b/docs/repository-api.md
index 00a3d6fd7f..22c84794be 100644
--- a/docs/repository-api.md
+++ b/docs/repository-api.md
@@ -51,7 +51,7 @@ const users = await repository
}
```
-* `getId` - Gets the primary column property values of the given entity.
+* `getId` - Gets the primary column property values of the given entity.
If entity has composite primary keys then the returned value will be an object with names and values of primary columns.
```typescript
@@ -135,12 +135,12 @@ await repository.insert({
});
-await manager.insert(User, [{
- firstName: "Foo",
- lastName: "Bar"
-}, {
- firstName: "Rizz",
- lastName: "Rak"
+await manager.insert(User, [{
+ firstName: "Foo",
+ lastName: "Bar"
+}, {
+ firstName: "Rizz",
+ lastName: "Rak"
}]);
```
@@ -162,6 +162,27 @@ await repository.delete([1, 2, 3]);
await repository.delete({ firstName: "Timber" });
```
+* `softDelete` and `restore` - Soft deleting and restoring a row by id
+
+```typescript
+const repository = connection.getRepository(Entity);
+// Delete a entity
+await repository.softDelete(1);
+// And You can restore it using restore;
+await repository.restore(1);
+```
+
+* `softRemove` and `recover` - This is alternative to `softDelete` and `restore`.
+```typescript
+// You can soft-delete them using softRemove
+const entities = await repository.find();
+const entitiesAfterSoftRemove = await repository.softRemove(entities);
+
+// And You can recover them using recover;
+await repository.recover(entitiesAfterSoftRemove);
+```
+
+
* `count` - Counts entities that match given options. Useful for pagination.
```typescript
diff --git a/docs/select-query-builder.md b/docs/select-query-builder.md
index 176af84e66..ba590c2d39 100644
--- a/docs/select-query-builder.md
+++ b/docs/select-query-builder.md
@@ -3,7 +3,7 @@
* [What is `QueryBuilder`](#what-is-querybuilder)
* [How to create and use a `QueryBuilder`](#how-to-create-and-use-a-querybuilder)
* [Getting values using QueryBuilder](#getting-values-using-querybuilder)
-* [What are aliases for?](#what-are-aliases-for?)
+* [What are aliases for?](#what-are-aliases-for)
* [Using parameters to escape data](#using-parameters-to-escape-data)
* [Adding `WHERE` expression](#adding-where-expression)
* [Adding `HAVING` expression](#adding-having-expression)
@@ -204,7 +204,7 @@ const photosSums = await getRepository(User)
.createQueryBuilder("user")
.select("user.id")
.addSelect("SUM(user.photosCount)", "sum")
- .where("user.id = :id", { id: 1 })
+ .groupBy("user.id")
.getRawMany();
// result will be like this: [{ id: 1, sum: 25 }, { id: 2, sum: 13 }, ...]
@@ -342,7 +342,7 @@ createQueryBuilder("user")
Which will produce the following SQL query:
```sql
-SELECT ... FROM users user WHERE user.firstName IN (1, 2, 3, 4)
+SELECT ... FROM users user WHERE user.id IN (1, 2, 3, 4)
```
@@ -776,7 +776,7 @@ const photosSums = await getRepository(User)
.createQueryBuilder("user")
.select("user.id")
.addSelect("SUM(user.photosCount)", "sum")
- .where("user.id = :id", { id: 1 })
+ .groupBy("user.id")
.getRawMany();
// result will be like this: [{ id: 1, sum: 25 }, { id: 2, sum: 13 }, ...]
diff --git a/docs/support.md b/docs/support.md
index d69707290a..aaf7229434 100644
--- a/docs/support.md
+++ b/docs/support.md
@@ -6,11 +6,11 @@ If you found a bug, issue, or you just want to propose a new feature, create [an
### Have a question?
-If you have a question, you can ask it on [StackOverflow](https://stackoverflow.com/questions/tagged/typeorm).
+If you have a question, you can ask it on [StackOverflow](https://stackoverflow.com/questions/tagged/typeorm) or other community support channels.
### Want community support?
-If you want community support, or simply want to chat with friendly TypeORM enthusiasts and users, you can do it on [Slack](https://join.slack.com/t/typeorm/shared_invite/enQtNDQ1MzA3MDA5MTExLTFiNDEyOGUxZGQyYWIwOTA0NDQxODdkOGQ0OTUxNzFjYjUwY2E0ZmFlODc5OTYyYzAzNGM3MGZjYzhjYTBiZTY).
+If you want community support, or simply want to chat with friendly TypeORM enthusiasts and users, you can do it on [Slack](https://join.slack.com/t/typeorm/shared_invite/zt-gej3gc00-hR~L~DqGUJ7qOpGy4SSq3g).
### Want professional commercial support?
diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md
index 344e63f5d7..ec817e6e84 100644
--- a/docs/supported-platforms.md
+++ b/docs/supported-platforms.md
@@ -31,7 +31,7 @@ plugins: [
]
```
-and make sure (sql-wasm.wasm)[https://github.com/sql-js/sql.js/blob/master/README.md#downloadingusing] file exists in your public path.
+and make sure [sql-wasm.wasm file](https://github.com/sql-js/sql.js/blob/master/README.md#downloadingusing) exists in your public path.
**Example of configuration**
@@ -61,7 +61,7 @@ You have the option to choose between module loaders just like in browser packag
For an example how to use TypeORM in Cordova see [typeorm/cordova-example](https://github.com/typeorm/cordova-example) and for Ionic see [typeorm/ionic-example](https://github.com/typeorm/ionic-example). **Important**: For use with Ionic, a custom webpack config file is needed! Please checkout the example to see the needed changes.
## React Native
-TypeORM is able to on React Native apps using the [react-native-sqlite-storage](https://github.com/andpor/react-native-sqlite-storage) plugin. For an example see [typeom/react-native-example](https://github.com/typeorm/react-native-example).
+TypeORM is able to run on React Native apps using the [react-native-sqlite-storage](https://github.com/andpor/react-native-sqlite-storage) plugin. For an example see [typeorm/react-native-example](https://github.com/typeorm/react-native-example).
## Expo
diff --git a/docs/transactions.md b/docs/transactions.md
index 0c03fb6efe..92f1788c2d 100644
--- a/docs/transactions.md
+++ b/docs/transactions.md
@@ -150,7 +150,7 @@ try {
} catch (err) {
- // since we have errors lets rollback changes we made
+ // since we have errors let's rollback changes we made
await queryRunner.rollbackTransaction();
} finally {
diff --git a/docs/using-cli.md b/docs/using-cli.md
index 56b9f5aaa4..a240a9bf9d 100644
--- a/docs/using-cli.md
+++ b/docs/using-cli.md
@@ -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 existing table schema](#generate-a-migration-from-exist-table-schema)
+* [Generate a migration from existing table schema](#generate-a-migration-from-existing-table-schema)
* [Run migrations](#run-migrations)
* [Revert migrations](#revert-migrations)
* [Show migrations](#show-migrations)
@@ -37,10 +37,12 @@ Add typeorm command under scripts section in package.json
```
"scripts" {
...
- "typeorm": "ts-node -r tsconfig-paths/register ./node_modules/typeorm/cli.js"
+ "typeorm": "node --require ts-node/register ./node_modules/typeorm/cli.js"
}
```
+If you want to load more modules like [module-alias](https://github.com/ilearnio/module-alias) you can add more `--require my-module-supporting-register`
+
Then you may run the command like this:
```
npm run typeorm migration:run
diff --git a/docs/using-ormconfig.md b/docs/using-ormconfig.md
index 49f1271c08..1f95b39354 100644
--- a/docs/using-ormconfig.md
+++ b/docs/using-ormconfig.md
@@ -101,37 +101,36 @@ TYPEORM_ENTITIES = entity/*.js,modules/**/entity/*.js
List of available env variables you can set:
+* TYPEORM_CACHE
+* TYPEORM_CACHE_ALWAYS_ENABLED
+* TYPEORM_CACHE_DURATION
+* TYPEORM_CACHE_OPTIONS
* TYPEORM_CONNECTION
-* TYPEORM_HOST
-* TYPEORM_USERNAME
-* TYPEORM_PASSWORD
* TYPEORM_DATABASE
-* TYPEORM_PORT
-* TYPEORM_URL
-* TYPEORM_SID
-* TYPEORM_SCHEMA
-* TYPEORM_SYNCHRONIZE
+* TYPEORM_DEBUG
+* TYPEORM_DRIVER_EXTRA
* TYPEORM_DROP_SCHEMA
-* TYPEORM_MIGRATIONS_RUN
-* TYPEORM_MIGRATIONS_TRANSACTION_MODE
* TYPEORM_ENTITIES
-* TYPEORM_MIGRATIONS
-* TYPEORM_MIGRATIONS_TABLE_NAME
-* TYPEORM_SUBSCRIBERS
-* TYPEORM_ENTITY_SCHEMAS
-* TYPEORM_LOGGING
-* TYPEORM_LOGGER
+* TYPEORM_ENTITIES_DIR
* TYPEORM_ENTITY_PREFIX
+* TYPEORM_HOST
+* TYPEORM_LOGGER
+* TYPEORM_LOGGING
* TYPEORM_MAX_QUERY_EXECUTION_TIME
-* TYPEORM_ENTITIES_DIR
+* TYPEORM_MIGRATIONS
* TYPEORM_MIGRATIONS_DIR
+* TYPEORM_MIGRATIONS_RUN
+* TYPEORM_MIGRATIONS_TABLE_NAME
+* TYPEORM_PASSWORD
+* TYPEORM_PORT
+* TYPEORM_SCHEMA
+* TYPEORM_SID
+* TYPEORM_SUBSCRIBERS
* TYPEORM_SUBSCRIBERS_DIR
-* TYPEORM_DRIVER_EXTRA
-* TYPEORM_DEBUG
-* TYPEORM_CACHE
-* TYPEORM_CACHE_OPTIONS
-* TYPEORM_CACHE_ALWAYS_ENABLED
-* TYPEORM_CACHE_DURATION
+* TYPEORM_SYNCHRONIZE
+* TYPEORM_URL
+* TYPEORM_USERNAME
+* TYPEORM_UUID_EXTENSION
`TYPEORM_CACHE` should be boolean or string of cache type
@@ -211,7 +210,7 @@ Note that Typeorm will use the first valid method found and will not load the ot
## Overriding options defined in ormconfig
Sometimes you want to override values defined in your ormconfig file,
-or you might to append some TypeScript / JavaScript logic to your configuration.
+or you might want to append some TypeScript / JavaScript logic to your configuration.
In such cases you can load options from ormconfig and get `ConnectionOptions` built,
then you can do whatever you want with those options, before passing them to `createConnection` function:
diff --git a/docs/zh_CN/README.md b/docs/zh_CN/README.md
index 348588f0a3..c8e24aeee8 100644
--- a/docs/zh_CN/README.md
+++ b/docs/zh_CN/README.md
@@ -4,8 +4,8 @@
-
+
-
+
= {
[P in keyof T]?:
T[P] extends Array ? Array> :
T[P] extends ReadonlyArray ? ReadonlyArray> :
- DeepPartial
+ DeepPartial | T[P]
};
diff --git a/src/connection/Connection.ts b/src/connection/Connection.ts
index ec3917318f..c95d70af7d 100644
--- a/src/connection/Connection.ts
+++ b/src/connection/Connection.ts
@@ -2,6 +2,7 @@ import {Driver} from "../driver/Driver";
import {QueryObserver} from "../observer/QueryObserver";
import {Repository} from "../repository/Repository";
import {EntitySubscriberInterface} from "../subscriber/EntitySubscriberInterface";
+import {EntityTarget} from "../common/EntityTarget";
import {ObjectType} from "../common/ObjectType";
import {EntityManager} from "../entity-manager/EntityManager";
import {DefaultNamingStrategy} from "../naming-strategy/DefaultNamingStrategy";
@@ -32,15 +33,16 @@ import {QueryResultCache} from "../cache/QueryResultCache";
import {SqljsEntityManager} from "../entity-manager/SqljsEntityManager";
import {RelationLoader} from "../query-builder/RelationLoader";
import {RelationIdLoader} from "../query-builder/RelationIdLoader";
-import {EntitySchema, PromiseUtils} from "../";
+import {EntitySchema} from "../";
import {SqlServerDriver} from "../driver/sqlserver/SqlServerDriver";
import {MysqlDriver} from "../driver/mysql/MysqlDriver";
import {ObjectUtils} from "../util/ObjectUtils";
import {IsolationLevel} from "../driver/types/IsolationLevel";
import {AuroraDataApiDriver} from "../driver/aurora-data-api/AuroraDataApiDriver";
+import {DriverUtils} from "../driver/DriverUtils";
+import {ReplicationMode} from "../driver/types/ReplicationMode";
import {EntityFactoryInterface} from "../entity-factory/EntityFactoryInterface";
import {DefaultEntityFactory} from "../entity-factory/DefaultEntityFactory";
-import {EntityTarget} from "../common/EntityTarget";
/**
* Connection is a single database ORM connection to a specific database.
@@ -286,7 +288,7 @@ export class Connection {
*/
// TODO rename
async dropDatabase(): Promise {
- const queryRunner = this.createQueryRunner("master");
+ const queryRunner = this.createQueryRunner();
try {
if (this.driver instanceof SqlServerDriver || this.driver instanceof MysqlDriver || this.driver instanceof AuroraDataApiDriver) {
const databases: string[] = this.driver.database ? [this.driver.database] : [];
@@ -294,7 +296,10 @@ export class Connection {
if (metadata.database && databases.indexOf(metadata.database) === -1)
databases.push(metadata.database);
});
- await PromiseUtils.runInSequence(databases, database => queryRunner.clearDatabase(database));
+
+ for (const database of databases) {
+ await queryRunner.clearDatabase(database);
+ }
} else {
await queryRunner.clearDatabase();
}
@@ -424,7 +429,7 @@ export class Connection {
if (queryRunner && queryRunner.isReleased)
throw new QueryRunnerProviderAlreadyReleasedError();
- const usedQueryRunner = queryRunner || this.createQueryRunner("master");
+ const usedQueryRunner = queryRunner || this.createQueryRunner();
try {
return await usedQueryRunner.query(query, parameters); // await is needed here because we are using finally
@@ -453,7 +458,7 @@ export class Connection {
throw new Error(`Query Builder is not supported by MongoDB.`);
if (alias) {
- const metadata = this.getMetadata(entityOrRunner as Function|EntitySchema|string);
+ const metadata = this.getMetadata(entityOrRunner as EntityTarget);
return new SelectQueryBuilder(this, queryRunner)
.select(alias)
.from(metadata.target, alias);
@@ -473,7 +478,7 @@ export class Connection {
* If you perform writes you must use master database,
* if you perform reads you can use slave databases.
*/
- createQueryRunner(mode: "master"|"slave" = "master"): QueryRunner {
+ createQueryRunner(mode: ReplicationMode = "master"): QueryRunner {
const queryRunner = this.driver.createQueryRunner(mode);
const manager = this.createEntityManager(queryRunner);
Object.assign(queryRunner, { manager: manager });
@@ -483,7 +488,7 @@ export class Connection {
/**
* Gets entity metadata of the junction table (many-to-many table).
*/
- getManyToManyMetadata(entityTarget: Function|string, relationPropertyPath: string) {
+ getManyToManyMetadata(entityTarget: EntityTarget, relationPropertyPath: string) {
const relationMetadata = this.getMetadata(entityTarget).findRelationWithPropertyPath(relationPropertyPath);
if (!relationMetadata)
throw new Error(`Relation "${relationPropertyPath}" was not found in ${entityTarget} entity.`);
@@ -570,17 +575,17 @@ export class Connection {
// This database name property is nested for replication configs.
protected getDatabaseName(): string {
- const options = this.options;
- switch (options.type) {
- case "mysql" :
- case "mariadb" :
- case "postgres":
- case "cockroachdb":
- case "mssql":
- case "oracle":
- return (options.replication ? options.replication.master.database : options.database) as string;
- default:
- return options.database as string;
+ const options = this.options;
+ switch (options.type) {
+ case "mysql" :
+ case "mariadb" :
+ case "postgres":
+ case "cockroachdb":
+ case "mssql":
+ case "oracle":
+ return DriverUtils.buildDriverOptions(options.replication ? options.replication.master : options).database;
+ default:
+ return DriverUtils.buildDriverOptions(options).database;
}
}
diff --git a/src/connection/ConnectionOptions.ts b/src/connection/ConnectionOptions.ts
index 2d223f74d6..40fd608087 100644
--- a/src/connection/ConnectionOptions.ts
+++ b/src/connection/ConnectionOptions.ts
@@ -12,6 +12,8 @@ import {NativescriptConnectionOptions} from "../driver/nativescript/Nativescript
import {ExpoConnectionOptions} from "../driver/expo/ExpoConnectionOptions";
import {AuroraDataApiConnectionOptions} from "../driver/aurora-data-api/AuroraDataApiConnectionOptions";
import {SapConnectionOptions} from "../driver/sap/SapConnectionOptions";
+import {AuroraDataApiPostgresConnectionOptions} from "../driver/aurora-data-api-pg/AuroraDataApiPostgresConnectionOptions";
+import {BetterSqlite3ConnectionOptions} from "../driver/better-sqlite3/BetterSqlite3ConnectionOptions";
/**
@@ -33,4 +35,6 @@ export type ConnectionOptions =
SqljsConnectionOptions|
MongoConnectionOptions|
AuroraDataApiConnectionOptions|
- ExpoConnectionOptions;
+ AuroraDataApiPostgresConnectionOptions|
+ ExpoConnectionOptions|
+ BetterSqlite3ConnectionOptions;
diff --git a/src/connection/ConnectionOptionsReader.ts b/src/connection/ConnectionOptionsReader.ts
index bfd2295183..997c240554 100644
--- a/src/connection/ConnectionOptionsReader.ts
+++ b/src/connection/ConnectionOptionsReader.ts
@@ -1,3 +1,4 @@
+import appRootPath from "app-root-path";
import {ConnectionOptions} from "./ConnectionOptions";
import {PlatformTools} from "../platform/PlatformTools";
import {ConnectionOptionsEnvReader} from "./options-reader/ConnectionOptionsEnvReader";
@@ -38,7 +39,7 @@ export class ConnectionOptionsReader {
async all(): Promise {
const options = await this.load();
if (!options)
- throw new Error(`No connection options were found in any of configurations file.`);
+ throw new Error(`No connection options were found in any orm configuration files.`);
return options;
}
@@ -80,7 +81,7 @@ export class ConnectionOptionsReader {
protected async load(): Promise {
let connectionOptions: ConnectionOptions|ConnectionOptions[]|undefined = undefined;
- const fileFormats = ["env", "js", "ts", "json", "yml", "yaml", "xml"];
+ const fileFormats = ["env", "js", "cjs", "ts", "json", "yml", "yaml", "xml"];
// Detect if baseFilePath contains file extension
const possibleExtension = this.baseFilePath.substr(this.baseFilePath.lastIndexOf("."));
@@ -93,11 +94,9 @@ export class ConnectionOptionsReader {
// if .env file found then load all its variables into process.env using dotenv package
if (foundFileFormat === "env") {
- const dotenv = PlatformTools.load("dotenv");
- dotenv.config({ path: this.baseFilePath });
+ PlatformTools.dotenv(this.baseFilePath);
} else if (PlatformTools.fileExist(".env")) {
- const dotenv = PlatformTools.load("dotenv");
- dotenv.config({ path: ".env" });
+ PlatformTools.dotenv(".env");
}
// Determine config file name
@@ -107,14 +106,14 @@ export class ConnectionOptionsReader {
if (PlatformTools.getEnvVariable("TYPEORM_CONNECTION") || PlatformTools.getEnvVariable("TYPEORM_URL")) {
connectionOptions = new ConnectionOptionsEnvReader().read();
- } else if (foundFileFormat === "js") {
- connectionOptions = await PlatformTools.load(configFile);
+ } else if (foundFileFormat === "js" || foundFileFormat === "cjs") {
+ connectionOptions = await require(configFile);
} else if (foundFileFormat === "ts") {
- connectionOptions = await PlatformTools.load(configFile);
+ connectionOptions = await require(configFile);
} else if (foundFileFormat === "json") {
- connectionOptions = PlatformTools.load(configFile);
+ connectionOptions = require(configFile);
} else if (foundFileFormat === "yml") {
connectionOptions = new ConnectionOptionsYmlReader().read(configFile);
@@ -171,7 +170,7 @@ export class ConnectionOptionsReader {
}
// make database path file in sqlite relative to package.json
- if (options.type === "sqlite") {
+ if (options.type === "sqlite" || options.type === "better-sqlite3") {
if (typeof options.database === "string" &&
options.database.substr(0, 1) !== "/" && // unix absolute
options.database.substr(1, 2) !== ":\\" && // windows absolute
@@ -200,7 +199,7 @@ export class ConnectionOptionsReader {
if (this.options && this.options.root)
return this.options.root;
- return PlatformTools.load("app-root-path").path;
+ return appRootPath.path;
}
/**
diff --git a/src/connection/options-reader/ConnectionOptionsXmlReader.ts b/src/connection/options-reader/ConnectionOptionsXmlReader.ts
index d43e9e7644..17f5cf347e 100644
--- a/src/connection/options-reader/ConnectionOptionsXmlReader.ts
+++ b/src/connection/options-reader/ConnectionOptionsXmlReader.ts
@@ -1,3 +1,4 @@
+import {parseString as xmlParser} from 'xml2js';
import {PlatformTools} from "../../platform/PlatformTools";
import {ConnectionOptions} from "../ConnectionOptions";
@@ -43,11 +44,10 @@ export class ConnectionOptionsXmlReader {
* Reads xml file contents and returns them in a promise.
*/
protected readXml(path: string): Promise {
- const xmlParser = PlatformTools.load("xml2js").parseString;
const xmlOptions = { trim: true, explicitRoot: false };
return new Promise((ok, fail) => {
xmlParser(PlatformTools.readFileSync(path), xmlOptions, (err: any, result: any) => err ? fail(err) : ok(result));
});
}
-}
\ No newline at end of file
+}
diff --git a/src/connection/options-reader/ConnectionOptionsYmlReader.ts b/src/connection/options-reader/ConnectionOptionsYmlReader.ts
index 8d90e6a519..7c14a4d28f 100644
--- a/src/connection/options-reader/ConnectionOptionsYmlReader.ts
+++ b/src/connection/options-reader/ConnectionOptionsYmlReader.ts
@@ -1,3 +1,4 @@
+import ymlParser from 'js-yaml';
import {PlatformTools} from "../../platform/PlatformTools";
import {ConnectionOptions} from "../ConnectionOptions";
@@ -14,11 +15,18 @@ export class ConnectionOptionsYmlReader {
* Reads connection options from given yml file.
*/
read(path: string): ConnectionOptions[] {
- const ymlParser = PlatformTools.load("js-yaml");
- const config = ymlParser.safeLoad(PlatformTools.readFileSync(path));
+ const contentsBuffer = PlatformTools.readFileSync(path);
+ const contents = contentsBuffer.toString();
+
+ const config: undefined | string | {[key: string]: any} = ymlParser.safeLoad(contents);
+
+ if (typeof config !== 'object') {
+ return [];
+ }
+
return Object.keys(config).map(connectionName => {
return Object.assign({ name: connectionName }, config[connectionName]);
});
}
-}
\ No newline at end of file
+}
diff --git a/src/decorator/Check.ts b/src/decorator/Check.ts
index 138eea1174..305fd1e5b8 100644
--- a/src/decorator/Check.ts
+++ b/src/decorator/Check.ts
@@ -6,21 +6,21 @@ import {CheckMetadataArgs} from "../metadata-args/CheckMetadataArgs";
* Can be used on entity property or on entity.
* Can create checks with composite columns when used on entity.
*/
-export function Check(expression: string): Function;
+export function Check(expression: string): ClassDecorator & PropertyDecorator;
/**
* Creates a database check.
* Can be used on entity property or on entity.
* Can create checks with composite columns when used on entity.
*/
-export function Check(name: string, expression: string): Function;
+export function Check(name: string, expression: string): ClassDecorator & PropertyDecorator;
/**
* Creates a database check.
* Can be used on entity property or on entity.
* Can create checks with composite columns when used on entity.
*/
-export function Check(nameOrExpression: string, maybeExpression?: string): Function {
+export function Check(nameOrExpression: string, maybeExpression?: string): ClassDecorator & PropertyDecorator {
const name = maybeExpression ? nameOrExpression : undefined;
const expression = maybeExpression ? maybeExpression : nameOrExpression;
@@ -28,7 +28,7 @@ export function Check(nameOrExpression: string, maybeExpression?: string): Funct
if (!expression)
throw new Error(`Check expression is required`);
- return function (clsOrObject: Function|Object, propertyName?: string) {
+ return function (clsOrObject: Function|Object, propertyName?: string | symbol) {
getMetadataArgsStorage().checks.push({
target: propertyName ? clsOrObject.constructor : clsOrObject as Function,
diff --git a/src/decorator/EntityRepository.ts b/src/decorator/EntityRepository.ts
index 092f4c1218..3a25adcdd0 100644
--- a/src/decorator/EntityRepository.ts
+++ b/src/decorator/EntityRepository.ts
@@ -7,7 +7,7 @@ import {EntitySchema} from "../entity-schema/EntitySchema";
* Custom repository can manage some specific entity or just be generic.
* Custom repository optionally can extend AbstractRepository, Repository or TreeRepository.
*/
-export function EntityRepository(entity?: Function | EntitySchema): Function {
+export function EntityRepository(entity?: Function | EntitySchema): ClassDecorator {
return function (target: Function) {
getMetadataArgsStorage().entityRepositories.push({
diff --git a/src/decorator/Exclusion.ts b/src/decorator/Exclusion.ts
index 75f3434a94..d05394cab8 100644
--- a/src/decorator/Exclusion.ts
+++ b/src/decorator/Exclusion.ts
@@ -6,21 +6,21 @@ import {ExclusionMetadataArgs} from "../metadata-args/ExclusionMetadataArgs";
* Can be used on entity.
* Can create exclusions with composite columns when used on entity.
*/
-export function Exclusion(expression: string): Function;
+export function Exclusion(expression: string): ClassDecorator & PropertyDecorator;
/**
* Creates a database exclusion.
* Can be used on entity.
* Can create exclusions with composite columns when used on entity.
*/
-export function Exclusion(name: string, expression: string): Function;
+export function Exclusion(name: string, expression: string): ClassDecorator & PropertyDecorator;
/**
* Creates a database exclusion.
* Can be used on entity.
* Can create exclusions with composite columns when used on entity.
*/
-export function Exclusion(nameOrExpression: string, maybeExpression?: string): Function {
+export function Exclusion(nameOrExpression: string, maybeExpression?: string): ClassDecorator & PropertyDecorator {
const name = maybeExpression ? nameOrExpression : undefined;
const expression = maybeExpression ? maybeExpression : nameOrExpression;
@@ -28,7 +28,7 @@ export function Exclusion(nameOrExpression: string, maybeExpression?: string): F
if (!expression)
throw new Error(`Exclusion expression is required`);
- return function (clsOrObject: Function|Object, propertyName?: string) {
+ return function (clsOrObject: Function|Object, propertyName?: string | symbol) {
getMetadataArgsStorage().exclusions.push({
target: propertyName ? clsOrObject.constructor : clsOrObject as Function,
diff --git a/src/decorator/Generated.ts b/src/decorator/Generated.ts
index 9857c95e49..934ccd4b6c 100644
--- a/src/decorator/Generated.ts
+++ b/src/decorator/Generated.ts
@@ -10,7 +10,7 @@ import {GeneratedMetadataArgs} from "../metadata-args/GeneratedMetadataArgs";
*
* Note, some databases do not support non-primary generation columns.
*/
-export function Generated(strategy: "increment"|"uuid"|"rowid" = "increment"): Function {
+export function Generated(strategy: "increment"|"uuid"|"rowid" = "increment"): PropertyDecorator {
return function (object: Object, propertyName: string) {
getMetadataArgsStorage().generations.push({
diff --git a/src/decorator/Index.ts b/src/decorator/Index.ts
index 17e57ea5c0..2bc63d6826 100644
--- a/src/decorator/Index.ts
+++ b/src/decorator/Index.ts
@@ -6,49 +6,49 @@ import {IndexMetadataArgs} from "../metadata-args/IndexMetadataArgs";
* Can be used on entity property or on entity.
* Can create indices with composite columns when used on entity.
*/
-export function Index(options?: IndexOptions): Function;
+export function Index(options?: IndexOptions): ClassDecorator & PropertyDecorator;
/**
* Creates a database index.
* Can be used on entity property or on entity.
* Can create indices with composite columns when used on entity.
*/
-export function Index(name: string, options?: IndexOptions): Function;
+export function Index(name: string, options?: IndexOptions): ClassDecorator & PropertyDecorator;
/**
* Creates a database index.
* Can be used on entity property or on entity.
* Can create indices with composite columns when used on entity.
*/
-export function Index(name: string, options: { synchronize: false }): Function;
+export function Index(name: string, options: { synchronize: false }): ClassDecorator & PropertyDecorator;
/**
* Creates a database index.
* Can be used on entity property or on entity.
* Can create indices with composite columns when used on entity.
*/
-export function Index(name: string, fields: string[], options?: IndexOptions): Function;
+export function Index(name: string, fields: string[], options?: IndexOptions): ClassDecorator & PropertyDecorator;
/**
* Creates a database index.
* Can be used on entity property or on entity.
* Can create indices with composite columns when used on entity.
*/
-export function Index(fields: string[], options?: IndexOptions): Function;
+export function Index(fields: string[], options?: IndexOptions): ClassDecorator & PropertyDecorator;
/**
* Creates a database index.
* Can be used on entity property or on entity.
* Can create indices with composite columns when used on entity.
*/
-export function Index(fields: (object?: any) => (any[]|{ [key: string]: number }), options?: IndexOptions): Function;
+export function Index(fields: (object?: any) => (any[]|{ [key: string]: number }), options?: IndexOptions): ClassDecorator & PropertyDecorator;
/**
* Creates a database index.
* Can be used on entity property or on entity.
* Can create indices with composite columns when used on entity.
*/
-export function Index(name: string, fields: (object?: any) => (any[]|{ [key: string]: number }), options?: IndexOptions): Function;
+export function Index(name: string, fields: (object?: any) => (any[]|{ [key: string]: number }), options?: IndexOptions): ClassDecorator & PropertyDecorator;
/**
* Creates a database index.
@@ -57,7 +57,7 @@ export function Index(name: string, fields: (object?: any) => (any[]|{ [key: str
*/
export function Index(nameOrFieldsOrOptions?: string|string[]|((object: any) => (any[]|{ [key: string]: number }))|IndexOptions,
maybeFieldsOrOptions?: ((object?: any) => (any[]|{ [key: string]: number }))|IndexOptions|string[]|{ synchronize: false },
- maybeOptions?: IndexOptions): Function {
+ maybeOptions?: IndexOptions): ClassDecorator & PropertyDecorator {
// normalize parameters
const name = typeof nameOrFieldsOrOptions === "string" ? nameOrFieldsOrOptions : undefined;
@@ -66,7 +66,7 @@ export function Index(nameOrFieldsOrOptions?: string|string[]|((object: any) =>
if (!options)
options = (typeof maybeFieldsOrOptions === "object" && !Array.isArray(maybeFieldsOrOptions)) ? maybeFieldsOrOptions as IndexOptions : maybeOptions;
- return function (clsOrObject: Function|Object, propertyName?: string) {
+ return function (clsOrObject: Function|Object, propertyName?: string | symbol) {
getMetadataArgsStorage().indices.push({
target: propertyName ? clsOrObject.constructor : clsOrObject as Function,
diff --git a/src/decorator/Unique.ts b/src/decorator/Unique.ts
index 871e25c58a..1923af52ad 100644
--- a/src/decorator/Unique.ts
+++ b/src/decorator/Unique.ts
@@ -1,39 +1,54 @@
-import {getMetadataArgsStorage} from "../index";
-import {UniqueMetadataArgs} from "../metadata-args/UniqueMetadataArgs";
+import { getMetadataArgsStorage } from "../index";
+import { UniqueMetadataArgs } from "../metadata-args/UniqueMetadataArgs";
/**
* Composite unique constraint must be set on entity classes and must specify entity's fields to be unique.
*/
-export function Unique(name: string, fields: string[]): Function;
+export function Unique(name: string, fields: string[]): ClassDecorator & PropertyDecorator;
/**
* Composite unique constraint must be set on entity classes and must specify entity's fields to be unique.
*/
-export function Unique(fields: string[]): Function;
+export function Unique(fields: string[]): ClassDecorator & PropertyDecorator;
/**
* Composite unique constraint must be set on entity classes and must specify entity's fields to be unique.
*/
-export function Unique(fields: (object?: any) => (any[]|{ [key: string]: number })): Function;
+export function Unique(fields: (object?: any) => (any[] | { [key: string]: number })): ClassDecorator & PropertyDecorator;
/**
* Composite unique constraint must be set on entity classes and must specify entity's fields to be unique.
*/
-export function Unique(name: string, fields: (object?: any) => (any[]|{ [key: string]: number })): Function;
+export function Unique(name: string, fields: (object?: any) => (any[] | { [key: string]: number })): ClassDecorator & PropertyDecorator;
/**
* Composite unique constraint must be set on entity classes and must specify entity's fields to be unique.
*/
-export function Unique(nameOrFields?: string|string[]|((object: any) => (any[]|{ [key: string]: number })),
- maybeFields?: ((object?: any) => (any[]|{ [key: string]: number }))|string[]): Function {
+export function Unique(nameOrFields?: string | string[] | ((object: any) => (any[] | { [key: string]: number })),
+ maybeFields?: ((object?: any) => (any[] | { [key: string]: number })) | string[]): ClassDecorator & PropertyDecorator {
const name = typeof nameOrFields === "string" ? nameOrFields : undefined;
- const fields = typeof nameOrFields === "string" ? <((object?: any) => (any[]|{ [key: string]: number }))|string[]> maybeFields : nameOrFields as string[];
+ const fields = typeof nameOrFields === "string" ? <((object?: any) => (any[] | { [key: string]: number })) | string[]>maybeFields : nameOrFields as string[];
+
+ return function (clsOrObject: Function | Object, propertyName?: string | symbol) {
+
+ let columns = fields;
+
+ if (propertyName !== undefined) {
+ switch (typeof (propertyName)) {
+ case "string":
+ columns = [propertyName];
+ break;
+
+ case "symbol":
+ columns = [propertyName.toString()];
+ break;
+ }
+ }
- return function (clsOrObject: Function|Object, propertyName?: string) {
const args: UniqueMetadataArgs = {
target: propertyName ? clsOrObject.constructor : clsOrObject as Function,
name: name,
- columns: propertyName ? [propertyName] : fields
+ columns,
};
getMetadataArgsStorage().uniques.push(args);
};
diff --git a/src/decorator/columns/Column.ts b/src/decorator/columns/Column.ts
index 457f548d81..ac5467980c 100644
--- a/src/decorator/columns/Column.ts
+++ b/src/decorator/columns/Column.ts
@@ -24,67 +24,67 @@ import {GeneratedMetadataArgs} from "../../metadata-args/GeneratedMetadataArgs";
* Column decorator is used to mark a specific class property as a table column. Only properties decorated with this
* decorator will be persisted to the database when entity be saved.
*/
-export function Column(): Function;
+export function Column(): PropertyDecorator;
/**
* Column decorator is used to mark a specific class property as a table column.
* Only properties decorated with this decorator will be persisted to the database when entity be saved.
*/
-export function Column(options: ColumnOptions): Function;
+export function Column(options: ColumnOptions): PropertyDecorator;
/**
* Column decorator is used to mark a specific class property as a table column.
* Only properties decorated with this decorator will be persisted to the database when entity be saved.
*/
-export function Column(type: SimpleColumnType, options?: ColumnCommonOptions): Function;
+export function Column(type: SimpleColumnType, options?: ColumnCommonOptions): PropertyDecorator;
/**
* Column decorator is used to mark a specific class property as a table column.
* Only properties decorated with this decorator will be persisted to the database when entity be saved.
*/
-export function Column(type: SpatialColumnType, options?: ColumnCommonOptions & SpatialColumnOptions): Function;
+export function Column(type: SpatialColumnType, options?: ColumnCommonOptions & SpatialColumnOptions): PropertyDecorator;
/**
* Column decorator is used to mark a specific class property as a table column.
* Only properties decorated with this decorator will be persisted to the database when entity be saved.
*/
-export function Column(type: WithLengthColumnType, options?: ColumnCommonOptions & ColumnWithLengthOptions): Function;
+export function Column(type: WithLengthColumnType, options?: ColumnCommonOptions & ColumnWithLengthOptions): PropertyDecorator;
/**
* Column decorator is used to mark a specific class property as a table column.
* Only properties decorated with this decorator will be persisted to the database when entity be saved.
*/
-export function Column(type: WithWidthColumnType, options?: ColumnCommonOptions & ColumnWithWidthOptions): Function;
+export function Column(type: WithWidthColumnType, options?: ColumnCommonOptions & ColumnWithWidthOptions): PropertyDecorator;
/**
* Column decorator is used to mark a specific class property as a table column.
* Only properties decorated with this decorator will be persisted to the database when entity be saved.
*/
-export function Column(type: WithPrecisionColumnType, options?: ColumnCommonOptions & ColumnNumericOptions): Function;
+export function Column(type: WithPrecisionColumnType, options?: ColumnCommonOptions & ColumnNumericOptions): PropertyDecorator;
/**
* Column decorator is used to mark a specific class property as a table column.
* Only properties decorated with this decorator will be persisted to the database when entity be saved.
*/
-export function Column(type: "enum", options?: ColumnCommonOptions & ColumnEnumOptions): Function;
+export function Column(type: "enum", options?: ColumnCommonOptions & ColumnEnumOptions): PropertyDecorator;
/**
* Column decorator is used to mark a specific class property as a table column.
* Only properties decorated with this decorator will be persisted to the database when entity be saved.
*/
-export function Column(type: "simple-enum", options?: ColumnCommonOptions & ColumnEnumOptions): Function;
+export function Column(type: "simple-enum", options?: ColumnCommonOptions & ColumnEnumOptions): PropertyDecorator;
/**
* Column decorator is used to mark a specific class property as a table column.
* Only properties decorated with this decorator will be persisted to the database when entity be saved.
*/
-export function Column(type: "set", options?: ColumnCommonOptions & ColumnEnumOptions): Function;
+export function Column(type: "set", options?: ColumnCommonOptions & ColumnEnumOptions): PropertyDecorator;
/**
* Column decorator is used to mark a specific class property as a table column.
* Only properties decorated with this decorator will be persisted to the database when entity be saved.
*/
-export function Column(type: "hstore", options?: ColumnCommonOptions & ColumnHstoreOptions): Function;
+export function Column(type: "hstore", options?: ColumnCommonOptions & ColumnHstoreOptions): PropertyDecorator;
/**
* Column decorator is used to mark a specific class property as a table column.
@@ -94,13 +94,13 @@ export function Column(type: "hstore", options?: ColumnCommonOptions & ColumnHst
* single table of the entity where Embedded is used. And on hydration all columns which supposed to be in the
* embedded will be mapped to it from the single table.
*/
-export function Column(type: (type?: any) => Function, options?: ColumnEmbeddedOptions): Function;
+export function Column(type: (type?: any) => Function, options?: ColumnEmbeddedOptions): PropertyDecorator;
/**
* Column decorator is used to mark a specific class property as a table column.
* Only properties decorated with this decorator will be persisted to the database when entity be saved.
*/
-export function Column(typeOrOptions?: ((type?: any) => Function)|ColumnType|(ColumnOptions&ColumnEmbeddedOptions), options?: (ColumnOptions&ColumnEmbeddedOptions)): Function {
+export function Column(typeOrOptions?: ((type?: any) => Function)|ColumnType|(ColumnOptions&ColumnEmbeddedOptions), options?: (ColumnOptions&ColumnEmbeddedOptions)): PropertyDecorator {
return function (object: Object, propertyName: string) {
// normalize parameters
diff --git a/src/decorator/columns/CreateDateColumn.ts b/src/decorator/columns/CreateDateColumn.ts
index 6d9acd802d..b14bf5c4f3 100644
--- a/src/decorator/columns/CreateDateColumn.ts
+++ b/src/decorator/columns/CreateDateColumn.ts
@@ -6,7 +6,7 @@ import {ColumnMetadataArgs} from "../../metadata-args/ColumnMetadataArgs";
* Creation date is generated and inserted only once,
* at the first time when you create an object, the value is inserted into the table, and is never touched again.
*/
-export function CreateDateColumn(options?: ColumnOptions): Function {
+export function CreateDateColumn(options?: ColumnOptions): PropertyDecorator {
return function (object: Object, propertyName: string) {
getMetadataArgsStorage().columns.push({
target: object.constructor,
diff --git a/src/decorator/columns/DeleteDateColumn.ts b/src/decorator/columns/DeleteDateColumn.ts
index 35ea43b848..deece8bba0 100644
--- a/src/decorator/columns/DeleteDateColumn.ts
+++ b/src/decorator/columns/DeleteDateColumn.ts
@@ -5,7 +5,7 @@ import { ColumnMetadataArgs } from "../../metadata-args/ColumnMetadataArgs";
* This column will store a delete date of the soft-deleted object.
* This date is being updated each time you soft-delete the object.
*/
-export function DeleteDateColumn(options?: ColumnOptions): Function {
+export function DeleteDateColumn(options?: ColumnOptions): PropertyDecorator {
return function(object: Object, propertyName: string) {
getMetadataArgsStorage().columns.push({
target: object.constructor,
diff --git a/src/decorator/columns/ObjectIdColumn.ts b/src/decorator/columns/ObjectIdColumn.ts
index 257aebf347..5feeb201de 100644
--- a/src/decorator/columns/ObjectIdColumn.ts
+++ b/src/decorator/columns/ObjectIdColumn.ts
@@ -5,7 +5,7 @@ import {ColumnMetadataArgs} from "../../metadata-args/ColumnMetadataArgs";
* Special type of column that is available only for MongoDB database.
* Marks your entity's column to be an object id.
*/
-export function ObjectIdColumn(options?: ColumnOptions): Function {
+export function ObjectIdColumn(options?: ColumnOptions): PropertyDecorator {
return function (object: Object, propertyName: string) {
// if column options are not given then create a new empty options
diff --git a/src/decorator/columns/PrimaryColumn.ts b/src/decorator/columns/PrimaryColumn.ts
index d47ec1748e..e84b8d12ba 100644
--- a/src/decorator/columns/PrimaryColumn.ts
+++ b/src/decorator/columns/PrimaryColumn.ts
@@ -9,21 +9,21 @@ import {GeneratedMetadataArgs} from "../../metadata-args/GeneratedMetadataArgs";
* Only properties decorated with this decorator will be persisted to the database when entity be saved.
* Primary columns also creates a PRIMARY KEY for this column in a db.
*/
-export function PrimaryColumn(options?: ColumnOptions): Function;
+export function PrimaryColumn(options?: ColumnOptions): PropertyDecorator;
/**
* Column decorator is used to mark a specific class property as a table column.
* Only properties decorated with this decorator will be persisted to the database when entity be saved.
* Primary columns also creates a PRIMARY KEY for this column in a db.
*/
-export function PrimaryColumn(type?: ColumnType, options?: ColumnOptions): Function;
+export function PrimaryColumn(type?: ColumnType, options?: ColumnOptions): PropertyDecorator;
/**
* Column decorator is used to mark a specific class property as a table column.
* Only properties decorated with this decorator will be persisted to the database when entity be saved.
* Primary columns also creates a PRIMARY KEY for this column in a db.
*/
-export function PrimaryColumn(typeOrOptions?: ColumnType|ColumnOptions, options?: ColumnOptions): Function {
+export function PrimaryColumn(typeOrOptions?: ColumnType|ColumnOptions, options?: ColumnOptions): PropertyDecorator {
return function (object: Object, propertyName: string) {
// normalize parameters
diff --git a/src/decorator/columns/PrimaryGeneratedColumn.ts b/src/decorator/columns/PrimaryGeneratedColumn.ts
index afa6c81336..14fbffa55a 100644
--- a/src/decorator/columns/PrimaryGeneratedColumn.ts
+++ b/src/decorator/columns/PrimaryGeneratedColumn.ts
@@ -6,27 +6,27 @@ import {GeneratedMetadataArgs} from "../../metadata-args/GeneratedMetadataArgs";
/**
* Column decorator is used to mark a specific class property as a table column.
*/
-export function PrimaryGeneratedColumn(): Function;
+export function PrimaryGeneratedColumn(): PropertyDecorator;
/**
* Column decorator is used to mark a specific class property as a table column.
*/
-export function PrimaryGeneratedColumn(options: PrimaryGeneratedColumnNumericOptions): Function;
+export function PrimaryGeneratedColumn(options: PrimaryGeneratedColumnNumericOptions): PropertyDecorator;
/**
* Column decorator is used to mark a specific class property as a table column.
*/
-export function PrimaryGeneratedColumn(strategy: "increment", options?: PrimaryGeneratedColumnNumericOptions): Function;
+export function PrimaryGeneratedColumn(strategy: "increment", options?: PrimaryGeneratedColumnNumericOptions): PropertyDecorator;
/**
* Column decorator is used to mark a specific class property as a table column.
*/
-export function PrimaryGeneratedColumn(strategy: "uuid", options?: PrimaryGeneratedColumnUUIDOptions): Function;
+export function PrimaryGeneratedColumn(strategy: "uuid", options?: PrimaryGeneratedColumnUUIDOptions): PropertyDecorator;
/**
* Column decorator is used to mark a specific class property as a table column.
*/
-export function PrimaryGeneratedColumn(strategy: "rowid", options?: PrimaryGeneratedColumnUUIDOptions): Function;
+export function PrimaryGeneratedColumn(strategy: "rowid", options?: PrimaryGeneratedColumnUUIDOptions): PropertyDecorator;
/**
* Column decorator is used to mark a specific class property as a table column.
@@ -34,7 +34,7 @@ export function PrimaryGeneratedColumn(strategy: "rowid", options?: PrimaryGener
* This column creates an integer PRIMARY COLUMN with generated set to true.
*/
export function PrimaryGeneratedColumn(strategyOrOptions?: "increment"|"uuid"|"rowid"|PrimaryGeneratedColumnNumericOptions|PrimaryGeneratedColumnUUIDOptions,
- maybeOptions?: PrimaryGeneratedColumnNumericOptions|PrimaryGeneratedColumnUUIDOptions): Function {
+ maybeOptions?: PrimaryGeneratedColumnNumericOptions|PrimaryGeneratedColumnUUIDOptions): PropertyDecorator {
// normalize parameters
const options: ColumnOptions = {};
diff --git a/src/decorator/columns/UpdateDateColumn.ts b/src/decorator/columns/UpdateDateColumn.ts
index f4895e76b4..f4627a0df4 100644
--- a/src/decorator/columns/UpdateDateColumn.ts
+++ b/src/decorator/columns/UpdateDateColumn.ts
@@ -5,7 +5,7 @@ import {ColumnMetadataArgs} from "../../metadata-args/ColumnMetadataArgs";
* This column will store an update date of the updated object.
* This date is being updated each time you persist the object.
*/
-export function UpdateDateColumn(options?: ColumnOptions): Function {
+export function UpdateDateColumn(options?: ColumnOptions): PropertyDecorator {
return function (object: Object, propertyName: string) {
getMetadataArgsStorage().columns.push({
diff --git a/src/decorator/columns/VersionColumn.ts b/src/decorator/columns/VersionColumn.ts
index f1f14984a3..1779869783 100644
--- a/src/decorator/columns/VersionColumn.ts
+++ b/src/decorator/columns/VersionColumn.ts
@@ -6,7 +6,7 @@ import {ColumnMetadataArgs} from "../../metadata-args/ColumnMetadataArgs";
* Every time your entity will be persisted, this number will be increased by one -
* so you can organize visioning and update strategies of your entity.
*/
-export function VersionColumn(options?: ColumnOptions): Function {
+export function VersionColumn(options?: ColumnOptions): PropertyDecorator {
return function (object: Object, propertyName: string) {
getMetadataArgsStorage().columns.push({
diff --git a/src/decorator/columns/ViewColumn.ts b/src/decorator/columns/ViewColumn.ts
index 998af7bfbd..11356f66e3 100644
--- a/src/decorator/columns/ViewColumn.ts
+++ b/src/decorator/columns/ViewColumn.ts
@@ -1,16 +1,17 @@
import {getMetadataArgsStorage} from "../../";
import {ColumnMetadataArgs} from "../../metadata-args/ColumnMetadataArgs";
+import { ViewColumnOptions } from "../options/ViewColumnOptions";
/**
* ViewColumn decorator is used to mark a specific class property as a view column.
*/
-export function ViewColumn(): Function {
+export function ViewColumn(options?: ViewColumnOptions): PropertyDecorator {
return function (object: Object, propertyName: string) {
getMetadataArgsStorage().columns.push({
target: object.constructor,
propertyName: propertyName,
mode: "regular",
- options: {}
+ options: options || {}
} as ColumnMetadataArgs);
};
}
diff --git a/src/decorator/entity-view/ViewEntity.ts b/src/decorator/entity-view/ViewEntity.ts
index 50cb0f96a4..7223ed8ce5 100644
--- a/src/decorator/entity-view/ViewEntity.ts
+++ b/src/decorator/entity-view/ViewEntity.ts
@@ -6,19 +6,19 @@ import {ViewEntityOptions} from "../options/ViewEntityOptions";
* This decorator is used to mark classes that will be an entity view.
* Database schema will be created for all classes decorated with it, and Repository can be retrieved and used for it.
*/
-export function ViewEntity(options?: ViewEntityOptions): Function;
+export function ViewEntity(options?: ViewEntityOptions): ClassDecorator;
/**
* This decorator is used to mark classes that will be an entity view.
* Database schema will be created for all classes decorated with it, and Repository can be retrieved and used for it.
*/
-export function ViewEntity(name?: string, options?: ViewEntityOptions): Function;
+export function ViewEntity(name?: string, options?: ViewEntityOptions): ClassDecorator;
/**
* This decorator is used to mark classes that will be an entity view.
* Database schema will be created for all classes decorated with it, and Repository can be retrieved and used for it.
*/
-export function ViewEntity(nameOrOptions?: string|ViewEntityOptions, maybeOptions?: ViewEntityOptions): Function {
+export function ViewEntity(nameOrOptions?: string|ViewEntityOptions, maybeOptions?: ViewEntityOptions): ClassDecorator {
const options = (typeof nameOrOptions === "object" ? nameOrOptions as ViewEntityOptions : maybeOptions) || {};
const name = typeof nameOrOptions === "string" ? nameOrOptions : options.name;
diff --git a/src/decorator/entity/ChildEntity.ts b/src/decorator/entity/ChildEntity.ts
index 644b7d5bab..aee1b9746a 100644
--- a/src/decorator/entity/ChildEntity.ts
+++ b/src/decorator/entity/ChildEntity.ts
@@ -5,7 +5,7 @@ import {DiscriminatorValueMetadataArgs} from "../../metadata-args/DiscriminatorV
/**
* Special type of the table used in the single-table inherited tables.
*/
-export function ChildEntity(discriminatorValue?: any) {
+export function ChildEntity(discriminatorValue?: any): ClassDecorator {
return function (target: Function) {
// register a table metadata
diff --git a/src/decorator/entity/Entity.ts b/src/decorator/entity/Entity.ts
index bb2af675d0..f90e446470 100644
--- a/src/decorator/entity/Entity.ts
+++ b/src/decorator/entity/Entity.ts
@@ -5,23 +5,23 @@ import {TableMetadataArgs} from "../../metadata-args/TableMetadataArgs";
* This decorator is used to mark classes that will be an entity (table or document depend on database type).
* Database schema will be created for all classes decorated with it, and Repository can be retrieved and used for it.
*/
-export function Entity(options?: EntityOptions): Function;
+export function Entity(options?: EntityOptions): ClassDecorator;
/**
* This decorator is used to mark classes that will be an entity (table or document depend on database type).
* Database schema will be created for all classes decorated with it, and Repository can be retrieved and used for it.
*/
-export function Entity(name?: string, options?: EntityOptions): Function;
+export function Entity(name?: string, options?: EntityOptions): ClassDecorator;
/**
* This decorator is used to mark classes that will be an entity (table or document depend on database type).
* Database schema will be created for all classes decorated with it, and Repository can be retrieved and used for it.
*/
-export function Entity(nameOrOptions?: string|EntityOptions, maybeOptions?: EntityOptions): Function {
+export function Entity(nameOrOptions?: string|EntityOptions, maybeOptions?: EntityOptions): ClassDecorator {
const options = (typeof nameOrOptions === "object" ? nameOrOptions as EntityOptions : maybeOptions) || {};
const name = typeof nameOrOptions === "string" ? nameOrOptions : options.name;
- return function (target: Function) {
+ return function (target) {
getMetadataArgsStorage().tables.push({
target: target,
name: name,
diff --git a/src/decorator/entity/TableInheritance.ts b/src/decorator/entity/TableInheritance.ts
index 264743713e..f716b5c227 100644
--- a/src/decorator/entity/TableInheritance.ts
+++ b/src/decorator/entity/TableInheritance.ts
@@ -4,7 +4,7 @@ import {InheritanceMetadataArgs} from "../../metadata-args/InheritanceMetadataAr
/**
* Sets for entity to use table inheritance pattern.
*/
-export function TableInheritance(options?: { pattern?: "STI"/*|"CTI"*/, column?: string|ColumnOptions }) {
+export function TableInheritance(options?: { pattern?: "STI"/*|"CTI"*/, column?: string|ColumnOptions }): ClassDecorator {
return function (target: Function) {
getMetadataArgsStorage().inheritances.push({
diff --git a/src/decorator/listeners/AfterInsert.ts b/src/decorator/listeners/AfterInsert.ts
index 68c2c1a11c..48be17d67d 100644
--- a/src/decorator/listeners/AfterInsert.ts
+++ b/src/decorator/listeners/AfterInsert.ts
@@ -5,7 +5,7 @@ import {EntityListenerMetadataArgs} from "../../metadata-args/EntityListenerMeta
/**
* Calls a method on which this decorator is applied after this entity insertion.
*/
-export function AfterInsert() {
+export function AfterInsert(): PropertyDecorator {
return function (object: Object, propertyName: string) {
getMetadataArgsStorage().entityListeners.push({
diff --git a/src/decorator/listeners/AfterLoad.ts b/src/decorator/listeners/AfterLoad.ts
index 8b810feed7..02e2fe81c6 100644
--- a/src/decorator/listeners/AfterLoad.ts
+++ b/src/decorator/listeners/AfterLoad.ts
@@ -5,7 +5,7 @@ import {EntityListenerMetadataArgs} from "../../metadata-args/EntityListenerMeta
/**
* Calls a method on which this decorator is applied after entity is loaded.
*/
-export function AfterLoad() {
+export function AfterLoad(): PropertyDecorator {
return function (object: Object, propertyName: string) {
getMetadataArgsStorage().entityListeners.push({
diff --git a/src/decorator/listeners/AfterRemove.ts b/src/decorator/listeners/AfterRemove.ts
index e9e7d2549c..a2f00f63f4 100644
--- a/src/decorator/listeners/AfterRemove.ts
+++ b/src/decorator/listeners/AfterRemove.ts
@@ -5,7 +5,7 @@ import {EntityListenerMetadataArgs} from "../../metadata-args/EntityListenerMeta
/**
* Calls a method on which this decorator is applied after this entity removal.
*/
-export function AfterRemove() {
+export function AfterRemove(): PropertyDecorator {
return function (object: Object, propertyName: string) {
getMetadataArgsStorage().entityListeners.push({
diff --git a/src/decorator/listeners/AfterUpdate.ts b/src/decorator/listeners/AfterUpdate.ts
index fadb31815f..f77241e095 100644
--- a/src/decorator/listeners/AfterUpdate.ts
+++ b/src/decorator/listeners/AfterUpdate.ts
@@ -5,7 +5,7 @@ import {EntityListenerMetadataArgs} from "../../metadata-args/EntityListenerMeta
/**
* Calls a method on which this decorator is applied after this entity update.
*/
-export function AfterUpdate() {
+export function AfterUpdate(): PropertyDecorator {
return function (object: Object, propertyName: string) {
getMetadataArgsStorage().entityListeners.push({
diff --git a/src/decorator/listeners/BeforeInsert.ts b/src/decorator/listeners/BeforeInsert.ts
index 10db63ad14..6f2d4c7d98 100644
--- a/src/decorator/listeners/BeforeInsert.ts
+++ b/src/decorator/listeners/BeforeInsert.ts
@@ -5,7 +5,7 @@ import {EntityListenerMetadataArgs} from "../../metadata-args/EntityListenerMeta
/**
* Calls a method on which this decorator is applied before this entity insertion.
*/
-export function BeforeInsert() {
+export function BeforeInsert(): PropertyDecorator {
return function (object: Object, propertyName: string) {
getMetadataArgsStorage().entityListeners.push({
diff --git a/src/decorator/listeners/BeforeRemove.ts b/src/decorator/listeners/BeforeRemove.ts
index e108e2e9f6..0fcadd1fa4 100644
--- a/src/decorator/listeners/BeforeRemove.ts
+++ b/src/decorator/listeners/BeforeRemove.ts
@@ -5,7 +5,7 @@ import {EntityListenerMetadataArgs} from "../../metadata-args/EntityListenerMeta
/**
* Calls a method on which this decorator is applied before this entity removal.
*/
-export function BeforeRemove() {
+export function BeforeRemove(): PropertyDecorator {
return function (object: Object, propertyName: string) {
getMetadataArgsStorage().entityListeners.push({
diff --git a/src/decorator/listeners/BeforeUpdate.ts b/src/decorator/listeners/BeforeUpdate.ts
index 753e3a1532..d4a15d36d2 100644
--- a/src/decorator/listeners/BeforeUpdate.ts
+++ b/src/decorator/listeners/BeforeUpdate.ts
@@ -5,7 +5,7 @@ import {EntityListenerMetadataArgs} from "../../metadata-args/EntityListenerMeta
/**
* Calls a method on which this decorator is applied before this entity update.
*/
-export function BeforeUpdate() {
+export function BeforeUpdate(): PropertyDecorator {
return function (object: Object, propertyName: string) {
getMetadataArgsStorage().entityListeners.push({
diff --git a/src/decorator/listeners/EventSubscriber.ts b/src/decorator/listeners/EventSubscriber.ts
index 99741d0b9a..ea13dc44a8 100644
--- a/src/decorator/listeners/EventSubscriber.ts
+++ b/src/decorator/listeners/EventSubscriber.ts
@@ -5,7 +5,7 @@ import {EntitySubscriberMetadataArgs} from "../../metadata-args/EntitySubscriber
* Classes decorated with this decorator will listen to ORM events and their methods will be triggered when event
* occurs. Those classes must implement EventSubscriberInterface interface.
*/
-export function EventSubscriber() {
+export function EventSubscriber(): ClassDecorator {
return function (target: Function) {
getMetadataArgsStorage().entitySubscribers.push({
diff --git a/src/decorator/options/ViewColumnOptions.ts b/src/decorator/options/ViewColumnOptions.ts
new file mode 100644
index 0000000000..a2b132cd61
--- /dev/null
+++ b/src/decorator/options/ViewColumnOptions.ts
@@ -0,0 +1,9 @@
+/**
+ * Describes all view column's options.
+ */
+export interface ViewColumnOptions {
+ /**
+ * Column name in the database.
+ */
+ name?: string;
+}
diff --git a/src/decorator/relations/JoinColumn.ts b/src/decorator/relations/JoinColumn.ts
index 3bded3a080..f619e374ad 100644
--- a/src/decorator/relations/JoinColumn.ts
+++ b/src/decorator/relations/JoinColumn.ts
@@ -6,28 +6,28 @@ import {JoinColumnMetadataArgs} from "../../metadata-args/JoinColumnMetadataArgs
* It also can be used on both one-to-one and many-to-one relations to specify custom column name
* or custom referenced column.
*/
-export function JoinColumn(): Function;
+export function JoinColumn(): PropertyDecorator;
/**
* JoinColumn decorator used on one-to-one relations to specify owner side of relationship.
* It also can be used on both one-to-one and many-to-one relations to specify custom column name
* or custom referenced column.
*/
-export function JoinColumn(options: JoinColumnOptions): Function;
+export function JoinColumn(options: JoinColumnOptions): PropertyDecorator;
/**
* JoinColumn decorator used on one-to-one relations to specify owner side of relationship.
* It also can be used on both one-to-one and many-to-one relations to specify custom column name
* or custom referenced column.
*/
-export function JoinColumn(options: JoinColumnOptions[]): Function;
+export function JoinColumn(options: JoinColumnOptions[]): PropertyDecorator;
/**
* JoinColumn decorator used on one-to-one relations to specify owner side of relationship.
* It also can be used on both one-to-one and many-to-one relations to specify custom column name
* or custom referenced column.
*/
-export function JoinColumn(optionsOrOptionsArray?: JoinColumnOptions|JoinColumnOptions[]): Function {
+export function JoinColumn(optionsOrOptionsArray?: JoinColumnOptions|JoinColumnOptions[]): PropertyDecorator {
return function (object: Object, propertyName: string) {
const options = Array.isArray(optionsOrOptionsArray) ? optionsOrOptionsArray : [optionsOrOptionsArray || {}];
options.forEach(options => {
diff --git a/src/decorator/relations/JoinTable.ts b/src/decorator/relations/JoinTable.ts
index ed7ddab587..c9d95b0909 100644
--- a/src/decorator/relations/JoinTable.ts
+++ b/src/decorator/relations/JoinTable.ts
@@ -6,25 +6,25 @@ import {JoinTableMultipleColumnsOptions} from "../options/JoinTableMultipleColum
* JoinTable decorator is used in many-to-many relationship to specify owner side of relationship.
* Its also used to set a custom junction table's name, column names and referenced columns.
*/
-export function JoinTable(): Function;
+export function JoinTable(): PropertyDecorator;
/**
* JoinTable decorator is used in many-to-many relationship to specify owner side of relationship.
* Its also used to set a custom junction table's name, column names and referenced columns.
*/
-export function JoinTable(options: JoinTableOptions): Function;
+export function JoinTable(options: JoinTableOptions): PropertyDecorator;
/**
* JoinTable decorator is used in many-to-many relationship to specify owner side of relationship.
* Its also used to set a custom junction table's name, column names and referenced columns.
*/
-export function JoinTable(options: JoinTableMultipleColumnsOptions): Function;
+export function JoinTable(options: JoinTableMultipleColumnsOptions): PropertyDecorator;
/**
* JoinTable decorator is used in many-to-many relationship to specify owner side of relationship.
* Its also used to set a custom junction table's name, column names and referenced columns.
*/
-export function JoinTable(options?: JoinTableOptions|JoinTableMultipleColumnsOptions): Function {
+export function JoinTable(options?: JoinTableOptions|JoinTableMultipleColumnsOptions): PropertyDecorator {
return function (object: Object, propertyName: string) {
options = options || {} as JoinTableOptions|JoinTableMultipleColumnsOptions;
getMetadataArgsStorage().joinTables.push({
diff --git a/src/decorator/relations/ManyToMany.ts b/src/decorator/relations/ManyToMany.ts
index f287b434f5..e07a124f04 100644
--- a/src/decorator/relations/ManyToMany.ts
+++ b/src/decorator/relations/ManyToMany.ts
@@ -7,7 +7,7 @@ import {RelationMetadataArgs} from "../../metadata-args/RelationMetadataArgs";
* entity1 and entity2 ids. This is owner side of the relationship.
*/
export function ManyToMany(typeFunctionOrTarget: string|((type?: any) => ObjectType),
- options?: RelationOptions): Function;
+ options?: RelationOptions): PropertyDecorator;
/**
* Many-to-many is a type of relationship when Entity1 can have multiple instances of Entity2, and Entity2 can have
@@ -16,7 +16,7 @@ export function ManyToMany(typeFunctionOrTarget: string|((type?: any) => Obje
*/
export function ManyToMany(typeFunctionOrTarget: string|((type?: any) => ObjectType),
inverseSide?: string|((object: T) => any),
- options?: RelationOptions): Function;
+ options?: RelationOptions): PropertyDecorator;
/**
* Many-to-many is a type of relationship when Entity1 can have multiple instances of Entity2, and Entity2 can have
@@ -25,7 +25,7 @@ export function ManyToMany(typeFunctionOrTarget: string|((type?: any) => Obje
*/
export function ManyToMany(typeFunctionOrTarget: string|((type?: any) => ObjectType),
inverseSideOrOptions?: string|((object: T) => any)|RelationOptions,
- options?: RelationOptions): Function {
+ options?: RelationOptions): PropertyDecorator {
// normalize parameters
let inverseSideProperty: string|((object: T) => any);
diff --git a/src/decorator/relations/ManyToOne.ts b/src/decorator/relations/ManyToOne.ts
index 7c0031e6c0..0c60ba0bf6 100644
--- a/src/decorator/relations/ManyToOne.ts
+++ b/src/decorator/relations/ManyToOne.ts
@@ -6,7 +6,7 @@ import {RelationMetadataArgs} from "../../metadata-args/RelationMetadataArgs";
* Entity2 can have a multiple instances of Entity1. Entity1 is an owner of the relationship, and storages Entity2 id
* on its own side.
*/
-export function ManyToOne(typeFunctionOrTarget: string|((type?: any) => ObjectType), options?: RelationOptions): Function;
+export function ManyToOne(typeFunctionOrTarget: string|((type?: any) => ObjectType), options?: RelationOptions): PropertyDecorator;
/**
* Many-to-one relation allows to create type of relation when Entity1 can have single instance of Entity2, but
@@ -15,7 +15,7 @@ export function ManyToOne(typeFunctionOrTarget: string|((type?: any) => Objec
*/
export function ManyToOne(typeFunctionOrTarget: string|((type?: any) => ObjectType),
inverseSide?: string|((object: T) => any),
- options?: RelationOptions): Function;
+ options?: RelationOptions): PropertyDecorator;
/**
* Many-to-one relation allows to create type of relation when Entity1 can have single instance of Entity2, but
@@ -24,7 +24,7 @@ export function ManyToOne(typeFunctionOrTarget: string|((type?: any) => Objec
*/
export function ManyToOne(typeFunctionOrTarget: string|((type?: any) => ObjectType),
inverseSideOrOptions?: string|((object: T) => any)|RelationOptions,
- options?: RelationOptions): Function {
+ options?: RelationOptions): PropertyDecorator {
// normalize parameters
let inverseSideProperty: string|((object: T) => any);
diff --git a/src/decorator/relations/OneToMany.ts b/src/decorator/relations/OneToMany.ts
index 80e1f7175c..e174ba8f08 100644
--- a/src/decorator/relations/OneToMany.ts
+++ b/src/decorator/relations/OneToMany.ts
@@ -2,10 +2,10 @@ import {getMetadataArgsStorage, ObjectType, RelationOptions} from "../../";
import {RelationMetadataArgs} from "../../metadata-args/RelationMetadataArgs";
/**
- * One-to-many relation allows to create type of relation when Entity2 can have multiple instances of Entity1.
- * Entity1 have only one Entity2. Entity1 is an owner of the relationship, and storages Entity2 id on its own side.
+ * One-to-many relation allows to create type of relation when Entity1 can have multiple instances of Entity2.
+ * Entity2 have only one Entity1. Entity2 is an owner of the relationship, and storages Entity1 id on its own side.
*/
-export function OneToMany(typeFunctionOrTarget: string|((type?: any) => ObjectType), inverseSide: string|((object: T) => any), options?: RelationOptions): Function {
+export function OneToMany(typeFunctionOrTarget: string|((type?: any) => ObjectType), inverseSide: string|((object: T) => any), options?: RelationOptions): PropertyDecorator {
return function (object: Object, propertyName: string) {
if (!options) options = {} as RelationOptions;
diff --git a/src/decorator/relations/OneToOne.ts b/src/decorator/relations/OneToOne.ts
index 85f196b227..e1d8c04982 100644
--- a/src/decorator/relations/OneToOne.ts
+++ b/src/decorator/relations/OneToOne.ts
@@ -6,7 +6,7 @@ import {RelationMetadataArgs} from "../../metadata-args/RelationMetadataArgs";
* Entity1 is an owner of the relationship, and storages Entity1 id on its own side.
*/
export function OneToOne(typeFunctionOrTarget: string|((type?: any) => ObjectType),
- options?: RelationOptions): Function;
+ options?: RelationOptions): PropertyDecorator;
/**
* One-to-one relation allows to create direct relation between two entities. Entity1 have only one Entity2.
@@ -14,7 +14,7 @@ export function OneToOne(typeFunctionOrTarget: string|((type?: any) => Object
*/
export function OneToOne(typeFunctionOrTarget: string|((type?: any) => ObjectType),
inverseSide?: string|((object: T) => any),
- options?: RelationOptions): Function;
+ options?: RelationOptions): PropertyDecorator;
/**
* One-to-one relation allows to create direct relation between two entities. Entity1 have only one Entity2.
@@ -22,7 +22,7 @@ export function OneToOne(typeFunctionOrTarget: string|((type?: any) => Object
*/
export function OneToOne(typeFunctionOrTarget: string|((type?: any) => ObjectType),
inverseSideOrOptions?: string|((object: T) => any)|RelationOptions,
- options?: RelationOptions): Function {
+ options?: RelationOptions): PropertyDecorator {
// normalize parameters
let inverseSideProperty: string|((object: T) => any);
diff --git a/src/decorator/relations/RelationCount.ts b/src/decorator/relations/RelationCount.ts
index abfb76c2e4..9670c5c895 100644
--- a/src/decorator/relations/RelationCount.ts
+++ b/src/decorator/relations/RelationCount.ts
@@ -6,7 +6,7 @@ import {RelationCountMetadataArgs} from "../../metadata-args/RelationCountMetada
*
* @deprecated Do not use this decorator, it may be removed in the future versions
*/
-export function RelationCount(relation: string|((object: T) => any), alias?: string, queryBuilderFactory?: (qb: SelectQueryBuilder) => SelectQueryBuilder): Function {
+export function RelationCount(relation: string|((object: T) => any), alias?: string, queryBuilderFactory?: (qb: SelectQueryBuilder) => SelectQueryBuilder): PropertyDecorator {
return function (object: Object, propertyName: string) {
getMetadataArgsStorage().relationCounts.push({
diff --git a/src/decorator/relations/RelationId.ts b/src/decorator/relations/RelationId.ts
index c7880e17a6..78855aeb4f 100644
--- a/src/decorator/relations/RelationId.ts
+++ b/src/decorator/relations/RelationId.ts
@@ -6,7 +6,7 @@ import {RelationIdMetadataArgs} from "../../metadata-args/RelationIdMetadataArgs
*
* @experimental
*/
-export function RelationId(relation: string|((object: T) => any), alias?: string, queryBuilderFactory?: (qb: SelectQueryBuilder) => SelectQueryBuilder): Function {
+export function RelationId(relation: string|((object: T) => any), alias?: string, queryBuilderFactory?: (qb: SelectQueryBuilder) => SelectQueryBuilder): PropertyDecorator {
return function (object: Object, propertyName: string) {
getMetadataArgsStorage().relationIds.push({
diff --git a/src/decorator/tree/Tree.ts b/src/decorator/tree/Tree.ts
index e93ab0be9c..79da2fc96b 100644
--- a/src/decorator/tree/Tree.ts
+++ b/src/decorator/tree/Tree.ts
@@ -8,7 +8,7 @@ import {TreeType} from "../../metadata/types/TreeTypes";
* @TreeParent decorator must be used in tree entities.
* TreeRepository can be used to manipulate with tree entities.
*/
-export function Tree(type: TreeType): Function {
+export function Tree(type: TreeType): ClassDecorator {
return function (target: Function) {
getMetadataArgsStorage().trees.push({
diff --git a/src/decorator/tree/TreeChildren.ts b/src/decorator/tree/TreeChildren.ts
index 70de9e5995..2ef0935e0a 100644
--- a/src/decorator/tree/TreeChildren.ts
+++ b/src/decorator/tree/TreeChildren.ts
@@ -5,7 +5,7 @@ import {RelationMetadataArgs} from "../../metadata-args/RelationMetadataArgs";
* Marks a entity property as a children of the tree.
* "Tree children" will contain all children (bind) of this entity.
*/
-export function TreeChildren(options?: { cascade?: boolean|("insert"|"update"|"remove"|"soft-remove"|"recover")[] }): Function {
+export function TreeChildren(options?: { cascade?: boolean|("insert"|"update"|"remove"|"soft-remove"|"recover")[] }): PropertyDecorator {
return function (object: Object, propertyName: string) {
if (!options) options = {} as RelationOptions;
diff --git a/src/decorator/tree/TreeLevelColumn.ts b/src/decorator/tree/TreeLevelColumn.ts
index f34a4173ed..24d9b5f2b1 100644
--- a/src/decorator/tree/TreeLevelColumn.ts
+++ b/src/decorator/tree/TreeLevelColumn.ts
@@ -4,7 +4,7 @@ import {ColumnMetadataArgs} from "../../metadata-args/ColumnMetadataArgs";
/**
* Creates a "level"/"length" column to the table that holds a closure table.
*/
-export function TreeLevelColumn(): Function {
+export function TreeLevelColumn(): PropertyDecorator {
return function (object: Object, propertyName: string) {
getMetadataArgsStorage().columns.push({
diff --git a/src/decorator/tree/TreeParent.ts b/src/decorator/tree/TreeParent.ts
index 4b0d38b9ef..931b78206e 100644
--- a/src/decorator/tree/TreeParent.ts
+++ b/src/decorator/tree/TreeParent.ts
@@ -5,7 +5,7 @@ import {RelationMetadataArgs} from "../../metadata-args/RelationMetadataArgs";
* Marks a entity property as a parent of the tree.
* "Tree parent" indicates who owns (is a parent) of this entity in tree structure.
*/
-export function TreeParent(): Function {
+export function TreeParent(): PropertyDecorator {
return function (object: Object, propertyName: string) {
// now try to determine it its lazy relation
diff --git a/src/driver/Driver.ts b/src/driver/Driver.ts
index 1c5f084312..8d683dca9c 100644
--- a/src/driver/Driver.ts
+++ b/src/driver/Driver.ts
@@ -8,6 +8,7 @@ import {DataTypeDefaults} from "./types/DataTypeDefaults";
import {BaseConnectionOptions} from "../connection/BaseConnectionOptions";
import {TableColumn} from "../schema-builder/table/TableColumn";
import {EntityMetadata} from "../metadata/EntityMetadata";
+import {ReplicationMode} from "./types/ReplicationMode";
/**
* Driver organizes TypeORM communication with specific database management system.
@@ -102,7 +103,7 @@ export interface Driver {
/**
* Creates a query runner used for common queries.
*/
- createQueryRunner(mode: "master"|"slave"): QueryRunner;
+ createQueryRunner(mode: ReplicationMode): QueryRunner;
/**
* Replaces parameters in the given sql with special escaping character
@@ -175,7 +176,7 @@ export interface Driver {
/**
* Creates generated map of values generated or returned by database after INSERT query.
*/
- createGeneratedMap(metadata: EntityMetadata, insertResult: any): ObjectLiteral|undefined;
+ createGeneratedMap(metadata: EntityMetadata, insertResult: any, entityIndex?: number, entityNum?: number): ObjectLiteral|undefined;
/**
* Differentiate columns of this table and columns from the given column metadatas columns
@@ -193,6 +194,11 @@ export interface Driver {
*/
isUUIDGenerationSupported(): boolean;
+ /**
+ * Returns true if driver supports fulltext indices.
+ */
+ isFullTextColumnTypeSupported(): boolean;
+
/**
* Creates an escaped parameter.
*/
diff --git a/src/driver/DriverFactory.ts b/src/driver/DriverFactory.ts
index f6aa97b017..e3eed40e59 100644
--- a/src/driver/DriverFactory.ts
+++ b/src/driver/DriverFactory.ts
@@ -9,12 +9,13 @@ import {ReactNativeDriver} from "./react-native/ReactNativeDriver";
import {NativescriptDriver} from "./nativescript/NativescriptDriver";
import {SqljsDriver} from "./sqljs/SqljsDriver";
import {MysqlDriver} from "./mysql/MysqlDriver";
-import {PostgresDriver} from "./postgres/PostgresDriver";
+import {PostgresDriver, AuroraDataApiPostgresDriver} from "./postgres/PostgresDriver";
import {ExpoDriver} from "./expo/ExpoDriver";
import {AuroraDataApiDriver} from "./aurora-data-api/AuroraDataApiDriver";
import {Driver} from "./Driver";
import {Connection} from "../connection/Connection";
import {SapDriver} from "./sap/SapDriver";
+import {BetterSqlite3Driver} from "./better-sqlite3/BetterSqlite3Driver";
/**
* Helps to create drivers.
@@ -39,6 +40,8 @@ export class DriverFactory {
return new MysqlDriver(connection);
case "sqlite":
return new SqliteDriver(connection);
+ case "better-sqlite3":
+ return new BetterSqlite3Driver(connection);
case "cordova":
return new CordovaDriver(connection);
case "nativescript":
@@ -57,6 +60,8 @@ export class DriverFactory {
return new ExpoDriver(connection);
case "aurora-data-api":
return new AuroraDataApiDriver(connection);
+ case "aurora-data-api-pg":
+ return new AuroraDataApiPostgresDriver(connection);
default:
throw new MissingDriverError(type);
}
diff --git a/src/driver/DriverUtils.ts b/src/driver/DriverUtils.ts
index 36d80ff07f..56d7309d9f 100644
--- a/src/driver/DriverUtils.ts
+++ b/src/driver/DriverUtils.ts
@@ -28,7 +28,7 @@ export class DriverUtils {
if (buildOptions && buildOptions.useSid) {
urlDriverOptions.sid = parsedUrl.database;
}
- return Object.assign({}, options, urlDriverOptions);
+ return Object.assign({}, urlDriverOptions, options);
}
return Object.assign({}, options);
}
@@ -68,7 +68,11 @@ export class DriverUtils {
const preBase = url.substr(firstSlashes + 2);
const secondSlash = preBase.indexOf("/");
const base = (secondSlash !== -1) ? preBase.substr(0, secondSlash) : preBase;
- const afterBase = (secondSlash !== -1) ? preBase.substr(secondSlash + 1) : undefined;
+ let afterBase = (secondSlash !== -1) ? preBase.substr(secondSlash + 1) : undefined;
+ // remove mongodb query params
+ if (afterBase && afterBase.indexOf("?") !== -1) {
+ afterBase = afterBase.substr(0, afterBase.indexOf("?"));
+ }
const lastAtSign = base.lastIndexOf("@");
const usernameAndPassword = base.substr(0, lastAtSign);
diff --git a/src/driver/aurora-data-api-pg/AuroraDataApiPostgresConnectionOptions.ts b/src/driver/aurora-data-api-pg/AuroraDataApiPostgresConnectionOptions.ts
new file mode 100644
index 0000000000..18078aed82
--- /dev/null
+++ b/src/driver/aurora-data-api-pg/AuroraDataApiPostgresConnectionOptions.ts
@@ -0,0 +1,38 @@
+import {BaseConnectionOptions} from "../../connection/BaseConnectionOptions";
+
+/**
+ * Postgres-specific connection options.
+ */
+export interface AuroraDataApiPostgresConnectionOptions extends BaseConnectionOptions {
+
+ /**
+ * Database type.
+ */
+ readonly type: "aurora-data-api-pg";
+
+ readonly region: string;
+
+ readonly secretArn: string;
+
+ readonly resourceArn: string;
+
+ readonly database: string;
+
+ /**
+ * The Postgres extension to use to generate UUID columns. Defaults to uuid-ossp.
+ * If pgcrypto is selected, TypeORM will use the gen_random_uuid() function from this extension.
+ * If uuid-ossp is selected, TypeORM will use the uuid_generate_v4() function from this extension.
+ */
+ readonly uuidExtension?: "pgcrypto" | "uuid-ossp";
+
+
+ /*
+ * Function handling errors thrown by drivers pool.
+ * Defaults to logging error with `warn` level.
+ */
+ readonly poolErrorHandler?: (err: any) => any;
+
+ readonly serviceConfigOptions?: { [key: string]: any };
+
+ readonly formatOptions?: { [key: string]: any };
+}
diff --git a/src/driver/aurora-data-api-pg/AuroraDataApiPostgresQueryRunner.ts b/src/driver/aurora-data-api-pg/AuroraDataApiPostgresQueryRunner.ts
new file mode 100644
index 0000000000..f9ec0cb06d
--- /dev/null
+++ b/src/driver/aurora-data-api-pg/AuroraDataApiPostgresQueryRunner.ts
@@ -0,0 +1,139 @@
+import {QueryRunnerAlreadyReleasedError} from "../../error/QueryRunnerAlreadyReleasedError";
+import {TransactionAlreadyStartedError} from "../../error/TransactionAlreadyStartedError";
+import {TransactionNotStartedError} from "../../error/TransactionNotStartedError";
+import {QueryRunner} from "../../query-runner/QueryRunner";
+import {IsolationLevel} from "../types/IsolationLevel";
+import {AuroraDataApiPostgresDriver} from "../postgres/PostgresDriver";
+import {PostgresQueryRunner} from "../postgres/PostgresQueryRunner";
+import {ReplicationMode} from "../types/ReplicationMode";
+
+class PostgresQueryRunnerWrapper extends PostgresQueryRunner {
+ driver: any;
+
+ constructor(driver: any, mode: ReplicationMode) {
+ super(driver, mode);
+ }
+}
+
+/**
+ * Runs queries on a single postgres database connection.
+ */
+export class AuroraDataApiPostgresQueryRunner extends PostgresQueryRunnerWrapper implements QueryRunner {
+
+ // -------------------------------------------------------------------------
+ // Public Implemented Properties
+ // -------------------------------------------------------------------------
+
+ /**
+ * Database driver used by connection.
+ */
+ driver: AuroraDataApiPostgresDriver;
+
+ // -------------------------------------------------------------------------
+ // Protected Properties
+ // -------------------------------------------------------------------------
+
+ /**
+ * Promise used to obtain a database connection for a first time.
+ */
+ protected databaseConnectionPromise: Promise;
+
+ /**
+ * Special callback provided by a driver used to release a created connection.
+ */
+ protected releaseCallback: Function;
+
+ // -------------------------------------------------------------------------
+ // Constructor
+ // -------------------------------------------------------------------------
+
+ constructor(driver: AuroraDataApiPostgresDriver, mode: ReplicationMode) {
+ super(driver, mode);
+ }
+
+ // -------------------------------------------------------------------------
+ // Public Methods
+ // -------------------------------------------------------------------------
+
+ /**
+ * Creates/uses database connection from the connection pool to perform further operations.
+ * Returns obtained database connection.
+ */
+ connect(): Promise {
+ if (this.databaseConnection)
+ return Promise.resolve(this.databaseConnection);
+
+ if (this.databaseConnectionPromise)
+ return this.databaseConnectionPromise;
+
+ if (this.mode === "slave" && this.driver.isReplicated) {
+ this.databaseConnectionPromise = this.driver.obtainSlaveConnection().then(([ connection, release]: any[]) => {
+ this.driver.connectedQueryRunners.push(this);
+ this.databaseConnection = connection;
+ this.releaseCallback = release;
+ return this.databaseConnection;
+ });
+
+ } else { // master
+ this.databaseConnectionPromise = this.driver.obtainMasterConnection().then(([connection, release]: any[]) => {
+ this.driver.connectedQueryRunners.push(this);
+ this.databaseConnection = connection;
+ this.releaseCallback = release;
+ return this.databaseConnection;
+ });
+ }
+
+ return this.databaseConnectionPromise;
+ }
+
+ /**
+ * Starts transaction on the current connection.
+ */
+ async startTransaction(isolationLevel?: IsolationLevel): Promise {
+ if (this.isTransactionActive)
+ throw new TransactionAlreadyStartedError();
+
+ this.isTransactionActive = true;
+ await this.driver.client.startTransaction();
+ }
+
+ /**
+ * Commits transaction.
+ * Error will be thrown if transaction was not started.
+ */
+ async commitTransaction(): Promise {
+ if (!this.isTransactionActive)
+ throw new TransactionNotStartedError();
+
+ await this.driver.client.commitTransaction();
+ this.isTransactionActive = false;
+ }
+
+ /**
+ * Rollbacks transaction.
+ * Error will be thrown if transaction was not started.
+ */
+ async rollbackTransaction(): Promise {
+ if (!this.isTransactionActive)
+ throw new TransactionNotStartedError();
+
+ await this.driver.client.rollbackTransaction();
+ this.isTransactionActive = false;
+ }
+
+ /**
+ * Executes a given SQL query.
+ */
+ async query(query: string, parameters?: any[]): Promise {
+ if (this.isReleased)
+ throw new QueryRunnerAlreadyReleasedError();
+
+ const result = await this.driver.client.query(query, parameters);
+
+ if (result.records) {
+ return result.records;
+ }
+
+ return result;
+ }
+}
diff --git a/src/driver/aurora-data-api/AuroraDataApiConnection.ts b/src/driver/aurora-data-api/AuroraDataApiConnection.ts
index 386248809f..e79bc30dc9 100644
--- a/src/driver/aurora-data-api/AuroraDataApiConnection.ts
+++ b/src/driver/aurora-data-api/AuroraDataApiConnection.ts
@@ -1,6 +1,7 @@
import {AuroraDataApiQueryRunner} from "./AuroraDataApiQueryRunner";
import {Connection} from "../../connection/Connection";
import {ConnectionOptions, QueryRunner} from "../..";
+import {ReplicationMode} from "../types/ReplicationMode";
/**
* Organizes communication with MySQL DBMS.
@@ -13,7 +14,7 @@ export class AuroraDataApiConnection extends Connection {
this.queryRunnter = queryRunner;
}
- public createQueryRunner(mode: "master" | "slave" = "master"): QueryRunner {
+ public createQueryRunner(mode: ReplicationMode): QueryRunner {
return this.queryRunnter;
}
diff --git a/src/driver/aurora-data-api/AuroraDataApiConnectionOptions.ts b/src/driver/aurora-data-api/AuroraDataApiConnectionOptions.ts
index 9e9b0d283e..5e5722c227 100644
--- a/src/driver/aurora-data-api/AuroraDataApiConnectionOptions.ts
+++ b/src/driver/aurora-data-api/AuroraDataApiConnectionOptions.ts
@@ -21,6 +21,10 @@ export interface AuroraDataApiConnectionOptions extends BaseConnectionOptions, A
readonly database: string;
+ readonly serviceConfigOptions?: { [key: string]: any }; // pass optional AWS.ConfigurationOptions here
+
+ readonly formatOptions?: { [key: string]: any };
+
/**
* Use spatial functions like GeomFromText and AsText which are removed in MySQL 8.
* (Default: true)
diff --git a/src/driver/aurora-data-api/AuroraDataApiDriver.ts b/src/driver/aurora-data-api/AuroraDataApiDriver.ts
index f120c1bfba..9f6cc71cc9 100644
--- a/src/driver/aurora-data-api/AuroraDataApiDriver.ts
+++ b/src/driver/aurora-data-api/AuroraDataApiDriver.ts
@@ -16,6 +16,7 @@ import {AuroraDataApiConnectionCredentialsOptions} from "./AuroraDataApiConnecti
import {EntityMetadata} from "../../metadata/EntityMetadata";
import {OrmUtils} from "../../util/OrmUtils";
import {ApplyValueTransformers} from "../../util/ApplyValueTransformers";
+import {ReplicationMode} from "../types/ReplicationMode";
/**
* Organizes communication with MySQL DBMS.
@@ -306,6 +307,8 @@ export class AuroraDataApiDriver implements Driver {
this.options.resourceArn,
this.options.database,
(query: string, parameters?: any[]) => this.connection.logger.logQuery(query, parameters),
+ this.options.serviceConfigOptions,
+ this.options.formatOptions,
);
// validate options to make sure everything is set
@@ -353,7 +356,7 @@ export class AuroraDataApiDriver implements Driver {
/**
* Creates a query runner used to execute database queries.
*/
- createQueryRunner(mode: "master"|"slave" = "master") {
+ createQueryRunner(mode: ReplicationMode) {
return new AuroraDataApiQueryRunner(this);
}
@@ -748,6 +751,13 @@ export class AuroraDataApiDriver implements Driver {
return false;
}
+ /**
+ * Returns true if driver supports fulltext indices.
+ */
+ isFullTextColumnTypeSupported(): boolean {
+ return true;
+ }
+
/**
* Creates an escaped parameter.
*/
diff --git a/src/driver/aurora-data-api/AuroraDataApiQueryRunner.ts b/src/driver/aurora-data-api/AuroraDataApiQueryRunner.ts
index 3d5e69069b..fcc8a51ab6 100644
--- a/src/driver/aurora-data-api/AuroraDataApiQueryRunner.ts
+++ b/src/driver/aurora-data-api/AuroraDataApiQueryRunner.ts
@@ -17,7 +17,7 @@ import {TableIndexOptions} from "../../schema-builder/options/TableIndexOptions"
import {TableUnique} from "../../schema-builder/table/TableUnique";
import {BaseQueryRunner} from "../../query-runner/BaseQueryRunner";
import {Broadcaster} from "../../subscriber/Broadcaster";
-import {ColumnType, PromiseUtils} from "../../index";
+import {ColumnType} from "../../index";
import {TableCheck} from "../../schema-builder/table/TableCheck";
import {IsolationLevel} from "../types/IsolationLevel";
import {TableExclusion} from "../../schema-builder/table/TableExclusion";
@@ -470,7 +470,9 @@ export class AuroraDataApiQueryRunner extends BaseQueryRunner implements QueryRu
* Creates a new columns from the column in the table.
*/
async addColumns(tableOrName: Table|string, columns: TableColumn[]): Promise {
- await PromiseUtils.runInSequence(columns, column => this.addColumn(tableOrName, column));
+ for (const column of columns) {
+ await this.addColumn(tableOrName, column);
+ }
}
/**
@@ -683,7 +685,9 @@ export class AuroraDataApiQueryRunner extends BaseQueryRunner implements QueryRu
* Changes a column in the table.
*/
async changeColumns(tableOrName: Table|string, changedColumns: { newColumn: TableColumn, oldColumn: TableColumn }[]): Promise {
- await PromiseUtils.runInSequence(changedColumns, changedColumn => this.changeColumn(tableOrName, changedColumn.oldColumn, changedColumn.newColumn));
+ for (const {oldColumn, newColumn} of changedColumns) {
+ await this.changeColumn(tableOrName, oldColumn, newColumn)
+ }
}
/**
@@ -775,7 +779,9 @@ export class AuroraDataApiQueryRunner extends BaseQueryRunner implements QueryRu
* Drops the columns in the table.
*/
async dropColumns(tableOrName: Table|string, columns: TableColumn[]): Promise {
- await PromiseUtils.runInSequence(columns, column => this.dropColumn(tableOrName, column));
+ for (const column of columns) {
+ await this.dropColumn(tableOrName, column);
+ }
}
/**
@@ -1624,4 +1630,26 @@ export class AuroraDataApiQueryRunner extends BaseQueryRunner implements QueryRu
return c;
}
+ /**
+ * Checks if column display width is by default.
+ */
+ protected isDefaultColumnWidth(table: Table, column: TableColumn, width: number): boolean {
+ // if table have metadata, we check if length is specified in column metadata
+ if (this.connection.hasMetadata(table.name)) {
+ const metadata = this.connection.getMetadata(table.name);
+ const columnMetadata = metadata.findColumnWithDatabaseName(column.name);
+ if (columnMetadata && columnMetadata.width)
+ return false;
+ }
+
+ const defaultWidthForType = this.connection.driver.dataTypeDefaults
+ && this.connection.driver.dataTypeDefaults[column.type]
+ && this.connection.driver.dataTypeDefaults[column.type].width;
+
+ if (defaultWidthForType) {
+ return defaultWidthForType === width;
+ }
+ return false;
+ }
+
}
diff --git a/src/driver/better-sqlite3/BetterSqlite3ConnectionOptions.ts b/src/driver/better-sqlite3/BetterSqlite3ConnectionOptions.ts
new file mode 100644
index 0000000000..09422cbfc0
--- /dev/null
+++ b/src/driver/better-sqlite3/BetterSqlite3ConnectionOptions.ts
@@ -0,0 +1,60 @@
+import {BaseConnectionOptions} from "../../connection/BaseConnectionOptions";
+
+/**
+ * Sqlite-specific connection options.
+ */
+export interface BetterSqlite3ConnectionOptions extends BaseConnectionOptions {
+
+ /**
+ * Database type.
+ */
+ readonly type: "better-sqlite3";
+
+ /**
+ * Storage type or path to the storage.
+ */
+ readonly database: string;
+
+ /**
+ * Encryption key for for SQLCipher.
+ */
+ readonly key?: string;
+
+ /**
+ * Cache size of sqlite statement to speed up queries.
+ * Default: 100.
+ */
+ readonly statementCacheSize?: number;
+
+ /**
+ * Function to run before a database is used in typeorm.
+ * You can set pragmas, register plugins or register
+ * functions or aggregates in this function.
+ */
+ readonly prepareDatabase?: (db: any) => void | Promise;
+
+ /**
+ * Open the database connection in readonly mode.
+ * Default: false.
+ */
+ readonly readonly?: boolean;
+
+ /**
+ * If the database does not exist, an Error will be thrown instead of creating a new file.
+ * This option does not affect in-memory or readonly database connections.
+ * Default: false.
+ */
+ readonly fileMustExist?: boolean;
+
+ /**
+ * The number of milliseconds to wait when executing queries
+ * on a locked database, before throwing a SQLITE_BUSY error.
+ * Default: 5000.
+ */
+ readonly timeout?: number;
+
+ /**
+ * Provide a function that gets called with every SQL string executed by the database connection.
+ */
+ readonly verbose?: Function;
+}
\ No newline at end of file
diff --git a/src/driver/better-sqlite3/BetterSqlite3Driver.ts b/src/driver/better-sqlite3/BetterSqlite3Driver.ts
new file mode 100644
index 0000000000..25c9c2f3bc
--- /dev/null
+++ b/src/driver/better-sqlite3/BetterSqlite3Driver.ts
@@ -0,0 +1,142 @@
+import mkdirp from 'mkdirp';
+import path from 'path';
+import { DriverPackageNotInstalledError } from "../../error/DriverPackageNotInstalledError";
+import { DriverOptionNotSetError } from "../../error/DriverOptionNotSetError";
+import { PlatformTools } from "../../platform/PlatformTools";
+import { Connection } from "../../connection/Connection";
+import { ColumnType } from "../types/ColumnTypes";
+import { QueryRunner } from "../../query-runner/QueryRunner";
+import { AbstractSqliteDriver } from "../sqlite-abstract/AbstractSqliteDriver";
+import { BetterSqlite3ConnectionOptions } from "./BetterSqlite3ConnectionOptions";
+import { BetterSqlite3QueryRunner } from "./BetterSqlite3QueryRunner";
+import {ReplicationMode} from "../types/ReplicationMode";
+
+/**
+ * Organizes communication with sqlite DBMS.
+ */
+export class BetterSqlite3Driver extends AbstractSqliteDriver {
+
+ // -------------------------------------------------------------------------
+ // Public Implemented Properties
+ // -------------------------------------------------------------------------
+
+ /**
+ * Connection options.
+ */
+ options: BetterSqlite3ConnectionOptions;
+
+ /**
+ * SQLite underlying library.
+ */
+ sqlite: any;
+
+ // -------------------------------------------------------------------------
+ // Constructor
+ // -------------------------------------------------------------------------
+
+ constructor(connection: Connection) {
+ super(connection);
+
+ this.connection = connection;
+ this.options = connection.options as BetterSqlite3ConnectionOptions;
+ this.database = this.options.database;
+
+ // validate options to make sure everything is set
+ if (!this.options.database)
+ throw new DriverOptionNotSetError("database");
+
+ // load sqlite package
+ this.loadDependencies();
+ }
+
+ // -------------------------------------------------------------------------
+ // Public Methods
+ // -------------------------------------------------------------------------
+
+ /**
+ * Closes connection with database.
+ */
+ async disconnect(): Promise {
+ this.queryRunner = undefined;
+ this.databaseConnection.close();
+ }
+
+ /**
+ * Creates a query runner used to execute database queries.
+ */
+ createQueryRunner(mode: ReplicationMode): QueryRunner {
+ if (!this.queryRunner)
+ this.queryRunner = new BetterSqlite3QueryRunner(this);
+
+ return this.queryRunner;
+ }
+
+ normalizeType(column: { type?: ColumnType, length?: number | string, precision?: number, scale?: number }): string {
+ if ((column.type as any) === Buffer) {
+ return "blob";
+ }
+
+ return super.normalizeType(column);
+ }
+
+ // -------------------------------------------------------------------------
+ // Protected Methods
+ // -------------------------------------------------------------------------
+
+ /**
+ * Creates connection with the database.
+ */
+ protected async createDatabaseConnection() {
+ // not to create database directory if is in memory
+ if (this.options.database !== ":memory:")
+ await this.createDatabaseDirectory(this.options.database);
+
+ const {
+ database,
+ readonly = false,
+ fileMustExist = false,
+ timeout = 5000,
+ verbose = null,
+ prepareDatabase
+ } = this.options;
+ const databaseConnection = this.sqlite(database, { readonly, fileMustExist, timeout, verbose });
+
+ // we need to enable foreign keys in sqlite to make sure all foreign key related features
+ // working properly. this also makes onDelete to work with sqlite.
+ databaseConnection.exec(`PRAGMA foreign_keys = ON`);
+
+ // turn on WAL mode to enhance performance
+ databaseConnection.exec(`PRAGMA journal_mode = WAL`);
+
+ // in the options, if encryption key for SQLCipher is setted.
+ if (this.options.key) {
+ databaseConnection.exec(`PRAGMA key = ${JSON.stringify(this.options.key)}`);
+ }
+
+ if (typeof prepareDatabase === "function") {
+ prepareDatabase(databaseConnection);
+ }
+
+ return databaseConnection;
+ }
+
+ /**
+ * If driver dependency is not given explicitly, then try to load it via "require".
+ */
+ protected loadDependencies(): void {
+ try {
+ this.sqlite = PlatformTools.load("better-sqlite3");
+
+ } catch (e) {
+ throw new DriverPackageNotInstalledError("SQLite", "better-sqlite3");
+ }
+ }
+
+ /**
+ * Auto creates database directory if it does not exist.
+ */
+ protected async createDatabaseDirectory(fullPath: string): Promise {
+ await mkdirp(path.dirname(fullPath));
+ }
+
+}
diff --git a/src/driver/better-sqlite3/BetterSqlite3QueryRunner.ts b/src/driver/better-sqlite3/BetterSqlite3QueryRunner.ts
new file mode 100644
index 0000000000..7df796ade4
--- /dev/null
+++ b/src/driver/better-sqlite3/BetterSqlite3QueryRunner.ts
@@ -0,0 +1,106 @@
+import { QueryRunnerAlreadyReleasedError } from "../../error/QueryRunnerAlreadyReleasedError";
+import { QueryFailedError } from "../../error/QueryFailedError";
+import { AbstractSqliteQueryRunner } from "../sqlite-abstract/AbstractSqliteQueryRunner";
+import { Broadcaster } from "../../subscriber/Broadcaster";
+import { BetterSqlite3Driver } from "./BetterSqlite3Driver";
+
+/**
+ * Runs queries on a single sqlite database connection.
+ *
+ * Does not support compose primary keys with autoincrement field.
+ * todo: need to throw exception for this case.
+ */
+export class BetterSqlite3QueryRunner extends AbstractSqliteQueryRunner {
+
+ /**
+ * Database driver used by connection.
+ */
+ driver: BetterSqlite3Driver;
+
+ // -------------------------------------------------------------------------
+ // Constructor
+ // -------------------------------------------------------------------------
+
+ constructor(driver: BetterSqlite3Driver) {
+ super();
+ this.driver = driver;
+ this.connection = driver.connection;
+ this.broadcaster = new Broadcaster(this);
+ if (typeof this.driver.options.statementCacheSize === "number") {
+ this.cacheSize = this.driver.options.statementCacheSize;
+ } else {
+ this.cacheSize = 100;
+ }
+ }
+
+ private cacheSize: number;
+ private stmtCache = new Map();
+
+ private async getStmt(query: string) {
+ if (this.cacheSize > 0) {
+ let stmt = this.stmtCache.get(query);
+ if (!stmt) {
+ const databaseConnection = await this.connect();
+ stmt = databaseConnection.prepare(query);
+ this.stmtCache.set(query, stmt);
+ while (this.stmtCache.size > this.cacheSize) {
+ // since es6 map keeps the insertion order,
+ // it comes to be FIFO cache
+ const key = this.stmtCache.keys().next().value;
+ this.stmtCache.delete(key);
+ }
+ }
+ return stmt;
+ } else {
+ const databaseConnection = await this.connect();
+ return databaseConnection.prepare(query);
+ }
+ }
+
+ /**
+ * Executes a given SQL query.
+ */
+ async query(query: string, parameters?: any[]): Promise {
+ if (this.isReleased)
+ throw new QueryRunnerAlreadyReleasedError();
+
+ const connection = this.driver.connection;
+
+ parameters = parameters || [];
+ for (let i = 0; i < parameters.length; i++) {
+ // in "where" clauses the parameters are not escaped by the driver
+ if (typeof parameters[i] === "boolean")
+ parameters[i] = +parameters[i];
+ }
+
+ this.driver.connection.logger.logQuery(query, parameters, this);
+ const queryStartTime = +new Date();
+
+ const stmt = await this.getStmt(query);
+
+ try {
+
+ let result: any;
+ if (stmt.reader) {
+ result = stmt.all.apply(stmt, parameters);
+ } else {
+ result = stmt.run.apply(stmt, parameters);
+ if (query.substr(0, 6) === "INSERT") {
+ result = result.lastInsertRowid;
+ }
+ }
+
+ // log slow queries if maxQueryExecution time is set
+ const maxQueryExecutionTime = connection.options.maxQueryExecutionTime;
+ const queryEndTime = +new Date();
+ const queryExecutionTime = queryEndTime - queryStartTime;
+ if (maxQueryExecutionTime && queryExecutionTime > maxQueryExecutionTime)
+ connection.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
+
+ return result;
+ } catch (err) {
+ connection.logger.logQueryError(err, query, parameters, this);
+ throw new QueryFailedError(query, parameters, err);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/driver/cockroachdb/CockroachDriver.ts b/src/driver/cockroachdb/CockroachDriver.ts
index c150d5443b..2b90e6a589 100644
--- a/src/driver/cockroachdb/CockroachDriver.ts
+++ b/src/driver/cockroachdb/CockroachDriver.ts
@@ -19,6 +19,7 @@ import {EntityMetadata} from "../../metadata/EntityMetadata";
import {OrmUtils} from "../../util/OrmUtils";
import {CockroachQueryRunner} from "./CockroachQueryRunner";
import {ApplyValueTransformers} from "../../util/ApplyValueTransformers";
+import {ReplicationMode} from "../types/ReplicationMode";
/**
* Organizes communication with Cockroach DBMS.
@@ -284,7 +285,7 @@ export class CockroachDriver implements Driver {
/**
* Creates a query runner used to execute database queries.
*/
- createQueryRunner(mode: "master"|"slave" = "master") {
+ createQueryRunner(mode: ReplicationMode) {
return new CockroachQueryRunner(this, mode);
}
@@ -651,6 +652,13 @@ export class CockroachDriver implements Driver {
return true;
}
+ /**
+ * Returns true if driver supports fulltext indices.
+ */
+ isFullTextColumnTypeSupported(): boolean {
+ return false;
+ }
+
/**
* Creates an escaped parameter.
*/
diff --git a/src/driver/cockroachdb/CockroachQueryRunner.ts b/src/driver/cockroachdb/CockroachQueryRunner.ts
index 5297a78443..4675c495d9 100644
--- a/src/driver/cockroachdb/CockroachQueryRunner.ts
+++ b/src/driver/cockroachdb/CockroachQueryRunner.ts
@@ -18,11 +18,11 @@ import {TableIndexOptions} from "../../schema-builder/options/TableIndexOptions"
import {TableUnique} from "../../schema-builder/table/TableUnique";
import {BaseQueryRunner} from "../../query-runner/BaseQueryRunner";
import {OrmUtils} from "../../util/OrmUtils";
-import {PromiseUtils} from "../../";
import {TableCheck} from "../../schema-builder/table/TableCheck";
import {ColumnType} from "../../index";
import {IsolationLevel} from "../types/IsolationLevel";
import {TableExclusion} from "../../schema-builder/table/TableExclusion";
+import {ReplicationMode} from "../types/ReplicationMode";
/**
* Runs queries on a single postgres database connection.
@@ -66,7 +66,7 @@ export class CockroachQueryRunner extends BaseQueryRunner implements QueryRunner
// Constructor
// -------------------------------------------------------------------------
- constructor(driver: CockroachDriver, mode: "master"|"slave" = "master") {
+ constructor(driver: CockroachDriver, mode: ReplicationMode) {
super();
this.driver = driver;
this.connection = driver.connection;
@@ -159,7 +159,9 @@ export class CockroachQueryRunner extends BaseQueryRunner implements QueryRunner
} catch (e) {
if (e.code === "40001") {
await this.query("ROLLBACK TO SAVEPOINT cockroach_restart");
- await PromiseUtils.runInSequence(this.queries, q => this.query(q.query, q.parameters));
+ for (const q of this.queries) {
+ await this.query(q.query, q.parameters);
+ }
await this.commitTransaction();
}
}
@@ -594,7 +596,9 @@ export class CockroachQueryRunner extends BaseQueryRunner implements QueryRunner
* Creates a new columns from the column in the table.
*/
async addColumns(tableOrName: Table|string, columns: TableColumn[]): Promise {
- await PromiseUtils.runInSequence(columns, column => this.addColumn(tableOrName, column));
+ for (const column of columns) {
+ await this.addColumn(tableOrName, column);
+ }
}
/**
@@ -844,7 +848,9 @@ export class CockroachQueryRunner extends BaseQueryRunner implements QueryRunner
* Changes a column in the table.
*/
async changeColumns(tableOrName: Table|string, changedColumns: { newColumn: TableColumn, oldColumn: TableColumn }[]): Promise {
- await PromiseUtils.runInSequence(changedColumns, changedColumn => this.changeColumn(tableOrName, changedColumn.oldColumn, changedColumn.newColumn));
+ for (const {oldColumn, newColumn} of changedColumns) {
+ await this.changeColumn(tableOrName, oldColumn, newColumn);
+ }
}
/**
@@ -923,7 +929,9 @@ export class CockroachQueryRunner extends BaseQueryRunner implements QueryRunner
* Drops the columns in the table.
*/
async dropColumns(tableOrName: Table|string, columns: TableColumn[]): Promise {
- await PromiseUtils.runInSequence(columns, column => this.dropColumn(tableOrName, column));
+ for (const column of columns) {
+ await this.dropColumn(tableOrName, column);
+ }
}
/**
@@ -1014,7 +1022,9 @@ export class CockroachQueryRunner extends BaseQueryRunner implements QueryRunner
* Creates new unique constraints.
*/
async createUniqueConstraints(tableOrName: Table|string, uniqueConstraints: TableUnique[]): Promise {
- await PromiseUtils.runInSequence(uniqueConstraints, uniqueConstraint => this.createUniqueConstraint(tableOrName, uniqueConstraint));
+ for (const uniqueConstraint of uniqueConstraints) {
+ await this.createUniqueConstraint(tableOrName, uniqueConstraint);
+ }
}
/**
@@ -1038,7 +1048,9 @@ export class CockroachQueryRunner extends BaseQueryRunner implements QueryRunner
* Drops unique constraints.
*/
async dropUniqueConstraints(tableOrName: Table|string, uniqueConstraints: TableUnique[]): Promise {
- await PromiseUtils.runInSequence(uniqueConstraints, uniqueConstraint => this.dropUniqueConstraint(tableOrName, uniqueConstraint));
+ for (const uniqueConstraint of uniqueConstraints) {
+ await this.dropUniqueConstraint(tableOrName, uniqueConstraint);
+ }
}
/**
@@ -1136,7 +1148,9 @@ export class CockroachQueryRunner extends BaseQueryRunner implements QueryRunner
* Creates a new foreign keys.
*/
async createForeignKeys(tableOrName: Table|string, foreignKeys: TableForeignKey[]): Promise {
- await PromiseUtils.runInSequence(foreignKeys, foreignKey => this.createForeignKey(tableOrName, foreignKey));
+ for (const foreignKey of foreignKeys) {
+ await this.createForeignKey(tableOrName, foreignKey);
+ }
}
/**
@@ -1158,7 +1172,9 @@ export class CockroachQueryRunner extends BaseQueryRunner implements QueryRunner
* Drops a foreign keys from the table.
*/
async dropForeignKeys(tableOrName: Table|string, foreignKeys: TableForeignKey[]): Promise {
- await PromiseUtils.runInSequence(foreignKeys, foreignKey => this.dropForeignKey(tableOrName, foreignKey));
+ for (const foreignKey of foreignKeys) {
+ await this.dropForeignKey(tableOrName, foreignKey);
+ }
}
/**
@@ -1196,7 +1212,9 @@ export class CockroachQueryRunner extends BaseQueryRunner implements QueryRunner
* Creates a new indices
*/
async createIndices(tableOrName: Table|string, indices: TableIndex[]): Promise {
- await PromiseUtils.runInSequence(indices, index => this.createIndex(tableOrName, index));
+ for (const index of indices) {
+ await this.createIndex(tableOrName, index);
+ }
}
/**
@@ -1218,7 +1236,9 @@ export class CockroachQueryRunner extends BaseQueryRunner implements QueryRunner
* Drops an indices from the table.
*/
async dropIndices(tableOrName: Table|string, indices: TableIndex[]): Promise {
- await PromiseUtils.runInSequence(indices, index => this.dropIndex(tableOrName, index));
+ for (const index of indices) {
+ await this.dropIndex(tableOrName, index);
+ }
}
/**
diff --git a/src/driver/cordova/CordovaDriver.ts b/src/driver/cordova/CordovaDriver.ts
index bec6b6b63f..6f6eb3a463 100644
--- a/src/driver/cordova/CordovaDriver.ts
+++ b/src/driver/cordova/CordovaDriver.ts
@@ -5,6 +5,7 @@ import {QueryRunner} from "../../query-runner/QueryRunner";
import {Connection} from "../../connection/Connection";
import {DriverOptionNotSetError} from "../../error/DriverOptionNotSetError";
import {DriverPackageNotInstalledError} from "../../error/DriverPackageNotInstalledError";
+import {ReplicationMode} from "../types/ReplicationMode";
// needed for typescript compiler
interface Window {
@@ -15,7 +16,7 @@ declare var window: Window;
export class CordovaDriver extends AbstractSqliteDriver {
options: CordovaConnectionOptions;
-
+
// -------------------------------------------------------------------------
// Constructor
// -------------------------------------------------------------------------
@@ -37,7 +38,7 @@ export class CordovaDriver extends AbstractSqliteDriver {
// load sqlite package
this.loadDependencies();
}
-
+
// -------------------------------------------------------------------------
// Public Methods
@@ -52,17 +53,17 @@ export class CordovaDriver extends AbstractSqliteDriver {
this.databaseConnection.close(ok, fail);
});
}
-
+
/**
* Creates a query runner used to execute database queries.
*/
- createQueryRunner(mode: "master"|"slave" = "master"): QueryRunner {
+ createQueryRunner(mode: ReplicationMode): QueryRunner {
if (!this.queryRunner)
this.queryRunner = new CordovaQueryRunner(this);
return this.queryRunner;
}
-
+
// -------------------------------------------------------------------------
// Protected Methods
// -------------------------------------------------------------------------
@@ -104,4 +105,4 @@ export class CordovaDriver extends AbstractSqliteDriver {
throw new DriverPackageNotInstalledError("Cordova-SQLite", "cordova-sqlite-storage");
}
}
-}
\ No newline at end of file
+}
diff --git a/src/driver/expo/ExpoDriver.ts b/src/driver/expo/ExpoDriver.ts
index fffd8ffff5..1086e42e71 100644
--- a/src/driver/expo/ExpoDriver.ts
+++ b/src/driver/expo/ExpoDriver.ts
@@ -4,10 +4,11 @@ import {ExpoQueryRunner} from "./ExpoQueryRunner";
import {QueryRunner} from "../../query-runner/QueryRunner";
import {Connection} from "../../connection/Connection";
import {DriverOptionNotSetError} from "../../error/DriverOptionNotSetError";
+import {ReplicationMode} from "../types/ReplicationMode";
export class ExpoDriver extends AbstractSqliteDriver {
options: ExpoConnectionOptions;
-
+
// -------------------------------------------------------------------------
// Constructor
// -------------------------------------------------------------------------
@@ -20,14 +21,14 @@ export class ExpoDriver extends AbstractSqliteDriver {
// validate options to make sure everything is set
if (!this.options.database)
throw new DriverOptionNotSetError("database");
-
+
if (!this.options.driver)
throw new DriverOptionNotSetError("driver");
// load sqlite package
this.sqlite = this.options.driver;
}
-
+
// -------------------------------------------------------------------------
// Public Methods
@@ -40,6 +41,7 @@ export class ExpoDriver extends AbstractSqliteDriver {
return new Promise((ok, fail) => {
try {
this.queryRunner = undefined;
+ this.databaseConnection._db.close();
this.databaseConnection = undefined;
ok();
} catch (error) {
@@ -47,17 +49,17 @@ export class ExpoDriver extends AbstractSqliteDriver {
}
});
}
-
+
/**
* Creates a query runner used to execute database queries.
*/
- createQueryRunner(mode: "master"|"slave" = "master"): QueryRunner {
+ createQueryRunner(mode: ReplicationMode): QueryRunner {
if (!this.queryRunner)
this.queryRunner = new ExpoQueryRunner(this);
return this.queryRunner;
}
-
+
// -------------------------------------------------------------------------
// Protected Methods
// -------------------------------------------------------------------------
diff --git a/src/driver/mongodb/MongoDriver.ts b/src/driver/mongodb/MongoDriver.ts
index bd45bd3f19..7319415e98 100644
--- a/src/driver/mongodb/MongoDriver.ts
+++ b/src/driver/mongodb/MongoDriver.ts
@@ -16,6 +16,7 @@ import {ConnectionOptions} from "../../connection/ConnectionOptions";
import {EntityMetadata} from "../../metadata/EntityMetadata";
import {ObjectUtils} from "../../util/ObjectUtils";
import {ApplyValueTransformers} from "../../util/ApplyValueTransformers";
+import {ReplicationMode} from "../types/ReplicationMode";
/**
* Organizes communication with MongoDB.
@@ -262,7 +263,7 @@ export class MongoDriver implements Driver {
/**
* Creates a query runner used to execute database queries.
*/
- createQueryRunner(mode: "master"|"slave" = "master") {
+ createQueryRunner(mode: ReplicationMode) {
return this.queryRunner!;
}
@@ -389,6 +390,13 @@ export class MongoDriver implements Driver {
return false;
}
+ /**
+ * Returns true if driver supports fulltext indices.
+ */
+ isFullTextColumnTypeSupported(): boolean {
+ return false;
+ }
+
/**
* Creates an escaped parameter.
*/
diff --git a/src/driver/mongodb/typings.ts b/src/driver/mongodb/typings.ts
index dea33ea258..f060531135 100644
--- a/src/driver/mongodb/typings.ts
+++ b/src/driver/mongodb/typings.ts
@@ -4271,7 +4271,7 @@ export interface BulkWriteResult {
/**
* Return an array of upserted ids.
*/
- getUpsertedIds(): Array;
+ getUpsertedIds(): Array<{ _id: string, index: number }>;
/**
* Retrieve the write concern error if any.
diff --git a/src/driver/mysql/MysqlDriver.ts b/src/driver/mysql/MysqlDriver.ts
index acb357fb2e..5dc18f74af 100644
--- a/src/driver/mysql/MysqlDriver.ts
+++ b/src/driver/mysql/MysqlDriver.ts
@@ -18,6 +18,7 @@ import {MysqlConnectionCredentialsOptions} from "./MysqlConnectionCredentialsOpt
import {EntityMetadata} from "../../metadata/EntityMetadata";
import {OrmUtils} from "../../util/OrmUtils";
import {ApplyValueTransformers} from "../../util/ApplyValueTransformers";
+import {ReplicationMode} from "../types/ReplicationMode";
/**
* Organizes communication with MySQL DBMS.
@@ -385,7 +386,7 @@ export class MysqlDriver implements Driver {
/**
* Creates a query runner used to execute database queries.
*/
- createQueryRunner(mode: "master"|"slave" = "master") {
+ createQueryRunner(mode: ReplicationMode) {
return new MysqlQueryRunner(this, mode);
}
@@ -709,11 +710,13 @@ export class MysqlDriver implements Driver {
/**
* Creates generated map of values generated or returned by database after INSERT query.
*/
- createGeneratedMap(metadata: EntityMetadata, insertResult: any) {
+ createGeneratedMap(metadata: EntityMetadata, insertResult: any, entityIndex: number) {
const generatedMap = metadata.generatedColumns.reduce((map, generatedColumn) => {
let value: any;
if (generatedColumn.generationStrategy === "increment" && insertResult.insertId) {
- value = insertResult.insertId;
+ // NOTE: When multiple rows is inserted by a single INSERT statement,
+ // `insertId` is the value generated for the first inserted row only.
+ value = insertResult.insertId + entityIndex;
// } else if (generatedColumn.generationStrategy === "uuid") {
// console.log("getting db value:", generatedColumn.databaseName);
// value = generatedColumn.getEntityValue(uuidMap);
@@ -798,6 +801,13 @@ export class MysqlDriver implements Driver {
return false;
}
+ /**
+ * Returns true if driver supports fulltext indices.
+ */
+ isFullTextColumnTypeSupported(): boolean {
+ return true;
+ }
+
/**
* Creates an escaped parameter.
*/
diff --git a/src/driver/mysql/MysqlQueryRunner.ts b/src/driver/mysql/MysqlQueryRunner.ts
index 2c6d808200..e390ed5ea3 100644
--- a/src/driver/mysql/MysqlQueryRunner.ts
+++ b/src/driver/mysql/MysqlQueryRunner.ts
@@ -18,11 +18,12 @@ import {TableIndexOptions} from "../../schema-builder/options/TableIndexOptions"
import {TableUnique} from "../../schema-builder/table/TableUnique";
import {BaseQueryRunner} from "../../query-runner/BaseQueryRunner";
import {Broadcaster} from "../../subscriber/Broadcaster";
-import {ColumnType, PromiseUtils} from "../../index";
+import {ColumnType} from "../../index";
import {TableCheck} from "../../schema-builder/table/TableCheck";
import {IsolationLevel} from "../types/IsolationLevel";
import {TableExclusion} from "../../schema-builder/table/TableExclusion";
import {VersionUtils} from "../../util/VersionUtils";
+import {ReplicationMode} from "../types/ReplicationMode";
/**
* Runs queries on a single mysql database connection.
@@ -51,7 +52,7 @@ export class MysqlQueryRunner extends BaseQueryRunner implements QueryRunner {
// Constructor
// -------------------------------------------------------------------------
- constructor(driver: MysqlDriver, mode: "master"|"slave" = "master") {
+ constructor(driver: MysqlDriver, mode: ReplicationMode) {
super();
this.driver = driver;
this.connection = driver.connection;
@@ -519,7 +520,9 @@ export class MysqlQueryRunner extends BaseQueryRunner implements QueryRunner {
* Creates a new columns from the column in the table.
*/
async addColumns(tableOrName: Table|string, columns: TableColumn[]): Promise {
- await PromiseUtils.runInSequence(columns, column => this.addColumn(tableOrName, column));
+ for (const column of columns) {
+ await this.addColumn(tableOrName, column);
+ }
}
/**
@@ -734,7 +737,9 @@ export class MysqlQueryRunner extends BaseQueryRunner implements QueryRunner {
* Changes a column in the table.
*/
async changeColumns(tableOrName: Table|string, changedColumns: { newColumn: TableColumn, oldColumn: TableColumn }[]): Promise {
- await PromiseUtils.runInSequence(changedColumns, changedColumn => this.changeColumn(tableOrName, changedColumn.oldColumn, changedColumn.newColumn));
+ for (const {oldColumn, newColumn} of changedColumns) {
+ await this.changeColumn(tableOrName, oldColumn, newColumn);
+ }
}
/**
@@ -826,7 +831,9 @@ export class MysqlQueryRunner extends BaseQueryRunner implements QueryRunner {
* Drops the columns in the table.
*/
async dropColumns(tableOrName: Table|string, columns: TableColumn[]): Promise {
- await PromiseUtils.runInSequence(columns, column => this.dropColumn(tableOrName, column));
+ for (const column of columns) {
+ await this.dropColumn(tableOrName, column);
+ }
}
/**
@@ -1219,7 +1226,7 @@ export class MysqlQueryRunner extends BaseQueryRunner implements QueryRunner {
return `(\`s\`.\`TABLE_SCHEMA\` = '${database}' AND \`s\`.\`TABLE_NAME\` = '${name}')`;
}).join(" OR ");
const indicesSql = `SELECT \`s\`.* FROM \`INFORMATION_SCHEMA\`.\`STATISTICS\` \`s\` ` +
- `LEFT JOIN \`INFORMATION_SCHEMA\`.\`REFERENTIAL_CONSTRAINTS\` \`rc\` ON \`s\`.\`INDEX_NAME\` = \`rc\`.\`CONSTRAINT_NAME\` ` +
+ `LEFT JOIN \`INFORMATION_SCHEMA\`.\`REFERENTIAL_CONSTRAINTS\` \`rc\` ON \`s\`.\`INDEX_NAME\` = \`rc\`.\`CONSTRAINT_NAME\` AND \`s\`.\`TABLE_SCHEMA\` = \`rc\`.\`CONSTRAINT_SCHEMA\`` +
`WHERE (${indicesCondition}) AND \`s\`.\`INDEX_NAME\` != 'PRIMARY' AND \`rc\`.\`CONSTRAINT_NAME\` IS NULL`;
const foreignKeysCondition = tableNames.map(tableName => {
@@ -1297,6 +1304,13 @@ export class MysqlQueryRunner extends BaseQueryRunner implements QueryRunner {
tableColumn.name = dbColumn["COLUMN_NAME"];
tableColumn.type = dbColumn["DATA_TYPE"].toLowerCase();
+ tableColumn.zerofill = dbColumn["COLUMN_TYPE"].indexOf("zerofill") !== -1;
+ tableColumn.unsigned = tableColumn.zerofill ? true : dbColumn["COLUMN_TYPE"].indexOf("unsigned") !== -1;
+ if (this.driver.withWidthColumnTypes.indexOf(tableColumn.type as ColumnType) !== -1) {
+ const width = dbColumn["COLUMN_TYPE"].substring(dbColumn["COLUMN_TYPE"].indexOf("(") + 1, dbColumn["COLUMN_TYPE"].indexOf(")"));
+ tableColumn.width = width && !this.isDefaultColumnWidth(table, tableColumn, parseInt(width)) ? parseInt(width) : undefined;
+ }
+
if (dbColumn["COLUMN_DEFAULT"] === null
|| dbColumn["COLUMN_DEFAULT"] === undefined
|| (isMariaDb && dbColumn["COLUMN_DEFAULT"] === "NULL")) {
@@ -1315,7 +1329,9 @@ export class MysqlQueryRunner extends BaseQueryRunner implements QueryRunner {
}
if (dbColumn["EXTRA"].indexOf("on update") !== -1) {
- tableColumn.onUpdate = dbColumn["EXTRA"].substring(dbColumn["EXTRA"].indexOf("on update") + 10);
+ // New versions of MariaDB return expressions in lowercase. We need to set it in
+ // uppercase so the comparison in MysqlDriver#compareExtraValues does not fail.
+ tableColumn.onUpdate = dbColumn["EXTRA"].substring(dbColumn["EXTRA"].indexOf("on update") + 10).toUpperCase();
}
if (dbColumn["GENERATION_EXPRESSION"]) {
@@ -1328,13 +1344,6 @@ export class MysqlQueryRunner extends BaseQueryRunner implements QueryRunner {
tableColumn.isPrimary = dbPrimaryKeys.some(dbPrimaryKey => {
return this.driver.buildTableName(dbPrimaryKey["TABLE_NAME"], undefined, dbPrimaryKey["TABLE_SCHEMA"]) === tableFullName && dbPrimaryKey["COLUMN_NAME"] === tableColumn.name;
});
- tableColumn.zerofill = dbColumn["COLUMN_TYPE"].indexOf("zerofill") !== -1;
- tableColumn.unsigned = tableColumn.zerofill ? true : dbColumn["COLUMN_TYPE"].indexOf("unsigned") !== -1;
- if (this.driver.withWidthColumnTypes.indexOf(tableColumn.type as ColumnType) !== -1) {
- const width = dbColumn["COLUMN_TYPE"].substring(dbColumn["COLUMN_TYPE"].indexOf("(") + 1, dbColumn["COLUMN_TYPE"].indexOf(")"));
- tableColumn.width = width && !this.isDefaultColumnWidth(table, tableColumn, parseInt(width)) ? parseInt(width) : undefined;
- }
-
tableColumn.isGenerated = dbColumn["EXTRA"].indexOf("auto_increment") !== -1;
if (tableColumn.isGenerated)
tableColumn.generationStrategy = "increment";
@@ -1681,7 +1690,7 @@ export class MysqlQueryRunner extends BaseQueryRunner implements QueryRunner {
if (column.isGenerated && column.generationStrategy === "increment") // don't use skipPrimary here since updates can update already exist primary without auto inc.
c += " AUTO_INCREMENT";
if (column.comment)
- c += ` COMMENT '${column.comment}'`;
+ c += ` COMMENT '${column.comment.replace("'", "''")}'`;
if (column.default !== undefined && column.default !== null)
c += ` DEFAULT ${column.default}`;
if (column.onUpdate)
@@ -1695,4 +1704,35 @@ export class MysqlQueryRunner extends BaseQueryRunner implements QueryRunner {
return result[0]["version"];
}
+ /**
+ * Checks if column display width is by default.
+ */
+ protected isDefaultColumnWidth(table: Table, column: TableColumn, width: number): boolean {
+ // if table have metadata, we check if length is specified in column metadata
+ if (this.connection.hasMetadata(table.name)) {
+ const metadata = this.connection.getMetadata(table.name);
+ const columnMetadata = metadata.findColumnWithDatabaseName(column.name);
+ if (columnMetadata && columnMetadata.width)
+ return false;
+ }
+
+ const defaultWidthForType = this.connection.driver.dataTypeDefaults
+ && this.connection.driver.dataTypeDefaults[column.type]
+ && this.connection.driver.dataTypeDefaults[column.type].width;
+
+ if (defaultWidthForType) {
+ // In MariaDB & MySQL 5.7, the default widths of certain numeric types are 1 less than
+ // the usual defaults when the column is unsigned.
+ const typesWithReducedUnsignedDefault = ["int", "tinyint", "smallint", "mediumint"];
+ const needsAdjustment = typesWithReducedUnsignedDefault.indexOf(column.type) !== -1;
+ if (column.unsigned && needsAdjustment) {
+ return (defaultWidthForType - 1) === width;
+ } else {
+ return defaultWidthForType === width;
+ }
+ }
+
+ return false;
+ }
+
}
diff --git a/src/driver/nativescript/NativescriptDriver.ts b/src/driver/nativescript/NativescriptDriver.ts
index 93cc4409b5..fc2fd6e82d 100644
--- a/src/driver/nativescript/NativescriptDriver.ts
+++ b/src/driver/nativescript/NativescriptDriver.ts
@@ -6,6 +6,7 @@ import {Connection} from "../../connection/Connection";
import {DriverOptionNotSetError} from "../../error/DriverOptionNotSetError";
import {DriverPackageNotInstalledError} from "../../error/DriverPackageNotInstalledError";
import {ColumnType} from "../types/ColumnTypes";
+import {ReplicationMode} from "../types/ReplicationMode";
/**
* Organizes communication with sqlite DBMS within Nativescript.
@@ -66,7 +67,7 @@ export class NativescriptDriver extends AbstractSqliteDriver {
/**
* Creates a query runner used to execute database queries.
*/
- createQueryRunner(mode: "master"|"slave" = "master"): QueryRunner {
+ createQueryRunner(mode: ReplicationMode): QueryRunner {
if (!this.queryRunner) {
this.queryRunner = new NativescriptQueryRunner(this);
}
diff --git a/src/driver/oracle/OracleDriver.ts b/src/driver/oracle/OracleDriver.ts
index 1bdabf03a8..c9af99497f 100644
--- a/src/driver/oracle/OracleDriver.ts
+++ b/src/driver/oracle/OracleDriver.ts
@@ -18,6 +18,7 @@ import {DriverUtils} from "../DriverUtils";
import {EntityMetadata} from "../../metadata/EntityMetadata";
import {OrmUtils} from "../../util/OrmUtils";
import {ApplyValueTransformers} from "../../util/ApplyValueTransformers";
+import {ReplicationMode} from "../types/ReplicationMode";
/**
* Organizes communication with Oracle RDBMS.
@@ -287,7 +288,7 @@ export class OracleDriver implements Driver {
/**
* Creates a query runner used to execute database queries.
*/
- createQueryRunner(mode: "master"|"slave" = "master") {
+ createQueryRunner(mode: ReplicationMode) {
return new OracleQueryRunner(this, mode);
}
@@ -624,11 +625,18 @@ export class OracleDriver implements Driver {
return false;
}
+ /**
+ * Returns true if driver supports fulltext indices.
+ */
+ isFullTextColumnTypeSupported(): boolean {
+ return false;
+ }
+
/**
* Creates an escaped parameter.
*/
createParameter(parameterName: string, index: number): string {
- return ":" + parameterName;
+ return ":" + (index + 1);
}
/**
diff --git a/src/driver/oracle/OracleQueryRunner.ts b/src/driver/oracle/OracleQueryRunner.ts
index 7f8c35cacb..0fc9af0378 100644
--- a/src/driver/oracle/OracleQueryRunner.ts
+++ b/src/driver/oracle/OracleQueryRunner.ts
@@ -18,9 +18,10 @@ import {Broadcaster} from "../../subscriber/Broadcaster";
import {BaseQueryRunner} from "../../query-runner/BaseQueryRunner";
import {OrmUtils} from "../../util/OrmUtils";
import {TableCheck} from "../../schema-builder/table/TableCheck";
-import {ColumnType, PromiseUtils} from "../../index";
+import {ColumnType} from "../../index";
import {IsolationLevel} from "../types/IsolationLevel";
import {TableExclusion} from "../../schema-builder/table/TableExclusion";
+import {ReplicationMode} from "../types/ReplicationMode";
/**
* Runs queries on a single oracle database connection.
@@ -49,7 +50,7 @@ export class OracleQueryRunner extends BaseQueryRunner implements QueryRunner {
// Constructor
// -------------------------------------------------------------------------
- constructor(driver: OracleDriver, mode: "master"|"slave" = "master") {
+ constructor(driver: OracleDriver, mode: ReplicationMode) {
super();
this.driver = driver;
this.connection = driver.connection;
@@ -507,7 +508,9 @@ export class OracleQueryRunner extends BaseQueryRunner implements QueryRunner {
* Creates a new columns from the column in the table.
*/
async addColumns(tableOrName: Table|string, columns: TableColumn[]): Promise {
- await PromiseUtils.runInSequence(columns, column => this.addColumn(tableOrName, column));
+ for (const column of columns) {
+ await this.addColumn(tableOrName, column);
+ }
}
/**
@@ -734,7 +737,9 @@ export class OracleQueryRunner extends BaseQueryRunner implements QueryRunner {
* Changes a column in the table.
*/
async changeColumns(tableOrName: Table|string, changedColumns: { newColumn: TableColumn, oldColumn: TableColumn }[]): Promise {
- await PromiseUtils.runInSequence(changedColumns, changedColumn => this.changeColumn(tableOrName, changedColumn.oldColumn, changedColumn.newColumn));
+ for (const {oldColumn, newColumn} of changedColumns) {
+ await this.changeColumn(tableOrName, oldColumn, newColumn);
+ }
}
/**
@@ -806,7 +811,9 @@ export class OracleQueryRunner extends BaseQueryRunner implements QueryRunner {
* Drops the columns in the table.
*/
async dropColumns(tableOrName: Table|string, columns: TableColumn[]): Promise {
- await PromiseUtils.runInSequence(columns, column => this.dropColumn(tableOrName, column));
+ for (const column of columns) {
+ await this.dropColumn(tableOrName, column);
+ }
}
/**
@@ -1503,7 +1510,7 @@ export class OracleQueryRunner extends BaseQueryRunner implements QueryRunner {
`REFERENCES "${foreignKey.referencedTableName}" (${referencedColumnNames})`;
// Oracle does not support NO ACTION, but we set NO ACTION by default in EntityMetadata
if (foreignKey.onDelete && foreignKey.onDelete !== "NO ACTION")
- sql += ` ON DELETE ${foreignKey.onDelete}`;
+ sql += ` ON DELETE ${foreignKey.onDelete}`;
return new Query(sql);
}
diff --git a/src/driver/postgres/PostgresConnectionCredentialsOptions.ts b/src/driver/postgres/PostgresConnectionCredentialsOptions.ts
index d20bac3846..3601670bce 100644
--- a/src/driver/postgres/PostgresConnectionCredentialsOptions.ts
+++ b/src/driver/postgres/PostgresConnectionCredentialsOptions.ts
@@ -28,7 +28,7 @@ export interface PostgresConnectionCredentialsOptions {
/**
* Database password.
*/
- readonly password?: string;
+ readonly password?: string | (() => string) | (() => Promise);
/**
* Database name to connect to.
diff --git a/src/driver/postgres/PostgresConnectionOptions.ts b/src/driver/postgres/PostgresConnectionOptions.ts
index aa70411217..908360df6d 100644
--- a/src/driver/postgres/PostgresConnectionOptions.ts
+++ b/src/driver/postgres/PostgresConnectionOptions.ts
@@ -33,6 +33,12 @@ export interface PostgresConnectionOptions extends BaseConnectionOptions, Postgr
};
+ /**
+ * The milliseconds before a timeout occurs during the initial connection to the postgres
+ * server. If undefined, or set to 0, there is no timeout. Defaults to undefined.
+ */
+ readonly connectTimeoutMS?: number;
+
/**
* The Postgres extension to use to generate UUID columns. Defaults to uuid-ossp.
* If pgcrypto is selected, TypeORM will use the gen_random_uuid() function from this extension.
@@ -46,4 +52,9 @@ export interface PostgresConnectionOptions extends BaseConnectionOptions, Postgr
* Defaults to logging error with `warn` level.
*/
readonly poolErrorHandler?: (err: any) => any;
+
+ /**
+ * Include notification messages from Postgres server in client logs
+ */
+ readonly logNotifications?: boolean;
}
diff --git a/src/driver/postgres/PostgresDriver.ts b/src/driver/postgres/PostgresDriver.ts
index a18c64be27..6e21ee57aa 100644
--- a/src/driver/postgres/PostgresDriver.ts
+++ b/src/driver/postgres/PostgresDriver.ts
@@ -19,6 +19,9 @@ import {PostgresConnectionCredentialsOptions} from "./PostgresConnectionCredenti
import {EntityMetadata} from "../../metadata/EntityMetadata";
import {OrmUtils} from "../../util/OrmUtils";
import {ApplyValueTransformers} from "../../util/ApplyValueTransformers";
+import {AuroraDataApiPostgresConnectionOptions} from "../aurora-data-api-pg/AuroraDataApiPostgresConnectionOptions";
+import {AuroraDataApiPostgresQueryRunner} from "../aurora-data-api-pg/AuroraDataApiPostgresQueryRunner";
+import {ReplicationMode} from "../types/ReplicationMode";
/**
* Organizes communication with PostgreSQL DBMS.
@@ -149,7 +152,8 @@ export class PostgresDriver implements Driver {
"daterange",
"geometry",
"geography",
- "cube"
+ "cube",
+ "ltree"
];
/**
@@ -248,7 +252,11 @@ export class PostgresDriver implements Driver {
// Constructor
// -------------------------------------------------------------------------
- constructor(connection: Connection) {
+ constructor(connection?: Connection) {
+ if (!connection) {
+ return;
+ }
+
this.connection = connection;
this.options = connection.options as PostgresConnectionOptions;
this.isReplicated = this.options.replication ? true : false;
@@ -295,6 +303,83 @@ export class PostgresDriver implements Driver {
* Makes any action after connection (e.g. create extensions in Postgres driver).
*/
async afterConnect(): Promise {
+ const extensionsMetadata = await this.checkMetadataForExtensions();
+
+ if (extensionsMetadata.hasExtensions) {
+ await Promise.all([this.master, ...this.slaves].map(pool => {
+ return new Promise((ok, fail) => {
+ pool.connect(async (err: any, connection: any, release: Function) => {
+ await this.enableExtensions(extensionsMetadata, connection);
+ if (err) return fail(err);
+ release();
+ ok();
+ });
+ });
+ }));
+ }
+
+ return Promise.resolve();
+ }
+
+ protected async enableExtensions(extensionsMetadata: any, connection: any) {
+ const { logger } = this.connection;
+
+ const {
+ hasUuidColumns,
+ hasCitextColumns,
+ hasHstoreColumns,
+ hasCubeColumns,
+ hasGeometryColumns,
+ hasLtreeColumns,
+ hasExclusionConstraints,
+ } = extensionsMetadata;
+
+ if (hasUuidColumns)
+ try {
+ await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "${this.options.uuidExtension || "uuid-ossp"}"`);
+ } catch (_) {
+ logger.log("warn", `At least one of the entities has uuid column, but the '${this.options.uuidExtension || "uuid-ossp"}' extension cannot be installed automatically. Please install it manually using superuser rights, or select another uuid extension.`);
+ }
+ if (hasCitextColumns)
+ try {
+ await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "citext"`);
+ } catch (_) {
+ logger.log("warn", "At least one of the entities has citext column, but the 'citext' extension cannot be installed automatically. Please install it manually using superuser rights");
+ }
+ if (hasHstoreColumns)
+ try {
+ await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "hstore"`);
+ } catch (_) {
+ logger.log("warn", "At least one of the entities has hstore column, but the 'hstore' extension cannot be installed automatically. Please install it manually using superuser rights");
+ }
+ if (hasGeometryColumns)
+ try {
+ await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "postgis"`);
+ } catch (_) {
+ logger.log("warn", "At least one of the entities has a geometry column, but the 'postgis' extension cannot be installed automatically. Please install it manually using superuser rights");
+ }
+ if (hasCubeColumns)
+ try {
+ await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "cube"`);
+ } catch (_) {
+ logger.log("warn", "At least one of the entities has a cube column, but the 'cube' extension cannot be installed automatically. Please install it manually using superuser rights");
+ }
+ if (hasLtreeColumns)
+ try {
+ await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "ltree"`);
+ } catch (_) {
+ logger.log("warn", "At least one of the entities has a cube column, but the 'ltree' extension cannot be installed automatically. Please install it manually using superuser rights");
+ }
+ if (hasExclusionConstraints)
+ try {
+ // The btree_gist extension provides operator support in PostgreSQL exclusion constraints
+ await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "btree_gist"`);
+ } catch (_) {
+ logger.log("warn", "At least one of the entities has an exclusion constraint, but the 'btree_gist' extension cannot be installed automatically. Please install it manually using superuser rights");
+ }
+ }
+
+ protected async checkMetadataForExtensions() {
const hasUuidColumns = this.connection.entityMetadatas.some(metadata => {
return metadata.generatedColumns.filter(column => column.generationStrategy === "uuid").length > 0;
});
@@ -310,60 +395,23 @@ export class PostgresDriver implements Driver {
const hasGeometryColumns = this.connection.entityMetadatas.some(metadata => {
return metadata.columns.filter(column => this.spatialTypes.indexOf(column.type) >= 0).length > 0;
});
+ const hasLtreeColumns = this.connection.entityMetadatas.some(metadata => {
+ return metadata.columns.filter(column => column.type === 'ltree').length > 0;
+ });
const hasExclusionConstraints = this.connection.entityMetadatas.some(metadata => {
return metadata.exclusions.length > 0;
});
- if (hasUuidColumns || hasCitextColumns || hasHstoreColumns || hasGeometryColumns || hasCubeColumns || hasExclusionConstraints) {
- await Promise.all([this.master, ...this.slaves].map(pool => {
- return new Promise((ok, fail) => {
- pool.connect(async (err: any, connection: any, release: Function) => {
- const { logger } = this.connection;
- if (err) return fail(err);
- if (hasUuidColumns)
- try {
- await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "${this.options.uuidExtension || "uuid-ossp"}"`);
- } catch (_) {
- logger.log("warn", `At least one of the entities has uuid column, but the '${this.options.uuidExtension || "uuid-ossp"}' extension cannot be installed automatically. Please install it manually using superuser rights, or select another uuid extension.`);
- }
- if (hasCitextColumns)
- try {
- await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "citext"`);
- } catch (_) {
- logger.log("warn", "At least one of the entities has citext column, but the 'citext' extension cannot be installed automatically. Please install it manually using superuser rights");
- }
- if (hasHstoreColumns)
- try {
- await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "hstore"`);
- } catch (_) {
- logger.log("warn", "At least one of the entities has hstore column, but the 'hstore' extension cannot be installed automatically. Please install it manually using superuser rights");
- }
- if (hasGeometryColumns)
- try {
- await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "postgis"`);
- } catch (_) {
- logger.log("warn", "At least one of the entities has a geometry column, but the 'postgis' extension cannot be installed automatically. Please install it manually using superuser rights");
- }
- if (hasCubeColumns)
- try {
- await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "cube"`);
- } catch (_) {
- logger.log("warn", "At least one of the entities has a cube column, but the 'cube' extension cannot be installed automatically. Please install it manually using superuser rights");
- }
- if (hasExclusionConstraints)
- try {
- // The btree_gist extension provides operator support in PostgreSQL exclusion constraints
- await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "btree_gist"`);
- } catch (_) {
- logger.log("warn", "At least one of the entities has an exclusion constraint, but the 'btree_gist' extension cannot be installed automatically. Please install it manually using superuser rights");
- }
- release();
- ok();
- });
- });
- }));
- }
- return Promise.resolve();
+ return {
+ hasUuidColumns,
+ hasCitextColumns,
+ hasHstoreColumns,
+ hasCubeColumns,
+ hasGeometryColumns,
+ hasLtreeColumns,
+ hasExclusionConstraints,
+ hasExtensions: hasUuidColumns || hasCitextColumns || hasHstoreColumns || hasGeometryColumns || hasCubeColumns || hasLtreeColumns || hasExclusionConstraints,
+ };
}
/**
@@ -389,7 +437,7 @@ export class PostgresDriver implements Driver {
/**
* Creates a query runner used to execute database queries.
*/
- createQueryRunner(mode: "master"|"slave" = "master") {
+ createQueryRunner(mode: ReplicationMode): QueryRunner {
return new PostgresQueryRunner(this, mode);
}
@@ -452,6 +500,8 @@ export class PostgresDriver implements Driver {
}
return `(${value.join(",")})`;
+ } else if (columnMetadata.type === "ltree") {
+ return value.split(".").filter(Boolean).join('.').replace(/[\s]+/g, "_");
} else if (
(
columnMetadata.type === "enum"
@@ -863,6 +913,13 @@ export class PostgresDriver implements Driver {
return true;
}
+ /**
+ * Returns true if driver supports fulltext indices.
+ */
+ isFullTextColumnTypeSupported(): boolean {
+ return false;
+ }
+
get uuidGenerator(): string {
return this.options.uuidExtension === "pgcrypto" ? "gen_random_uuid()" : "uuid_generate_v4()";
}
@@ -919,13 +976,15 @@ export class PostgresDriver implements Driver {
credentials = Object.assign({}, credentials, DriverUtils.buildDriverOptions(credentials)); // todo: do it better way
// build connection options for the driver
+ // See: https://github.com/brianc/node-postgres/tree/master/packages/pg-pool#create
const connectionOptions = Object.assign({}, {
host: credentials.host,
user: credentials.username,
password: credentials.password,
database: credentials.database,
port: credentials.port,
- ssl: credentials.ssl
+ ssl: credentials.ssl,
+ connectionTimeoutMillis: options.connectTimeoutMS
}, options.extra || {});
// create a connection pool
@@ -943,6 +1002,15 @@ export class PostgresDriver implements Driver {
return new Promise((ok, fail) => {
pool.connect((err: any, connection: any, release: Function) => {
if (err) return fail(err);
+
+ if (options.logNotifications) {
+ connection.on("notice", (msg: any) => {
+ msg && this.connection.logger.log("info", msg.message);
+ });
+ connection.on("notification", (msg: any) => {
+ msg && this.connection.logger.log("info", `Received NOTIFY on channel ${msg.channel}: ${msg.payload}.`);
+ });
+ }
release();
ok(pool);
});
@@ -972,3 +1040,124 @@ export class PostgresDriver implements Driver {
}
}
+
+abstract class PostgresWrapper extends PostgresDriver {
+ options: any;
+
+ abstract createQueryRunner(mode: ReplicationMode): any;
+}
+
+export class AuroraDataApiPostgresDriver extends PostgresWrapper {
+
+ // -------------------------------------------------------------------------
+ // Public Properties
+ // -------------------------------------------------------------------------
+
+ /**
+ * Connection used by driver.
+ */
+ connection: Connection;
+
+ /**
+ * Aurora Data API underlying library.
+ */
+ DataApiDriver: any;
+
+ client: any;
+
+ // -------------------------------------------------------------------------
+ // Public Implemented Properties
+ // -------------------------------------------------------------------------
+
+ /**
+ * Connection options.
+ */
+ options: AuroraDataApiPostgresConnectionOptions;
+
+ /**
+ * Master database used to perform all write queries.
+ */
+ database?: string;
+
+ // -------------------------------------------------------------------------
+ // Constructor
+ // -------------------------------------------------------------------------
+
+ constructor(connection: Connection) {
+ super();
+ this.connection = connection;
+ this.options = connection.options as AuroraDataApiPostgresConnectionOptions;
+ this.isReplicated = false;
+
+ // load data-api package
+ this.loadDependencies();
+
+ this.client = new this.DataApiDriver(
+ this.options.region,
+ this.options.secretArn,
+ this.options.resourceArn,
+ this.options.database,
+ (query: string, parameters?: any[]) => this.connection.logger.logQuery(query, parameters),
+ this.options.serviceConfigOptions,
+ this.options.formatOptions,
+ );
+ }
+
+ // -------------------------------------------------------------------------
+ // Public Implemented Methods
+ // -------------------------------------------------------------------------
+
+ /**
+ * Performs connection to the database.
+ * Based on pooling options, it can either create connection immediately,
+ * either create a pool and create connection when needed.
+ */
+ async connect(): Promise {
+ }
+
+ /**
+ * Closes connection with database.
+ */
+ async disconnect(): Promise {
+ }
+
+ /**
+ * Creates a query runner used to execute database queries.
+ */
+ createQueryRunner(mode: ReplicationMode) {
+ return new AuroraDataApiPostgresQueryRunner(this, mode);
+ }
+
+ // -------------------------------------------------------------------------
+ // Protected Methods
+ // -------------------------------------------------------------------------
+
+ /**
+ * If driver dependency is not given explicitly, then try to load it via "require".
+ */
+ protected loadDependencies(): void {
+ const { pg } = PlatformTools.load("typeorm-aurora-data-api-driver");
+
+ this.DataApiDriver = pg;
+ }
+
+ /**
+ * Executes given query.
+ */
+ protected executeQuery(connection: any, query: string) {
+ return this.client.query(query);
+ }
+
+ /**
+ * Makes any action after connection (e.g. create extensions in Postgres driver).
+ */
+ async afterConnect(): Promise {
+ const extensionsMetadata = await this.checkMetadataForExtensions();
+
+ if (extensionsMetadata.hasExtensions) {
+ await this.enableExtensions(extensionsMetadata, this.connection);
+ }
+
+ return Promise.resolve();
+ }
+}
diff --git a/src/driver/postgres/PostgresQueryRunner.ts b/src/driver/postgres/PostgresQueryRunner.ts
index 9fd1ef8db6..a8def64da2 100644
--- a/src/driver/postgres/PostgresQueryRunner.ts
+++ b/src/driver/postgres/PostgresQueryRunner.ts
@@ -1,4 +1,3 @@
-import {PromiseUtils} from "../../";
import {ObjectLiteral} from "../../common/ObjectLiteral";
import {QueryFailedError} from "../../error/QueryFailedError";
import {QueryRunnerAlreadyReleasedError} from "../../error/QueryRunnerAlreadyReleasedError";
@@ -23,6 +22,7 @@ import {OrmUtils} from "../../util/OrmUtils";
import {Query} from "../Query";
import {IsolationLevel} from "../types/IsolationLevel";
import {PostgresDriver} from "./PostgresDriver";
+import {ReplicationMode} from "../types/ReplicationMode";
/**
* Runs queries on a single postgres database connection.
@@ -56,7 +56,7 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
// Constructor
// -------------------------------------------------------------------------
- constructor(driver: PostgresDriver, mode: "master"|"slave" = "master") {
+ constructor(driver: PostgresDriver, mode: ReplicationMode) {
super();
this.driver = driver;
this.connection = driver.connection;
@@ -80,10 +80,17 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
return this.databaseConnectionPromise;
if (this.mode === "slave" && this.driver.isReplicated) {
- this.databaseConnectionPromise = this.driver.obtainSlaveConnection().then(([ connection, release]: any[]) => {
+ this.databaseConnectionPromise = this.driver.obtainSlaveConnection().then(([connection, release]: any[]) => {
this.driver.connectedQueryRunners.push(this);
this.databaseConnection = connection;
- this.releaseCallback = release;
+
+ const onErrorCallback = () => this.release();
+ this.releaseCallback = () => {
+ this.databaseConnection.removeListener("error", onErrorCallback);
+ release();
+ };
+ this.databaseConnection.on("error", onErrorCallback);
+
return this.databaseConnection;
});
@@ -91,7 +98,14 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
this.databaseConnectionPromise = this.driver.obtainMasterConnection().then(([connection, release]: any[]) => {
this.driver.connectedQueryRunners.push(this);
this.databaseConnection = connection;
- this.releaseCallback = release;
+
+ const onErrorCallback = () => this.release();
+ this.releaseCallback = () => {
+ this.databaseConnection.removeListener("error", onErrorCallback);
+ release();
+ };
+ this.databaseConnection.on("error", onErrorCallback);
+
return this.databaseConnection;
});
}
@@ -104,6 +118,10 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
* You cannot use query runner methods once its released.
*/
release(): Promise {
+ if (this.isReleased) {
+ return Promise.resolve();
+ }
+
this.isReleased = true;
if (this.releaseCallback)
this.releaseCallback();
@@ -166,7 +184,6 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
const queryStartTime = +new Date();
databaseConnection.query(query, parameters, (err: any, result: any) => {
-
// log slow queries if maxQueryExecution time is set
const maxQueryExecutionTime = this.driver.connection.options.maxQueryExecutionTime;
const queryEndTime = +new Date();
@@ -557,7 +574,9 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
* Creates a new columns from the column in the table.
*/
async addColumns(tableOrName: Table|string, columns: TableColumn[]): Promise {
- await PromiseUtils.runInSequence(columns, column => this.addColumn(tableOrName, column));
+ for (const column of columns) {
+ await this.addColumn(tableOrName, column);
+ }
}
/**
@@ -875,7 +894,9 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
* Changes a column in the table.
*/
async changeColumns(tableOrName: Table|string, changedColumns: { newColumn: TableColumn, oldColumn: TableColumn }[]): Promise {
- await PromiseUtils.runInSequence(changedColumns, changedColumn => this.changeColumn(tableOrName, changedColumn.oldColumn, changedColumn.newColumn));
+ for (const {oldColumn, newColumn} of changedColumns) {
+ await this.changeColumn(tableOrName, oldColumn, newColumn);
+ }
}
/**
@@ -959,7 +980,9 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
* Drops the columns in the table.
*/
async dropColumns(tableOrName: Table|string, columns: TableColumn[]): Promise {
- await PromiseUtils.runInSequence(columns, column => this.dropColumn(tableOrName, column));
+ for (const column of columns) {
+ await this.dropColumn(tableOrName, column);
+ }
}
/**
@@ -1048,7 +1071,9 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
* Creates new unique constraints.
*/
async createUniqueConstraints(tableOrName: Table|string, uniqueConstraints: TableUnique[]): Promise {
- await PromiseUtils.runInSequence(uniqueConstraints, uniqueConstraint => this.createUniqueConstraint(tableOrName, uniqueConstraint));
+ for (const uniqueConstraint of uniqueConstraints) {
+ await this.createUniqueConstraint(tableOrName, uniqueConstraint);
+ }
}
/**
@@ -1070,7 +1095,9 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
* Drops unique constraints.
*/
async dropUniqueConstraints(tableOrName: Table|string, uniqueConstraints: TableUnique[]): Promise {
- await PromiseUtils.runInSequence(uniqueConstraints, uniqueConstraint => this.dropUniqueConstraint(tableOrName, uniqueConstraint));
+ for (const uniqueConstraint of uniqueConstraints) {
+ await this.dropUniqueConstraint(tableOrName, uniqueConstraint);
+ }
}
/**
@@ -1187,7 +1214,9 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
* Creates a new foreign keys.
*/
async createForeignKeys(tableOrName: Table|string, foreignKeys: TableForeignKey[]): Promise {
- await PromiseUtils.runInSequence(foreignKeys, foreignKey => this.createForeignKey(tableOrName, foreignKey));
+ for (const foreignKey of foreignKeys) {
+ await this.createForeignKey(tableOrName, foreignKey);
+ }
}
/**
@@ -1209,7 +1238,9 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
* Drops a foreign keys from the table.
*/
async dropForeignKeys(tableOrName: Table|string, foreignKeys: TableForeignKey[]): Promise {
- await PromiseUtils.runInSequence(foreignKeys, foreignKey => this.dropForeignKey(tableOrName, foreignKey));
+ for (const foreignKey of foreignKeys) {
+ await this.dropForeignKey(tableOrName, foreignKey);
+ }
}
/**
@@ -1232,7 +1263,9 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
* Creates a new indices
*/
async createIndices(tableOrName: Table|string, indices: TableIndex[]): Promise {
- await PromiseUtils.runInSequence(indices, index => this.createIndex(tableOrName, index));
+ for (const index of indices) {
+ await this.createIndex(tableOrName, index);
+ }
}
/**
@@ -1254,7 +1287,9 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
* Drops an indices from the table.
*/
async dropIndices(tableOrName: Table|string, indices: TableIndex[]): Promise {
- await PromiseUtils.runInSequence(indices, index => this.dropIndex(tableOrName, index));
+ for (const index of indices) {
+ await this.dropIndex(tableOrName, index);
+ }
}
/**
@@ -1425,7 +1460,6 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
this.query(indicesSql),
this.query(foreignKeysSql),
]);
-
// if tables were not found in the db, no need to proceed
if (!dbTables.length)
return [];
@@ -1434,9 +1468,10 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
return Promise.all(dbTables.map(async dbTable => {
const table = new Table();
+ const getSchemaFromKey = (dbObject: any, key: string) => dbObject[key] === currentSchema && !this.driver.options.schema ? undefined : dbObject[key];
// We do not need to join schema name, when database is by default.
// In this case we need local variable `tableFullName` for below comparision.
- const schema = dbTable["table_schema"] === currentSchema && !this.driver.options.schema ? undefined : dbTable["table_schema"];
+ const schema = getSchemaFromKey(dbTable, "table_schema");
table.name = this.driver.buildTableName(dbTable["table_name"], schema);
const tableFullName = this.driver.buildTableName(dbTable["table_name"], dbTable["table_schema"]);
@@ -1502,7 +1537,7 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
"type"
FROM "geometry_columns"
) AS _
- WHERE (${tablesCondition}) AND "column_name" = '${tableColumn.name}' AND "table_name" = '${table.name}'`;
+ WHERE (${tablesCondition}) AND "column_name" = '${tableColumn.name}' AND "table_name" = '${dbTable["table_name"]}'`;
const results: ObjectLiteral[] = await this.query(geometryColumnSql);
tableColumn.spatialFeatureType = results[0].type;
@@ -1519,7 +1554,7 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
"type"
FROM "geography_columns"
) AS _
- WHERE (${tablesCondition}) AND "column_name" = '${tableColumn.name}' AND "table_name" = '${table.name}'`;
+ WHERE (${tablesCondition}) AND "column_name" = '${tableColumn.name}' AND "table_name" = '${dbTable["table_name"]}'`;
const results: ObjectLiteral[] = await this.query(geographyColumnSql);
tableColumn.spatialFeatureType = results[0].type;
@@ -1613,7 +1648,7 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
const foreignKeys = dbForeignKeys.filter(dbFk => dbFk["constraint_name"] === dbForeignKey["constraint_name"]);
// if referenced table located in currently used schema, we don't need to concat schema name to table name.
- const schema = dbForeignKey["referenced_table_schema"] === currentSchema ? undefined : dbForeignKey["referenced_table_schema"];
+ const schema = getSchemaFromKey(dbForeignKey, "referenced_table_schema");
const referencedTableName = this.driver.buildTableName(dbForeignKey["referenced_table_name"], schema);
return new TableForeignKey({
diff --git a/src/driver/react-native/ReactNativeDriver.ts b/src/driver/react-native/ReactNativeDriver.ts
index 803ac93b79..0763c04d7d 100644
--- a/src/driver/react-native/ReactNativeDriver.ts
+++ b/src/driver/react-native/ReactNativeDriver.ts
@@ -5,10 +5,12 @@ import {QueryRunner} from "../../query-runner/QueryRunner";
import {Connection} from "../../connection/Connection";
import {DriverOptionNotSetError} from "../../error/DriverOptionNotSetError";
import {DriverPackageNotInstalledError} from "../../error/DriverPackageNotInstalledError";
+import {PlatformTools} from "../../platform/PlatformTools";
+import {ReplicationMode} from "../types/ReplicationMode";
export class ReactNativeDriver extends AbstractSqliteDriver {
options: ReactNativeConnectionOptions;
-
+
// -------------------------------------------------------------------------
// Constructor
// -------------------------------------------------------------------------
@@ -28,7 +30,7 @@ export class ReactNativeDriver extends AbstractSqliteDriver {
// load sqlite package
this.loadDependencies();
}
-
+
// -------------------------------------------------------------------------
// Public Methods
@@ -43,17 +45,17 @@ export class ReactNativeDriver extends AbstractSqliteDriver {
this.databaseConnection.close(ok, fail);
});
}
-
+
/**
* Creates a query runner used to execute database queries.
*/
- createQueryRunner(mode: "master"|"slave" = "master"): QueryRunner {
+ createQueryRunner(mode: ReplicationMode): QueryRunner {
if (!this.queryRunner)
this.queryRunner = new ReactNativeQueryRunner(this);
return this.queryRunner;
}
-
+
// -------------------------------------------------------------------------
// Protected Methods
// -------------------------------------------------------------------------
@@ -89,10 +91,10 @@ export class ReactNativeDriver extends AbstractSqliteDriver {
*/
protected loadDependencies(): void {
try {
- this.sqlite = require("react-native-sqlite-storage");
+ this.sqlite = PlatformTools.load("react-native-sqlite-storage");
} catch (e) {
throw new DriverPackageNotInstalledError("React-Native", "react-native-sqlite-storage");
}
}
-}
\ No newline at end of file
+}
diff --git a/src/driver/sap/SapConnectionCredentialsOptions.ts b/src/driver/sap/SapConnectionCredentialsOptions.ts
index d0a36c746d..a64ddcfee3 100644
--- a/src/driver/sap/SapConnectionCredentialsOptions.ts
+++ b/src/driver/sap/SapConnectionCredentialsOptions.ts
@@ -36,7 +36,7 @@ export interface SapConnectionCredentialsOptions {
/**
* Validate database certificate
*/
- readonly validateCertificate?: boolean;
+ readonly sslValidateCertificate?: boolean;
/**
* Key for encrypted connection
diff --git a/src/driver/sap/SapDriver.ts b/src/driver/sap/SapDriver.ts
index 491b003726..1ae1cfea3e 100644
--- a/src/driver/sap/SapDriver.ts
+++ b/src/driver/sap/SapDriver.ts
@@ -11,6 +11,7 @@ import {DataTypeDefaults} from "../types/DataTypeDefaults";
import {MappedColumnTypes} from "../types/MappedColumnTypes";
import {SapConnectionOptions} from "./SapConnectionOptions";
import {SapQueryRunner} from "./SapQueryRunner";
+import {ReplicationMode} from "../types/ReplicationMode";
/**
* Organizes communication with SAP Hana DBMS.
@@ -220,7 +221,7 @@ export class SapDriver implements Driver {
if (this.options.database) dbParams.databaseName = this.options.database;
if (this.options.encrypt) dbParams.encrypt = this.options.encrypt;
- if (this.options.validateCertificate) dbParams.validateCertificate = this.options.validateCertificate;
+ if (this.options.sslValidateCertificate) dbParams.validateCertificate = this.options.sslValidateCertificate;
if (this.options.key) dbParams.key = this.options.key;
if (this.options.cert) dbParams.cert = this.options.cert;
if (this.options.ca) dbParams.ca = this.options.ca;
@@ -228,7 +229,7 @@ export class SapDriver implements Driver {
// pool options
const options: any = {
min: this.options.pool && this.options.pool.min ? this.options.pool.min : 1,
- max: this.options.pool && this.options.pool.max ? this.options.pool.max : 1,
+ max: this.options.pool && this.options.pool.max ? this.options.pool.max : 10,
};
if (this.options.pool && this.options.pool.checkInterval) options.checkInterval = this.options.pool.checkInterval;
@@ -273,7 +274,7 @@ export class SapDriver implements Driver {
/**
* Creates a query runner used to execute database queries.
*/
- createQueryRunner(mode: "master"|"slave" = "master") {
+ createQueryRunner(mode: ReplicationMode) {
return new SapQueryRunner(this, mode);
}
@@ -283,6 +284,10 @@ export class SapDriver implements Driver {
*/
escapeQueryWithParameters(sql: string, parameters: ObjectLiteral, nativeParameters: ObjectLiteral): [string, any[]] {
const builtParameters: any[] = Object.keys(nativeParameters).map(key => {
+
+ if (nativeParameters[key] instanceof Date)
+ return DateUtils.mixedDateToDatetimeString(nativeParameters[key], true);
+
return nativeParameters[key];
});
@@ -310,6 +315,9 @@ export class SapDriver implements Driver {
} else if (value instanceof Function) {
return value();
+ } else if (value instanceof Date) {
+ return DateUtils.mixedDateToDatetimeString(value, true);
+
} else {
builtParameters.push(value);
return "?";
@@ -573,15 +581,15 @@ export class SapDriver implements Driver {
// console.log("table:", columnMetadata.entityMetadata.tableName);
// console.log("name:", tableColumn.name, columnMetadata.databaseName);
- // console.log("type:", tableColumn.type, this.normalizeType(columnMetadata));
- // console.log("length:", tableColumn.length, columnMetadata.length);
+ // console.log("type:", tableColumn.type, _this.normalizeType(columnMetadata));
+ // console.log("length:", tableColumn.length, _this.getColumnLength(columnMetadata));
// console.log("width:", tableColumn.width, columnMetadata.width);
// console.log("precision:", tableColumn.precision, columnMetadata.precision);
// console.log("scale:", tableColumn.scale, columnMetadata.scale);
// console.log("default:", tableColumn.default, columnMetadata.default);
// console.log("isPrimary:", tableColumn.isPrimary, columnMetadata.isPrimary);
// console.log("isNullable:", tableColumn.isNullable, columnMetadata.isNullable);
- // console.log("isUnique:", tableColumn.isUnique, this.normalizeIsUnique(columnMetadata));
+ // console.log("isUnique:", tableColumn.isUnique, _this.normalizeIsUnique(columnMetadata));
// console.log("isGenerated:", tableColumn.isGenerated, columnMetadata.isGenerated);
// console.log((columnMetadata.generationStrategy !== "uuid" && tableColumn.isGenerated !== columnMetadata.isGenerated));
// console.log("==========================================");
@@ -589,9 +597,9 @@ export class SapDriver implements Driver {
const normalizeDefault = this.normalizeDefault(columnMetadata);
const hanaNullComapatibleDefault = normalizeDefault == null ? undefined : normalizeDefault;
- return tableColumn.name !== columnMetadata.databaseName
+ return tableColumn.name !== columnMetadata.databaseName
|| tableColumn.type !== this.normalizeType(columnMetadata)
- || tableColumn.length !== columnMetadata.length
+ || columnMetadata.length && tableColumn.length !== this.getColumnLength(columnMetadata)
|| tableColumn.precision !== columnMetadata.precision
|| tableColumn.scale !== columnMetadata.scale
// || tableColumn.comment !== columnMetadata.comment || // todo
@@ -599,7 +607,7 @@ export class SapDriver implements Driver {
|| tableColumn.isPrimary !== columnMetadata.isPrimary
|| tableColumn.isNullable !== columnMetadata.isNullable
|| tableColumn.isUnique !== this.normalizeIsUnique(columnMetadata)
- || tableColumn.isGenerated !== columnMetadata.isGenerated;
+ || (columnMetadata.generationStrategy !== "uuid" && tableColumn.isGenerated !== columnMetadata.isGenerated);
});
}
@@ -617,6 +625,13 @@ export class SapDriver implements Driver {
return false;
}
+ /**
+ * Returns true if driver supports fulltext indices.
+ */
+ isFullTextColumnTypeSupported(): boolean {
+ return true;
+ }
+
/**
* Creates an escaped parameter.
*/
diff --git a/src/driver/sap/SapQueryRunner.ts b/src/driver/sap/SapQueryRunner.ts
index c3d606b8c4..d070176d9d 100644
--- a/src/driver/sap/SapQueryRunner.ts
+++ b/src/driver/sap/SapQueryRunner.ts
@@ -2,7 +2,7 @@ import {ObjectLiteral} from "../../common/ObjectLiteral";
import {QueryRunnerAlreadyReleasedError} from "../../error/QueryRunnerAlreadyReleasedError";
import {TransactionAlreadyStartedError} from "../../error/TransactionAlreadyStartedError";
import {TransactionNotStartedError} from "../../error/TransactionNotStartedError";
-import {ColumnType, PromiseUtils, QueryFailedError} from "../../index";
+import {ColumnType, QueryFailedError} from "../../index";
import {ReadStream} from "../../platform/PlatformTools";
import {BaseQueryRunner} from "../../query-runner/BaseQueryRunner";
import {QueryRunner} from "../../query-runner/QueryRunner";
@@ -20,6 +20,7 @@ import {OrmUtils} from "../../util/OrmUtils";
import {Query} from "../Query";
import {IsolationLevel} from "../types/IsolationLevel";
import {SapDriver} from "./SapDriver";
+import {ReplicationMode} from "../types/ReplicationMode";
/**
* Runs queries on a single SQL Server database connection.
@@ -55,7 +56,7 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
// Constructor
// -------------------------------------------------------------------------
- constructor(driver: SapDriver, mode: "master"|"slave" = "master") {
+ constructor(driver: SapDriver, mode: ReplicationMode) {
super();
this.driver = driver;
this.connection = driver.connection;
@@ -91,7 +92,7 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
return this.driver.master.release(this.databaseConnection);
}
- return Promise.resolve();
+ return Promise.resolve();
}
/**
@@ -633,7 +634,9 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
* Creates a new columns from the column in the table.
*/
async addColumns(tableOrName: Table|string, columns: TableColumn[]): Promise {
- await PromiseUtils.runInSequence(columns, column => this.addColumn(tableOrName, column));
+ for (const column of columns) {
+ await this.addColumn(tableOrName, column);
+ }
}
/**
@@ -869,7 +872,9 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
* Changes a column in the table.
*/
async changeColumns(tableOrName: Table|string, changedColumns: { newColumn: TableColumn, oldColumn: TableColumn }[]): Promise {
- await PromiseUtils.runInSequence(changedColumns, changedColumn => this.changeColumn(tableOrName, changedColumn.oldColumn, changedColumn.newColumn));
+ for (const {oldColumn, newColumn} of changedColumns) {
+ await this.changeColumn(tableOrName, oldColumn, newColumn)
+ }
}
/**
@@ -989,7 +994,9 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
* Drops the columns in the table.
*/
async dropColumns(tableOrName: Table|string, columns: TableColumn[]): Promise {
- await PromiseUtils.runInSequence(columns, column => this.dropColumn(tableOrName, column));
+ for (const column of columns) {
+ await this.dropColumn(tableOrName, column);
+ }
}
/**
@@ -1447,7 +1454,7 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
return `("SCHEMA_NAME" = '${schema}' AND "TABLE_NAME" = '${name}')`;
}).join(" OR ");
const tablesSql = `SELECT * FROM "SYS"."TABLES" WHERE ` + tablesCondition;
- const columnsSql = `SELECT * FROM "SYS"."TABLE_COLUMNS" WHERE ` + tablesCondition;
+ const columnsSql = `SELECT * FROM "SYS"."TABLE_COLUMNS" WHERE ` + tablesCondition + ` ORDER BY "POSITION"`;
const constraintsCondition = tableNames.map(tableName => {
let [schema, name] = tableName.split(".");
@@ -1458,7 +1465,7 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
return `("SCHEMA_NAME" = '${schema}' AND "TABLE_NAME" = '${name}')`;
}).join(" OR ");
- const constraintsSql = `SELECT * FROM "SYS"."CONSTRAINTS" WHERE (${constraintsCondition})`;
+ const constraintsSql = `SELECT * FROM "SYS"."CONSTRAINTS" WHERE (${constraintsCondition}) ORDER BY "POSITION"`;
const indicesCondition = tableNames.map(tableName => {
let [schema, name] = tableName.split(".");
@@ -1471,7 +1478,7 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
// excluding primary key and autogenerated fulltext indices
const indicesSql = `SELECT "I"."INDEX_TYPE", "I"."SCHEMA_NAME", "I"."TABLE_NAME", "I"."INDEX_NAME", "IC"."COLUMN_NAME", "I"."CONSTRAINT" ` +
`FROM "SYS"."INDEXES" "I" INNER JOIN "SYS"."INDEX_COLUMNS" "IC" ON "IC"."INDEX_OID" = "I"."INDEX_OID" ` +
- `WHERE (${indicesCondition}) AND ("I"."CONSTRAINT" IS NULL OR "I"."CONSTRAINT" != 'PRIMARY KEY') AND "I"."INDEX_NAME" NOT LIKE '%_SYS_FULLTEXT_%'`;
+ `WHERE (${indicesCondition}) AND ("I"."CONSTRAINT" IS NULL OR "I"."CONSTRAINT" != 'PRIMARY KEY') AND "I"."INDEX_NAME" NOT LIKE '%_SYS_FULLTEXT_%' ORDER BY "IC"."POSITION"`;
const foreignKeysCondition = tableNames.map(tableName => {
let [schema, name] = tableName.split(".");
@@ -1481,7 +1488,7 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
}
return `("SCHEMA_NAME" = '${schema}' AND "TABLE_NAME" = '${name}')`;
}).join(" OR ");
- const foreignKeysSql = `SELECT * FROM "SYS"."REFERENTIAL_CONSTRAINTS" WHERE (${foreignKeysCondition})`;
+ const foreignKeysSql = `SELECT * FROM "SYS"."REFERENTIAL_CONSTRAINTS" WHERE (${foreignKeysCondition}) ORDER BY "POSITION"`;
const [dbTables, dbColumns, dbConstraints, dbIndices, dbForeignKeys]: ObjectLiteral[][] = await Promise.all([
this.query(tablesSql),
this.query(columnsSql),
@@ -1823,7 +1830,7 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
let indexType = "";
if (index.isUnique) {
indexType += "UNIQUE ";
- }
+ }
if (index.isFulltext) {
indexType += "FULLTEXT ";
}
diff --git a/src/driver/sqlite-abstract/AbstractSqliteDriver.ts b/src/driver/sqlite-abstract/AbstractSqliteDriver.ts
index f5a7efe4af..55db1a1c5f 100644
--- a/src/driver/sqlite-abstract/AbstractSqliteDriver.ts
+++ b/src/driver/sqlite-abstract/AbstractSqliteDriver.ts
@@ -13,6 +13,7 @@ import {BaseConnectionOptions} from "../../connection/BaseConnectionOptions";
import {EntityMetadata} from "../../metadata/EntityMetadata";
import {OrmUtils} from "../../util/OrmUtils";
import {ApplyValueTransformers} from "../../util/ApplyValueTransformers";
+import {ReplicationMode} from "../types/ReplicationMode";
/**
* Organizes communication with sqlite DBMS.
@@ -130,12 +131,31 @@ export abstract class AbstractSqliteDriver implements Driver {
/**
* Gets list of column data types that support precision by a driver.
*/
- withPrecisionColumnTypes: ColumnType[] = [];
+ withPrecisionColumnTypes: ColumnType[] = [
+ "real",
+ "double",
+ "double precision",
+ "float",
+ "real",
+ "numeric",
+ "decimal",
+ "date",
+ "time",
+ "datetime"
+ ];
/**
* Gets list of column data types that support scale by a driver.
*/
- withScaleColumnTypes: ColumnType[] = [];
+ withScaleColumnTypes: ColumnType[] = [
+ "real",
+ "double",
+ "double precision",
+ "float",
+ "real",
+ "numeric",
+ "decimal",
+ ];
/**
* Orm has special columns and we need to know what database column types should be for those types.
@@ -195,7 +215,7 @@ export abstract class AbstractSqliteDriver implements Driver {
/**
* Creates a query runner used to execute database queries.
*/
- abstract createQueryRunner(mode: "master"|"slave"): QueryRunner;
+ abstract createQueryRunner(mode: ReplicationMode): QueryRunner;
// -------------------------------------------------------------------------
// Public Methods
@@ -507,11 +527,13 @@ export abstract class AbstractSqliteDriver implements Driver {
/**
* Creates generated map of values generated or returned by database after INSERT query.
*/
- createGeneratedMap(metadata: EntityMetadata, insertResult: any) {
+ createGeneratedMap(metadata: EntityMetadata, insertResult: any, entityIndex: number, entityNum: number) {
const generatedMap = metadata.generatedColumns.reduce((map, generatedColumn) => {
let value: any;
if (generatedColumn.generationStrategy === "increment" && insertResult) {
- value = insertResult;
+ // NOTE: When INSERT statement is successfully completed, the last inserted row ID is returned.
+ // see also: SqliteQueryRunner.query()
+ value = insertResult - entityNum + entityIndex + 1;
// } else if (generatedColumn.generationStrategy === "uuid") {
// value = insertValue[generatedColumn.databaseName];
}
@@ -576,6 +598,13 @@ export abstract class AbstractSqliteDriver implements Driver {
return false;
}
+ /**
+ * Returns true if driver supports fulltext indices.
+ */
+ isFullTextColumnTypeSupported(): boolean {
+ return false;
+ }
+
/**
* Creates an escaped parameter.
*/
diff --git a/src/driver/sqlite-abstract/AbstractSqliteQueryRunner.ts b/src/driver/sqlite-abstract/AbstractSqliteQueryRunner.ts
index a5ce81ee44..1d0edb2d19 100644
--- a/src/driver/sqlite-abstract/AbstractSqliteQueryRunner.ts
+++ b/src/driver/sqlite-abstract/AbstractSqliteQueryRunner.ts
@@ -10,7 +10,6 @@ import {TableIndex} from "../../schema-builder/table/TableIndex";
import {TableForeignKey} from "../../schema-builder/table/TableForeignKey";
import {View} from "../../schema-builder/view/View";
import {Query} from "../Query";
-import {SqliteConnectionOptions} from "../sqlite/SqliteConnectionOptions";
import {AbstractSqliteDriver} from "./AbstractSqliteDriver";
import {ReadStream} from "../../platform/PlatformTools";
import {TableIndexOptions} from "../../schema-builder/options/TableIndexOptions";
@@ -69,19 +68,8 @@ export abstract class AbstractSqliteQueryRunner extends BaseQueryRunner implemen
* Starts transaction.
*/
async startTransaction(isolationLevel?: IsolationLevel): Promise {
- if (this.isTransactionActive) {
- const options = this.driver.options as SqliteConnectionOptions;
- if (options.busyErrorRetry && typeof options.busyErrorRetry === "number") {
- return new Promise((ok, fail) => {
- setTimeout(
- () => this.startTransaction(isolationLevel).then(ok).catch(fail),
- options.busyErrorRetry as number
- );
- });
- } else {
- throw new TransactionAlreadyStartedError();
- }
- }
+ if (this.isTransactionActive)
+ throw new TransactionAlreadyStartedError();
this.isTransactionActive = true;
@@ -97,10 +85,6 @@ export abstract class AbstractSqliteQueryRunner extends BaseQueryRunner implemen
}
}
- if ((this.connection.options as SqliteConnectionOptions).enableWAL === true) {
- await this.query("PRAGMA journal_mode = WAL");
- }
-
await this.query("BEGIN TRANSACTION");
}
@@ -842,17 +826,31 @@ export abstract class AbstractSqliteQueryRunner extends BaseQueryRunner implemen
}
}
- // parse datatype and attempt to retrieve length
+ // parse datatype and attempt to retrieve length, precision and scale
let pos = tableColumn.type.indexOf("(");
if (pos !== -1) {
- let dataType = tableColumn.type.substr(0, pos);
+ const fullType = tableColumn.type;
+ let dataType = fullType.substr(0, pos);
if (!!this.driver.withLengthColumnTypes.find(col => col === dataType)) {
- let len = parseInt(tableColumn.type.substring(pos + 1, tableColumn.type.length - 1));
+ let len = parseInt(fullType.substring(pos + 1, fullType.length - 1));
if (len) {
tableColumn.length = len.toString();
tableColumn.type = dataType; // remove the length part from the datatype
}
}
+ if (!!this.driver.withPrecisionColumnTypes.find(col => col === dataType)) {
+ const re = new RegExp(`^${dataType}\\((\\d+),?\\s?(\\d+)?\\)`);
+ const matches = fullType.match(re);
+ if (matches && matches[1]) {
+ tableColumn.precision = +matches[1];
+ }
+ if (!!this.driver.withScaleColumnTypes.find(col => col === dataType)) {
+ if (matches && matches[2]) {
+ tableColumn.scale = +matches[2];
+ }
+ }
+ tableColumn.type = dataType; // remove the precision/scale part from the datatype
+ }
}
return tableColumn;
diff --git a/src/driver/sqlite/SqliteConnectionOptions.ts b/src/driver/sqlite/SqliteConnectionOptions.ts
index 8534fc5a76..8e092b9c69 100644
--- a/src/driver/sqlite/SqliteConnectionOptions.ts
+++ b/src/driver/sqlite/SqliteConnectionOptions.ts
@@ -31,7 +31,7 @@ export interface SqliteConnectionOptions extends BaseConnectionOptions {
* Enabling WAL can improve your app performance and face less SQLITE_BUSY issues.
* Time in milliseconds.
*/
- readonly busyErrorRetry?: number; // todo: implement this option for all SQLite family drivers
+ readonly busyErrorRetry?: number;
/**
* Enables WAL mode. By default its disabled.
@@ -40,4 +40,4 @@ export interface SqliteConnectionOptions extends BaseConnectionOptions {
*/
readonly enableWAL?: boolean;
-}
\ No newline at end of file
+}
diff --git a/src/driver/sqlite/SqliteDriver.ts b/src/driver/sqlite/SqliteDriver.ts
index 064039df04..585facffe1 100644
--- a/src/driver/sqlite/SqliteDriver.ts
+++ b/src/driver/sqlite/SqliteDriver.ts
@@ -1,12 +1,15 @@
-import {DriverPackageNotInstalledError} from "../../error/DriverPackageNotInstalledError";
-import {SqliteQueryRunner} from "./SqliteQueryRunner";
-import {DriverOptionNotSetError} from "../../error/DriverOptionNotSetError";
-import {PlatformTools} from "../../platform/PlatformTools";
-import {Connection} from "../../connection/Connection";
-import {SqliteConnectionOptions} from "./SqliteConnectionOptions";
-import {ColumnType} from "../types/ColumnTypes";
-import {QueryRunner} from "../../query-runner/QueryRunner";
-import {AbstractSqliteDriver} from "../sqlite-abstract/AbstractSqliteDriver";
+import mkdirp from 'mkdirp';
+import path from 'path';
+import { DriverPackageNotInstalledError } from "../../error/DriverPackageNotInstalledError";
+import { SqliteQueryRunner } from "./SqliteQueryRunner";
+import { DriverOptionNotSetError } from "../../error/DriverOptionNotSetError";
+import { PlatformTools } from "../../platform/PlatformTools";
+import { Connection } from "../../connection/Connection";
+import { SqliteConnectionOptions } from "./SqliteConnectionOptions";
+import { ColumnType } from "../types/ColumnTypes";
+import { QueryRunner } from "../../query-runner/QueryRunner";
+import { AbstractSqliteDriver } from "../sqlite-abstract/AbstractSqliteDriver";
+import {ReplicationMode} from "../types/ReplicationMode";
/**
* Organizes communication with sqlite DBMS.
@@ -63,7 +66,7 @@ export class SqliteDriver extends AbstractSqliteDriver {
/**
* Creates a query runner used to execute database queries.
*/
- createQueryRunner(mode: "master"|"slave" = "master"): QueryRunner {
+ createQueryRunner(mode: ReplicationMode): QueryRunner {
if (!this.queryRunner)
this.queryRunner = new SqliteQueryRunner(this);
@@ -105,6 +108,10 @@ export class SqliteDriver extends AbstractSqliteDriver {
});
}
+ if (this.options.enableWAL) {
+ await run(`PRAGMA journal_mode = WAL;`);
+ }
+
// we need to enable foreign keys in sqlite to make sure all foreign key related features
// working properly. this also makes onDelete to work with sqlite.
await run(`PRAGMA foreign_keys = ON;`);
@@ -132,12 +139,8 @@ export class SqliteDriver extends AbstractSqliteDriver {
/**
* Auto creates database directory if it does not exist.
*/
- protected createDatabaseDirectory(fullPath: string): Promise {
- return new Promise((resolve, reject) => {
- const mkdirp = PlatformTools.load("mkdirp");
- const path = PlatformTools.load("path");
- mkdirp(path.dirname(fullPath), (err: any) => err ? reject(err) : resolve());
- });
+ protected async createDatabaseDirectory(fullPath: string): Promise {
+ await mkdirp(path.dirname(fullPath));
}
}
diff --git a/src/driver/sqlite/SqliteQueryRunner.ts b/src/driver/sqlite/SqliteQueryRunner.ts
index d1ac916d7d..308bb72855 100644
--- a/src/driver/sqlite/SqliteQueryRunner.ts
+++ b/src/driver/sqlite/SqliteQueryRunner.ts
@@ -55,11 +55,8 @@ export class SqliteQueryRunner extends AbstractSqliteQueryRunner {
};
const handler = function (err: any, result: any) {
-
- if (err) {
- if (err.toString().indexOf("SQLITE_BUSY:") !== -1 &&
- typeof options.busyErrorRetry === "number" &&
- options.busyErrorRetry) {
+ if (err && err.toString().indexOf("SQLITE_BUSY:") !== -1) {
+ if (typeof options.busyErrorRetry === "number" && options.busyErrorRetry > 0) {
setTimeout(execute, options.busyErrorRetry);
return;
}
@@ -83,4 +80,4 @@ export class SqliteQueryRunner extends AbstractSqliteQueryRunner {
await execute();
});
}
-}
\ No newline at end of file
+}
diff --git a/src/driver/sqljs/SqljsDriver.ts b/src/driver/sqljs/SqljsDriver.ts
index d1cf4994ff..ef06346ca8 100644
--- a/src/driver/sqljs/SqljsDriver.ts
+++ b/src/driver/sqljs/SqljsDriver.ts
@@ -9,6 +9,7 @@ import {PlatformTools} from "../../platform/PlatformTools";
import {EntityMetadata} from "../../metadata/EntityMetadata";
import {OrmUtils} from "../../util/OrmUtils";
import {ObjectLiteral} from "../../common/ObjectLiteral";
+import {ReplicationMode} from "../types/ReplicationMode";
// This is needed to satisfy the typescript compiler.
interface Window {
@@ -69,13 +70,13 @@ export class SqljsDriver extends AbstractSqliteDriver {
/**
* Creates a query runner used to execute database queries.
*/
- createQueryRunner(mode: "master" | "slave" = "master"): QueryRunner {
+ createQueryRunner(mode: ReplicationMode): QueryRunner {
if (!this.queryRunner)
this.queryRunner = new SqljsQueryRunner(this);
return this.queryRunner;
}
-
+
/**
* Loads a database from a given file (Node.js), local storage key (browser) or array.
* This will delete the current database!
@@ -99,7 +100,7 @@ export class SqljsDriver extends AbstractSqliteDriver {
// File will be written on first write operation.
return this.createDatabaseConnectionWithImport();
}
- }
+ }
else {
// browser
// fileNameOrLocalStorageOrData should be a local storage / indexedDB key
@@ -113,7 +114,7 @@ export class SqljsDriver extends AbstractSqliteDriver {
} else {
localStorageContent = PlatformTools.getGlobalVariable().localStorage.getItem(fileNameOrLocalStorageOrData);
}
-
+
if (localStorageContent != null) {
// localStorage value exists.
return this.createDatabaseConnectionWithImport(JSON.parse(localStorageContent));
@@ -143,7 +144,7 @@ export class SqljsDriver extends AbstractSqliteDriver {
if (!location && !this.options.location) {
throw new Error(`No location is set, specify a location parameter or add the location option to your configuration`);
}
-
+
let path = "";
if (location) {
path = location;
@@ -154,7 +155,7 @@ export class SqljsDriver extends AbstractSqliteDriver {
if (PlatformTools.type === "node") {
try {
- const content = new Buffer(this.databaseConnection.export());
+ const content = Buffer.from(this.databaseConnection.export());
await PlatformTools.writeFile(path, content);
}
catch (e) {
@@ -193,7 +194,7 @@ export class SqljsDriver extends AbstractSqliteDriver {
}
}
}
-
+
/**
* Returns the current database as Uint8Array.
*/
@@ -284,4 +285,4 @@ export class SqljsDriver extends AbstractSqliteDriver {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/driver/sqljs/SqljsQueryRunner.ts b/src/driver/sqljs/SqljsQueryRunner.ts
index a3448e21ad..69a6349c47 100644
--- a/src/driver/sqljs/SqljsQueryRunner.ts
+++ b/src/driver/sqljs/SqljsQueryRunner.ts
@@ -41,7 +41,7 @@ export class SqljsQueryRunner extends AbstractSqliteQueryRunner {
/**
* Executes a given SQL query.
*/
- query(query: string, parameters?: any[]): Promise {
+ query(query: string, parameters: any[] = []): Promise {
if (this.isReleased)
throw new QueryRunnerAlreadyReleasedError();
@@ -52,7 +52,11 @@ export class SqljsQueryRunner extends AbstractSqliteQueryRunner {
let statement: any;
try {
statement = databaseConnection.prepare(query);
- statement.bind(parameters);
+ if (parameters) {
+ parameters = parameters.map(p => typeof p !== 'undefined' ? p : null);
+
+ statement.bind(parameters);
+ }
// log slow queries if maxQueryExecution time is set
const maxQueryExecutionTime = this.driver.connection.options.maxQueryExecutionTime;
diff --git a/src/driver/sqlserver/SqlServerDriver.ts b/src/driver/sqlserver/SqlServerDriver.ts
index 313f6954bd..45ac48e933 100644
--- a/src/driver/sqlserver/SqlServerDriver.ts
+++ b/src/driver/sqlserver/SqlServerDriver.ts
@@ -19,6 +19,7 @@ import {SqlServerConnectionCredentialsOptions} from "./SqlServerConnectionCreden
import {EntityMetadata} from "../../metadata/EntityMetadata";
import {OrmUtils} from "../../util/OrmUtils";
import {ApplyValueTransformers} from "../../util/ApplyValueTransformers";
+import {ReplicationMode} from "../types/ReplicationMode";
/**
* Organizes communication with SQL Server DBMS.
@@ -296,7 +297,7 @@ export class SqlServerDriver implements Driver {
/**
* Creates a query runner used to execute database queries.
*/
- createQueryRunner(mode: "master"|"slave" = "master") {
+ createQueryRunner(mode: ReplicationMode) {
return new SqlServerQueryRunner(this, mode);
}
@@ -642,6 +643,13 @@ export class SqlServerDriver implements Driver {
return true;
}
+ /**
+ * Returns true if driver supports fulltext indices.
+ */
+ isFullTextColumnTypeSupported(): boolean {
+ return false;
+ }
+
/**
* Creates an escaped parameter.
*/
diff --git a/src/driver/sqlserver/SqlServerQueryRunner.ts b/src/driver/sqlserver/SqlServerQueryRunner.ts
index 94575025e4..cb3b1eac86 100644
--- a/src/driver/sqlserver/SqlServerQueryRunner.ts
+++ b/src/driver/sqlserver/SqlServerQueryRunner.ts
@@ -4,7 +4,7 @@ import {QueryRunnerAlreadyReleasedError} from "../../error/QueryRunnerAlreadyRel
import {TransactionAlreadyStartedError} from "../../error/TransactionAlreadyStartedError";
import {TransactionNotStartedError} from "../../error/TransactionNotStartedError";
import {NotImplementedError} from "../../error/NotImplementedError";
-import {ColumnType, PromiseUtils} from "../../index";
+import {ColumnType} from "../../index";
import {ReadStream} from "../../platform/PlatformTools";
import {BaseQueryRunner} from "../../query-runner/BaseQueryRunner";
import {QueryRunner} from "../../query-runner/QueryRunner";
@@ -23,6 +23,7 @@ import {Query} from "../Query";
import {IsolationLevel} from "../types/IsolationLevel";
import {MssqlParameter} from "./MssqlParameter";
import {SqlServerDriver} from "./SqlServerDriver";
+import {ReplicationMode} from "../types/ReplicationMode";
/**
* Runs queries on a single SQL Server database connection.
@@ -55,7 +56,7 @@ export class SqlServerQueryRunner extends BaseQueryRunner implements QueryRunner
// Constructor
// -------------------------------------------------------------------------
- constructor(driver: SqlServerDriver, mode: "master"|"slave" = "master") {
+ constructor(driver: SqlServerDriver, mode: ReplicationMode) {
super();
this.driver = driver;
this.connection = driver.connection;
@@ -360,7 +361,7 @@ export class SqlServerQueryRunner extends BaseQueryRunner implements QueryRunner
async hasColumn(tableOrName: Table|string, columnName: string): Promise {
const parsedTableName = this.parseTableName(tableOrName);
const schema = parsedTableName.schema === "SCHEMA_NAME()" ? parsedTableName.schema : `'${parsedTableName.schema}'`;
- const sql = `SELECT * FROM "${parsedTableName.database}"."INFORMATION_SCHEMA"."TABLES" WHERE "TABLE_NAME" = '${parsedTableName.name}' AND "COLUMN_NAME" = '${columnName}' AND "TABLE_SCHEMA" = ${schema}`;
+ const sql = `SELECT * FROM "${parsedTableName.database}"."INFORMATION_SCHEMA"."COLUMNS" WHERE "TABLE_NAME" = '${parsedTableName.name}' AND "COLUMN_NAME" = '${columnName}' AND "TABLE_SCHEMA" = ${schema}`;
const result = await this.query(sql);
return result.length ? true : false;
}
@@ -710,7 +711,9 @@ export class SqlServerQueryRunner extends BaseQueryRunner implements QueryRunner
* Creates a new columns from the column in the table.
*/
async addColumns(tableOrName: Table|string, columns: TableColumn[]): Promise {
- await PromiseUtils.runInSequence(columns, column => this.addColumn(tableOrName, column));
+ for (const column of columns) {
+ await this.addColumn(tableOrName, column);
+ }
}
/**
@@ -977,7 +980,9 @@ export class SqlServerQueryRunner extends BaseQueryRunner implements QueryRunner
* Changes a column in the table.
*/
async changeColumns(tableOrName: Table|string, changedColumns: { newColumn: TableColumn, oldColumn: TableColumn }[]): Promise {
- await PromiseUtils.runInSequence(changedColumns, changedColumn => this.changeColumn(tableOrName, changedColumn.oldColumn, changedColumn.newColumn));
+ for (const {oldColumn, newColumn} of changedColumns) {
+ await this.changeColumn(tableOrName, oldColumn, newColumn);
+ }
}
/**
@@ -1057,7 +1062,9 @@ export class SqlServerQueryRunner extends BaseQueryRunner implements QueryRunner
* Drops the columns in the table.
*/
async dropColumns(tableOrName: Table|string, columns: TableColumn[]): Promise {
- await PromiseUtils.runInSequence(columns, column => this.dropColumn(tableOrName, column));
+ for (const column of columns) {
+ await this.dropColumn(tableOrName, column);
+ }
}
/**
diff --git a/src/driver/types/ColumnTypes.ts b/src/driver/types/ColumnTypes.ts
index 3569bedda3..44c3ab2b85 100644
--- a/src/driver/types/ColumnTypes.ts
+++ b/src/driver/types/ColumnTypes.ts
@@ -193,7 +193,8 @@ export type SimpleColumnType =
|"uniqueidentifier" // mssql
|"rowversion" // mssql
|"array" // cockroachdb, sap
- |"cube"; // postgres
+ |"cube" // postgres
+ |"ltree"; // postgres
/**
* Any column type column can be.
diff --git a/src/driver/types/DatabaseType.ts b/src/driver/types/DatabaseType.ts
index 68a3045013..5ceaece0cc 100644
--- a/src/driver/types/DatabaseType.ts
+++ b/src/driver/types/DatabaseType.ts
@@ -16,4 +16,6 @@ export type DatabaseType =
"mssql"|
"mongodb"|
"aurora-data-api"|
- "expo";
+ "aurora-data-api-pg"|
+ "expo"|
+ "better-sqlite3";
diff --git a/src/driver/types/ReplicationMode.ts b/src/driver/types/ReplicationMode.ts
new file mode 100644
index 0000000000..53aca0d997
--- /dev/null
+++ b/src/driver/types/ReplicationMode.ts
@@ -0,0 +1 @@
+export type ReplicationMode = "master" | "slave";
diff --git a/src/entity-manager/EntityManager.ts b/src/entity-manager/EntityManager.ts
index 5ad6f03283..9df6eae40e 100644
--- a/src/entity-manager/EntityManager.ts
+++ b/src/entity-manager/EntityManager.ts
@@ -1,23 +1,22 @@
+import {Connection} from "../connection/Connection";
+import {EntityTarget} from "../common/EntityTarget";
+import {ObjectType} from "../common/ObjectType";
+import {DeepPartial} from "../common/DeepPartial";
+import {RemoveOptions} from "../repository/RemoveOptions";
+import {SaveOptions} from "../repository/SaveOptions";
+import {MongoRepository} from "../repository/MongoRepository";
+import {TreeRepository} from "../repository/TreeRepository";
+import {Repository} from "../repository/Repository";
+import {QueryRunner} from "../query-runner/QueryRunner";
+import {SelectQueryBuilder} from "../query-builder/SelectQueryBuilder";
+import {QueryDeepPartialEntity} from "../query-builder/QueryPartialEntity";
+import {ObjectID} from "../driver/mongodb/typings";
+import {InsertResult} from "../query-builder/result/InsertResult";
+import {UpdateResult} from "../query-builder/result/UpdateResult";
+import {DeleteResult} from "../query-builder/result/DeleteResult";
+import {IsolationLevel} from "../driver/types/IsolationLevel";
+import {FindExtraOptions, FindOptions, FindOptionsWhere} from "../find-options/FindOptions";
import * as Observable from "zen-observable";
-import { DeepPartial } from "../common/DeepPartial";
-import { EntityTarget } from "../common/EntityTarget";
-import { ObjectType } from "../common/ObjectType";
-import { Connection } from "../connection/Connection";
-import { ObjectID } from "../driver/mongodb/typings";
-import { IsolationLevel } from "../driver/types/IsolationLevel";
-import { FindExtraOptions, FindOptions, FindOptionsWhere } from "../find-options/FindOptions";
-import { QueryDeepPartialEntity } from "../query-builder/QueryPartialEntity";
-import { DeleteResult } from "../query-builder/result/DeleteResult";
-import { InsertResult } from "../query-builder/result/InsertResult";
-import { UpdateResult } from "../query-builder/result/UpdateResult";
-import { SelectQueryBuilder } from "../query-builder/SelectQueryBuilder";
-import { QueryRunner } from "../query-runner/QueryRunner";
-import { MongoRepository } from "../repository/MongoRepository";
-import { RemoveOptions } from "../repository/RemoveOptions";
-import { Repository } from "../repository/Repository";
-import { SaveOptions } from "../repository/SaveOptions";
-import { TreeRepository } from "../repository/TreeRepository";
-import { EntitySchema } from "..";
/**
* Entity manager supposed to work with any entity, automatically find its repository and call its methods,
@@ -90,7 +89,7 @@ export type EntityManager = {
/**
* Gets entity mixed id.
*/
- getId(target: Function|string, entity: any): any;
+ getId(target: EntityTarget, entity: any): any;
/**
* Creates a new entity instance and copies all entity properties from this object into a new entity.
@@ -110,7 +109,7 @@ export type EntityManager = {
merge(entityClass: EntityTarget, mergeIntoEntity: Entity, ...entityLikes: DeepPartial[]): Entity;
/**
- * Creates a new entity from the given plan javascript object. If entity already exist in the database, then
+ * Creates a new entity from the given plain javascript object. If entity already exist in the database, then
* it loads it (and everything related to it), replaces all values with the new ones from the given object
* and returns this new entity. This new entity is actually a loaded from the db entity with all properties
* replaced from the new object.
@@ -174,22 +173,12 @@ export type EntityManager = {
/**
* Records the delete date of all given entities.
*/
- softRemove>(targetOrEntity: ObjectType|EntitySchema, entities: T[], options?: SaveOptions): Promise;
+ softRemove>(targetOrEntity: EntityTarget, entities: T[], options?: SaveOptions): Promise;
/**
* Records the delete date of a given entity.
*/
- softRemove>(targetOrEntity: ObjectType|EntitySchema, entity: T, options?: SaveOptions): Promise;
-
- /**
- * Records the delete date of all given entities.
- */
- softRemove(targetOrEntity: string, entities: T[], options?: SaveOptions): Promise;
-
- /**
- * Records the delete date of a given entity.
- */
- softRemove(targetOrEntity: string, entity: T, options?: SaveOptions): Promise;
+ softRemove>(targetOrEntity: EntityTarget, entity: T, options?: SaveOptions): Promise;
/**
* Recovers all given entities.
@@ -204,22 +193,12 @@ export type EntityManager = {
/**
* Recovers all given entities.
*/
- recover>(targetOrEntity: ObjectType|EntitySchema, entities: T[], options?: SaveOptions): Promise;
-
- /**
- * Recovers a given entity.
- */
- recover>(targetOrEntity: ObjectType|EntitySchema, entity: T, options?: SaveOptions): Promise;
-
- /**
- * Recovers all given entities.
- */
- recover(targetOrEntity: string, entities: T[], options?: SaveOptions): Promise;
+ recover>(targetOrEntity: EntityTarget, entities: T[], options?: SaveOptions): Promise;
/**
* Recovers a given entity.
*/
- recover(targetOrEntity: string, entity: T, options?: SaveOptions): Promise;
+ recover>(targetOrEntity: EntityTarget, entity: T, options?: SaveOptions): Promise;
/**
* Inserts a given entity into the database.
@@ -255,7 +234,7 @@ export type EntityManager = {
* Does not check if entity exist in the database.
* Condition(s) cannot be empty.
*/
- softDelete(targetOrEntity: ObjectType | EntitySchema | string, criteria: string | string[] | number | number[] | Date | Date[] | ObjectID | ObjectID[] | any): Promise;
+ softDelete(targetOrEntity: EntityTarget, criteria: string | string[] | number | number[] | Date | Date[] | ObjectID | ObjectID[] | any): Promise;
/**
* Restores entities by a given condition(s).
@@ -264,7 +243,7 @@ export type EntityManager = {
* Does not check if entity exist in the database.
* Condition(s) cannot be empty.
*/
- restore(targetOrEntity: ObjectType | EntitySchema | string, criteria: string | string[] | number | number[] | Date | Date[] | ObjectID | ObjectID[] | any): Promise;
+ restore(targetOrEntity: EntityTarget, criteria: string | string[] | number | number[] | Date | Date[] | ObjectID | ObjectID[] | any): Promise;
/**
* Counts entities that match given find options or conditions.
diff --git a/src/entity-manager/EntityManagerFactory.ts b/src/entity-manager/EntityManagerFactory.ts
index 110ad18965..c699a57006 100644
--- a/src/entity-manager/EntityManagerFactory.ts
+++ b/src/entity-manager/EntityManagerFactory.ts
@@ -1,11 +1,11 @@
-import { Connection } from "../connection/Connection";
-import { MongoDriver } from "../driver/mongodb/MongoDriver";
-import { SqljsDriver } from "../driver/sqljs/SqljsDriver";
-import { QueryRunner } from "../query-runner/QueryRunner";
-import { EntityManager } from "./EntityManager";
-import { createLiteralEntityManager } from "./LiteralEntityManager";
-import { createLiteralMongoEntityManager } from "./LiteralMongoEntityManager";
-import { createLiteralSqljsEntityManager } from "./LiteralSqljsEntityManager";
+import {Connection} from "../connection/Connection";
+import {EntityManager} from "./EntityManager";
+import {MongoDriver} from "../driver/mongodb/MongoDriver";
+import {SqljsDriver} from "../driver/sqljs/SqljsDriver";
+import {QueryRunner} from "../query-runner/QueryRunner";
+import {createLiteralEntityManager} from "./LiteralEntityManager";
+import {createLiteralMongoEntityManager} from "./LiteralMongoEntityManager";
+import {createLiteralSqljsEntityManager} from "./LiteralSqljsEntityManager";
/**
* Helps to create entity managers.
diff --git a/src/entity-manager/LiteralEntityManager.ts b/src/entity-manager/LiteralEntityManager.ts
index 9671c193ae..0817aa47e2 100644
--- a/src/entity-manager/LiteralEntityManager.ts
+++ b/src/entity-manager/LiteralEntityManager.ts
@@ -42,7 +42,7 @@ import {createLiteralRepository} from "../repository/LiteralRepository";
* Entity manager supposed to work with any entity, automatically find its repository and call its methods,
* whatever entity type are you passing.
*/
-export function createLiteralEntityManager({ connection, queryRunner }: {
+export function createLiteralEntityManager({ connection, queryRunner }: {
connection: Connection,
queryRunner?: QueryRunner,
}): EntityManager {
@@ -90,7 +90,7 @@ export function createLiteralEntityManager({ connection, queryRunner }:
// if query runner is already defined in this class, it means this entity manager was already created for a single connection
// if its not defined we create a new query runner - single connection where we'll execute all our operations
- const queryRunner = this.queryRunner || this.connection.createQueryRunner("master");
+ const queryRunner = this.queryRunner || this.connection.createQueryRunner();
try {
if (isolation) {
@@ -534,10 +534,13 @@ export function createLiteralEntityManager({ connection, queryRunner }:
return qb.getOne();
},
- async findOneOrFail(entityClass: EntityTarget, idOrOptionsOrConditions?: string | string[] | number | number[] | Date | Date[] | ObjectID | ObjectID[] | FindOptions | any, maybeOptions?: FindOptions): Promise {
- return this.findOne(entityClass as any, idOrOptionsOrConditions as any, maybeOptions).then((value: any) => {
+ async findOneOrFail(
+ entityClass: EntityTarget,
+ ...args: (string | string[] | number | number[] | Date | Date[] | ObjectID | ObjectID[] | FindOptions | any)[]
+ ): Promise {
+ return this.findOne(entityClass as any, ...args).then((value: any) => {
if (value === undefined) {
- return Promise.reject(new EntityNotFoundError(entityClass, idOrOptionsOrConditions));
+ return Promise.reject(new EntityNotFoundError(entityClass, args.length > 0 ? args[0]: undefined));
}
return Promise.resolve(value);
});
@@ -565,7 +568,7 @@ export function createLiteralEntityManager({ connection, queryRunner }:
async clear(entityClass: EntityTarget): Promise {
const metadata = this.connection.getMetadata(entityClass);
- const queryRunner = this.queryRunner || this.connection.createQueryRunner("master");
+ const queryRunner = this.queryRunner || this.connection.createQueryRunner();
try {
return await queryRunner.clearTable(metadata.tablePath); // await is needed here because we are using finally
diff --git a/src/entity-manager/LiteralMongoEntityManager.ts b/src/entity-manager/LiteralMongoEntityManager.ts
index ff33c87a4e..ec6ff09b13 100644
--- a/src/entity-manager/LiteralMongoEntityManager.ts
+++ b/src/entity-manager/LiteralMongoEntityManager.ts
@@ -57,7 +57,7 @@ import { createLiteralEntityManager } from "./LiteralEntityManager";
*
* This implementation is used for MongoDB driver which has some specifics in its EntityManager.
*/
-export function createLiteralMongoEntityManager({ connection }: {
+export function createLiteralMongoEntityManager({ connection }: {
connection: Connection,
}): MongoEntityManager {
diff --git a/src/entity-manager/LiteralSqljsEntityManager.ts b/src/entity-manager/LiteralSqljsEntityManager.ts
index bfa54590cd..54a63406ff 100644
--- a/src/entity-manager/LiteralSqljsEntityManager.ts
+++ b/src/entity-manager/LiteralSqljsEntityManager.ts
@@ -8,7 +8,7 @@ import { SqljsEntityManager } from "./SqljsEntityManager";
* A special EntityManager that includes import/export and load/save function
* that are unique to Sql.js.
*/
-export function createLiteralSqljsEntityManager({ connection, queryRunner }: {
+export function createLiteralSqljsEntityManager({ connection, queryRunner }: {
connection: Connection,
queryRunner?: QueryRunner,
}): SqljsEntityManager {
diff --git a/src/entity-manager/MongoEntityManager.ts b/src/entity-manager/MongoEntityManager.ts
index af233f5caa..537d005ff9 100644
--- a/src/entity-manager/MongoEntityManager.ts
+++ b/src/entity-manager/MongoEntityManager.ts
@@ -1,5 +1,5 @@
-import { ObjectLiteral } from "../common/ObjectLiteral";
-import { MongoQueryRunner } from "../driver/mongodb/MongoQueryRunner";
+import { EntityManager } from "./EntityManager";
+import { EntityTarget } from "../common/EntityTarget";
import {
AggregationCursor,
BulkWriteOpResultObject,
@@ -34,12 +34,13 @@ import {
UpdateWriteOpResult
} from "../driver/mongodb/typings";
import { FindOptions, FindOptionsWhere } from "../find-options/FindOptions";
-import { EntityTarget, FindExtraOptions } from "../index";
+import { FindExtraOptions } from "../index";
+import { ObjectLiteral } from "../common/ObjectLiteral";
+import { MongoQueryRunner } from "../driver/mongodb/MongoQueryRunner";
import { QueryDeepPartialEntity } from "../query-builder/QueryPartialEntity";
-import { DeleteResult } from "../query-builder/result/DeleteResult";
import { InsertResult } from "../query-builder/result/InsertResult";
import { UpdateResult } from "../query-builder/result/UpdateResult";
-import { EntityManager } from "./EntityManager";
+import { DeleteResult } from "../query-builder/result/DeleteResult";
/**
* Entity manager supposed to work with any entity, automatically find its repository and call its methods,
diff --git a/src/entity-manager/SqljsEntityManager.ts b/src/entity-manager/SqljsEntityManager.ts
index 7ce3467f23..eae7359d61 100644
--- a/src/entity-manager/SqljsEntityManager.ts
+++ b/src/entity-manager/SqljsEntityManager.ts
@@ -1,4 +1,4 @@
-import { EntityManager } from "./EntityManager";
+import {EntityManager} from "./EntityManager";
/**
* A special EntityManager that includes import/export and load/save function
diff --git a/src/entity-schema/EntitySchemaRelationOptions.ts b/src/entity-schema/EntitySchemaRelationOptions.ts
index 953caaccd6..0502fc67e6 100644
--- a/src/entity-schema/EntitySchemaRelationOptions.ts
+++ b/src/entity-schema/EntitySchemaRelationOptions.ts
@@ -55,7 +55,7 @@ export interface EntitySchemaRelationOptions {
/**
* Join column options of this column. If set to true then it simply means that it has a join column.
*/
- joinColumn?: boolean|JoinColumnOptions;
+ joinColumn?: boolean|JoinColumnOptions|JoinColumnOptions[];
/**
* Indicates if this is a parent (can be only many-to-one relation) relation in the tree tables.
diff --git a/src/entity-schema/EntitySchemaTransformer.ts b/src/entity-schema/EntitySchemaTransformer.ts
index 3ec3667e5a..64c2de8e33 100644
--- a/src/entity-schema/EntitySchemaTransformer.ts
+++ b/src/entity-schema/EntitySchemaTransformer.ts
@@ -202,13 +202,17 @@ export class EntitySchemaTransformer {
};
metadataArgsStorage.joinColumns.push(joinColumn);
} else {
- const joinColumn: JoinColumnMetadataArgs = {
- target: options.target || optionsName,
- propertyName: relationName,
- name: relationSchema.joinColumn.name,
- referencedColumnName: relationSchema.joinColumn.referencedColumnName
- };
- metadataArgsStorage.joinColumns.push(joinColumn);
+ const joinColumnsOptions = Array.isArray(relationSchema.joinColumn) ? relationSchema.joinColumn : [relationSchema.joinColumn];
+
+ for (const joinColumnOption of joinColumnsOptions) {
+ const joinColumn: JoinColumnMetadataArgs = {
+ target: options.target || optionsName,
+ propertyName: relationName,
+ name: joinColumnOption.name,
+ referencedColumnName: joinColumnOption.referencedColumnName
+ };
+ metadataArgsStorage.joinColumns.push(joinColumn);
+ }
}
}
diff --git a/src/error/EntityMetadataNotFoundError.ts b/src/error/EntityMetadataNotFoundError.ts
index a26d9bd613..26e6fa98f6 100644
--- a/src/error/EntityMetadataNotFoundError.ts
+++ b/src/error/EntityMetadataNotFoundError.ts
@@ -1,4 +1,5 @@
-import {EntitySchema, EntityTarget} from "../index";
+import {EntityTarget} from "../common/EntityTarget";
+import {EntitySchema} from "../index";
/**
*/
@@ -13,7 +14,7 @@ export class EntityMetadataNotFoundError extends Error {
targetName = target.options.name || "";
} else if (typeof target === "function") {
targetName = target.name;
- } else if (typeof target === "object") {
+ } else if (typeof target === "object" && "name" in target) {
targetName = target.name;
} else {
targetName = target;
diff --git a/src/error/EntityNotFoundError.ts b/src/error/EntityNotFoundError.ts
index 56d44f9764..593fceb065 100644
--- a/src/error/EntityNotFoundError.ts
+++ b/src/error/EntityNotFoundError.ts
@@ -1,4 +1,5 @@
-import {EntitySchema, EntityTarget} from "../index";
+import {EntityTarget} from "../common/EntityTarget";
+import {EntitySchema} from "../index";
/**
* Thrown when no result could be found in methods which are not allowed to return undefined or an empty set.
@@ -14,7 +15,7 @@ export class EntityNotFoundError extends Error {
targetName = (entityClass as EntitySchema).options.name || "";
} else if (typeof entityClass === "function") {
targetName = entityClass.name;
- } else if (typeof entityClass === "object") {
+ } else if (typeof entityClass === "object" && "name" in entityClass) {
targetName = entityClass.name;
} else {
targetName = entityClass;
diff --git a/src/error/FindCriteriaNotFoundError.ts b/src/error/FindCriteriaNotFoundError.ts
index 1b0f5032c8..e3c535cd74 100644
--- a/src/error/FindCriteriaNotFoundError.ts
+++ b/src/error/FindCriteriaNotFoundError.ts
@@ -1,14 +1,15 @@
import {EntityMetadata} from "..";
+import {EntityColumnNotFound} from "./EntityColumnNotFound";
/**
* Thrown when specified entity property in the find options were not found.
*/
-export class FindCriteriaNotFoundError extends Error {
+export class FindCriteriaNotFoundError extends EntityColumnNotFound {
constructor(propertyPath: string, metadata: EntityMetadata) {
- super();
+ super(propertyPath);
Object.setPrototypeOf(this, FindCriteriaNotFoundError.prototype);
this.message = `Property "${propertyPath}" was not found in ${metadata.targetName}. Make sure your query is correct.`;
}
-}
\ No newline at end of file
+}
diff --git a/src/error/MissingDriverError.ts b/src/error/MissingDriverError.ts
index 01abd5492c..5d2518fb55 100644
--- a/src/error/MissingDriverError.ts
+++ b/src/error/MissingDriverError.ts
@@ -7,7 +7,7 @@ export class MissingDriverError extends Error {
constructor(driverType: string) {
super();
Object.setPrototypeOf(this, MissingDriverError.prototype);
- this.message = `Wrong driver: "${driverType}" given. Supported drivers are: "cordova", "expo", "mariadb", "mongodb", "mssql", "mysql", "oracle", "postgres", "sqlite", "sqljs", "react-native".`;
+ this.message = `Wrong driver: "${driverType}" given. Supported drivers are: "cordova", "expo", "mariadb", "mongodb", "mssql", "mysql", "oracle", "postgres", "sqlite", "better-sqlite3", "sqljs", "react-native", "aurora-data-api", "aurora-data-api-pg".`;
}
-}
\ No newline at end of file
+}
diff --git a/src/error/RepositoryNotFoundError.ts b/src/error/RepositoryNotFoundError.ts
index 6171628f3d..488b323124 100644
--- a/src/error/RepositoryNotFoundError.ts
+++ b/src/error/RepositoryNotFoundError.ts
@@ -1,3 +1,4 @@
+import {EntityTarget} from "../common/EntityTarget";
import {EntitySchema} from "../index";
/**
@@ -6,7 +7,7 @@ import {EntitySchema} from "../index";
export class RepositoryNotFoundError extends Error {
name = "RepositoryNotFoundError";
- constructor(connectionName: string, entityClass: Function|EntitySchema|string) {
+ constructor(connectionName: string, entityClass: EntityTarget) {
super();
Object.setPrototypeOf(this, RepositoryNotFoundError.prototype);
let targetName: string;
@@ -14,6 +15,8 @@ export class RepositoryNotFoundError extends Error {
targetName = (entityClass as EntitySchema).options.name || "";
} else if (typeof entityClass === "function") {
targetName = entityClass.name;
+ } else if (typeof entityClass === "object" && "name" in entityClass) {
+ targetName = entityClass.name;
} else {
targetName = entityClass;
}
diff --git a/src/error/RepositoryNotTreeError.ts b/src/error/RepositoryNotTreeError.ts
index fc4ae16da4..ecf82058ba 100644
--- a/src/error/RepositoryNotTreeError.ts
+++ b/src/error/RepositoryNotTreeError.ts
@@ -1,3 +1,4 @@
+import {EntityTarget} from "../common/EntityTarget";
import {EntitySchema} from "../index";
/**
@@ -6,16 +7,18 @@ import {EntitySchema} from "../index";
export class RepositoryNotTreeError extends Error {
name = "RepositoryNotTreeError";
- constructor(target: Function|EntitySchema|string) {
+ constructor(entityClass: EntityTarget) {
super();
Object.setPrototypeOf(this, RepositoryNotTreeError.prototype);
let targetName: string;
- if (target instanceof EntitySchema) {
- targetName = target.options.name || "";
- } else if (typeof target === "function") {
- targetName = target.name;
+ if (entityClass instanceof EntitySchema) {
+ targetName = entityClass.options.name || "";
+ } else if (typeof entityClass === "function") {
+ targetName = entityClass.name;
+ } else if (typeof entityClass === "object" && "name" in entityClass) {
+ targetName = entityClass.name;
} else {
- targetName = target;
+ targetName = entityClass;
}
this.message = `Repository of the "${targetName}" class is not a TreeRepository. Try to apply @Tree decorator on your entity.`;
}
diff --git a/src/find-options/FindOperator.ts b/src/find-options/FindOperator.ts
index b3b772b311..05e68a4dd7 100644
--- a/src/find-options/FindOperator.ts
+++ b/src/find-options/FindOperator.ts
@@ -1,5 +1,7 @@
import {FindOperatorType} from "./FindOperatorType";
import {Connection} from "../";
+import {OracleDriver} from "../driver/oracle/OracleDriver";
+import {MysqlDriver} from "../driver/mysql/MysqlDriver";
/**
* Find Operator used in Find Conditions.
@@ -38,14 +40,11 @@ export class FindOperator {
// Constructor
// -------------------------------------------------------------------------
- constructor(type: FindOperatorType,
- value: T|FindOperator,
- useParameter: boolean = true,
- multipleParameters: boolean = false) {
+ constructor(type: FindOperatorType, value: T|FindOperator, useParameter: boolean = true, multipleParameters: boolean = false) {
this.type = type;
+ this._value = value;
this._useParameter = useParameter;
this._multipleParameters = multipleParameters;
- this._value = value;
// if (condition !== undefined) {
// this.condition = condition;
// this._useParameter = condition === true ? true : false;
@@ -120,6 +119,9 @@ export class FindOperator {
case "between":
return `${aliasPath} BETWEEN ${parameters[0]} AND ${parameters[1]}`;
case "in":
+ if ((connection.driver instanceof OracleDriver || connection.driver instanceof MysqlDriver) && parameters.length === 0) {
+ return `${aliasPath} IN (null)`;
+ }
return `${aliasPath} IN (${parameters.join(", ")})`;
case "any":
return `${aliasPath} = ANY(${parameters[0]})`;
@@ -136,4 +138,4 @@ export class FindOperator {
return "";
}
-}
\ No newline at end of file
+}
diff --git a/src/find-options/FindOperatorType.ts b/src/find-options/FindOperatorType.ts
index a8c00ecd9b..fabccdff9a 100644
--- a/src/find-options/FindOperatorType.ts
+++ b/src/find-options/FindOperatorType.ts
@@ -1,8 +1,7 @@
/**
* List of types that FindOperator can be.
*/
-export type FindOperatorType =
- | "not"
+export type FindOperatorType = "not"
| "lessThan"
| "lessThanOrEqual"
| "moreThan"
@@ -14,6 +13,6 @@ export type FindOperatorType =
| "isNull"
| "like"
| "ilike"
- | "raw"
| "if"
- | "switch";
+ | "switch"
+ | "raw";
diff --git a/src/find-options/FindOptionsUtils.ts b/src/find-options/FindOptionsUtils.ts
index 942c2a2f11..66827ca57f 100644
--- a/src/find-options/FindOptionsUtils.ts
+++ b/src/find-options/FindOptionsUtils.ts
@@ -88,30 +88,33 @@ export function normalizeFindOptions(options: FindOptions): FindOptions
const recursivelyWhere = (where: T): T => {
- if ((where as any) instanceof Array)
- return where.map((where: any) => recursivelyWhere(where));
+ if (Array.isArray(where)) {
+ return where.map((where: any) => recursivelyWhere(where)) as T;
+ }
+
+ return Object.keys(where as { [key: string ]: any }).reduce((newWhere, key) => {
+ const value = (where as { [key: string]: any })[key];
- return Object.keys(where).reduce((newWhere, key) => {
- if (where[key] instanceof Object && !(where[key] instanceof FindOperator)) {
- newWhere[key] = recursively$FindOption(where[key]);
+ if (value instanceof Object && !(value instanceof FindOperator)) {
+ newWhere[key] = recursively$FindOption(value);
// in the case if $find operator was not found we'll have a false as a value
// we need to recursive where because it can be another where options
if (newWhere[key] === false)
- newWhere[key] = recursivelyWhere(where[key]);
+ newWhere[key] = recursivelyWhere(value);
} else {
- newWhere[key] = where[key];
+ newWhere[key] = value;
}
return newWhere;
- }, {} as T);
+ }, {} as { [key: string]: any }) as T;
};
// todo: broken after merge
// if (options.lock) {
// if (options.lock.mode === "optimistic") {
// qb.setLock(options.lock.mode, options.lock.version as any);
- // } else if (options.lock.mode === "pessimistic_read" || options.lock.mode === "pessimistic_write") {
+ // } else if (options.lock.mode === "pessimistic_read" || options.lock.mode === "pessimistic_write" || options.lock.mode === "dirty_read" || options.lock.mode === "pessimistic_partial_write" || options.lock.mode === "pessimistic_write_or_fail") {
// qb.setLock(options.lock.mode);
// }
// }
diff --git a/src/find-options/operator/Raw.ts b/src/find-options/operator/Raw.ts
index 41fddb7620..ff8d4fd811 100644
--- a/src/find-options/operator/Raw.ts
+++ b/src/find-options/operator/Raw.ts
@@ -6,4 +6,4 @@ import {FindOperator} from "../FindOperator";
*/
export function Raw(value: string|((columnAlias?: string) => string)): FindOperator {
return new FindOperator("raw", value as any, false);
-}
\ No newline at end of file
+}
diff --git a/src/index.ts b/src/index.ts
index 9e22d5b61f..342d8ac5f9 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -14,7 +14,6 @@ import {PlatformTools} from "./platform/PlatformTools";
import {TreeRepository} from "./repository/TreeRepository";
import {MongoRepository} from "./repository/MongoRepository";
import {ConnectionOptionsReader} from "./connection/ConnectionOptionsReader";
-import {PromiseUtils} from "./util/PromiseUtils";
import {MongoEntityManager} from "./entity-manager/MongoEntityManager";
import {SqljsEntityManager} from "./entity-manager/SqljsEntityManager";
import {SelectQueryBuilder} from "./query-builder/SelectQueryBuilder";
@@ -25,8 +24,8 @@ import {EntityTarget} from "./common/EntityTarget";
// -------------------------------------------------------------------------
export * from "./container";
-export * from "./common/ObjectType";
export * from "./common/EntityTarget";
+export * from "./common/ObjectType";
export * from "./common/ObjectLiteral";
export * from "./common/DeepPartial";
export * from "./error/QueryFailedError";
@@ -117,6 +116,7 @@ export * from "./schema-builder/table/TableUnique";
export * from "./schema-builder/table/Table";
export * from "./driver/mongodb/typings";
export * from "./driver/types/DatabaseType";
+export * from "./driver/types/ReplicationMode";
export * from "./driver/sqlserver/MssqlParameter";
export * from "./typed-entity-schema";
@@ -139,7 +139,6 @@ export {DeleteResult} from "./query-builder/result/DeleteResult";
export {QueryPartialEntity} from "./query-builder/QueryPartialEntity";
export {QueryDeepPartialEntity} from "./query-builder/QueryPartialEntity";
export {QueryRunner} from "./query-runner/QueryRunner";
-export {EntityManager} from "./entity-manager/EntityManager";
export {MongoEntityManager} from "./entity-manager/MongoEntityManager";
export {Migration} from "./migration/Migration";
export {MigrationExecutor} from "./migration/MigrationExecutor";
@@ -153,16 +152,15 @@ export {TreeRepository} from "./repository/TreeRepository";
export {MongoRepository} from "./repository/MongoRepository";
export * from "./find-options/FindOptions";
export {InsertEvent} from "./subscriber/event/InsertEvent";
+export {LoadEvent} from "./subscriber/event/LoadEvent";
export {UpdateEvent} from "./subscriber/event/UpdateEvent";
export {RemoveEvent} from "./subscriber/event/RemoveEvent";
export {EntitySubscriberInterface} from "./subscriber/EntitySubscriberInterface";
-export {BaseEntity} from "./repository/BaseEntity";
export {EntitySchema} from "./entity-schema/EntitySchema";
export {EntitySchemaColumnOptions} from "./entity-schema/EntitySchemaColumnOptions";
export {EntitySchemaIndexOptions} from "./entity-schema/EntitySchemaIndexOptions";
export {EntitySchemaRelationOptions} from "./entity-schema/EntitySchemaRelationOptions";
export {ColumnType} from "./driver/types/ColumnTypes";
-export {PromiseUtils} from "./util/PromiseUtils";
// -------------------------------------------------------------------------
// Deprecated
@@ -245,7 +243,7 @@ export async function createConnections(options?: ConnectionOptions[]): Promise<
if (!options)
options = await new ConnectionOptionsReader().all();
const connections = options.map(options => getConnectionManager().create(options));
- return PromiseUtils.runInSequence(connections, connection => connection.connect());
+ return Promise.all(connections.map(connection => connection.connect()));
}
/**
diff --git a/src/logger/DebugLogger.ts b/src/logger/DebugLogger.ts
index 8943a4523b..36e901187a 100644
--- a/src/logger/DebugLogger.ts
+++ b/src/logger/DebugLogger.ts
@@ -1,3 +1,4 @@
+import debug from "debug";
import {Logger} from "./Logger";
import {QueryRunner} from "../";
import {PlatformTools} from "../platform/PlatformTools";
@@ -6,18 +7,16 @@ import {PlatformTools} from "../platform/PlatformTools";
* Performs logging of the events in TypeORM via debug library.
*/
export class DebugLogger implements Logger {
- private debug = PlatformTools.load("debug");
+ private debugQueryLog = debug("typeorm:query:log");
+ private debugQueryError = debug("typeorm:query:error");
+ private debugQuerySlow = debug("typeorm:query:slow");
+ private debugSchemaBuild = debug("typeorm:schema");
+ private debugMigration = debug("typeorm:migration");
+
+ private debugLog = debug("typeorm:log");
+ private debugInfo = debug("typeorm:info");
+ private debugWarn = debug("typeorm:warn");
- private debugQueryLog = this.debug("typeorm:query:log");
- private debugQueryError = this.debug("typeorm:query:error");
- private debugQuerySlow = this.debug("typeorm:query:slow");
- private debugSchemaBuild = this.debug("typeorm:schema");
- private debugMigration = this.debug("typeorm:migration");
-
- private debugLog = this.debug("typeorm:log");
- private debugInfo = this.debug("typeorm:info");
- private debugWarn = this.debug("typeorm:warn");
-
/**
* Logs query and parameters used in it.
*/
@@ -29,7 +28,7 @@ export class DebugLogger implements Logger {
}
}
}
-
+
/**
* Logs query that failed.
*/
@@ -42,7 +41,7 @@ export class DebugLogger implements Logger {
this.debugQueryError("error: ", error);
}
}
-
+
/**
* Logs query that is slow.
*/
@@ -55,7 +54,7 @@ export class DebugLogger implements Logger {
this.debugQuerySlow("execution time:", time);
}
}
-
+
/**
* Logs events from the schema build process.
*/
@@ -64,7 +63,7 @@ export class DebugLogger implements Logger {
this.debugSchemaBuild(message);
}
}
-
+
/**
* Logs events from the migration run process.
*/
@@ -73,7 +72,7 @@ export class DebugLogger implements Logger {
this.debugMigration(message);
}
}
-
+
/**
* Perform logging using given logger.
* Log has its own level and message.
diff --git a/src/logger/FileLogger.ts b/src/logger/FileLogger.ts
index 3bdccda7bd..e96d142ad2 100644
--- a/src/logger/FileLogger.ts
+++ b/src/logger/FileLogger.ts
@@ -1,4 +1,5 @@
-import {LoggerOptions} from "./LoggerOptions";
+import {LoggerOptions, FileLoggerOptions} from "./LoggerOptions";
+import appRootPath from "app-root-path";
import {QueryRunner} from "../query-runner/QueryRunner";
import {Logger} from "./Logger";
import {PlatformTools} from "../platform/PlatformTools";
@@ -13,7 +14,10 @@ export class FileLogger implements Logger {
// Constructor
// -------------------------------------------------------------------------
- constructor(private options?: LoggerOptions) {
+ constructor(
+ private options?: LoggerOptions,
+ private fileLoggerOptions?: FileLoggerOptions,
+ ) {
}
// -------------------------------------------------------------------------
@@ -97,9 +101,13 @@ export class FileLogger implements Logger {
*/
protected write(strings: string|string[]) {
strings = Array.isArray(strings) ? strings : [strings];
- const basePath = PlatformTools.load("app-root-path").path;
+ const basePath = appRootPath.path + "/";
+ let logPath = "ormlogs.log";
+ if (this.fileLoggerOptions && this.fileLoggerOptions.logPath) {
+ logPath = PlatformTools.pathNormalize(this.fileLoggerOptions.logPath);
+ }
strings = (strings as string[]).map(str => "[" + new Date().toISOString() + "]" + str);
- PlatformTools.appendFileSync(basePath + "/ormlogs.log", strings.join("\r\n") + "\r\n"); // todo: use async or implement promises?
+ PlatformTools.appendFileSync(basePath + logPath, strings.join("\r\n") + "\r\n"); // todo: use async or implement promises?
}
/**
diff --git a/src/logger/LoggerOptions.ts b/src/logger/LoggerOptions.ts
index 67049d5a4f..adfff93488 100644
--- a/src/logger/LoggerOptions.ts
+++ b/src/logger/LoggerOptions.ts
@@ -2,3 +2,13 @@
* Logging options.
*/
export type LoggerOptions = boolean|"all"|("query"|"schema"|"error"|"warn"|"info"|"log"|"migration")[];
+
+/**
+ * File logging option.
+ */
+export type FileLoggerOptions = {
+ /**
+ * Specify custom path for log file, relative to application root
+ */
+ logPath: string;
+};
diff --git a/src/metadata-args/EntityRepositoryMetadataArgs.ts b/src/metadata-args/EntityRepositoryMetadataArgs.ts
index 3e7373003c..fd55676630 100644
--- a/src/metadata-args/EntityRepositoryMetadataArgs.ts
+++ b/src/metadata-args/EntityRepositoryMetadataArgs.ts
@@ -1,4 +1,4 @@
-import {EntitySchema} from "../entity-schema/EntitySchema";
+import { EntityTarget } from "../common/EntityTarget";
/**
* Arguments for EntityRepositoryMetadata class, helps to construct an EntityRepositoryMetadata object.
@@ -13,6 +13,6 @@ export interface EntityRepositoryMetadataArgs {
/**
* Entity managed by this custom repository.
*/
- readonly entity?: Function|string|EntitySchema;
+ readonly entity?: EntityTarget;
}
diff --git a/src/metadata-builder/EntityMetadataBuilder.ts b/src/metadata-builder/EntityMetadataBuilder.ts
index 34030b2d2a..bc93c5fc5e 100644
--- a/src/metadata-builder/EntityMetadataBuilder.ts
+++ b/src/metadata-builder/EntityMetadataBuilder.ts
@@ -403,6 +403,8 @@ export class EntityMetadataBuilder {
}
}
+ const { namingStrategy } = this.connection;
+
// check if tree is used then we need to add extra columns for specific tree types
if (entityMetadata.treeType === "materialized-path") {
entityMetadata.ownColumns.push(new ColumnMetadata({
@@ -414,7 +416,7 @@ export class EntityMetadataBuilder {
mode: "virtual",
propertyName: "mpath",
options: /*tree.column || */ {
- name: "mpath",
+ name: namingStrategy.materializedPathColumnName,
type: "varchar",
nullable: true,
default: ""
@@ -423,6 +425,7 @@ export class EntityMetadataBuilder {
}));
} else if (entityMetadata.treeType === "nested-set") {
+ const { left, right } = namingStrategy.nestedSetColumnNames;
entityMetadata.ownColumns.push(new ColumnMetadata({
connection: this.connection,
entityMetadata: entityMetadata,
@@ -430,9 +433,9 @@ export class EntityMetadataBuilder {
args: {
target: entityMetadata.target,
mode: "virtual",
- propertyName: "nsleft",
+ propertyName: left,
options: /*tree.column || */ {
- name: "nsleft",
+ name: left,
type: "integer",
nullable: false,
default: 1
@@ -446,9 +449,9 @@ export class EntityMetadataBuilder {
args: {
target: entityMetadata.target,
mode: "virtual",
- propertyName: "nsright",
+ propertyName: right,
options: /*tree.column || */ {
- name: "nsright",
+ name: right,
type: "integer",
nullable: false,
default: 2
diff --git a/src/metadata-builder/JunctionEntityMetadataBuilder.ts b/src/metadata-builder/JunctionEntityMetadataBuilder.ts
index 079559fcaf..9fbb1ed733 100644
--- a/src/metadata-builder/JunctionEntityMetadataBuilder.ts
+++ b/src/metadata-builder/JunctionEntityMetadataBuilder.ts
@@ -6,7 +6,7 @@ import {ForeignKeyMetadata} from "../metadata/ForeignKeyMetadata";
import {IndexMetadata} from "../metadata/IndexMetadata";
import {JoinTableMetadataArgs} from "../metadata-args/JoinTableMetadataArgs";
import {RelationMetadata} from "../metadata/RelationMetadata";
-import { AuroraDataApiDriver } from "../driver/aurora-data-api/AuroraDataApiDriver";
+import {AuroraDataApiDriver} from "../driver/aurora-data-api/AuroraDataApiDriver";
/**
* Creates EntityMetadata for junction tables.
@@ -113,6 +113,7 @@ export class JunctionEntityMetadataBuilder {
&& (inverseReferencedColumn.generationStrategy === "uuid" || inverseReferencedColumn.type === "uuid")
? "36"
: inverseReferencedColumn.length, // fix https://github.com/typeorm/typeorm/issues/3604
+ width: inverseReferencedColumn.width, // fix https://github.com/typeorm/typeorm/issues/6442
type: inverseReferencedColumn.type,
precision: inverseReferencedColumn.precision,
scale: inverseReferencedColumn.scale,
diff --git a/src/metadata/ColumnMetadata.ts b/src/metadata/ColumnMetadata.ts
index f228133c5d..048eb1d2ed 100644
--- a/src/metadata/ColumnMetadata.ts
+++ b/src/metadata/ColumnMetadata.ts
@@ -7,7 +7,6 @@ import {ColumnMetadataArgs} from "../metadata-args/ColumnMetadataArgs";
import {Connection} from "../connection/Connection";
import {ValueTransformer} from "../decorator/options/ValueTransformer";
import {MongoDriver} from "../driver/mongodb/MongoDriver";
-import {PromiseUtils} from "../util/PromiseUtils";
import {FindOperator} from "../find-options/FindOperator";
import {ApplyValueTransformers} from "../util/ApplyValueTransformers";
@@ -579,21 +578,21 @@ export class ColumnMetadata {
if (this.relationMetadata && this.referencedColumn) {
const relatedEntity = this.relationMetadata.getEntityValue(embeddedObject);
if (relatedEntity && relatedEntity instanceof Object && !(relatedEntity instanceof FindOperator)) {
- value = this.referencedColumn.getEntityValue(PromiseUtils.extractValue(relatedEntity));
+ value = this.referencedColumn.getEntityValue(relatedEntity);
} else if (embeddedObject[this.propertyName] && embeddedObject[this.propertyName] instanceof Object && !(embeddedObject[this.propertyName] instanceof FindOperator)) {
- value = this.referencedColumn.getEntityValue(PromiseUtils.extractValue(embeddedObject[this.propertyName]));
+ value = this.referencedColumn.getEntityValue(embeddedObject[this.propertyName]);
} else {
- value = PromiseUtils.extractValue(embeddedObject[this.propertyName]);
+ value = embeddedObject[this.propertyName];
}
} else if (this.referencedColumn) {
- value = this.referencedColumn.getEntityValue(PromiseUtils.extractValue(embeddedObject[this.propertyName]));
+ value = this.referencedColumn.getEntityValue(embeddedObject[this.propertyName]);
} else {
- value = PromiseUtils.extractValue(embeddedObject[this.propertyName]);
+ value = embeddedObject[this.propertyName];
}
}
@@ -601,17 +600,17 @@ export class ColumnMetadata {
if (this.relationMetadata && this.referencedColumn) {
const relatedEntity = this.relationMetadata.getEntityValue(entity);
if (relatedEntity && relatedEntity instanceof Object && !(relatedEntity instanceof FindOperator) && !(relatedEntity instanceof Function)) {
- value = this.referencedColumn.getEntityValue(PromiseUtils.extractValue(relatedEntity));
+ value = this.referencedColumn.getEntityValue(relatedEntity);
} else if (entity[this.propertyName] && entity[this.propertyName] instanceof Object && !(entity[this.propertyName] instanceof FindOperator) && !(entity[this.propertyName] instanceof Function)) {
- value = this.referencedColumn.getEntityValue(PromiseUtils.extractValue(entity[this.propertyName]));
+ value = this.referencedColumn.getEntityValue(entity[this.propertyName]);
} else {
value = entity[this.propertyName];
}
} else if (this.referencedColumn) {
- value = this.referencedColumn.getEntityValue(PromiseUtils.extractValue(entity[this.propertyName]));
+ value = this.referencedColumn.getEntityValue(entity[this.propertyName]);
} else {
value = entity[this.propertyName];
diff --git a/src/metadata/EntityMetadata.ts b/src/metadata/EntityMetadata.ts
index 044000d214..8fd085d8be 100644
--- a/src/metadata/EntityMetadata.ts
+++ b/src/metadata/EntityMetadata.ts
@@ -6,6 +6,7 @@ import {PostgresDriver} from "../driver/postgres/PostgresDriver";
import {SapDriver} from "../driver/sap/SapDriver";
import {SqlServerConnectionOptions} from "../driver/sqlserver/SqlServerConnectionOptions";
import {SqlServerDriver} from "../driver/sqlserver/SqlServerDriver";
+import {OracleDriver} from "../driver/oracle/OracleDriver";
import {CannotCreateEntityIdMapError} from "../error/CannotCreateEntityIdMapError";
import {OrderByCondition} from "../find-options/OrderByCondition";
import {TableMetadataArgs} from "../metadata-args/TableMetadataArgs";
@@ -630,7 +631,7 @@ export class EntityMetadata {
const secondEntityIdMap = this.getEntityIdMap(secondEntity);
if (!secondEntityIdMap) return false;
- return EntityMetadata.compareIds(firstEntityIdMap, secondEntityIdMap);
+ return OrmUtils.compareIds(firstEntityIdMap, secondEntityIdMap);
}
/**
@@ -720,14 +721,21 @@ export class EntityMetadata {
relations.forEach(relation => {
const value = relation.getEntityValue(entity);
if (Array.isArray(value)) {
- value.forEach(subValue => relationsAndValues.push([relation, subValue, relation.inverseEntityMetadata]));
+ value.forEach(subValue => relationsAndValues.push([relation, subValue, this.getInverseEntityMetadata(subValue, relation)]));
} else if (value) {
- relationsAndValues.push([relation, value, relation.inverseEntityMetadata]);
+ relationsAndValues.push([relation, value, this.getInverseEntityMetadata(value, relation)]);
}
});
return relationsAndValues;
}
+ private getInverseEntityMetadata(value: any, relation: RelationMetadata): EntityMetadata {
+ const childEntityMetadata = relation.inverseEntityMetadata.childEntityMetadatas.find(metadata =>
+ metadata.target === value.constructor
+ );
+ return childEntityMetadata ? childEntityMetadata : relation.inverseEntityMetadata;
+ }
+
// -------------------------------------------------------------------------
// Public Static Methods
// -------------------------------------------------------------------------
@@ -759,21 +767,10 @@ export class EntityMetadata {
*/
static difference(firstIdMaps: ObjectLiteral[], secondIdMaps: ObjectLiteral[]): ObjectLiteral[] {
return firstIdMaps.filter(firstIdMap => {
- return !secondIdMaps.find(secondIdMap => OrmUtils.deepCompare(firstIdMap, secondIdMap));
+ return !secondIdMaps.find(secondIdMap => OrmUtils.compareIds(firstIdMap, secondIdMap));
});
}
- /**
- * Compares ids of the two entities.
- * Returns true if they match, false otherwise.
- */
- static compareIds(firstId: ObjectLiteral|undefined, secondId: ObjectLiteral|undefined): boolean {
- if (firstId === undefined || firstId === null || secondId === undefined || secondId === null)
- return false;
-
- return OrmUtils.deepCompare(firstId, secondId);
- }
-
/**
* Creates value map from the given values and columns.
* Examples of usages are primary columns map and join columns map.
@@ -872,7 +869,7 @@ export class EntityMetadata {
*/
protected buildTablePath(): string {
let tablePath = this.tableName;
- if (this.schema && ((this.connection.driver instanceof PostgresDriver) || (this.connection.driver instanceof SqlServerDriver) || (this.connection.driver instanceof SapDriver))) {
+ if (this.schema && ((this.connection.driver instanceof OracleDriver) || (this.connection.driver instanceof PostgresDriver) || (this.connection.driver instanceof SqlServerDriver) || (this.connection.driver instanceof SapDriver))) {
tablePath = this.schema + "." + tablePath;
}
diff --git a/src/migration/MigrationExecutor.ts b/src/migration/MigrationExecutor.ts
index 46754ed422..3ec3875039 100644
--- a/src/migration/MigrationExecutor.ts
+++ b/src/migration/MigrationExecutor.ts
@@ -2,7 +2,6 @@ import {Table} from "../schema-builder/table/Table";
import {Connection} from "../connection/Connection";
import {Migration} from "./Migration";
import {ObjectLiteral} from "../common/ObjectLiteral";
-import {PromiseUtils} from "../util/PromiseUtils";
import {QueryRunner} from "../query-runner/QueryRunner";
import {SqlServerDriver} from "../driver/sqlserver/SqlServerDriver";
import {MssqlParameter} from "../driver/sqlserver/MssqlParameter";
@@ -90,7 +89,7 @@ export class MigrationExecutor {
const executedMigrations = await this.getExecutedMigrations();
return allMigrations.filter(migration =>
- executedMigrations.find(
+ !executedMigrations.find(
executedMigration =>
executedMigration.name === migration.name
)
@@ -129,7 +128,7 @@ export class MigrationExecutor {
*/
async showMigrations(): Promise {
let hasUnappliedMigrations = false;
- const queryRunner = this.queryRunner || this.connection.createQueryRunner("master");
+ const queryRunner = this.queryRunner || this.connection.createQueryRunner();
// create migrations table if its not created yet
await this.createMigrationsTableIfNotExist(queryRunner);
// get all migrations that are executed and saved in the database
@@ -163,7 +162,7 @@ export class MigrationExecutor {
*/
async executePendingMigrations(): Promise {
- const queryRunner = this.queryRunner || this.connection.createQueryRunner("master");
+ const queryRunner = this.queryRunner || this.connection.createQueryRunner();
// create migrations table if its not created yet
await this.createMigrationsTableIfNotExist(queryRunner);
// get all migrations that are executed and saved in the database
@@ -218,13 +217,13 @@ export class MigrationExecutor {
// run all pending migrations in a sequence
try {
- await PromiseUtils.runInSequence(pendingMigrations, async migration => {
+ for (const migration of pendingMigrations) {
if (this.transaction === "each" && !queryRunner.isTransactionActive) {
await queryRunner.startTransaction();
transactionStartedByUs = true;
}
- return migration.instance!.up(queryRunner)
+ await migration.instance!.up(queryRunner)
.then(async () => { // now when migration is executed we need to insert record about it into the database
await this.insertExecutedMigration(queryRunner, migration);
// commit transaction if we started it
@@ -235,7 +234,7 @@ export class MigrationExecutor {
successMigrations.push(migration);
this.connection.logger.logSchemaBuild(`Migration ${migration.name} has been executed successfully.`);
});
- });
+ }
// commit transaction if we started it
if (this.transaction === "all" && transactionStartedByUs)
@@ -265,7 +264,7 @@ export class MigrationExecutor {
*/
async undoLastMigration(): Promise {
- const queryRunner = this.queryRunner || this.connection.createQueryRunner("master");
+ const queryRunner = this.queryRunner || this.connection.createQueryRunner();
// create migrations table if its not created yet
await this.createMigrationsTableIfNotExist(queryRunner);
@@ -496,7 +495,7 @@ export class MigrationExecutor {
}
protected async withQueryRunner(callback: (queryRunner: QueryRunner) => T) {
- const queryRunner = this.queryRunner || this.connection.createQueryRunner("master");
+ const queryRunner = this.queryRunner || this.connection.createQueryRunner();
try {
return callback(queryRunner);
diff --git a/src/naming-strategy/DefaultNamingStrategy.ts b/src/naming-strategy/DefaultNamingStrategy.ts
index cbd08e71da..e34dd792a7 100644
--- a/src/naming-strategy/DefaultNamingStrategy.ts
+++ b/src/naming-strategy/DefaultNamingStrategy.ts
@@ -153,4 +153,7 @@ export class DefaultNamingStrategy implements NamingStrategyInterface {
eagerJoinRelationAlias(alias: string, propertyPath: string): string {
return alias + "_" + propertyPath.replace(".", "_");
}
+
+ nestedSetColumnNames = { left: "nsleft", right: "nsright" };
+ materializedPathColumnName = "mpath";
}
diff --git a/src/naming-strategy/NamingStrategyInterface.ts b/src/naming-strategy/NamingStrategyInterface.ts
index 72fd26ecd2..50342d32b1 100644
--- a/src/naming-strategy/NamingStrategyInterface.ts
+++ b/src/naming-strategy/NamingStrategyInterface.ts
@@ -121,4 +121,14 @@ export interface NamingStrategyInterface {
* Gets the name of the alias used for relation joins.
*/
eagerJoinRelationAlias(alias: string, propertyPath: string): string;
- }
+
+ /**
+ * Column names for nested sets.
+ */
+ nestedSetColumnNames: { left: string, right: string };
+
+ /**
+ * Column name for materialized paths.
+ */
+ materializedPathColumnName: string;
+}
diff --git a/src/observer/QueryObserver.ts b/src/observer/QueryObserver.ts
index 978d758607..43d3e95d98 100644
--- a/src/observer/QueryObserver.ts
+++ b/src/observer/QueryObserver.ts
@@ -9,7 +9,7 @@ import {
UpdateEvent,
EntityTarget
} from "../index";
-import * as Observable from "zen-observable";
+import Observable from "zen-observable";
// todo: we probably need operation-level subscribers
// todo: right now if we save 1000 entities within a single save call its going to call this code 1000 times
diff --git a/src/persistence/EntityPersistExecutor.ts b/src/persistence/EntityPersistExecutor.ts
index cd12513cc2..66f04d816b 100644
--- a/src/persistence/EntityPersistExecutor.ts
+++ b/src/persistence/EntityPersistExecutor.ts
@@ -14,7 +14,6 @@ import {ManyToManySubjectBuilder} from "./subject-builder/ManyToManySubjectBuild
import {SubjectDatabaseEntityLoader} from "./SubjectDatabaseEntityLoader";
import {CascadesSubjectBuilder} from "./subject-builder/CascadesSubjectBuilder";
import {OrmUtils} from "../util/OrmUtils";
-import {PromiseUtils} from "../util/PromiseUtils";
/**
* Persists a single entity or multiple entities - saves or removes them.
@@ -51,7 +50,7 @@ export class EntityPersistExecutor {
// if query runner is already defined in this class, it means this entity manager was already created for a single connection
// if its not defined we create a new query runner - single connection where we'll execute all our operations
- const queryRunner = this.queryRunner || this.connection.createQueryRunner("master");
+ const queryRunner = this.queryRunner || this.connection.createQueryRunner();
// save data in the query runner - this is useful functionality to share data from outside of the world
// with third classes - like subscribers and listener methods
@@ -146,7 +145,9 @@ export class EntityPersistExecutor {
// execute all persistence operations for all entities we have
// console.time("executing subject executors...");
- await PromiseUtils.runInSequence(executorsWithExecutableOperations, executor => executor.execute());
+ for (const executor of executorsWithExecutableOperations) {
+ await executor.execute();
+ }
// console.timeEnd("executing subject executors...");
// commit transaction if it was started by us
diff --git a/src/persistence/SubjectChangedColumnsComputer.ts b/src/persistence/SubjectChangedColumnsComputer.ts
index cddd575ad5..c510d3b211 100644
--- a/src/persistence/SubjectChangedColumnsComputer.ts
+++ b/src/persistence/SubjectChangedColumnsComputer.ts
@@ -1,8 +1,8 @@
import {Subject} from "./Subject";
import {DateUtils} from "../util/DateUtils";
import {ObjectLiteral} from "../common/ObjectLiteral";
-import {EntityMetadata} from "../metadata/EntityMetadata";
import {OrmUtils} from "../util/OrmUtils";
+import {ApplyValueTransformers} from "../util/ApplyValueTransformers";
/**
* Finds what columns are changed in the subject entities.
@@ -40,10 +40,11 @@ export class SubjectChangedColumnsComputer {
// ignore special columns
if (column.isVirtual ||
- column.isDiscriminator ||
- column.isUpdateDate ||
- column.isVersion ||
- column.isCreateDate)
+ column.isDiscriminator // ||
+ // column.isUpdateDate ||
+ // column.isVersion ||
+ // column.isCreateDate
+ )
return;
const changeMap = subject.changeMaps.find(changeMap => changeMap.column === column);
@@ -62,7 +63,7 @@ export class SubjectChangedColumnsComputer {
if (subject.databaseEntity) {
// get database value of the column
- let databaseValue = column.getEntityValue(subject.databaseEntity);
+ let databaseValue = column.getEntityValue(subject.databaseEntity, true);
// filter out "relational columns" only in the case if there is a relation object in entity
if (column.relationMetadata) {
@@ -119,6 +120,10 @@ export class SubjectChangedColumnsComputer {
databaseValue = DateUtils.simpleJsonToString(databaseValue);
break;
}
+
+ if (column.transformer) {
+ normalizedValue = ApplyValueTransformers.transformTo(column.transformer, entityValue);
+ }
}
// if value is not changed - then do nothing
@@ -168,7 +173,7 @@ export class SubjectChangedColumnsComputer {
const databaseRelatedEntityRelationIdMap = relation.getEntityValue(subject.databaseEntity);
// if relation ids are equal then we don't need to update anything
- const areRelatedIdsEqual = EntityMetadata.compareIds(relatedEntityRelationIdMap, databaseRelatedEntityRelationIdMap);
+ const areRelatedIdsEqual = OrmUtils.compareIds(relatedEntityRelationIdMap, databaseRelatedEntityRelationIdMap);
if (areRelatedIdsEqual) {
return;
} else {
diff --git a/src/persistence/SubjectExecutor.ts b/src/persistence/SubjectExecutor.ts
index 1aa64e1d4d..56561e965f 100644
--- a/src/persistence/SubjectExecutor.ts
+++ b/src/persistence/SubjectExecutor.ts
@@ -1,7 +1,6 @@
import {SapDriver} from "../driver/sap/SapDriver";
import {QueryRunner} from "../query-runner/QueryRunner";
import {Subject} from "./Subject";
-import {PromiseUtils} from "../util/PromiseUtils";
import {SubjectTopoligicalSorter} from "./SubjectTopoligicalSorter";
import {SubjectChangedColumnsComputer} from "./SubjectChangedColumnsComputer";
import {SubjectWithoutIdentifierError} from "../error/SubjectWithoutIdentifierError";
@@ -250,7 +249,7 @@ export class SubjectExecutor {
const [groupedInsertSubjects, groupedInsertSubjectKeys] = this.groupBulkSubjects(this.insertSubjects, "insert");
// then we run insertion in the sequential order which is important since we have an ordered subjects
- await PromiseUtils.runInSequence(groupedInsertSubjectKeys, async groupName => {
+ for (const groupName of groupedInsertSubjectKeys) {
const subjects = groupedInsertSubjects[groupName];
// we must separately insert entities which does not have any values to insert
@@ -334,7 +333,7 @@ export class SubjectExecutor {
// insert subjects which must be inserted in separate requests (all default values)
if (singleInsertSubjects.length > 0) {
- await PromiseUtils.runInSequence(singleInsertSubjects, async subject => {
+ for (const subject of singleInsertSubjects) {
subject.insertedValueSet = subject.createValueSetAndPopChangeMap(); // important to have because query builder sets inserted values into it
// for nested set we execute additional queries
@@ -363,7 +362,7 @@ export class SubjectExecutor {
} else if (subject.metadata.treeType === "materialized-path") {
await new MaterializedPathSubjectExecutor(this.queryRunner).insert(subject);
}
- });
+ }
}
}
@@ -378,7 +377,7 @@ export class SubjectExecutor {
});
}
});
- });
+ }
}
/**
@@ -469,7 +468,7 @@ export class SubjectExecutor {
// group insertion subjects to make bulk insertions
const [groupedRemoveSubjects, groupedRemoveSubjectKeys] = this.groupBulkSubjects(this.removeSubjects, "delete");
- await PromiseUtils.runInSequence(groupedRemoveSubjectKeys, async groupName => {
+ for (const groupName of groupedRemoveSubjectKeys) {
const subjects = groupedRemoveSubjects[groupName];
const deleteMaps = subjects.map(subject => {
if (!subject.identifier)
@@ -499,7 +498,7 @@ export class SubjectExecutor {
.callObservers(false)
.execute();
}
- });
+ }
}
/**
diff --git a/src/persistence/subject-builder/ManyToManySubjectBuilder.ts b/src/persistence/subject-builder/ManyToManySubjectBuilder.ts
index 850af6ef39..7d896cdc68 100644
--- a/src/persistence/subject-builder/ManyToManySubjectBuilder.ts
+++ b/src/persistence/subject-builder/ManyToManySubjectBuilder.ts
@@ -2,7 +2,6 @@ import {Subject} from "../Subject";
import {OrmUtils} from "../../util/OrmUtils";
import {ObjectLiteral} from "../../common/ObjectLiteral";
import {RelationMetadata} from "../../metadata/RelationMetadata";
-import {EntityMetadata} from "../../metadata/EntityMetadata";
/**
* Builds operations needs to be executed for many-to-many relations of the given subjects.
@@ -150,7 +149,7 @@ export class ManyToManySubjectBuilder {
// try to find related entity in the database
// by example: find post's category in the database post's categories
const relatedEntityExistInDatabase = databaseRelatedEntityIds.find(databaseRelatedEntityRelationId => {
- return EntityMetadata.compareIds(databaseRelatedEntityRelationId, relatedEntityRelationIdMap);
+ return OrmUtils.compareIds(databaseRelatedEntityRelationId, relatedEntityRelationIdMap);
});
// if entity is found then don't do anything - it means binding in junction table already exist, we don't need to add anything
@@ -207,7 +206,7 @@ export class ManyToManySubjectBuilder {
// now from all entities in the persisted entity find only those which aren't found in the db
const removedJunctionEntityIds = databaseRelatedEntityIds.filter(existRelationId => {
return !changedInverseEntityRelationIds.find(changedRelationId => {
- return EntityMetadata.compareIds(changedRelationId, existRelationId);
+ return OrmUtils.compareIds(changedRelationId, existRelationId);
});
});
diff --git a/src/persistence/subject-builder/OneToManySubjectBuilder.ts b/src/persistence/subject-builder/OneToManySubjectBuilder.ts
index 25250dfc5a..2578bf1cdb 100644
--- a/src/persistence/subject-builder/OneToManySubjectBuilder.ts
+++ b/src/persistence/subject-builder/OneToManySubjectBuilder.ts
@@ -117,7 +117,7 @@ export class OneToManySubjectBuilder {
// check if this binding really exist in the database
// by example: find our category if its already bind in the database
const relationIdInDatabaseSubjectRelation = relatedEntityDatabaseRelationIds.find(relatedDatabaseEntityRelationId => {
- return OrmUtils.deepCompare(relationIdMap, relatedDatabaseEntityRelationId);
+ return OrmUtils.compareIds(relationIdMap, relatedDatabaseEntityRelationId);
});
// if relationIdMap DOES NOT exist in the subject's relation in the database it means its a new relation and we need to "bind" them
diff --git a/src/persistence/subject-builder/OneToOneInverseSideSubjectBuilder.ts b/src/persistence/subject-builder/OneToOneInverseSideSubjectBuilder.ts
index f421c5abc7..6912768fdd 100644
--- a/src/persistence/subject-builder/OneToOneInverseSideSubjectBuilder.ts
+++ b/src/persistence/subject-builder/OneToOneInverseSideSubjectBuilder.ts
@@ -139,7 +139,7 @@ export class OneToOneInverseSideSubjectBuilder {
// check if this binding really exist in the database
// by example: find our post if its already bind to category in the database and its not equal to what user tries to set
- const areRelatedIdEqualWithDatabase = relatedEntityDatabaseRelationId && OrmUtils.deepCompare(relationIdMap, relatedEntityDatabaseRelationId);
+ const areRelatedIdEqualWithDatabase = relatedEntityDatabaseRelationId && OrmUtils.compareIds(relationIdMap, relatedEntityDatabaseRelationId);
// if they aren't equal it means its a new relation and we need to "bind" them
// by example: this will tell category to insert into its post relation our post we are working with
diff --git a/src/platform/BrowserDirectoryExportedClassesLoader.template b/src/platform/BrowserDirectoryExportedClassesLoader.template
new file mode 100644
index 0000000000..39fe932a7b
--- /dev/null
+++ b/src/platform/BrowserDirectoryExportedClassesLoader.template
@@ -0,0 +1,22 @@
+/**
+ * Dummy functions for replacement via `package.json` in browser builds.
+ *
+ * If we don't include these functions typeorm will throw an error on runtime
+ * as well as during webpack builds.
+ */
+
+import {Logger} from "../logger/Logger";
+
+/**
+ * Loads all exported classes from the given directory.
+ */
+export function importClassesFromDirectories(logger: Logger, directories: string[], formats = [".js", ".cjs", ".ts"]): Function[] {
+ return [];
+}
+
+/**
+ * Loads all json files from the given directory.
+ */
+export function importJsonsFromDirectories(directories: string[], format = ".json"): any[] {
+ return [];
+}
diff --git a/src/platform/BrowserDisabledDriversDummy.template b/src/platform/BrowserDisabledDriversDummy.template
index 95cba48bea..9b34705886 100644
--- a/src/platform/BrowserDisabledDriversDummy.template
+++ b/src/platform/BrowserDisabledDriversDummy.template
@@ -3,8 +3,8 @@
* Using those classes reduces the build size by one third.
*
* If we don't include those dummy classes (and just disable the driver import
- * with `false` in `package.json`) typeorm will throw an error on runtime,
- * even if those driver are not used.
+ * with `false` in `package.json`) typeorm will throw an error on runtime and
+ * during webpack builds even if those driver are not used.
*/
/**
@@ -37,6 +37,24 @@ export class MongoRepository {}
*/
export class PostgresDriver {}
+/**
+ * DO NOT IMPORT THIS CLASS -
+ * This is a dummy class for replacement via `package.json` in browser builds
+ */
+export class AuroraDataApiDriver {}
+
+/**
+ * DO NOT IMPORT THIS CLASS -
+ * This is a dummy class for replacement via `package.json` in browser builds
+ */
+export class CockroachDriver {}
+
+/**
+ * DO NOT IMPORT THIS CLASS -
+ * This is a dummy class for replacement via `package.json` in browser builds
+ */
+export class AuroraDataApiPostgresDriver {}
+
/**
* DO NOT IMPORT THIS CLASS -
* This is a dummy class for replacement via `package.json` in browser builds
@@ -60,3 +78,15 @@ export class MysqlDriver {}
* This is a dummy class for replacement via `package.json` in browser builds
*/
export class OracleDriver {}
+
+/**
+ * DO NOT IMPORT THIS CLASS -
+ * This is a dummy class for replacement via `package.json` in browser builds
+ */
+export class SqliteDriver {}
+
+/**
+ * DO NOT IMPORT THIS CLASS -
+ * This is a dummy class for replacement via `package.json` in browser builds
+ */
+export class BetterSqlite3Driver {}
diff --git a/src/platform/BrowserPlatformTools.template b/src/platform/BrowserPlatformTools.template
index 216150aaa0..72295f27d3 100644
--- a/src/platform/BrowserPlatformTools.template
+++ b/src/platform/BrowserPlatformTools.template
@@ -75,6 +75,11 @@ export class PlatformTools {
return false;
}
+ static dotenv(pathStr: string): void {
+ if (this.type === "browser")
+ throw new Error(`This option/function is not supported in the browser environment. Failed operation: dotenv.config({ path: "${pathStr}" }).`);
+ }
+
/**
* Gets environment variable.
*/
@@ -89,7 +94,7 @@ export class PlatformTools {
throw new Error(`This option/function is not supported in the browser environment. Failed operation: fs.readFileSync("${filename}").`);
return null;
}
-
+
static appendFileSync(filename: string, data: any) {
if (this.type === "browser")
throw new Error(`This option/function is not supported in the browser environment. Failed operation: fs.appendFileSync("${filename}").`);
@@ -125,11 +130,11 @@ export class PlatformTools {
static logError(prefix: string, error: any) {
console.error(prefix + " ", error);
}
-
+
static logWarn(prefix: string, warning: any) {
console.warn(prefix + " ", warning);
}
-
+
static log(message: string) {
console.log(message);
}
@@ -165,4 +170,4 @@ if (typeof window !== "undefined") {
// NativeScript uses global, not window
if (typeof global !== "undefined") {
global.Buffer = require("buffer/").Buffer;
-}
\ No newline at end of file
+}
diff --git a/src/platform/PlatformTools.ts b/src/platform/PlatformTools.ts
index fffce6cbfd..9d75d8a479 100644
--- a/src/platform/PlatformTools.ts
+++ b/src/platform/PlatformTools.ts
@@ -1,13 +1,13 @@
import * as path from "path";
import * as fs from "fs";
+import dotenv from "dotenv";
+import chalk from "chalk";
import {highlight, Theme} from "cli-highlight";
export {ReadStream} from "fs";
export {EventEmitter} from "events";
export {Readable, Writable} from "stream";
-const chalk = require("chalk");
-
/**
* Platform-specific tools.
*/
@@ -50,8 +50,11 @@ export class PlatformTools {
/**
* hana
*/
- case "@sap/hdbext":
- return require("@sap/hdbext");
+ case "@sap/hana-client":
+ return require("@sap/hana-client");
+
+ case "hdb-pool":
+ return require("hdb-pool");
/**
* mysql
@@ -80,19 +83,24 @@ export class PlatformTools {
case "pg-query-stream":
return require("pg-query-stream");
+ case "typeorm-aurora-data-api-driver":
+ return require("typeorm-aurora-data-api-driver");
+
/**
* redis
*/
case "redis":
return require("redis");
- /**
- * ioredis
- */
case "ioredis":
- case "ioredis/cluster":
return require("ioredis");
+ /**
+ * better-sqlite3
+ */
+ case "better-sqlite3":
+ return require("better-sqlite3");
+
/**
* sqlite
*/
@@ -112,40 +120,21 @@ export class PlatformTools {
return require("mssql");
/**
- * other modules
- */
- case "mkdirp":
- return require("mkdirp");
-
- case "path":
- return require("path");
-
- case "debug":
- return require("debug");
-
- case "app-root-path":
- return require("app-root-path");
-
- case "glob":
- return require("glob");
-
- case "typeorm-aurora-data-api-driver":
- return require("typeorm-aurora-data-api-driver");
- /**
- * default
- */
- default:
- return require(name);
-
+ * react-native-sqlite
+ */
+ case "react-native-sqlite-storage":
+ return require("react-native-sqlite-storage");
}
} catch (err) {
- if (!path.isAbsolute(name) && name.substr(0, 2) !== "./" && name.substr(0, 3) !== "../") {
- return require(path.resolve(process.cwd() + "/node_modules/" + name));
- }
-
- throw err;
+ return require(path.resolve(process.cwd() + "/node_modules/" + name));
}
+
+ // If nothing above matched and we get here, the package was not listed within PlatformTools
+ // and is an Invalid Package. To make it explicit that this is NOT the intended use case for
+ // PlatformTools.load - it's not just a way to replace `require` all willy-nilly - let's throw
+ // an error.
+ throw new TypeError(`Invalid Package for PlatformTools.load: ${name}`);
}
/**
@@ -193,6 +182,15 @@ export class PlatformTools {
});
}
+ /**
+ * Loads a dotenv file into the environment variables.
+ *
+ * @param path The file to load as a dotenv configuration
+ */
+ static dotenv(pathStr: string): void {
+ dotenv.config({ path: pathStr });
+ }
+
/**
* Gets environment variable.
*/
diff --git a/src/query-builder/DeleteQueryBuilder.ts b/src/query-builder/DeleteQueryBuilder.ts
index a57afd2d06..05892a7f6f 100644
--- a/src/query-builder/DeleteQueryBuilder.ts
+++ b/src/query-builder/DeleteQueryBuilder.ts
@@ -2,6 +2,7 @@ import {CockroachDriver} from "../driver/cockroachdb/CockroachDriver";
import {OracleDriver} from "../driver/oracle/OracleDriver";
import {QueryBuilder} from "./QueryBuilder";
import {ObjectLiteral} from "../common/ObjectLiteral";
+import {EntityTarget} from "../common/EntityTarget";
import {Connection} from "../connection/Connection";
import {QueryRunner} from "../query-runner/QueryRunner";
import {SqlServerDriver} from "../driver/sqlserver/SqlServerDriver";
@@ -13,8 +14,9 @@ import {ReturningStatementNotSupportedError} from "../error/ReturningStatementNo
import {SqljsDriver} from "../driver/sqljs/SqljsDriver";
import {MysqlDriver} from "../driver/mysql/MysqlDriver";
import {BroadcasterResult} from "../subscriber/BroadcasterResult";
-import {EntitySchema, EntityTarget} from "../index";
+import {EntitySchema} from "../index";
import {AuroraDataApiDriver} from "../driver/aurora-data-api/AuroraDataApiDriver";
+import {BetterSqlite3Driver} from "../driver/better-sqlite3/BetterSqlite3Driver";
import {ObserverExecutor} from "../observer/ObserverExecutor";
/**
@@ -83,6 +85,10 @@ export class DeleteQueryBuilder extends QueryBuilder implements
} else if (driver instanceof OracleDriver) {
deleteResult.affected = result;
+ } else if (driver instanceof BetterSqlite3Driver) { // only works for better-sqlite3
+ deleteResult.raw = result;
+ deleteResult.affected = result.changes;
+
} else {
deleteResult.raw = result;
}
diff --git a/src/query-builder/InsertQueryBuilder.ts b/src/query-builder/InsertQueryBuilder.ts
index 38c67a1d35..8608b5dbe8 100644
--- a/src/query-builder/InsertQueryBuilder.ts
+++ b/src/query-builder/InsertQueryBuilder.ts
@@ -3,6 +3,7 @@ import {ObserverExecutor} from "../observer/ObserverExecutor";
import {SapDriver} from "../driver/sap/SapDriver";
import {QueryBuilder} from "./QueryBuilder";
import {ObjectLiteral} from "../common/ObjectLiteral";
+import {EntityTarget} from "../common/EntityTarget";
import {QueryDeepPartialEntity} from "./QueryPartialEntity";
import {SqlServerDriver} from "../driver/sqlserver/SqlServerDriver";
import {PostgresDriver} from "../driver/postgres/PostgresDriver";
@@ -16,7 +17,7 @@ import {ReturningResultsEntityUpdator} from "./ReturningResultsEntityUpdator";
import {AbstractSqliteDriver} from "../driver/sqlite-abstract/AbstractSqliteDriver";
import {SqljsDriver} from "../driver/sqljs/SqljsDriver";
import {BroadcasterResult} from "../subscriber/BroadcasterResult";
-import {EntitySchema, EntityTarget} from "../";
+import {EntitySchema} from "../entity-schema/EntitySchema";
import {OracleDriver} from "../driver/oracle/OracleDriver";
import {AuroraDataApiDriver} from "../driver/aurora-data-api/AuroraDataApiDriver";
@@ -41,6 +42,20 @@ export class InsertQueryBuilder extends QueryBuilder {
* Executes sql generated by query builder and returns raw database results.
*/
async execute(): Promise {
+ // console.time(".value sets");
+ const valueSets: ObjectLiteral[] = this.getValueSets();
+ // console.timeEnd(".value sets");
+
+ // If user passed empty array of entities then we don't need to do
+ // anything.
+ //
+ // Fixes GitHub issues #3111 and #5734. If we were to let this through
+ // we would run into problems downstream, like subscribers getting
+ // invoked with the empty array where they expect an entity, and SQL
+ // queries with an empty VALUES clause.
+ if (valueSets.length === 0)
+ return new InsertResult();
+
// console.time("QueryBuilder.execute");
// console.time(".database stuff");
const queryRunner = this.obtainQueryRunner();
@@ -55,9 +70,6 @@ export class InsertQueryBuilder extends QueryBuilder {
}
// console.timeEnd(".database stuff");
- // console.time(".value sets");
- const valueSets: ObjectLiteral[] = this.getValueSets();
- // console.timeEnd(".value sets");
// call before insertion methods in listeners and subscribers
if (this.expressionMap.callListeners === true && this.expressionMap.mainAlias!.hasMetadata) {
@@ -115,8 +127,9 @@ export class InsertQueryBuilder extends QueryBuilder {
// close transaction if we started it
// console.time(".commit");
- if (transactionStartedByUs)
+ if (transactionStartedByUs) {
await queryRunner.commitTransaction();
+ }
// second case is when operation is executed without transaction and at the same time
// nobody started transaction from the above
@@ -160,7 +173,7 @@ export class InsertQueryBuilder extends QueryBuilder {
/**
* Specifies INTO which entity's table insertion will be executed.
*/
- into(entityTarget: EntityTarget, columns?: string[]): InsertQueryBuilder {
+ into(entityTarget: EntityTarget, columns?: string[]): InsertQueryBuilder {
entityTarget = entityTarget instanceof EntitySchema ? entityTarget.options.name!! : entityTarget;
const mainAlias = this.createFromAlias(entityTarget);
this.expressionMap.setMainAlias(mainAlias);
@@ -429,7 +442,8 @@ export class InsertQueryBuilder extends QueryBuilder {
}
// newly inserted entities always have a version equal to 1 (first version)
- if (column.isVersion) {
+ // also, user-specified version must be empty
+ if (column.isVersion && value === undefined) {
expression += "1";
// } else if (column.isNestedSetLeft) {
@@ -506,6 +520,8 @@ export class InsertQueryBuilder extends QueryBuilder {
} else {
expression += `ST_GeomFromGeoJSON(${this.connection.driver.createParameter(paramName, parametersCount)})::${column.type}`;
}
+ } else if (this.connection.driver instanceof SqlServerDriver && this.connection.driver.spatialTypes.indexOf(column.type) !== -1) {
+ expression += column.type + "::STGeomFromText(" + this.connection.driver.createParameter(paramName, parametersCount) + ", " + (column.srid || "0") + ")";
} else {
expression += this.connection.driver.createParameter(paramName, parametersCount);
}
@@ -583,7 +599,7 @@ export class InsertQueryBuilder extends QueryBuilder {
* Gets array of values need to be inserted into the target table.
*/
protected getValueSets(): ObjectLiteral[] {
- if (Array.isArray(this.expressionMap.valuesSet) && this.expressionMap.valuesSet.length > 0)
+ if (Array.isArray(this.expressionMap.valuesSet))
return this.expressionMap.valuesSet;
if (this.expressionMap.valuesSet instanceof Object)
diff --git a/src/query-builder/QueryBuilder.ts b/src/query-builder/QueryBuilder.ts
index ea78df9e9b..5dd5503d12 100644
--- a/src/query-builder/QueryBuilder.ts
+++ b/src/query-builder/QueryBuilder.ts
@@ -8,7 +8,7 @@ import {DeleteQueryBuilder} from "./DeleteQueryBuilder";
import {SoftDeleteQueryBuilder} from "./SoftDeleteQueryBuilder";
import {InsertQueryBuilder} from "./InsertQueryBuilder";
import {RelationQueryBuilder} from "./RelationQueryBuilder";
-import {ObjectType} from "../common/ObjectType";
+import {EntityTarget} from "../common/EntityTarget";
import {Alias} from "./Alias";
import {Brackets} from "./Brackets";
import {QueryDeepPartialEntity} from "./QueryPartialEntity";
@@ -17,9 +17,10 @@ import {ColumnMetadata} from "../metadata/ColumnMetadata";
import {SqljsDriver} from "../driver/sqljs/SqljsDriver";
import {SqlServerDriver} from "../driver/sqlserver/SqlServerDriver";
import {OracleDriver} from "../driver/oracle/OracleDriver";
-import {EntitySchema, EntityTarget} from "../";
+import {EntitySchema} from "../";
import {FindOperator} from "../find-options/FindOperator";
import {In} from "../find-options/operator/In";
+import {EntityColumnNotFound} from "../error/EntityColumnNotFound";
// todo: completely cover query builder with tests
// todo: entityOrProperty can be target name. implement proper behaviour if it is.
@@ -186,17 +187,7 @@ export abstract class QueryBuilder {
/**
* Creates UPDATE query for the given entity and applies given update values.
*/
- update(entity: ObjectType, updateSet?: QueryDeepPartialEntity): UpdateQueryBuilder;
-
- /**
- * Creates UPDATE query for the given entity and applies given update values.
- */
- update(entity: EntitySchema, updateSet?: QueryDeepPartialEntity): UpdateQueryBuilder;
-
- /**
- * Creates UPDATE query for the given entity and applies given update values.
- */
- update(entity: EntityTarget, updateSet?: QueryDeepPartialEntity): UpdateQueryBuilder;
+ update(entity: EntityTarget, updateSet?: QueryDeepPartialEntity): UpdateQueryBuilder 
+
+ 
@@ -22,13 +22,13 @@
TypeORM 是一个 [ORM](https://en.wikipedia.org/wiki/Object-relational_mapping) 框架，它可以运行在 NodeJS、Browser、Cordova、PhoneGap、Ionic、React Native、Expo 和 Electron 平台上，可以与 TypeScript 和 JavaScript (ES5,ES6,ES7,ES8)一起使用。 它的目标是始终支持最新的 JavaScript 特性并提供额外的特性以帮助你开发任何使用数据库的（不管是只有几张表的小型应用还是拥有多数据库的大型企业应用）应用程序。
-不同于现有的所有其他 JavaScript ORM 框架，TypeORM 支持 [Active Record](./docs/active-record-data-mapper.md#what-is-the-active-record-pattern) 和 [Data Mapper](./docs/active-record-data-mapper.md#what-is-the-data-mapper-pattern) 模式，这意味着你可以以最高效的方式编写高质量的、松耦合的、可扩展的、可维护的应用程序。
+不同于现有的所有其他 JavaScript ORM 框架，TypeORM 支持 [Data Mapper](./docs/zh_CN/active-record-data-mapper.md#什么是data-mapper模式) 和 [Active Record](./docs/zh_CN/active-record-data-mapper.md#什么是active-record模式) 模式，这意味着你可以以最高效的方式编写高质量的、松耦合的、可扩展的、可维护的应用程序。
TypeORM 参考了很多其他优秀 ORM 的实现, 比如 [Hibernate](http://hibernate.org/orm/), [Doctrine](http://www.doctrine-project.org/) 和 [Entity Framework](https://www.asp.net/entity-framework)。
TypeORM 的一些特性:
-- 同时支持 [DataMapper](./docs/active-record-data-mapper.md#what-is-the-data-mapper-pattern) 和 [ActiveRecord](./docs/active-record-data-mapper.md#what-is-the-active-record-pattern) (随你选择)
+- 同时支持 [DataMapper](./docs/zh_CN/active-record-data-mapper.md#什么是data-mapper模式) 和 [ActiveRecord](./docs/zh_CN/active-record-data-mapper.md#什么是active-record模式) (随你选择)
- 实体和列
- 数据库特性列类型
- 实体管理
@@ -69,7 +69,7 @@ TypeORM 的一些特性:
通过使用 `TypeORM` 你的 `models` 看起来如下:
-```typescript
+```ts
import { Entity, PrimaryGeneratedColumn, Column } from "typeorm";
@Entity()
@@ -90,7 +90,7 @@ export class User {
逻辑操作如下:
-```typescript
+```ts
const user = new User();
user.firstName = "Timber";
user.lastName = "Saw";
@@ -106,7 +106,7 @@ await repository.remove(timber);
或者，如果你更喜欢使用 `ActiveRecord` 模式，也可以这样用：
-```typescript
+```ts
import { Entity, PrimaryGeneratedColumn, Column, BaseEntity } from "typeorm";
@Entity()
@@ -127,7 +127,7 @@ export class User extends BaseEntity {
逻辑操作如下所示:
-```typescript
+```ts
const user = new User();
user.firstName = "Timber";
user.lastName = "Saw";
@@ -241,7 +241,7 @@ typeorm init --name MyProject --database mysql
此命令将在 `MyProject` 目录中生成一个包含以下文件的新项目:
-```
+```sh
MyProject
├── src // TypeScript 代码
│ ├── entity // 存储实体（数据库模型）的位置
@@ -259,9 +259,9 @@ MyProject
接下来安装项目依赖项：
-```
-cd MyProject
-npm install
+```sh
+$ cd MyProject
+$ npm install
```
在安装过程中，编辑 `ormconfig.json` 文件并在其中编辑自己的数据库连接配置选项：
@@ -286,8 +286,8 @@ npm install
完成配置并安装所有 node modules 后，即可运行应用程序：
-```
-npm start
+```sh
+$ npm start
```
至此你的应用程序应该成功运行并将新用户插入数据库。你可以继续使用此项目并集成所需的其他模块并创建更多实体。
@@ -305,7 +305,7 @@ npm start
举个例子, 你有一个 `Photo` 模型:
-```typescript
+```ts
export class Photo {
id: number;
name: string;
@@ -323,7 +323,7 @@ export class Photo {
让我们将 `Photo` 模型作为一个实体
-```typescript
+```ts
import { Entity } from "typeorm";
@Entity()
@@ -344,7 +344,7 @@ export class Photo {
要添加数据库列，你只需要将要生成的实体属性加上 `@Column` 装饰器。
-```typescript
+```ts
import { Entity, Column } from "typeorm";
@Entity()
@@ -378,7 +378,7 @@ export class Photo {
每个**必须**至少有一个主键列。这是必须的，你无法避免。要使列成为主键，你需要使用 `@PrimaryColumn` 装饰器。
-```typescript
+```ts
import { Entity, Column, PrimaryColumn } from "typeorm";
@Entity()
@@ -407,7 +407,7 @@ export class Photo {
假设你希望 id 列自动生成（这称为 auto-increment/sequence/serial/generated identity column）。为此你需要将`@PrimaryColumn` 装饰器更改为 `@PrimaryGeneratedColumn` 装饰器：
-```typescript
+```ts
import { Entity, Column, PrimaryGeneratedColumn } from "typeorm";
@Entity()
@@ -437,7 +437,7 @@ export class Photo {
接下来，让我们修改数据类型。默认情况下，字符串被映射到一个 varchar(255) 类型（取决于数据库类型）。
数字被映射到一个类似 integer 类型（取决于数据库类型）。但是我们不希望所有的列都是有限的 varchars 或 integer，让我们修改下代码以设置想要的数据类型：
-```typescript
+```ts
import { Entity, Column, PrimaryGeneratedColumn } from "typeorm";
@Entity()
@@ -464,13 +464,13 @@ export class Photo {
}
```
-列类型是特定于数据库的。你可以设置数据库支持的任何列类型。有关支持的列类型的更多信息，请参见[此处](./docs/entities.md#column-types)。
+列类型是特定于数据库的。你可以设置数据库支持的任何列类型。有关支持的列类型的更多信息，请参见[此处](./docs/zh_CN/entities.md#列类型)。
### 创建数据库的连接
当实体被创建后，让我们创建一个`index.ts`（或`app.ts`，无论你怎么命名）文件，并配置数据库连接：:
-```typescript
+```ts
import "reflect-metadata";
import { createConnection } from "typeorm";
import { Photo } from "./entity/Photo";
@@ -502,7 +502,7 @@ createConnection({
之后当我们创建更多实体时，都需要一一将它们添加到配置中的实体中，但是这不是很方便，所以我们可以设置加载整个目录，从中连接所有实体并使用：
-```typescript
+```ts
import { createConnection } from "typeorm";
createConnection({
@@ -547,7 +547,7 @@ createConnection({
现在创建一个新的 photo 存到数据库：
-```typescript
+```ts
import { createConnection } from "typeorm";
import { Photo } from "./entity/Photo";
@@ -573,7 +573,7 @@ createConnection(/*...*/)
我们可以使用ES8(ES2017)的新特性，并使用 async/await 语法代替：
-```typescript
+```ts
import { createConnection } from "typeorm";
import { Photo } from "./entity/Photo";
@@ -598,7 +598,7 @@ createConnection(/*...*/)
例如，加载已经保存的实体：
-```typescript
+```ts
import { createConnection } from "typeorm";
import { Photo } from "./entity/Photo";
@@ -613,13 +613,13 @@ createConnection(/*...*/)
`savedPhotos` 是一个 Photo 对象数组，其中包含从数据库加载的数据。
-了解更多有关 [EntityManager](./docs/working-with-entity-manager.md) 的信息。
+了解更多有关 [EntityManager](./docs/zh_CN/working-with-entity-manager.md) 的信息。
### 使用 Repositories
现在让我们重构之前的代码，并使用 `Repository` 替代 `EntityManager`。每个实体都有自己的repository，可以处理其实体的所有操作。当你经常处理实体时，Repositories 比 EntityManagers 更方便使用：
-```typescript
+```ts
import { createConnection } from "typeorm";
import { Photo } from "./entity/Photo";
@@ -643,13 +643,13 @@ createConnection(/*...*/)
.catch(error => console.log(error));
```
-了解更多有关 [Repository](./docs/working-with-repository.md) 的信息。
+了解更多有关 [Repository](./docs/zh_CN/working-with-repository.md) 的信息。
### 从数据库加载
让我们使用 Repository 尝试更多的加载操作:
-```typescript
+```ts
import { createConnection } from "typeorm";
import { Photo } from "./entity/Photo";
@@ -682,7 +682,7 @@ createConnection(/*...*/)
让我们从数据库加载出 photo，更新并保存到数据库：
-```typescript
+```ts
import { createConnection } from "typeorm";
import { Photo } from "./entity/Photo";
@@ -702,7 +702,7 @@ createConnection(/*...*/)
让我们从数据库中删除 Photo:
-```typescript
+```ts
import { createConnection } from "typeorm";
import { Photo } from "./entity/Photo";
@@ -721,7 +721,7 @@ createConnection(/*...*/)
要与另一个类创建一对一的关系。先在 `PhotoMetadata.ts` 中创建一个新类。此 PhotoMetadata 类应包含 photo 的其他元信息：
-```typescript
+```ts
import { Entity, Column, PrimaryGeneratedColumn, OneToOne, JoinColumn } from "typeorm";
import { Photo } from "./Photo";
@@ -777,7 +777,7 @@ export class PhotoMetadata {
现在让我们来创建一个 photo，它的元信息将它们互相连接起来。
-```typescript
+```ts
import { createConnection } from "typeorm";
import { Photo } from "./entity/Photo";
import { PhotoMetadata } from "./entity/PhotoMetadata";
@@ -820,7 +820,7 @@ createConnection(/*...*/)
关系可以是单向的或双向的。目前 PhotoMetadata 和 Photo 之间的关系是单向的。关系的所有者是 PhotoMetadata，而 Photo 对 PhotoMetadata 一无所知。这使得从 Photo 中访问 PhotoMetadata 变得很复杂。要解决这个问题，我们应该在 PhotoMetadata 和 Photo 之间建立双向关系。让我们来修改一下实体：
-```typescript
+```ts
import { Entity, Column, PrimaryGeneratedColumn, OneToOne, JoinColumn } from "typeorm";
import { Photo } from "./Photo";
@@ -855,7 +855,7 @@ export class Photo {
在一个查询中加载 photo 及 photo metadata 有两种方法。使用 `find *` 或使用 `QueryBuilder`。我们先使用 `find *` 方法。 `find *` 方法允许你使用 `FindOneOptions` / `FindManyOptions` 接口指定对象。
-```typescript
+```ts
import { createConnection } from "typeorm";
import { Photo } from "./entity/Photo";
import { PhotoMetadata } from "./entity/PhotoMetadata";
@@ -869,11 +869,11 @@ createConnection(/*...*/)
.catch(error => console.log(error));
```
-photos 包含来自数据库的 photos 数组，每个 photo 包含其 photo metadata。详细了解本文档中的[Find 选项](./docs/find-options.md)。
+photos 包含来自数据库的 photos 数组，每个 photo 包含其 photo metadata。详细了解本文档中的[Find 选项](./docs/zh_CN/find-options.md)。
使用find选项很简单，但是如果你需要更复杂的查询，则应该使用 `QueryBuilder`。 `QueryBuilder` 使用更优雅的方式执行更复杂的查询：
-```typescript
+```ts
import { createConnection } from "typeorm";
import { Photo } from "./entity/Photo";
import { PhotoMetadata } from "./entity/PhotoMetadata";
@@ -896,7 +896,7 @@ createConnection(/*...*/)
我们可以在关系中设置 `cascade` 选项，这时就可以在保存其他对象的同时保存相关对象。让我们更改一下的 photo 的 `@OneToOne` 装饰器：
-```typescript
+```ts
export class Photo {
/// ... 其他列
@@ -909,7 +909,7 @@ export class Photo {
使用 `cascade` 允许就不需要边存 photo 边存元数据对象。我们可以简单地保存一个 photo 对象，由于使用了 cascade，metadata 也将自动保存。
-```typescript
+```ts
createConnection(options)
.then(async connection => {
// 创建 photo 对象
@@ -966,7 +966,7 @@ export class Author {
现在让我们将关系的所有者方添加到 Photo 实体中：
-```typescript
+```ts
import { Entity, Column, PrimaryGeneratedColumn, ManyToOne } from "typeorm";
import { PhotoMetadata } from "./PhotoMetadata";
import { Author } from "./Author";
@@ -1011,7 +1011,7 @@ export class Photo {
假设一个 photo 可以放在多个 albums 中，每个 albums 可以包含多个 photo。让我们创建一个`Album`类：
-```typescript
+```ts
import { Entity, PrimaryGeneratedColumn, Column, ManyToMany, JoinTable } from "typeorm";
@Entity()
@@ -1032,7 +1032,7 @@ export class Album {
现在添加反向关系到`Photo`类：
-```typescript
+```ts
export class Photo {
/// ... 其他列
@@ -1054,7 +1054,7 @@ export class Photo {
记得在 ORM 中使用 ConnectionOptions 注册`Album`类：
-```typescript
+```ts
const options: ConnectionOptions = {
// ... 其他选项
entities: [Photo, PhotoMetadata, Author, Album]
@@ -1063,7 +1063,7 @@ const options: ConnectionOptions = {
现在让我们将 albums 和 photos 插入我们的数据库:
-```typescript
+```ts
let connection = await createConnection(options);
// 创建一些 albums
@@ -1090,7 +1090,7 @@ const loadedPhoto = await connection.getRepository(Photo).findOne(1, { relations
`loadedPhoto` 如下所示:
-```typescript
+```ts
{
id: 1,
name: "Me and Bears",
@@ -1110,7 +1110,7 @@ const loadedPhoto = await connection.getRepository(Photo).findOne(1, { relations
你可以使用 QueryBuilder 构建几乎任何复杂性的 SQL 查询。例如，可以这样做：
-```typescript
+```ts
let photos = await connection
.getRepository(Photo)
.createQueryBuilder("photo") // 第一个参数是别名。即photos。 该参数必须指定。
@@ -1128,7 +1128,7 @@ let photos = await connection
此查询选择所有 published 的 name 等于"My"或"Mishka"的 photos。它将从结果中的第 5 个（分页偏移）开始，并且仅选择 10 个结果（分页限制）。得到的结果将按 ID 降序排序。photo 的 albums 将被 left-joined，其元数据将被 inner joined。
由于 QueryBuilder 的自由度更高，因此在项目中可能会大量的使用它。
-更多关于 QueryBuilder 的信息，[可查看](./docs/select-query-builder.md)。
+更多关于 QueryBuilder 的信息，[可查看](./docs/zh_CN/select-query-builder.md)。
## 示例
diff --git a/README.md b/README.md
index 516b37cdd5..72f9b72e45 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@
