From 61150c74d21bc98e4b819602bbca67ca23b82dc0 Mon Sep 17 00:00:00 2001
From: Omar Roth <omarroth@protonmail.com>
Date: Tue, 14 Apr 2020 18:08:58 -0500
Subject: [PATCH] Move privacy type into playlists.sql

---
 README.md                     |  1 -
 config/sql/playlists.sql      | 11 +++++++++++
 config/sql/privacy.sql        | 10 ----------
 docker/entrypoint.postgres.sh |  1 -
 kubernetes/README.md          |  1 -
 5 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 config/sql/privacy.sql

diff --git a/README.md b/README.md
index 3d4532082..d8cc1c6e8 100644
--- a/README.md
+++ b/README.md
@@ -115,7 +115,6 @@ $ psql invidious kemal < /home/invidious/invidious/config/sql/users.sql
 $ psql invidious kemal < /home/invidious/invidious/config/sql/session_ids.sql
 $ psql invidious kemal < /home/invidious/invidious/config/sql/nonces.sql
 $ psql invidious kemal < /home/invidious/invidious/config/sql/annotations.sql
-$ psql invidious kemal < /home/invidious/invidious/config/sql/privacy.sql
 $ psql invidious kemal < /home/invidious/invidious/config/sql/playlists.sql
 $ psql invidious kemal < /home/invidious/invidious/config/sql/playlist_videos.sql
 $ exit
diff --git a/config/sql/playlists.sql b/config/sql/playlists.sql
index 46ff30ecf..468496cbc 100644
--- a/config/sql/playlists.sql
+++ b/config/sql/playlists.sql
@@ -1,3 +1,14 @@
+-- Type: public.privacy
+
+-- DROP TYPE public.privacy;
+
+CREATE TYPE public.privacy AS ENUM
+(
+    'Public',
+    'Unlisted',
+    'Private'
+);
+
 -- Table: public.playlists
 
 -- DROP TABLE public.playlists;
diff --git a/config/sql/privacy.sql b/config/sql/privacy.sql
deleted file mode 100644
index 4356813ed..000000000
--- a/config/sql/privacy.sql
+++ /dev/null
@@ -1,10 +0,0 @@
--- Type: public.privacy
-
--- DROP TYPE public.privacy;
-
-CREATE TYPE public.privacy AS ENUM
-(
-    'Public',
-    'Unlisted',
-    'Private'
-);
diff --git a/docker/entrypoint.postgres.sh b/docker/entrypoint.postgres.sh
index 1588c56cf..be6f6782a 100755
--- a/docker/entrypoint.postgres.sh
+++ b/docker/entrypoint.postgres.sh
@@ -19,7 +19,6 @@ if [ ! -f /var/lib/postgresql/data/setupFinished ]; then
     su postgres -c 'psql invidious kemal < config/sql/session_ids.sql'
     su postgres -c 'psql invidious kemal < config/sql/nonces.sql'
     su postgres -c 'psql invidious kemal < config/sql/annotations.sql'
-    su postgres -c 'psql invidious kemal < config/sql/privacy.sql'
     su postgres -c 'psql invidious kemal < config/sql/playlists.sql'
     su postgres -c 'psql invidious kemal < config/sql/playlist_videos.sql'
     touch /var/lib/postgresql/data/setupFinished
diff --git a/kubernetes/README.md b/kubernetes/README.md
index 1c62f469c..35478f99e 100644
--- a/kubernetes/README.md
+++ b/kubernetes/README.md
@@ -17,7 +17,6 @@ $ kubectl create configmap invidious-postgresql-init \
   --from-file=../config/sql/session_ids.sql \
   --from-file=../config/sql/nonces.sql \
   --from-file=../config/sql/annotations.sql \
-  --from-file=../config/sql/privacy.sql \
   --from-file=../config/sql/playlists.sql \
   --from-file=../config/sql/playlist_videos.sql