fixes based on ekim's suggestions

common/common/database.py

@@ -14,21 +14,22 @@ from psycogreen.gevent import patch_psycopg
 
 
 class DBManager(object):
-	"""Patches psycopg2 before any connections are created, and applies the schema.
+	"""Patches psycopg2 before any connections are created. Stores connect info 
-	Stores connect info for easy creation of new connections, and sets some defaults before
+	for easy creation of new connections, and sets some defaults before
 	returning them.
 
-	It has the ability to serve as a primitive connection pool, as getting a new conn will
+	It has the ability to serve as a primitive connection pool, as getting a
-	return existing conns it knows about first, but this mainly just exists to re-use
+	new conn will return existing conns it knows about first, but this mainly
-	the initial conn used to apply the schema, and you should use a real conn pool for
+	just exists to re-use the initial conn used to test the connection, and you 
-	any non-trivial use.
+	should use a real conn pool for any non-trivial use.
 
-	Returned conns are set to seralizable isolation level, autocommit, and use NamedTupleCursor cursors.
+	Returned conns are set to seralizable isolation level, autocommit, and use
-	"""
+	NamedTupleCursor cursors."""
 	def __init__(self, **connect_kwargs):
 		patch_psycopg()
 		self.conns = []
 		self.connect_kwargs = connect_kwargs
+		# get a connection to test whether connection is working. 
 		conn = self.get_conn()
 		self.put_conn(conn)
 

postgres/setup.sh

@@ -36,19 +36,16 @@ fi
 
 echo "Applying schema for $POSTGRES_DB"
 psql -v ON_ERROR_STOP=1 -U $WUBLOADER_USER -d $POSTGRES_DB <<-EOSQL
--- Create type if it doesn't already exist
+
-DO \$\$ BEGIN
+CREATE TYPE event_state as ENUM (
-	CREATE TYPE event_state as ENUM (
+	'UNEDITED',
-		'UNEDITED',
+	'EDITED',
-		'EDITED',
+	'CLAIMED',
-		'CLAIMED',
+	'FINALIZING',
-		'FINALIZING',
+	'TRANSCODING',
-		'TRANSCODING',
+	'DONE'
-		'DONE'
+);
-	);
+
-EXCEPTION WHEN duplicate_object THEN
-	NULL;
-END \$\$;
 
 CREATE TABLE events (
 	id UUID PRIMARY KEY,