From c54322f76ad6e553809a068a0670b3f33d0368a9 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulip.com>
Date: Wed, 13 Nov 2013 12:06:53 -0500
Subject: [PATCH] install: Move DROP SCHEMA PUBLIC to run in zulip database.

(imported from commit 1eef44e7255b8fe1314f7763ebfc6c04083305e5)
---
 scripts/setup/initialize-database | 6 +++++-
 scripts/setup/postgres-init-db    | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/setup/initialize-database b/scripts/setup/initialize-database
index bd6ec0dfb0..db15556506 100755
--- a/scripts/setup/initialize-database
+++ b/scripts/setup/initialize-database
@@ -3,7 +3,11 @@
 # Change to root directory of the checkout that we're running from
 cd $(dirname $0)/../..
 
-echo "DROP SCHEMA zulip CASCADE; CREATE SCHEMA zulip;" | python manage.py dbshell
+psql <<EOF
+DROP SCHEMA zulip CASCADE;
+DROP SCHEMA public CASCADE;
+CREATE SCHEMA zulip;
+EOF
 
 python manage.py checkconfig
 
diff --git a/scripts/setup/postgres-init-db b/scripts/setup/postgres-init-db
index 726b81b171..4cf2b275f8 100755
--- a/scripts/setup/postgres-init-db
+++ b/scripts/setup/postgres-init-db
@@ -5,7 +5,6 @@ CREATE USER zulip;
 ALTER ROLE zulip SET search_path TO zulip,public;
 DROP DATABASE IF EXISTS zulip;
 CREATE DATABASE zulip OWNER=zulip;
-DROP SCHEMA public CASCADE;
 EOF
 
 echo "Database created"