From 350301f7d3272be28291a43c07f1a5ae53090214 Mon Sep 17 00:00:00 2001
From: wishu <wish@sek.ai>
Date: Mon, 18 Jul 2022 15:18:12 +1000
Subject: [PATCH] merge guild schema

---
 Erupe/guild-additions.sql | 20 ++++++++++++++++++++
 Erupe/guild-adventure.sql | 14 --------------
 Erupe/guild-food.sql      | 12 ------------
 3 files changed, 20 insertions(+), 26 deletions(-)
 delete mode 100644 Erupe/guild-adventure.sql
 delete mode 100644 Erupe/guild-food.sql

diff --git a/Erupe/guild-additions.sql b/Erupe/guild-additions.sql
index 46b0579b4..10a258316 100644
--- a/Erupe/guild-additions.sql
+++ b/Erupe/guild-additions.sql
@@ -17,4 +17,24 @@ CREATE TABLE IF NOT EXISTS public.guild_alliances
     sub2_id int
 );
 
+CREATE TABLE IF NOT EXISTS public.guild_adventures
+(
+    id serial NOT NULL PRIMARY KEY,
+    guild_id int NOT NULL,
+    destination int NOT NULL,
+    charge int NOT NULL DEFAULT 0,
+    depart int NOT NULL,
+    return int NOT NULL,
+    collected_by text NOT NULL DEFAULT ''
+);
+
+CREATE TABLE IF NOT EXISTS public.guild_meals
+(
+	  id serial NOT NULL PRIMARY KEY,
+    guild_id int NOT NULL,
+    meal_id int NOT NULL,
+    level int NOT NULL,
+    expires int NOT NULL
+);
+
 END;
\ No newline at end of file
diff --git a/Erupe/guild-adventure.sql b/Erupe/guild-adventure.sql
deleted file mode 100644
index 7c238c837..000000000
--- a/Erupe/guild-adventure.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-BEGIN;
-
-CREATE TABLE IF NOT EXISTS public.guild_adventures
-(
-    id serial NOT NULL PRIMARY KEY,
-    guild_id int NOT NULL,
-    destination int NOT NULL,
-    charge int NOT NULL DEFAULT 0,
-    depart int NOT NULL,
-    return int NOT NULL,
-    collected_by text NOT NULL DEFAULT ''
-);
-
-END;
\ No newline at end of file
diff --git a/Erupe/guild-food.sql b/Erupe/guild-food.sql
deleted file mode 100644
index 34a2dec08..000000000
--- a/Erupe/guild-food.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-BEGIN;
-
-CREATE TABLE IF NOT EXISTS public.guild_meals
-(
-	  id serial NOT NULL PRIMARY KEY,
-    guild_id int NOT NULL,
-    meal_id int NOT NULL,
-    level int NOT NULL,
-    expires int NOT NULL
-);
-
-END;
\ No newline at end of file