In this commit, I mostly did work on the migrations. Firstly, I droppped the

vestigial columns from the User table (ie. status, email_verified, is_admin).
Otherwise, I did a lot of work converting my existing migrations from high-
level ORM commands to low-level SQL commands to ensure that the migrating will
work regardless of what stage their instance is working in. I also re-integrated
my two registered migrations into one. Because the migration became very long, I
also added a lot of clarifying documentation.

1 files changed, 0 insertions, 6 deletions

diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 466f31b8..5173be9e 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -63,18 +63,12 @@ class User(Base, UserMixin):
     # point.
     email = Column(Unicode, nullable=False)
     pw_hash = Column(Unicode)
-#--column email_verified is VESTIGIAL with privileges and should not be used---
-#--should be dropped ASAP though a bug in sqlite3 prevents this atm------------
-    email_verified = Column(Boolean, default=False)
     created = Column(DateTime, nullable=False, default=datetime.datetime.now)
     # Intented to be nullable=False, but migrations would not work for it
     # set to nullable=True implicitly.
     wants_comment_notification = Column(Boolean, default=True)
     wants_notifications = Column(Boolean, default=True)
     license_preference = Column(Unicode)
-#--column admin is VESTIGIAL with privileges and should not be used------------
-#--should be dropped ASAP though a bug in sqlite3 prevents this atm------------
-    is_admin = Column(Boolean, default=False, nullable=False)
     url = Column(Unicode)
     bio = Column(UnicodeText)  # ??