Update fork (#1)

* Update all non-major dependencies * Update typescript-eslint monorepo to v3 (major) (salsita#634) * Update typescript-eslint monorepo to v3 * Fixing lint Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Jan Dolezel <[email protected]> * Update all non-major dependencies * Keep this bind in logger methods (salsita#638) * Updated changelog * 5.0.1 * Fix alter column collation (salsita#641) * Updated changelog * 5.0.2 * Ability to specify own template file (salsita#642) * Updated changelog * 5.1.0 * Update all non-major dependencies * Fix creating migration (salsita#646) * Fix creating migration * Check migration creation * Fix yaml * another method of counting files * Updated changelog * 5.1.1 * Update all non-major dependencies * Update dependency mocha to v8 (salsita#650) Co-authored-by: Renovate Bot <[email protected]> * Update all non-major dependencies * View options (salsita#656) * View options * Fix migration * Fix creating SQL * Updated changelog * 5.2.0 * Update all non-major dependencies * Update all non-major dependencies * Update all non-major dependencies * Update dependency @types/mocha to v8 (salsita#662) Co-authored-by: Renovate Bot <[email protected]> * let console.error display all the properties on an err object, which can include useful debugging information. (salsita#660) * Updated changelog * 5.3.0 * Updated dependencies (salsita#663) * Update all non-major dependencies * Update all non-major dependencies * Update all non-major dependencies * docs: fixed small error (salsita#666) * Update isExternalClient check (salsita#664) * Update isExternalClient check Problem using pg-promise - adopting the method used here: https://github.com/voxpelli/node-connect-pg-simple/blob/master/index.js#L95 * Update db.ts * Do not use 'any' Co-authored-by: Jan Dolezel <[email protected]> * Updated changelog * 5.4.0 * Update all non-major dependencies * Regenerated package-lock.json (salsita#674) * Allow opclass and sort per column in indexes (salsita#671) * Allow opclass and sort per column in indexes * Fixes for using schemalize * Fix double escaping * Using structured object instead of array * Updated changelog * 5.5.0 * Update all non-major dependencies * Update all non-major dependencies Docker tags * Do not try to unlock DB if connection failed (salsita#677) * Updated changelog * 5.5.1 * PgLiteral can be serialized (salsita#678) * Updated changelog * 5.6.0 * Using pg client in custom runner test (salsita#679) * Update all non-major dependencies * Update dependency ts-node to v9 (salsita#681) Co-authored-by: Renovate Bot <[email protected]> * Update dependency typescript to v4 (salsita#682) * Update dependency typescript to v4 * Refactored type computing * Regenerated dependencies Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Jan Dolezel <[email protected]> * Update all non-major dependencies * Update all non-major dependencies * Update all non-major dependencies * Update dependency yargs to v16 (salsita#691) Co-authored-by: Renovate Bot <[email protected]> * Eslint config (salsita#692) * Simplified eslint config, eslint fixes * Simplify prettier config * Update all non-major dependencies * Bump node-fetch from 2.6.0 to 2.6.1 (salsita#689) Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1. - [Release notes](https://github.com/bitinn/node-fetch/releases) - [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md) - [Commits](node-fetch/node-fetch@v2.6.0...v2.6.1) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jan Dolezel <[email protected]> Co-authored-by: Joel Hillacre <[email protected]> Co-authored-by: 0xflotus <[email protected]> Co-authored-by: Jon <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
ryands17 · Sep 21, 2020 · 151d0c9 · 151d0c9
1 parent 017b51c
commit 151d0c9
Show file tree

Hide file tree

Showing 39 changed files with 1,463 additions and 2,940 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -92,7 +92,7 @@ jobs:
       - <<: *node-image
         environment:
           - DATABASE_URL=postgres://ubuntu:ubuntu@localhost:5432/circle_test
-      - image: postgres:10.13-alpine
+      - image: postgres:10.14-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_PASSWORD=ubuntu
@@ -106,7 +106,7 @@ jobs:
       - <<: *node-image
         environment:
           - DATABASE_URL=postgres://ubuntu:ubuntu@localhost:5432/circle_test
-      - image: postgres:11.8-alpine
+      - image: postgres:11.9-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_PASSWORD=ubuntu
@@ -120,7 +120,7 @@ jobs:
       - <<: *node-image
         environment:
           - DATABASE_URL=postgres://ubuntu:ubuntu@localhost:5432/circle_test
-      - image: postgres:12.3-alpine
+      - image: postgres:12.4-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_PASSWORD=ubuntu
@@ -160,7 +160,7 @@ jobs:
       - image: circleci/node:10
         environment:
           - DATABASE_URL=postgres://ubuntu:ubuntu@localhost:5432/circle_test
-      - image: postgres:12.3-alpine
+      - image: postgres:12.4-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_PASSWORD=ubuntu
@@ -174,7 +174,7 @@ jobs:
       - image: circleci/node:14
         environment:
           - DATABASE_URL=postgres://ubuntu:ubuntu@localhost:5432/circle_test
-      - image: postgres:12.3-alpine
+      - image: postgres:12.4-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_PASSWORD=ubuntu
@@ -186,7 +186,7 @@ jobs:
   test-config:
     docker:
       - <<: *node-image
-      - image: postgres:12.3-alpine
+      - image: postgres:12.4-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_PASSWORD=ubuntu
@@ -216,7 +216,7 @@ jobs:
         environment:
           # can't use characters @#?/ in password - they have special meaning in url
           - DATABASE_URL=postgres://ubuntu:123456abcdefghABCDEFGH~\`\!$%^\&*-_=+{}[]\(\)\<\>,.\;:\"\'\|\\@localhost:5432/circle_test
-      - image: postgres:12.3-alpine
+      - image: postgres:12.4-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_PASSWORD=123456abcdefghABCDEFGH~\`\!$%^\&*-_=+{}[]\(\)\<\>,.\;:\"\'\|\\
@@ -228,7 +228,7 @@ jobs:
   test-password-2:
     docker:
       - <<: *node-image
-      - image: postgres:12.3-alpine
+      - image: postgres:12.4-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_PASSWORD=123456abcdefghABCDEFGH~\`\!@#$%^\&*-_=+{}[]\(\)\<\>,.\;:\"\'?\|/\\
@@ -259,7 +259,7 @@ jobs:
         - PGUSER=ubuntu
         - PGPASSWORD=123456abcdefghABCDEFGH~\`\!@#$%^\&*-_=+{}[]\(\)\<\>,.\;:\"\'?\|/\\
         - PGDATABASE=circle_test
-    - image: postgres:12.3-alpine
+    - image: postgres:12.4-alpine
       environment:
         - POSTGRES_USER=ubuntu
         - POSTGRES_PASSWORD=123456abcdefghABCDEFGH~\`\!@#$%^\&*-_=+{}[]\(\)\<\>,.\;:\"\'?\|/\\
@@ -275,7 +275,7 @@ jobs:
           - DATABASE_URL=postgres://ubuntu:ubuntu@localhost:5432/circle_test
           # used in tests
           - SCHEMA=myschema
-      - image: postgres:12.3-alpine
+      - image: postgres:12.4-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_PASSWORD=ubuntu
@@ -293,7 +293,7 @@ jobs:
           - DATABASE_URL=postgres://ubuntu:ubuntu@localhost:5432/circle_test
           # used in tests
           - SCHEMA=myschema
-      - image: postgres:12.3-alpine
+      - image: postgres:12.4-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_PASSWORD=ubuntu
@@ -309,7 +309,7 @@ jobs:
       - <<: *node-image
         environment:
           - DATABASE_URL=postgres://ubuntu:ubuntu@localhost:5432/circle_test
-      - image: postgres:12.3-alpine
+      - image: postgres:12.4-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_PASSWORD=ubuntu
@@ -320,12 +320,12 @@ jobs:
       - run:
           name: test
           command: npm run migrate up -- --tsconfig tsconfig.json -m test/ts/migrations && npm run migrate down 0 -- --tsconfig tsconfig.json -m test/ts/migrations --timestamps
-  test-typescript-customrunner:
+  test-typescript-customrunner-url:
     docker:
       - <<: *node-image
         environment:
           - DATABASE_URL=postgres://ubuntu:ubuntu@localhost:5432/circle_test
-      - image: postgres:12.3-alpine
+      - image: postgres:12.4-alpine
         environment:
           - POSTGRES_USER=ubuntu
           - POSTGRES_PASSWORD=ubuntu
@@ -335,7 +335,39 @@ jobs:
       - <<: *postgres-wait
       - run:
           name: test
-          command: $(npm bin)/ts-node test/ts/customRunner.ts
+          command: $(npm bin)/ts-node test/ts/customRunnerDBUrl.ts
+  test-typescript-customrunner-client:
+    docker:
+      - <<: *node-image
+        environment:
+          - DATABASE_URL=postgres://ubuntu:ubuntu@localhost:5432/circle_test
+      - image: postgres:12.4-alpine
+        environment:
+          - POSTGRES_USER=ubuntu
+          - POSTGRES_PASSWORD=ubuntu
+          - POSTGRES_DB=circle_test
+    steps:
+      - <<: *restore
+      - <<: *postgres-wait
+      - run:
+          name: test
+          command: $(npm bin)/ts-node test/ts/customRunnerDBClient.ts
+  test-create-migration:
+    docker:
+      - <<: *node-image
+    steps:
+      - <<: *restore
+      - run:
+          name: check dir does not exists
+          command: |
+            [ ! -d migrations ]
+      - run:
+          name: create migration
+          command: npm run migrate create test
+      - run:
+          name: check file was created
+          command: |
+            [ $(ls -1 migrations | wc -l) -eq 1 ]
 
 workflows:
   version: 2
@@ -393,6 +425,12 @@ workflows:
       - test-typescript-migration:
           requires:
           - install
-      - test-typescript-customrunner:
+      - test-typescript-customrunner-url:
+          requires:
+          - install
+      - test-typescript-customrunner-client:
+          requires:
+          - install
+      - test-create-migration:
           requires:
           - install
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -11,34 +11,27 @@ module.exports = {
   ],
   parser: '@typescript-eslint/parser',
   parserOptions: {
+    ecmaVersion: 2020,
     sourceType: 'module',
   },
-  plugins: ['@typescript-eslint', 'import', 'security'],
   settings: {
-    'import/parsers': {
-      '@typescript-eslint/parser': ['.ts', '.tsx'],
-    },
     'import/resolver': {
       typescript: {},
     },
   },
-  env: {
-    node: true,
-    mocha: true,
-  },
   rules: {
-    'no-underscore-dangle': 0,
-    'security/detect-object-injection': 0,
-    '@typescript-eslint/explicit-function-return-type': 0,
-    '@typescript-eslint/no-explicit-any': 0,
+    'no-underscore-dangle': 'off',
+    'security/detect-object-injection': 'off',
+    '@typescript-eslint/explicit-function-return-type': 'off',
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
     'import/extensions': ['error', 'never'],
   },
   overrides: [
     {
       files: ['*.js', 'node-pg-migrate'],
       rules: {
-        '@typescript-eslint/no-var-requires': 0,
-        '@typescript-eslint/camelcase': 0,
+        '@typescript-eslint/no-var-requires': 'off',
+        '@typescript-eslint/camelcase': 'off',
       },
     },
   ],

diff --git a/.prettierrc.js b/.prettierrc.js
@@ -1,18 +1,7 @@
 module.exports = {
-  parser: 'typescript',
   semi: false,
   trailingComma: 'all',
   singleQuote: true,
   printWidth: 120,
   tabWidth: 2,
-  overrides: [
-    {
-      files: '*.json',
-      options: { parser: 'json' },
-    },
-    {
-      files: '*.md',
-      options: { parser: 'markdown' },
-    },
-  ],
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,65 @@
 # Change Log
 
+## [5.6.0](2020-08-19)
+
+### PgLiteral can be serialized
+
+- Do not try to unlock DB if connection failed [#678](https://github.com/salsita/node-pg-migrate/pull/678)
+
+## [5.5.1](2020-08-18)
+
+### Fixed
+
+- Do not try to unlock DB if connection failed [#677](https://github.com/salsita/node-pg-migrate/pull/677)
+
+## [5.5.0](2020-08-10)
+
+### Changed
+
+- Allow opclass and sort per column in indexes [#671](https://github.com/salsita/node-pg-migrate/pull/671)
+
+## [5.4.0](2020-08-05)
+
+### Changed
+
+- Update isExternalClient check [#664](https://github.com/salsita/node-pg-migrate/pull/664)
+
+## [5.3.0](2020-07-13)
+
+### Added
+
+- Display additional details when logging errors [#660](https://github.com/salsita/node-pg-migrate/pull/660)
+
+## [5.2.0](2020-06-26)
+
+### Added
+
+- View options [#656](https://github.com/salsita/node-pg-migrate/pull/656)
+
+## [5.1.1](2020-06-08)
+
+### Fixed
+
+- Fix creating migration [#646](https://github.com/salsita/node-pg-migrate/pull/646)
+
+## [5.1.0](2020-06-05)
+
+### Added
+
+- Ability to specify own template file [#642](https://github.com/salsita/node-pg-migrate/pull/642)
+
+## [5.0.2](2020-06-05)
+
+### Fixed
+
+- Fix alter column collation [#641](https://github.com/salsita/node-pg-migrate/pull/641)
+
+## [5.0.1](2020-06-02)
+
+### Fixed
+
+- Keep `this` bind in logger methods [#638](https://github.com/salsita/node-pg-migrate/pull/638)
+
 ## [5.0.0](2020-05-19)
 
 ### Breaking changes