Update dependency: @synor/core

Author: MunifTanjim

package.json

@@ -28,12 +28,12 @@
  "test": "jest"
  },
  "dependencies": {
- "connection-string": "^3.1.0",
+ "connection-string": "^3.1.1",
  "debug": "^4.1.1",
- "pg": "^7.15.1"
+ "pg": "^7.18.2"
  },
  "devDependencies": {
- "@synor/core": "^0.6.1",
+ "@synor/core": "^0.9.0",
  "@types/debug": "^4.1.5",
  "@types/jest": "^24.0.25",
  "@types/pg": "^7.14.1",
@@ -43,7 +43,7 @@
  "eslint": "^6.8.0",
  "eslint-config-prettier": "^6.9.0",
  "eslint-config-standard-with-typescript": "^11.0.1",
- "eslint-plugin-import": "^2.20.0",
+ "eslint-plugin-import": "^2.20.1",
  "eslint-plugin-node": "^11.0.0",
  "eslint-plugin-prettier": "^3.1.2",
  "eslint-plugin-promise": "^4.2.1",
@@ -53,14 +53,14 @@
  "lint-staged": "^9.4.2",
  "prettier": "^1.18.2",
  "pretty-quick": "^2.0.0",
- "rimraf": "^3.0.0",
+ "rimraf": "^3.0.2",
  "rollup-plugin-typescript2": "^0.25.2",
  "ts-jest": "^24.3.0",
  "ts-node": "^8.5.4",
  "typescript": "^3.7.4"
  },
  "peerDependencies": {
- "@synor/core": "^0.6.1"
+ "@synor/core": "^0.9.0"
  },
  "publishConfig": {
  "access": "public"

src/__snapshots__/index.test.ts.snap

@@ -65,7 +65,7 @@ Array [
 ]
 `;
 
-exports[`methods run 1`] = `
+exports[`methods run (with body) 1`] = `
 Array [
  Object {
  "applied_at": 2020-01-01T00:00:00.000Z,
@@ -102,3 +102,30 @@ Array [
  },
 ]
 `;
+
+exports[`methods run (with run) 1`] = `
+Array [
+ Object {
+ "applied_at": 2020-01-01T00:00:00.000Z,
+ "applied_by": "Synor",
+ "dirty": false,
+ "execution_time": 0,
+ "hash": "",
+ "id": 1,
+ "title": "Base Migration",
+ "type": "do",
+ "version": "0",
+ },
+ Object {
+ "applied_at": 2020-01-01T00:00:00.000Z,
+ "applied_by": "Jest",
+ "dirty": false,
+ "execution_time": 0,
+ "hash": "hash-02-do",
+ "id": 2,
+ "title": "Test Two",
+ "type": "do",
+ "version": "02",
+ },
+]
+`;

src/index.test.ts

@@ -25,7 +25,10 @@ const getTableColumnCount = async (
  .then(result => result.rows.length)
 }
 
-const migrationSource: Record<'01.do' | '01.undo', MigrationSource> = {
+const migrationSource: Record<
+ '01.do' | '01.undo' | '02.do',
+ MigrationSource
+> = {
  '01.do': {
  version: '01',
  type: 'do',
@@ -39,6 +42,15 @@ const migrationSource: Record<'01.do' | '01.undo', MigrationSource> = {
  title: 'Test One',
  body: 'SELEC -1;',
  hash: 'hash-01-undo'
+ },
+ '02.do': {
+ version: '02',
+ type: 'do',
+ title: 'Test Two',
+ hash: 'hash-02-do',
+ run: (client: Client) => {
+ return client.query(`SELECT 2;`)
+ }
  }
 }
 
@@ -334,7 +346,7 @@ describe('methods', () => {
  ).resolves.toBe(0)
  })
 
- test('run', async () => {
+ test('run (with body)', async () => {
  await expect(engine.run(migrationSource['01.do'])).resolves.toBeUndefined()
  await expect(engine.run(migrationSource['01.undo'])).rejects.toThrow()
 
@@ -346,6 +358,17 @@ describe('methods', () => {
  await engine.drop()
  })
 
+ test('run (with run)', async () => {
+ await expect(engine.run(migrationSource['02.do'])).resolves.toBeUndefined()
+
+ const { rows } = await client.query(
+ `SELECT * FROM ${schemaName}.${tableName};`
+ )
+ expect(rows).toMatchSnapshot()
+
+ await engine.drop()
+ })
+
  test('repair', async () => {
  await expect(engine.run(migrationSource['01.do'])).resolves.toBeUndefined()
  await expect(engine.run(migrationSource['01.undo'])).rejects.toThrow()

src/index.ts

@@ -9,6 +9,8 @@ type DatabaseEngine = import('@synor/core').DatabaseEngine
 type DatabaseEngineFactory = import('@synor/core').DatabaseEngineFactory
 type MigrationSource = import('@synor/core').MigrationSource
 
+export type MigrationSourceContentRunner = (client: Client) => Promise<void>
+
 export const PostgreSQLDatabaseEngine: DatabaseEngineFactory = (
  uri,
  { baseVersion, getAdvisoryLockId, getUserInfo }
@@ -77,14 +79,19 @@ export const PostgreSQLDatabaseEngine: DatabaseEngineFactory = (
  type,
  title,
  hash,
- body
+ body,
+ run
  }: MigrationSource) => {
  let dirty = false
 
  const startTime = performance.now()
 
  try {
- await client.query(body)
+ if (body) {
+ await client.query(body)
+ } else {
+ await (run as MigrationSourceContentRunner)(client)
+ }
  } catch (err) {
  dirty = true
 

yarn.lock

@@ -894,10 +894,10 @@
  dependencies:
  any-observable "^0.3.0"
 
-"@synor/core@^0.6.1":
- version "0.6.1"
- resolved "https://registry.yarnpkg.com/@synor/core/-/core-0.6.1.tgz#16db5a677c6a046b467c455e45aa7ddb16828588"
- integrity sha512-bJIFL6jLemkz9RoW0kcQXOypiDq4u9uHA3WXl5tV2D2lUTGkzPTNsZ63dparuInVpqwghERHNvkPHFxTeo9BFw==
+"@synor/core@^0.9.0":
+ version "0.9.0"
+ resolved "https://registry.yarnpkg.com/@synor/core/-/core-0.9.0.tgz#f05bf65ec4f86eb85c01e774ae0f13e6116e59fe"
+ integrity sha512-ZKR1Zulm2DUWu5CdJs+T08lRIBsLdg8K+K5rR+LBOZwml+u4a5WqAIVPA4BbulyFrNIWjjwaDO7gHq9KB/iKxQ==
  dependencies:
  debug "^4.1.1"
  lodash.defaultsdeep "^4.6.1"
@@ -1840,10 +1840,10 @@ concat-with-sourcemaps@^1.0.5:
  dependencies:
  source-map "^0.6.1"
 
-connection-string@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/connection-string/-/connection-string-3.1.0.tgz#459ac5cf04eb239ee179506c630be8ed3265218a"
- integrity sha512-Gy+QoTYc09PqsrRoOZyKUYWL73ug/afVvQfRA3C5XIoYlm3TTUBAwjvOOP3AlGF3FHnZGY+nS98uKFjcj8RrPA==
+connection-string@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/connection-string/-/connection-string-3.1.1.tgz#871d81ec627ccc43eb8d621290e10a996598e733"
+ integrity sha512-d58cz9qYiz4lOw10EXjMadtElrb1TlPLDva5gwJELPzfJDe8MWEu10G6Y9ktgfMo8wP0LnREHjfGQr2ZEvbfcQ==
 
 contains-path@^0.1.0:
  version "0.1.0"
@@ -2395,10 +2395,10 @@ eslint-plugin-es@^3.0.0:
  eslint-utils "^2.0.0"
  regexpp "^3.0.0"
 
-eslint-plugin-import@^2.20.0:
- version "2.20.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.0.tgz#d749a7263fb6c29980def8e960d380a6aa6aecaa"
- integrity sha512-NK42oA0mUc8Ngn4kONOPsPB1XhbUvNHqF+g307dPV28aknPoiNnKLFd9em4nkswwepdF5ouieqv5Th/63U7YJQ==
+eslint-plugin-import@^2.20.1:
+ version "2.20.1"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz#802423196dcb11d9ce8435a5fc02a6d3b46939b3"
+ integrity sha512-qQHgFOTjguR+LnYRoToeZWT62XM55MBVXObHM6SKFd1VzDcX/vqT1kAz8ssqigh5eMj8qXcRoXXGZpPP6RfdCw==
  dependencies:
  array-includes "^3.0.3"
  array.prototype.flat "^1.2.1"
@@ -4935,10 +4935,15 @@ pg-int8@1.0.1:
  resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
  integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
 
-pg-pool@^2.0.7:
- version "2.0.8"
- resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.8.tgz#f6d8c1727707cebcb1c50d0b1b770e0a031bf831"
- integrity sha512-UE4H+4PT53RbwYaGxkeVDcMcp1g8EmYo91qeUugijsHwzV/RDpYVRWzmfiDisEQZhVDzyf/GUctNOrh+ZPJCGA==
+pg-packet-stream@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz#e45c3ae678b901a2873af1e17b92d787962ef914"
+ integrity sha512-kRBH0tDIW/8lfnnOyTwKD23ygJ/kexQVXZs7gEyBljw4FYqimZFxnMMx50ndZ8In77QgfGuItS5LLclC2TtjYg==
+
+pg-pool@^2.0.10:
+ version "2.0.10"
+ resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.10.tgz#842ee23b04e86824ce9d786430f8365082d81c4a"
+ integrity sha512-qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg==
 
 pg-types@^2.1.0:
  version "2.2.0"
@@ -4951,15 +4956,16 @@ pg-types@^2.1.0:
  postgres-date "~1.0.4"
  postgres-interval "^1.1.0"
 
-pg@^7.15.1:
- version "7.15.1"
- resolved "https://registry.yarnpkg.com/pg/-/pg-7.15.1.tgz#a0bac84ebaeb809f3a369fb695ae89b314b08b22"
- integrity sha512-o293Pxx5bNRpTv3Dh4+IIhPbTw19Bo4zvppLgR+MAV2I7AF3sMr9gPB4JPvBffWb24pDfC+7Ghe6xh2VxVMBpQ==
+pg@^7.18.2:
+ version "7.18.2"
+ resolved "https://registry.yarnpkg.com/pg/-/pg-7.18.2.tgz#4e219f05a00aff4db6aab1ba02f28ffa4513b0bb"
+ integrity sha512-Mvt0dGYMwvEADNKy5PMQGlzPudKcKKzJds/VbOeZJpb6f/pI3mmoXX0JksPgI3l3JPP/2Apq7F36O63J7mgveA==
  dependencies:
  buffer-writer "2.0.0"
  packet-reader "1.0.0"
  pg-connection-string "0.1.3"
- pg-pool "^2.0.7"
+ pg-packet-stream "^1.1.0"
+ pg-pool "^2.0.10"
  pg-types "^2.1.0"
  pgpass "1.x"
  semver "4.3.2"
@@ -5809,6 +5815,13 @@ rimraf@^3.0.0:
  dependencies:
  glob "^7.1.3"
 
+rimraf@^3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+ integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+ dependencies:
+ glob "^7.1.3"
+
 rollup-plugin-babel@^4.3.2:
  version "4.3.3"
  resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-4.3.3.tgz#7eb5ac16d9b5831c3fd5d97e8df77ba25c72a2aa"