From 8eb6767da959d2d3c73cbee361c39e834a7eada3 Mon Sep 17 00:00:00 2001
From: Edvard <edvard@hubinette.me>
Date: Fri, 26 Oct 2018 15:14:17 +0200
Subject: [PATCH] Squash drip_drip checked_headers

---
 db/migrations/1536710319_create_drip_drip.down.sql           | 4 ++++
 ..._drip_table.up.sql => 1536710319_create_drip_drip.up.sql} | 5 ++++-
 db/migrations/1536710319_create_drip_drip_table.down.sql     | 1 -
 .../1538067790_add_drip_drip_to_checked_headers.down.sql     | 2 --
 .../1538067790_add_drip_drip_to_checked_headers.up.sql       | 2 --
 5 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 db/migrations/1536710319_create_drip_drip.down.sql
 rename db/migrations/{1536710319_create_drip_drip_table.up.sql => 1536710319_create_drip_drip.up.sql} (74%)
 delete mode 100644 db/migrations/1536710319_create_drip_drip_table.down.sql
 delete mode 100644 db/migrations/1538067790_add_drip_drip_to_checked_headers.down.sql
 delete mode 100644 db/migrations/1538067790_add_drip_drip_to_checked_headers.up.sql

diff --git a/db/migrations/1536710319_create_drip_drip.down.sql b/db/migrations/1536710319_create_drip_drip.down.sql
new file mode 100644
index 00000000..cce76663
--- /dev/null
+++ b/db/migrations/1536710319_create_drip_drip.down.sql
@@ -0,0 +1,4 @@
+DROP TABLE maker.drip_drip;
+
+ALTER TABLE public.checked_headers
+  DROP COLUMN drip_drip_checked;
\ No newline at end of file
diff --git a/db/migrations/1536710319_create_drip_drip_table.up.sql b/db/migrations/1536710319_create_drip_drip.up.sql
similarity index 74%
rename from db/migrations/1536710319_create_drip_drip_table.up.sql
rename to db/migrations/1536710319_create_drip_drip.up.sql
index 4e325f3e..b9ff8bb4 100644
--- a/db/migrations/1536710319_create_drip_drip_table.up.sql
+++ b/db/migrations/1536710319_create_drip_drip.up.sql
@@ -6,4 +6,7 @@ CREATE TABLE maker.drip_drip (
   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 drip_drip_checked BOOLEAN NOT NULL DEFAULT FALSE;
\ No newline at end of file
diff --git a/db/migrations/1536710319_create_drip_drip_table.down.sql b/db/migrations/1536710319_create_drip_drip_table.down.sql
deleted file mode 100644
index 2c9b7a28..00000000
--- a/db/migrations/1536710319_create_drip_drip_table.down.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE maker.drip_drip;
\ No newline at end of file
diff --git a/db/migrations/1538067790_add_drip_drip_to_checked_headers.down.sql b/db/migrations/1538067790_add_drip_drip_to_checked_headers.down.sql
deleted file mode 100644
index 0da752a1..00000000
--- a/db/migrations/1538067790_add_drip_drip_to_checked_headers.down.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE public.checked_headers
-    DROP COLUMN drip_drip_checked;
\ No newline at end of file
diff --git a/db/migrations/1538067790_add_drip_drip_to_checked_headers.up.sql b/db/migrations/1538067790_add_drip_drip_to_checked_headers.up.sql
deleted file mode 100644
index 852e61b5..00000000
--- a/db/migrations/1538067790_add_drip_drip_to_checked_headers.up.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE public.checked_headers
-    ADD COLUMN drip_drip_checked BOOLEAN NOT NULL DEFAULT FALSE;
\ No newline at end of file