Merge branch 'univeristy-model' of https://github.com/JeanAEckelberg/…

…byte_engine into univeristy-model
JeanAEckelberg · Sep 16, 2023 · 997db13 · 997db13
2 parents b6e93aa + 7ed453f
commit 997db13
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/server/models/errors.py b/server/models/errors.py
@@ -6,10 +6,9 @@
 
 class Errors(Base):
     __tablename__: str = 'errors'
-    run_id: Mapped[int] = mapped_column(Integer(), primary_key=True)  # run id pk
-    run_id_fk: Mapped[int] = mapped_column(Integer(), ForeignKey("run.run_id"))  # run id
-    submission_id: Mapped[int] = mapped_column(Integer(), primary_key=True)  # submission id
-    submission_id_fk: Mapped[int] = mapped_column(Integer(), ForeignKey("submission.submission_id"))  # submission id fk
+    error_id: Mapped[int] = mapped_column(Integer(), primary_key=True, autoincrement=True)  # run id pk
+    run_id: Mapped[int] = mapped_column(Integer(), ForeignKey("run.run_id"))  # run id
+    submission_id: Mapped[int] = mapped_column(Integer(), ForeignKey("submission.submission_id"))  # submission id fk
     error_txt: Mapped[str] = mapped_column(String(), nullable=True)
 
 

diff --git a/server/models/turn_table.py b/server/models/turn_table.py
@@ -6,9 +6,9 @@
 
 class TurnTable(Base):
     __tablename__: str = 'turn_table'
-    turn_number: Mapped[int] = mapped_column(Integer(), primary_key=True)
-    run_id: Mapped[int] = mapped_column(Integer(), primary_key=True)
-    run_id_fk: Mapped[int] = mapped_column(Integer(), ForeignKey('run.run_id'))
+    turn_id: Mapped[int] = mapped_column(Integer(), primary_key=True)
+    turn_number: Mapped[int] = mapped_column(Integer())
+    run_id: Mapped[int] = mapped_column(Integer(), ForeignKey('run.run_id'))
     turn_data: Mapped[str] = mapped_column(LargeBinary(), nullable=False)