Skip to content
Snippets Groups Projects
Commit 1bd58505 authored by Bjarke Madsen's avatar Bjarke Madsen
Browse files

remove redundant nullable=True

parent a3a5d79a
No related branches found
No related tags found
No related merge requests found
...@@ -18,7 +18,7 @@ class BudgetEntry(base_schema): ...@@ -18,7 +18,7 @@ class BudgetEntry(base_schema):
id = sa.Column(sa.Integer, sa.Sequence( id = sa.Column(sa.Integer, sa.Sequence(
'budgetentry_seq_id_seq'), nullable=False) 'budgetentry_seq_id_seq'), nullable=False)
nren = sa.Column(sa.String(128), primary_key=True) 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) year = sa.Column(sa.Integer, primary_key=True)
...@@ -28,8 +28,8 @@ class FundingSource(base_schema): ...@@ -28,8 +28,8 @@ class FundingSource(base_schema):
'fundingentry_seq_id_seq'), nullable=False) 'fundingentry_seq_id_seq'), nullable=False)
nren = sa.Column(sa.String(128), primary_key=True) nren = sa.Column(sa.String(128), primary_key=True)
year = sa.Column(sa.Integer, primary_key=True) year = sa.Column(sa.Integer, primary_key=True)
client_institutions = sa.Column(sa.String(128), nullable=True) client_institutions = sa.Column(sa.String(128))
european_funding = sa.Column(sa.String(128), nullable=True) european_funding = sa.Column(sa.String(128))
gov_public_bodies = sa.Column(sa.String(128), nullable=True) gov_public_bodies = sa.Column(sa.String(128))
commercial = sa.Column(sa.String(128), nullable=True) commercial = sa.Column(sa.String(128))
other = sa.Column(sa.String(128), nullable=True) other = sa.Column(sa.String(128))
...@@ -19,22 +19,19 @@ funding_id_seq = sa.Sequence('fundingentry_seq_id_seq') ...@@ -19,22 +19,19 @@ funding_id_seq = sa.Sequence('fundingentry_seq_id_seq')
def upgrade(): def upgrade():
op.execute(sa.schema.CreateSequence(funding_id_seq)) # create the sequence op.execute(sa.schema.CreateSequence(funding_id_seq)) # create the sequence
op.create_table('funding_source', op.create_table(
sa.Column('id', sa.Integer, funding_id_seq, nullable=False, 'funding_source',
server_default=funding_id_seq.next_value()), sa.Column('id', sa.Integer, funding_id_seq, nullable=False,
sa.Column('nren', sa.String(length=128), nullable=False), server_default=funding_id_seq.next_value()),
sa.Column('year', sa.Integer, nullable=False), sa.Column('nren', sa.String(length=128), nullable=False),
sa.Column('client_institutions', sa.String(length=128), sa.Column('year', sa.Integer, nullable=False),
nullable=True), sa.Column('client_institutions', sa.String(length=128)),
sa.Column('european_funding', sa.String(length=128), sa.Column('european_funding', sa.String(length=128)),
nullable=True), sa.Column('gov_public_bodies', sa.String(length=128)),
sa.Column('gov_public_bodies', sa.String(length=128), sa.Column('commercial', sa.String(length=128)),
nullable=True), sa.Column('other', sa.String(length=128)),
sa.Column('commercial', sa.String(length=128), sa.PrimaryKeyConstraint('nren', 'year')
nullable=True), )
sa.Column('other', sa.String(length=128), nullable=True),
sa.PrimaryKeyConstraint('nren', 'year')
)
def downgrade(): def downgrade():
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment