Mercurial > sci
changeset 12:be3ec0e6bb8f
scid: remove status from jobresult
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Tue, 29 Jun 2021 21:24:16 +0200 |
| parents | 0647f9ec7319 |
| children | 67348ec46425 |
| files | scictl.c sql/init.sql sql/jobresult-add.sql |
| diffstat | 3 files changed, 8 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/scictl.c Tue Jun 29 20:49:24 2021 +0200 +++ b/scictl.c Tue Jun 29 21:24:16 2021 +0200 @@ -108,9 +108,9 @@ const char *project = "unknown"; /* Find project if exists (it should). */ - for (size_t i = 0; i < projectsz; ++i) { - if (projects[i].id == jobs[i].project_id) { - project = projects[i].name; + for (size_t p = 0; p < projectsz; ++p) { + if (projects[p].id == jobs[i].project_id) { + project = projects[p].name; break; } }
--- a/sql/init.sql Tue Jun 29 20:49:24 2021 +0200 +++ b/sql/init.sql Tue Jun 29 21:24:16 2021 +0200 @@ -1,6 +1,6 @@ CREATE TABLE IF NOT EXISTS project( id INTEGER PRIMARY KEY AUTOINCREMENT, - name TEXT NOT NULL, + name TEXT NOT NULL UNIQUE, desc TEXT NOT NULL, url TEXT NOT NULL, script TEXT NOT NULL, @@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS worker( id INTEGER PRIMARY KEY AUTOINCREMENT, - name TEXT NOT NULL, + name TEXT NOT NULL UNIQUE, desc TEXT NOT NULL, date INTEGER NOT NULL DEFAULT (strftime('%s', 'now')) ); @@ -25,8 +25,7 @@ id INTEGER PRIMARY KEY AUTOINCREMENT, job_id INTEGER NOT NULL REFERENCES job (id), worker_id INTEGER NOT NULL REFERENCES worker (id), - status INTEGER DEFAULT 0, - retcode INTEGER DEFAULT 0, + exitcode INTEGER DEFAULT 0, console TEXT DEFAULT NULL, date INTEGER NOT NULL DEFAULT (strftime('%s', 'now')) );