From 7c1754a2c4878a23c3f25f12c49d3f8bed515d30 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 26 Sep 2012 18:23:54 +0200 Subject: [PATCH] fixup insert --- debian_build.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian_build.py b/debian_build.py index 07ff817..168ff5b 100755 --- a/debian_build.py +++ b/debian_build.py @@ -139,14 +139,14 @@ def db_add_build(con, number, db_id): #logger.debug("INSERT INTO jenkins_build(jenkins_build_number, jenkins_job_id) VALUES(%s, %s) RETURNING id" % (number, db_id)) return cur.fetchone()[0] -def db_add_build_result(con, number, start, end): +def db_add_build_result(con, build_id, start, end): cur = con.cursor() cur.execute("SAVEPOINT a") try: - cur.execute("INSERT INTO jenkins_build_result(jenkins_build_number, build_start, build_end, successful) VALUES(%s, '%s', '%s', %s) RETURNING id" % (number, start, end, 'true')) + cur.execute("INSERT INTO jenkins_build_result(jenkins_build_id, build_start, build_end, successful) VALUES(%s, '%s', '%s', %s) RETURNING id" % (build_id, start, end, 'true')) except psycopg2.DatabaseError as e: cur.execute("ROLLBACK TO a") # have to rollback after failed command - #logger.debug("INSERT INTO jenkins_build_result(jenkins_build_number, build_start, build_end, successful) VALUES(%s, '%s', '%s', %s) RETURNING id" % (number, start, end, 'true')) + #logger.debug("INSERT INTO jenkins_build_result(jenkins_build_id, build_start, build_end, successful) VALUES(%s, '%s', '%s', %s) RETURNING id" % (build_id, start, end, 'true')) return cur.fetchone()[0] def db_add_package(con, package): @@ -194,7 +194,7 @@ def add_package_instance(origin, job_name, build_number, changes_file, version, #logger.debug("INSERT success job %s" % job_name) # maybe FIXME: we could add the build already once its started, but for package builds we dont wanna add failures to the db at all db_build_id = db_add_build (con, build_number, db_job_id) - db_build_result_id = db_add_build_result (con, build_number, start, end) + db_build_result_id = db_add_build_result (con, db_build_id, start, end) #logger.debug("INSERT success build number %s" % build_number) #logger.debug("processing %s" %(changes_file)) cmd = ["dcmd", '--deb', changes_file] -- 2.39.5