From 5aa4e7c904b043a0221bed78fc5f4a98cdfdf187 Mon Sep 17 00:00:00 2001
From: Craig Kerstiens <craig.kerstiens@gmail.com>
Date: Wed, 7 Sep 2011 12:45:16 -0700
Subject: [PATCH] tweaking settings to be safer, and removing requirement of
 psycopg2 for django

---
 bin/compile | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/bin/compile b/bin/compile
index 9e936db..ead1384 100755
--- a/bin/compile
+++ b/bin/compile
@@ -45,19 +45,28 @@ if [ "$NAME" = "Python/Django" ]; then
   echo "       Injecting code into $SETTINGS_FILE to read from DATABASE_URL"
   
   cat >>$SETTINGS_FILE <<EOF
-
 import os, urlparse
-if os.environ.has_key('DATABASE_URL'):
-    urlparse.uses_netloc.append('postgres')
-    url = urlparse.urlparse(os.environ['DATABASE_URL'])
-    DATABASES['default'] = {
-        'ENGINE':   'django.db.backends.postgresql_psycopg2',
-        'NAME':     url.path[1:],
-        'USER':     url.username,
-        'PASSWORD': url.password,
-        'HOST':     url.hostname,
-        'PORT':     url.port,
-    }
+try:
+    if os.environ.has_key('DATABASE_URL'):
+        urlparse.uses_netloc.append('postgres')
+        urlparse.uses_netloc.append('mysql')
+        url = urlparse.urlparse(os.environ['DATABASE_URL'])
+        DATABASES['default'] = {
+            'ENGINE':   'django.db.backends.postgresql_psycopg2',
+            'NAME':     url.path[1:],
+            'USER':     url.username,
+            'PASSWORD': url.password,
+            'HOST':     url.hostname,
+            'PORT':     url.port,
+        }
+        if 'postgres' in os.environ['DATABASE_URL']:
+            DATABASES['default']['ENGINE'] = 'django.db.backends.postgresql_psycopg2',
+        if 'mysql' in os.environ['DATABASE_URL']:
+            DATABASES['default']['ENGINE'] = 'django.db.backends.mysql',
+except:
+    print "Unexpected error:", sys.exc_info()
+    raise
+
 EOF
 
   echo "-----> Django script installation"
@@ -75,12 +84,8 @@ PIP_DOWNLOAD_CACHE=$PIP_DOWNLOAD_CACHE bin/pip install -r requirements.txt | sed
 echo "-----> Making virtualenv relocatable"
 virtualenv --relocatable . | sed -u 's/^/       /'
 
-if [ "$NAME" = "Python/Django" ]; then
-  bin/pip freeze | grep psycopg2 > /dev/null || { echo " !     Missing psycopg2 dependency in requirements.txt"; exit 1; }
-fi
-
 # store new artifacts in cache
 for dir in $VIRTUALENV_DIRS; do
   rm -rf $CACHE_DIR/$dir
   cp -R $dir $CACHE_DIR/
-done
\ No newline at end of file
+done