From 77c7c9b453f7723aa356bddc90ddb0e28ce35b80 Mon Sep 17 00:00:00 2001
From: Edvard <edvard@hubinette.me>
Date: Fri, 26 Oct 2018 15:26:36 +0200
Subject: [PATCH] Squash frob checked_headers

---
 db/migrations/1533844125_create_frob.down.sql                | 4 ++++
 ...reate_frob_table.up.sql => 1533844125_create_frob.up.sql} | 5 ++++-
 db/migrations/1533844125_create_frob_table.down.sql          | 1 -
 .../1538075501_add_frob_to_checked_headers.down.sql          | 2 --
 db/migrations/1538075501_add_frob_to_checked_headers.up.sql  | 2 --
 5 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 db/migrations/1533844125_create_frob.down.sql
 rename db/migrations/{1533844125_create_frob_table.up.sql => 1533844125_create_frob.up.sql} (80%)
 delete mode 100644 db/migrations/1533844125_create_frob_table.down.sql
 delete mode 100644 db/migrations/1538075501_add_frob_to_checked_headers.down.sql
 delete mode 100644 db/migrations/1538075501_add_frob_to_checked_headers.up.sql

diff --git a/db/migrations/1533844125_create_frob.down.sql b/db/migrations/1533844125_create_frob.down.sql
new file mode 100644
index 00000000..8c8d394e
--- /dev/null
+++ b/db/migrations/1533844125_create_frob.down.sql
@@ -0,0 +1,4 @@
+DROP TABLE maker.frob;
+
+ALTER TABLE public.checked_headers
+  DROP COLUMN frob_checked;
\ No newline at end of file
diff --git a/db/migrations/1533844125_create_frob_table.up.sql b/db/migrations/1533844125_create_frob.up.sql
similarity index 80%
rename from db/migrations/1533844125_create_frob_table.up.sql
rename to db/migrations/1533844125_create_frob.up.sql
index 13be1690..2ef436b1 100644
--- a/db/migrations/1533844125_create_frob_table.up.sql
+++ b/db/migrations/1533844125_create_frob.up.sql
@@ -12,4 +12,7 @@ CREATE TABLE maker.frob (
   tx_idx    INTEGER NOT NUll,
   raw_log   JSONB,
   UNIQUE (header_id, tx_idx, log_idx)
-);
\ No newline at end of file
+);
+
+ALTER TABLE public.checked_headers
+  ADD COLUMN frob_checked BOOLEAN NOT NULL DEFAULT FALSE;
\ No newline at end of file
diff --git a/db/migrations/1533844125_create_frob_table.down.sql b/db/migrations/1533844125_create_frob_table.down.sql
deleted file mode 100644
index c0382604..00000000
--- a/db/migrations/1533844125_create_frob_table.down.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE maker.frob;
\ No newline at end of file
diff --git a/db/migrations/1538075501_add_frob_to_checked_headers.down.sql b/db/migrations/1538075501_add_frob_to_checked_headers.down.sql
deleted file mode 100644
index 8549624c..00000000
--- a/db/migrations/1538075501_add_frob_to_checked_headers.down.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE public.checked_headers
-    DROP COLUMN frob_checked;
\ No newline at end of file
diff --git a/db/migrations/1538075501_add_frob_to_checked_headers.up.sql b/db/migrations/1538075501_add_frob_to_checked_headers.up.sql
deleted file mode 100644
index b6332392..00000000
--- a/db/migrations/1538075501_add_frob_to_checked_headers.up.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE public.checked_headers
-    ADD COLUMN frob_checked BOOLEAN NOT NULL DEFAULT FALSE;
\ No newline at end of file