4 commit

data/mini-tests.py

@@ -0,0 +1,41 @@
+import datetime
+
+import sqlalchemy
+# from werkzeug.security import generate_password_hash, check_password_hash
+from .db_session import SqlAlchemyBase
+from sqlalchemy import orm
+from flask_login import UserMixin
+
+
+class MiniTest(SqlAlchemyBase, UserMixin):
+    __tablename__ = 'questions'
+
+    id = sqlalchemy.Column(sqlalchemy.Integer,
+                           primary_key=True, autoincrement=True)
+    date = sqlalchemy.Column(sqlalchemy.DateTime, default=datetime.datetime.now)
+
+
+    # text = sqlalchemy.Column(sqlalchemy.String, nullable=True)
+    #
+    # topic_id = sqlalchemy.Column(sqlalchemy.Integer, sqlalchemy.ForeignKey('topics.id'), nullable=True)
+    # topic = orm.relationship("Topic",
+    #                          secondary="question_to_topic",
+    #                          backref="question")
+
+    # about = sqlalchemy.Column(sqlalchemy.String, nullable=True)
+    # email = sqlalchemy.Column(sqlalchemy.String,
+    #                           index=True, unique=True, nullable=True)
+    # group = sqlalchemy.Column(sqlalchemy.String, nullable=True, default='default')
+    # # hashed_password = sqlalchemy.Column(sqlalchemy.String, nullable=True)
+    # date_of_birth = sqlalchemy.Column(sqlalchemy.Date, nullable=True)
+    # # created_date = sqlalchemy.Column(sqlalchemy.DateTime,
+    # #                                  default=datetime.datetime.now)
+    # user_level = sqlalchemy.Column(sqlalchemy.String, default='student')
+
+    # news = orm.relationship("News", back_populates='user')
+
+    # def set_password(self, password):
+    #     self.hashed_password = generate_password_hash(password)
+    #
+    # def check_password(self, password):
+    #     return check_password_hash(self.hashed_password, password)

data/questions.py

@@ -1,5 +1,5 @@
 import sqlalchemy
-from werkzeug.security import generate_password_hash, check_password_hash
+# from werkzeug.security import generate_password_hash, check_password_hash
 from .db_session import SqlAlchemyBase
 from sqlalchemy import orm
 from flask_login import UserMixin
@@ -12,10 +12,10 @@ class Question(SqlAlchemyBase, UserMixin):
                            primary_key=True, autoincrement=True)
     text = sqlalchemy.Column(sqlalchemy.String, nullable=True)
 
-    # topic = orm.relationship("Topic")
+    topic_id = sqlalchemy.Column(sqlalchemy.Integer, sqlalchemy.ForeignKey('topics.id'), nullable=True)
     topic = orm.relationship("Topic",
-                                  secondary="question_to_topic",
-                                  backref="question")
+                             secondary="question_to_topic",
+                             backref="question")
 
     # about = sqlalchemy.Column(sqlalchemy.String, nullable=True)
     # email = sqlalchemy.Column(sqlalchemy.String,