Merge branch 'master' into temp

3 files changed, 5 insertions, 10 deletions

diff --git a/askbot/migrations/0034_auto__add_field_user_avatar_url.py b/askbot/migrations/0034_auto__add_field_user_avatar_url.py
index fe50057b..26319611 100644
--- a/askbot/migrations/0034_auto__add_field_user_avatar_url.py
+++ b/askbot/migrations/0034_auto__add_field_user_avatar_url.py
@@ -3,16 +3,14 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
+from askbot.migrations_api import safe_add_column
 
 class Migration(SchemaMigration):
     
     def forwards(self, orm):
         
         # Adding field 'Tag.avatar_url'
-        try:
-            db.add_column(u'auth_user', 'has_custom_avatar', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
-        except:
-            pass
+        safe_add_column(u'auth_user', 'has_custom_avatar', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
     
     
     def backwards(self, orm):
diff --git a/askbot/migrations/0161_add_field__user_languages.py b/askbot/migrations/0161_add_field__user_languages.py
index 534a3733..85d35884 100644
--- a/askbot/migrations/0161_add_field__user_languages.py
+++ b/askbot/migrations/0161_add_field__user_languages.py
@@ -3,18 +3,16 @@ import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
+from askbot.migrations_api import safe_add_column
 
 
 class Migration(SchemaMigration):
 
     def forwards(self, orm):
         # Adding field 'Thread.language_code'
-        try:
-            db.add_column('auth_user', 'languages',
+        safe_add_column('auth_user', 'languages',
                           self.gf('django.db.models.fields.CharField')(default='en', max_length=128),
                           keep_default=False)
-        except:
-            pass
 
     def backwards(self, orm):
         # Deleting field 'Thread.junk'
diff --git a/askbot/migrations_api/__init__.py b/askbot/migrations_api/__init__.py
index 2e172a99..5a65f9cf 100644
--- a/askbot/migrations_api/__init__.py
+++ b/askbot/migrations_api/__init__.py
@@ -13,10 +13,9 @@ def safe_add_column(table, column, column_data, keep_default = False):
     so, we need to add these columns here in separate transactions
     and roll back if they fail, if we want we could also record - which columns clash
     """
-    if db.backend_name=='mysql':
+    if db.backend_name in ('mysql', 'postgres'):
         if len(db.execute('select column_name from information_schema.columns where table_name=%s and column_name=%s', params=[table, column])) == 0:
             db.add_column(table, column, column_data, keep_default = keep_default)
-    	
     else:
         try:
             db.start_transaction()