diff options
| -rw-r--r-- | zuul/driver/sql/alembic.ini (renamed from zuul/driver/sql/alembic_reporter.ini) | 0 | ||||
| -rw-r--r-- | zuul/driver/sql/alembic_reporter/versions/1dd914d4a482_allow_score_to_be_null.py | 25 | ||||
| -rw-r--r-- | zuul/driver/sql/sqlconnection.py | 2 | ||||
| -rw-r--r-- | zuul/driver/sql/sqlreporter.py | 3 |
4 files changed, 27 insertions, 3 deletions
diff --git a/zuul/driver/sql/alembic_reporter.ini b/zuul/driver/sql/alembic.ini index 0c5950517..0c5950517 100644 --- a/zuul/driver/sql/alembic_reporter.ini +++ b/zuul/driver/sql/alembic.ini diff --git a/zuul/driver/sql/alembic_reporter/versions/1dd914d4a482_allow_score_to_be_null.py b/zuul/driver/sql/alembic_reporter/versions/1dd914d4a482_allow_score_to_be_null.py new file mode 100644 index 000000000..b153cabf7 --- /dev/null +++ b/zuul/driver/sql/alembic_reporter/versions/1dd914d4a482_allow_score_to_be_null.py @@ -0,0 +1,25 @@ +"""Allow score to be null + +Revision ID: 1dd914d4a482 +Revises: 4d3ebd7f06b9 +Create Date: 2017-03-28 08:09:32.908643 + +""" + +# revision identifiers, used by Alembic. +revision = '1dd914d4a482' +down_revision = '4d3ebd7f06b9' +branch_labels = None +depends_on = None + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + op.alter_column('zuul_buildset', 'score', nullable=True, + existing_type=sa.Integer) + + +def downgrade(): + raise Exception("Downgrades not supported") diff --git a/zuul/driver/sql/sqlconnection.py b/zuul/driver/sql/sqlconnection.py index 69e53dfb4..31bc13aab 100644 --- a/zuul/driver/sql/sqlconnection.py +++ b/zuul/driver/sql/sqlconnection.py @@ -80,7 +80,7 @@ class SQLConnection(BaseConnection): sa.Column('change', sa.Integer, nullable=True), sa.Column('patchset', sa.Integer, nullable=True), sa.Column('ref', sa.String(255)), - sa.Column('score', sa.Integer), + sa.Column('score', sa.Integer, nullable=True), sa.Column('message', sa.TEXT()), ) diff --git a/zuul/driver/sql/sqlreporter.py b/zuul/driver/sql/sqlreporter.py index 20fbc4a1d..d6e547dbb 100644 --- a/zuul/driver/sql/sqlreporter.py +++ b/zuul/driver/sql/sqlreporter.py @@ -29,8 +29,7 @@ class SQLReporter(BaseReporter): super(SQLReporter, self).__init__( driver, connection, config) # TODO(jeblair): document this is stored as NULL if unspecified - # TODO(jhesketh): actually make this null in a followup change - self.result_score = config.get('score', 0) + self.result_score = config.get('score', None) def report(self, source, pipeline, item): """Create an entry into a database.""" |