From 05ac9a50b04eed378fa9ae9fa3babee9eb06f159 Mon Sep 17 00:00:00 2001 From: Jan Feil <11638228+jfeil@users.noreply.github.com> Date: Sun, 17 Apr 2022 19:17:14 +0200 Subject: [PATCH] Upgrade Date to DateTime without (additional) migration! --- alembic/versions/be003b0637e8_.py | 4 ++-- src/datatypes.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/alembic/versions/be003b0637e8_.py b/alembic/versions/be003b0637e8_.py index 53811b8..3ecdca7 100644 --- a/alembic/versions/be003b0637e8_.py +++ b/alembic/versions/be003b0637e8_.py @@ -22,7 +22,7 @@ def upgrade(): sa.Column('title', sa.String(), nullable=True), sa.Column('description', sa.String(), nullable=True), sa.Column('icon', sa.BLOB(), nullable=True), - sa.Column('created', sa.Date(), nullable=True), + sa.Column('created', sa.DateTime(), nullable=True), sa.PrimaryKeyConstraint('id') ) op.create_table('regeltest_question_assoc', @@ -38,7 +38,7 @@ def upgrade(): sa.Column('level', sa.Integer(), nullable=True), sa.Column('correct_solved', sa.Integer(), nullable=True), sa.Column('wrong_solved', sa.Integer(), nullable=True), - sa.Column('last_tested', sa.Date(), nullable=True), + sa.Column('last_tested', sa.DateTime(), nullable=True), sa.ForeignKeyConstraint(['question_signature'], ['question.signature'], ), sa.PrimaryKeyConstraint('question_signature') ) diff --git a/src/datatypes.py b/src/datatypes.py index 4f4dd50..9a1011c 100644 --- a/src/datatypes.py +++ b/src/datatypes.py @@ -7,7 +7,7 @@ from typing import List, Tuple, Dict import bs4 -from sqlalchemy import Column, Integer, String, ForeignKey, Date, Table, BLOB +from sqlalchemy import Column, Integer, String, ForeignKey, Date, Table, BLOB, DateTime from sqlalchemy.orm import relationship from src.basic_config import Base, EagerDefault @@ -27,7 +27,7 @@ class Regeltest(Base): description = Column(String) icon = Column(BLOB) - created = Column(Date, default=date.today) + created = Column(DateTime, default=datetime.now) questions = relationship("Question", secondary=regeltest_question_assoc, back_populates="regeltests") @@ -42,7 +42,7 @@ class Statistics(Base): level = Column(Integer, default=0) correct_solved = Column(Integer, default=0) wrong_solved = Column(Integer, default=0) - last_tested = Column(Date, default=default_date) + last_tested = Column(DateTime, default=datetime.fromtimestamp(0)) class QuestionGroup(Base):