heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIXED SQL MIGRATION #2

Browse Source
This commit is contained in:
Joar Wandborg 2012-06-10 18:31:49 +02:00
parent 38c6d44123
commit c4869eff40
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/db/sql/migrations.py
View File

@ -43,5 +43,5 @@ def add_wants_notification_column(db_conn):
autoload_with=db_conn.bind) autoload_with=db_conn.bind)
col = Column('wants_comment_notification', Boolean, col = Column('wants_comment_notification', Boolean,
default=True, nullable=False) default=True, nullable=True)
col.create(users, populate_defaults=True) col.create(users, populate_defaults=True)

6
mediagoblin/db/sql/models.py
View File

@ -38,7 +38,7 @@ from mediagoblin.db.sql.base import Session
# It's actually kind of annoying how sqlalchemy-migrate does this, if # It's actually kind of annoying how sqlalchemy-migrate does this, if
# I understand it right, but whatever. Anyway, don't remove this :P # I understand it right, but whatever. Anyway, don't remove this :P
# #
# We could do migration calls more manually instead of relying on # We could do migration calls more manually instead of relying on
# this import-based meddling... # this import-based meddling...
from migrate import changeset from migrate import changeset
@ -70,7 +70,9 @@ class User(Base, UserMixin):
pw_hash = Column(Unicode, nullable=False) pw_hash = Column(Unicode, nullable=False)
email_verified = Column(Boolean, default=False) email_verified = Column(Boolean, default=False)
status = Column(Unicode, default=u"needs_email_verification", nullable=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) verification_key = Column(Unicode)
is_admin = Column(Boolean, default=False, nullable=False) is_admin = Column(Boolean, default=False, nullable=False)
url = Column(Unicode) url = Column(Unicode)