fix: set missing head

felixfbecker · May 19, 2018 · 437db56 · 437db56
1 parent fc6b695
commit 437db56
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/dist/adapters/postgres.js b/dist/adapters/postgres.js
diff --git a/dist/adapters/postgres.js.map b/dist/adapters/postgres.js.map
diff --git a/dist/cli.js b/dist/cli.js
diff --git a/dist/cli.js.map b/dist/cli.js.map
diff --git a/src/adapters/postgres.ts b/src/adapters/postgres.ts
@@ -71,6 +71,9 @@ export class PostgresAdapter extends DbAdapter {
  * Logs a task to the database. Sets the task ID
  */
  public async beginMigrationTask(task: Task): Promise<void> {
+ if (!task.head) {
+ throw new Error('Task has no HEAD')
+ }
  await this.client.query(`BEGIN TRANSACTION`)
  try {
  await this.client.query(`LOCK TABLE "merkel_meta"`)
@@ -83,7 +86,7 @@ export class PostgresAdapter extends DbAdapter {
  ${task.migration.name},
  ${task.type},
  ${task.commit ? task.commit.sha1 : null},
- ${task.head ? task.head.sha1 : null}
+ ${task.head.sha1}
  )
  RETURNING id
  `)

diff --git a/src/cli.ts b/src/cli.ts
@@ -316,6 +316,7 @@ yargs.command(
  // create pending tasks
  for (const task of tasks) {
  try {
+ task.head = head
  await adapter.beginMigrationTask(task)
  } catch (error) {
  if (error instanceof PendingMigrationFoundError) {