2 files changed, 6 insertions, 6 deletions
diff --git a/mediagoblin/db/sql/base.py b/mediagoblin/db/sql/base.py
index 6f45b21b..1db53c56 100644
--- a/mediagoblin/db/sql/base.py
+++ b/mediagoblin/db/sql/base.py
@@ -15,6 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import scoped_session, sessionmaker, object_session
 from sqlalchemy.orm.query import Query
 from sqlalchemy.sql.expression import desc
@@ -73,3 +74,6 @@ class GMGTableBase(object):
             sess = Session()
         sess.add(self)
         sess.commit()
+
+
+Base = declarative_base(cls=GMGTableBase)
diff --git a/mediagoblin/db/sql/models.py b/mediagoblin/db/sql/models.py
index 57444c2c..6232fff8 100644
--- a/mediagoblin/db/sql/models.py
+++ b/mediagoblin/db/sql/models.py
@@ -17,7 +17,6 @@
 
 import datetime
 
-from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy import (
     Column, Integer, Unicode, UnicodeText, DateTime, Boolean, ForeignKey,
     UniqueConstraint)
@@ -27,13 +26,10 @@ from sqlalchemy.sql.expression import desc
 from sqlalchemy.ext.associationproxy import association_proxy
 
 from mediagoblin.db.sql.extratypes import PathTupleWithSlashes
-from mediagoblin.db.sql.base import GMGTableBase
+from mediagoblin.db.sql.base import Base
 from mediagoblin.db.mixin import UserMixin, MediaEntryMixin
 
 
-Base = declarative_base(cls=GMGTableBase)
-
-
 class SimpleFieldAlias(object):
     """An alias for any field"""
     def __init__(self, fieldname):
@@ -76,7 +72,7 @@ class MediaEntry(Base, MediaEntryMixin):
     id = Column(Integer, primary_key=True)
     uploader = Column(Integer, ForeignKey('users.id'), nullable=False)
     title = Column(Unicode, nullable=False)
-    slug = Column(Unicode, nullable=False)
+    slug = Column(Unicode)
     created = Column(DateTime, nullable=False, default=datetime.datetime.now)
     description = Column(UnicodeText) # ??
     description_html = Column(UnicodeText) # ??