sh4nks 10 лет назад
Родитель
Сommit
05495f4362
3 измененных файлов с 28 добавлено и 28 удалено
  1. 10 10
      flaskbb/forum/models.py
  2. 7 7
      flaskbb/management/models.py
  3. 11 11
      flaskbb/user/models.py

+ 10 - 10
flaskbb/forum/models.py

@@ -105,7 +105,7 @@ class Report(db.Model):
     post_id = db.Column(db.Integer, db.ForeignKey("posts.id"), nullable=False)
     post_id = db.Column(db.Integer, db.ForeignKey("posts.id"), nullable=False)
     zapped = db.Column(db.DateTime)
     zapped = db.Column(db.DateTime)
     zapped_by = db.Column(db.Integer, db.ForeignKey("users.id"))
     zapped_by = db.Column(db.Integer, db.ForeignKey("users.id"))
-    reason = db.Column(db.String(63))
+    reason = db.Column(db.Text)
 
 
     post = db.relationship("Post", backref="report", lazy="joined")
     post = db.relationship("Post", backref="report", lazy="joined")
     reporter = db.relationship("User", lazy="joined",
     reporter = db.relationship("User", lazy="joined",
@@ -157,11 +157,11 @@ class Post(db.Model):
                                        name="fk_post_topic_id",
                                        name="fk_post_topic_id",
                                        ondelete="CASCADE"))
                                        ondelete="CASCADE"))
     user_id = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=False)
     user_id = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=False)
-    username = db.Column(db.String(15), nullable=False)
+    username = db.Column(db.String(200), nullable=False)
     content = db.Column(db.Text, nullable=False)
     content = db.Column(db.Text, nullable=False)
     date_created = db.Column(db.DateTime, default=datetime.utcnow())
     date_created = db.Column(db.DateTime, default=datetime.utcnow())
     date_modified = db.Column(db.DateTime)
     date_modified = db.Column(db.DateTime)
-    modified_by = db.Column(db.String(15))
+    modified_by = db.Column(db.String(200))
 
 
     # Properties
     # Properties
     @property
     @property
@@ -276,9 +276,9 @@ class Topic(db.Model):
                                        use_alter=True,
                                        use_alter=True,
                                        name="fk_topic_forum_id"),
                                        name="fk_topic_forum_id"),
                          nullable=False)
                          nullable=False)
-    title = db.Column(db.String(63), nullable=False)
+    title = db.Column(db.String(255), nullable=False)
     user_id = db.Column(db.Integer, db.ForeignKey("users.id"))
     user_id = db.Column(db.Integer, db.ForeignKey("users.id"))
-    username = db.Column(db.String(15), nullable=False)
+    username = db.Column(db.String(200), nullable=False)
     date_created = db.Column(db.DateTime, default=datetime.utcnow())
     date_created = db.Column(db.DateTime, default=datetime.utcnow())
     last_updated = db.Column(db.DateTime, default=datetime.utcnow())
     last_updated = db.Column(db.DateTime, default=datetime.utcnow())
     locked = db.Column(db.Boolean, default=False)
     locked = db.Column(db.Boolean, default=False)
@@ -577,12 +577,12 @@ class Forum(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     id = db.Column(db.Integer, primary_key=True)
     category_id = db.Column(db.Integer, db.ForeignKey("categories.id"),
     category_id = db.Column(db.Integer, db.ForeignKey("categories.id"),
                             nullable=False)
                             nullable=False)
-    title = db.Column(db.String(15), nullable=False)
-    description = db.Column(db.String(255))
+    title = db.Column(db.String(255), nullable=False)
+    description = db.Column(db.Text)
     position = db.Column(db.Integer, default=1, nullable=False)
     position = db.Column(db.Integer, default=1, nullable=False)
     locked = db.Column(db.Boolean, default=False, nullable=False)
     locked = db.Column(db.Boolean, default=False, nullable=False)
     show_moderators = db.Column(db.Boolean, default=False, nullable=False)
     show_moderators = db.Column(db.Boolean, default=False, nullable=False)
-    external = db.Column(db.String(63))
+    external = db.Column(db.String(200))
 
 
     post_count = db.Column(db.Integer, default=0, nullable=False)
     post_count = db.Column(db.Integer, default=0, nullable=False)
     topic_count = db.Column(db.Integer, default=0, nullable=False)
     topic_count = db.Column(db.Integer, default=0, nullable=False)
@@ -806,8 +806,8 @@ class Category(db.Model):
     __searchable__ = ['title', 'description']
     __searchable__ = ['title', 'description']
 
 
     id = db.Column(db.Integer, primary_key=True)
     id = db.Column(db.Integer, primary_key=True)
-    title = db.Column(db.String(63), nullable=False)
-    description = db.Column(db.String(255))
+    title = db.Column(db.String(255), nullable=False)
+    description = db.Column(db.Text)
     position = db.Column(db.Integer, default=1, nullable=False)
     position = db.Column(db.Integer, default=1, nullable=False)
 
 
     # One-to-many
     # One-to-many

+ 7 - 7
flaskbb/management/models.py

@@ -18,9 +18,9 @@ from flaskbb.extensions import db, cache
 class SettingsGroup(db.Model):
 class SettingsGroup(db.Model):
     __tablename__ = "settingsgroup"
     __tablename__ = "settingsgroup"
 
 
-    key = db.Column(db.String, primary_key=True)
-    name = db.Column(db.String, nullable=False)
-    description = db.Column(db.String, nullable=False)
+    key = db.Column(db.String(255), primary_key=True)
+    name = db.Column(db.String(255), nullable=False)
+    description = db.Column(db.Text, nullable=False)
     settings = db.relationship("Setting", lazy="dynamic", backref="group",
     settings = db.relationship("Setting", lazy="dynamic", backref="group",
                                cascade="all, delete-orphan")
                                cascade="all, delete-orphan")
 
 
@@ -38,7 +38,7 @@ class SettingsGroup(db.Model):
 class Setting(db.Model):
 class Setting(db.Model):
     __tablename__ = "settings"
     __tablename__ = "settings"
 
 
-    key = db.Column(db.String, primary_key=True)
+    key = db.Column(db.String(255), primary_key=True)
     value = db.Column(db.PickleType, nullable=False)
     value = db.Column(db.PickleType, nullable=False)
     settingsgroup = db.Column(db.String,
     settingsgroup = db.Column(db.String,
                               db.ForeignKey('settingsgroup.key',
                               db.ForeignKey('settingsgroup.key',
@@ -47,13 +47,13 @@ class Setting(db.Model):
                               nullable=False)
                               nullable=False)
 
 
     # The name (displayed in the form)
     # The name (displayed in the form)
-    name = db.Column(db.String, nullable=False)
+    name = db.Column(db.String(200), nullable=False)
 
 
     # The description (displayed in the form)
     # The description (displayed in the form)
-    description = db.Column(db.String, nullable=False)
+    description = db.Column(db.Text, nullable=False)
 
 
     # Available types: string, integer, float, boolean, select, selectmultiple
     # Available types: string, integer, float, boolean, select, selectmultiple
-    value_type = db.Column(db.String, nullable=False)
+    value_type = db.Column(db.String(20), nullable=False)
 
 
     # Extra attributes like, validation things (min, max length...)
     # Extra attributes like, validation things (min, max length...)
     # For Select*Fields required: choices
     # For Select*Fields required: choices

+ 11 - 11
flaskbb/user/models.py

@@ -32,8 +32,8 @@ class Group(db.Model):
     __tablename__ = "groups"
     __tablename__ = "groups"
 
 
     id = db.Column(db.Integer, primary_key=True)
     id = db.Column(db.Integer, primary_key=True)
-    name = db.Column(db.String(63), unique=True, nullable=False)
-    description = db.Column(db.String(80))
+    name = db.Column(db.String(255), unique=True, nullable=False)
+    description = db.Column(db.Text)
 
 
     # Group types
     # Group types
     admin = db.Column(db.Boolean, default=False, nullable=False)
     admin = db.Column(db.Boolean, default=False, nullable=False)
@@ -78,17 +78,17 @@ class User(db.Model, UserMixin):
     __searchable__ = ['username', 'email']
     __searchable__ = ['username', 'email']
 
 
     id = db.Column(db.Integer, primary_key=True)
     id = db.Column(db.Integer, primary_key=True)
-    username = db.Column(db.String(15), unique=True, nullable=False)
-    email = db.Column(db.String(63), unique=True, nullable=False)
-    _password = db.Column('password', db.String(80), nullable=False)
+    username = db.Column(db.String(200), unique=True, nullable=False)
+    email = db.Column(db.String(200), unique=True, nullable=False)
+    _password = db.Column('password', db.String(120), nullable=False)
     date_joined = db.Column(db.DateTime, default=datetime.utcnow())
     date_joined = db.Column(db.DateTime, default=datetime.utcnow())
     lastseen = db.Column(db.DateTime, default=datetime.utcnow())
     lastseen = db.Column(db.DateTime, default=datetime.utcnow())
     birthday = db.Column(db.DateTime)
     birthday = db.Column(db.DateTime)
-    gender = db.Column(db.String(1))
-    website = db.Column(db.String(63))
-    location = db.Column(db.String(63))
-    signature = db.Column(db.String(255))
-    avatar = db.Column(db.String(63))
+    gender = db.Column(db.String(10))
+    website = db.Column(db.String(200))
+    location = db.Column(db.String(100))
+    signature = db.Column(db.Text)
+    avatar = db.Column(db.String(200))
     notes = db.Column(db.Text)
     notes = db.Column(db.Text)
 
 
     theme = db.Column(db.String(15))
     theme = db.Column(db.String(15))
@@ -428,7 +428,7 @@ class PrivateMessage(db.Model):
     user_id = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=False)
     user_id = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=False)
     from_user_id = db.Column(db.Integer, db.ForeignKey("users.id"))
     from_user_id = db.Column(db.Integer, db.ForeignKey("users.id"))
     to_user_id = db.Column(db.Integer, db.ForeignKey("users.id"))
     to_user_id = db.Column(db.Integer, db.ForeignKey("users.id"))
-    subject = db.Column(db.String(63))
+    subject = db.Column(db.String(255))
     message = db.Column(db.Text)
     message = db.Column(db.Text)
     date_created = db.Column(db.DateTime, default=datetime.utcnow())
     date_created = db.Column(db.DateTime, default=datetime.utcnow())
     trash = db.Column(db.Boolean, nullable=False, default=False)
     trash = db.Column(db.Boolean, nullable=False, default=False)