FIXED SQL MIGRATION #2

diff --git a/mediagoblin/db/sql/migrations.py b/mediagoblin/db/sql/migrations.py
index c7f45e16345652effc6fba68329194ef460044e1..453801a516fb5df60d1abf98e3074feec67ab143 100644 (file)
--- a/mediagoblin/db/sql/migrations.py
+++ b/mediagoblin/db/sql/migrations.py
@@ -43,5 +43,5 @@ def add_wants_notification_column(db_conn):
             autoload_with=db_conn.bind)
 
     col = Column('wants_comment_notification', Boolean,
-            default=True, nullable=False)
+            default=True, nullable=True)
     col.create(users, populate_defaults=True)

diff --git a/mediagoblin/db/sql/models.py b/mediagoblin/db/sql/models.py
index ba28ab7bab509d383b02d384c3ed023c71233ef8..d17386fccf47c17a1266e74d900e444f9608dfaf 100644 (file)
--- a/mediagoblin/db/sql/models.py
+++ b/mediagoblin/db/sql/models.py
@@ -38,7 +38,7 @@ from mediagoblin.db.sql.base import Session
 
 # It's actually kind of annoying how sqlalchemy-migrate does this, if
 # I understand it right, but whatever.  Anyway, don't remove this :P
-# 
+#
 # We could do migration calls more manually instead of relying on
 # this import-based meddling...
 from migrate import changeset
@@ -70,7 +70,9 @@ class User(Base, UserMixin):
     pw_hash = Column(Unicode, nullable=False)
     email_verified = Column(Boolean, default=False)
     status = Column(Unicode, default=u"needs_email_verification", nullable=False)
-    wants_comment_notification = Column(Boolean, default=True, nullable=False)
+    # Intented to be nullable=False, but migrations would not work for it
+    # set to nullable=True implicitly.
+    wants_comment_notification = Column(Boolean, default=True)
     verification_key = Column(Unicode)
     is_admin = Column(Boolean, default=False, nullable=False)
     url = Column(Unicode)