From 969dff7821a7abd7b6afeeb09a604c495f7046dc Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Fri, 20 Jun 2014 18:11:27 -0400 Subject: [PATCH] Fix DB bugs found testing with mysql No one should be using this yet so I fixed a bug by changing a migration instead of doing the right thing. --- subunit2sql/db/api.py | 4 ++-- .../versions/4ca26dac400e_create_metadata_tables.py | 2 +- subunit2sql/shell.py | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/subunit2sql/db/api.py b/subunit2sql/db/api.py index 951c9bc..de9ade5 100644 --- a/subunit2sql/db/api.py +++ b/subunit2sql/db/api.py @@ -128,8 +128,8 @@ def create_test_run(test_id, run_id, status, start_time=None, test_run = models.TestRun() test_run.test_id = test_id test_run.run_id = run_id - test_run.stop_time = end_time - test_run.start_time = start_time + test_run.stop_time = end_time.replace(tzinfo=None) + test_run.start_time = start_time.replace(tzinfo=None) session = session or get_session() with session.begin(): session.add(test_run) diff --git a/subunit2sql/migrations/versions/4ca26dac400e_create_metadata_tables.py b/subunit2sql/migrations/versions/4ca26dac400e_create_metadata_tables.py index e959b2a..5495aaf 100644 --- a/subunit2sql/migrations/versions/4ca26dac400e_create_metadata_tables.py +++ b/subunit2sql/migrations/versions/4ca26dac400e_create_metadata_tables.py @@ -54,7 +54,7 @@ def upgrade(): sa.Column('key', sa.String(255)), sa.Column('value', sa.String(255)), sa.Column('test_run_id', sa.String(36), - sa.ForeignKey('test_runs.id'), + sa.ForeignKey('tests.id'), nullable=False), mysql_engine='InnoDB') diff --git a/subunit2sql/shell.py b/subunit2sql/shell.py index efa61e8..4ac76ec 100644 --- a/subunit2sql/shell.py +++ b/subunit2sql/shell.py @@ -47,7 +47,6 @@ _DEFAULT_SQL_CONNECTION = 'sqlite:///' + state_path_def('subunit2sql.sqlite') def parse_args(argv, default_config_files=None): options.set_defaults(CONF, connection=_DEFAULT_SQL_CONNECTION, sqlite_db='subunit2sql.sqlite') - CONF.register_opts(options.database_opts) cfg.CONF(argv[1:], project='subunit2sql', default_config_files=default_config_files)