Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set sto2 vars as nullable #1462

Merged
merged 3 commits into from
Sep 7, 2023
Merged

Set sto2 vars as nullable #1462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39d84df
sto2 vars must be nullable
i-oden Sep 7, 2023
2028431
fix tests that shouldn't have passed to begin with
i-oden Sep 7, 2023
e029629
sprintlog
i-oden Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions SPRINTLOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,3 +295,4 @@ _Nothing merged in CLI during this sprint_
# 2023-09-4 - 2023-09-15

- Only return date (not time) from `Statistics` endpoint ([#1456](https://github.com/ScilifelabDataCentre/dds_web/pull/1456))
- Set `sto2*` columns in `Unit` table to nullable ([#1456](https://github.com/ScilifelabDataCentre/dds_web/pull/1462))
8 changes: 4 additions & 4 deletions dds_web/database/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,10 @@ class Unit(db.Model):
internal_ref = db.Column(db.String(50), unique=True, nullable=False)

# Safespring storage
sto2_endpoint = db.Column(db.String(255), unique=False, nullable=False) # unique=True later
sto2_name = db.Column(db.String(255), unique=False, nullable=False) # unique=True later
sto2_access = db.Column(db.String(255), unique=False, nullable=False) # unique=True later
sto2_secret = db.Column(db.String(255), unique=False, nullable=False) # unique=True later
sto2_endpoint = db.Column(db.String(255), unique=False, nullable=True) # unique=True later
sto2_name = db.Column(db.String(255), unique=False, nullable=True) # unique=True later
sto2_access = db.Column(db.String(255), unique=False, nullable=True) # unique=True later
sto2_secret = db.Column(db.String(255), unique=False, nullable=True) # unique=True later

# New safespring storage
sto4_start_time = db.Column(db.DateTime(), nullable=True)
Expand Down
38 changes: 38 additions & 0 deletions migrations/versions/f27c5988d640_set_sto2_to_nullable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
"""set-sto2-to-nullable

Revision ID: f27c5988d640
Revises: 1e56b6212479
Create Date: 2023-09-07 09:36:25.289025

"""
from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import mysql

# revision identifiers, used by Alembic.
revision = "f27c5988d640"
down_revision = "1e56b6212479"
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.alter_column(
"units", "sto2_endpoint", existing_type=mysql.VARCHAR(length=255), nullable=True
)
op.alter_column("units", "sto2_name", existing_type=mysql.VARCHAR(length=255), nullable=True)
op.alter_column("units", "sto2_access", existing_type=mysql.VARCHAR(length=255), nullable=True)
op.alter_column("units", "sto2_secret", existing_type=mysql.VARCHAR(length=255), nullable=True)
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.alter_column("units", "sto2_secret", existing_type=mysql.VARCHAR(length=255), nullable=False)
op.alter_column("units", "sto2_access", existing_type=mysql.VARCHAR(length=255), nullable=False)
op.alter_column("units", "sto2_name", existing_type=mysql.VARCHAR(length=255), nullable=False)
op.alter_column(
"units", "sto2_endpoint", existing_type=mysql.VARCHAR(length=255), nullable=False
)
# ### end Alembic commands ###
Loading