From 1bd585059633919fc34c857d48bae48692b90cf9 Mon Sep 17 00:00:00 2001
From: Bjarke Madsen <bjarke@nordu.net>
Date: Thu, 16 Mar 2023 12:17:30 +0100
Subject: [PATCH] remove redundant nullable=True
---
compendium_v2/db/model.py | 12 ++++----
...3c99d745d7_create_funding_source_schema.py | 29 +++++++++----------
2 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/compendium_v2/db/model.py b/compendium_v2/db/model.py
index f06498df..2e982ea6 100644
--- a/compendium_v2/db/model.py
+++ b/compendium_v2/db/model.py
@@ -18,7 +18,7 @@ class BudgetEntry(base_schema):
id = sa.Column(sa.Integer, sa.Sequence(
'budgetentry_seq_id_seq'), nullable=False)
nren = sa.Column(sa.String(128), primary_key=True)
- budget = sa.Column(sa.String(128), nullable=True)
+ budget = sa.Column(sa.String(128))
year = sa.Column(sa.Integer, primary_key=True)
@@ -28,8 +28,8 @@ class FundingSource(base_schema):
'fundingentry_seq_id_seq'), nullable=False)
nren = sa.Column(sa.String(128), primary_key=True)
year = sa.Column(sa.Integer, primary_key=True)
- client_institutions = sa.Column(sa.String(128), nullable=True)
- european_funding = sa.Column(sa.String(128), nullable=True)
- gov_public_bodies = sa.Column(sa.String(128), nullable=True)
- commercial = sa.Column(sa.String(128), nullable=True)
- other = sa.Column(sa.String(128), nullable=True)
+ client_institutions = sa.Column(sa.String(128))
+ european_funding = sa.Column(sa.String(128))
+ gov_public_bodies = sa.Column(sa.String(128))
+ commercial = sa.Column(sa.String(128))
+ other = sa.Column(sa.String(128))
diff --git a/compendium_v2/migrations/versions/833c99d745d7_create_funding_source_schema.py b/compendium_v2/migrations/versions/833c99d745d7_create_funding_source_schema.py
index b07b4c04..cee4312f 100644
--- a/compendium_v2/migrations/versions/833c99d745d7_create_funding_source_schema.py
+++ b/compendium_v2/migrations/versions/833c99d745d7_create_funding_source_schema.py
@@ -19,22 +19,19 @@ funding_id_seq = sa.Sequence('fundingentry_seq_id_seq')
def upgrade():
op.execute(sa.schema.CreateSequence(funding_id_seq)) # create the sequence
- op.create_table('funding_source',
- sa.Column('id', sa.Integer, funding_id_seq, nullable=False,
- server_default=funding_id_seq.next_value()),
- sa.Column('nren', sa.String(length=128), nullable=False),
- sa.Column('year', sa.Integer, nullable=False),
- sa.Column('client_institutions', sa.String(length=128),
- nullable=True),
- sa.Column('european_funding', sa.String(length=128),
- nullable=True),
- sa.Column('gov_public_bodies', sa.String(length=128),
- nullable=True),
- sa.Column('commercial', sa.String(length=128),
- nullable=True),
- sa.Column('other', sa.String(length=128), nullable=True),
- sa.PrimaryKeyConstraint('nren', 'year')
- )
+ op.create_table(
+ 'funding_source',
+ sa.Column('id', sa.Integer, funding_id_seq, nullable=False,
+ server_default=funding_id_seq.next_value()),
+ sa.Column('nren', sa.String(length=128), nullable=False),
+ sa.Column('year', sa.Integer, nullable=False),
+ sa.Column('client_institutions', sa.String(length=128)),
+ sa.Column('european_funding', sa.String(length=128)),
+ sa.Column('gov_public_bodies', sa.String(length=128)),
+ sa.Column('commercial', sa.String(length=128)),
+ sa.Column('other', sa.String(length=128)),
+ sa.PrimaryKeyConstraint('nren', 'year')
+ )
def downgrade():
--
GitLab