diff options
author | Helmut Grohne <helmut@subdivi.de> | 2020-10-07 16:48:12 +0200 |
---|---|---|
committer | Helmut Grohne <helmut@subdivi.de> | 2020-10-07 16:48:12 +0200 |
commit | 7b5da3c5b65ee5633c42616d3e6ca3f3c7d4785c (patch) | |
tree | a39213ffa79f2189f7fb85f13bff524b650aa140 | |
parent | a52d12012b1befdf1f00d0fcd5101306c52271ff (diff) | |
download | crossqa-7b5da3c5b65ee5633c42616d3e6ca3f3c7d4785c.tar.gz |
add build architecture to schema of builds table
-rwxr-xr-x | build.py | 9 | ||||
-rw-r--r-- | schema.sql | 3 | ||||
-rw-r--r-- | webapp.py | 6 |
3 files changed, 9 insertions, 9 deletions
@@ -93,10 +93,11 @@ def main(): do_build(source, version, architecture, args.server) with contextlib.closing(db.cursor()) as cur: cur.execute("""INSERT INTO builds - (source, version, architecture, success, starttime, - filename) VALUES (?, ?, ?, ?, ?, ?);""", - (source, version, architecture, success, timestamp, - filename)) + (source, version, buildarch, hostarch, success, + starttime, filename) + VALUES (?, ?, ?, ?, ?, ?);""", + (source, version, 'amd64', architecture, success, + timestamp, filename)) if requestid is not None: cur.execute("DELETE FROM buildrequests WHERE id = ?;", (requestid,)) @@ -25,7 +25,8 @@ INSERT INTO depcheck (architecture, releasetime, updatetime, giveback) VALUES CREATE TABLE builds ( source TEXT NOT NULL, version TEXT NOT NULL, - architecture TEXT NOT NULL, + buildarch TEXT NOT NULL, + hostarch TEXT NOT NULL, success BOOLEAN NOT NULL CHECK (success in (0, 1)), starttime TIMESTAMP NOT NULL, filename TEXT NOT NULL); @@ -370,8 +370,7 @@ def collect_depstate(conn, source): def show_index(): with db.engine.connect() as conn: builds = list(conn.execute(""" - SELECT source, version, 'amd64' AS buildarch, - architecture AS hostarch, starttime, filename, + SELECT source, version, buildarch, hostarch, starttime, filename, ifnull((SELECT max(patched + 1) FROM bugs WHERE affects = source), 0) AS buglvl @@ -392,8 +391,7 @@ def show_source(source): context["version"], context["depresult"] = collect_depstate(conn, source) query = sqlalchemy.text(""" - SELECT version, 'amd64' AS buildarch, architecture AS hostarch, - success, starttime, filename + SELECT version, buildarch, hostarch, success, starttime, filename FROM builds WHERE source = :source;""") context["builds"] = list(conn.execute(query, source=source)) query = sqlalchemy.text(""" |