From patchwork Fri Jun 30 16:25:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 9820069 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1E030603F2 for ; Fri, 30 Jun 2017 16:28:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B121E286A4 for ; Fri, 30 Jun 2017 16:27:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A5C69286B6; Fri, 30 Jun 2017 16:27:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7DBC4286A4 for ; Fri, 30 Jun 2017 16:27:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQyjg-0005lv-4K; Fri, 30 Jun 2017 16:25:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQyje-0005jY-As for xen-devel@lists.xenproject.org; Fri, 30 Jun 2017 16:25:34 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id AE/6C-01724-D7B76595; Fri, 30 Jun 2017 16:25:33 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeJIrShJLcpLzFFi42JxWrrBXre2Oiz S4O43bovvWyYzOTB6HP5whSWAMYo1My8pvyKBNeNe8zT2grm6Ff8vLWNsYOxV6GLk5JAQ8JfY 9W8GC4jNJqAr0bTlL1sXIweHiICKxO29BiBhZoEFjBIPv5eA2MIC6RJ3P05nBrFZBFQl2u7PY wKxeQU8JT6f2cMIMVJO4vzxn2A1nAJeEg+nLWIHsYWAal6cm8ACMl5IQE1i7vp4iFZBiZMzn7 BArJKQOPjiBfMERt5ZSFKzkKQWMDKtYtQoTi0qSy3SNTLRSyrKTM8oyU3MzNE1NDDWy00tLk5 MT81JTCrWS87P3cQIDJx6BgbGHYyvjvsdYpTkYFIS5V15LTRSiC8pP6UyI7E4I76oNCe1+BCj DAeHkgSvdVVYpJBgUWp6akVaZg4whGHSEhw8SiK8skFAad7igsTc4sx0iNQpRl2OVxP+f2MSY snLz0uVEudNAJkhAFKUUZoHNwIWT5cYZaWEeRkZGBiEeApSi3IzS1DlXzGKczAqCfP2g0zhyc wrgdv0CugIJqAjhGeEgBxRkoiQkmpglPx2h/vYjeNJHR1xbj8q3Sa83cd4+OWzrarOZ1KYj4V YLhLNDFo79VjSiWNfi9OXTxPausjnSkWgy6mHXNuWF23VC/94zunllO3XWATZ/kW4KMwuPO69 adtfZ7N5KQoJUj/i/5zW2vt62xnF30wzpCXPJ/CL33MXzne4oZvtnPfn1JGXjEeEuJRYijMSD bWYi4oTAQMiVuqiAgAA X-Env-Sender: prvs=3471c4a24=Ian.Jackson@citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1498839926!103474145!4 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 60110 invoked from network); 30 Jun 2017 16:25:32 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-8.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 30 Jun 2017 16:25:32 -0000 X-IronPort-AV: E=Sophos;i="5.40,287,1496102400"; d="scan'208";a="438490413" From: Ian Jackson To: Date: Fri, 30 Jun 2017 17:25:09 +0100 Message-ID: <1498839920-17025-7-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1498839920-17025-1-git-send-email-ian.jackson@eu.citrix.com> References: <1498839920-17025-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Wei Liu , Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH 06/17] db updates: Make all INSERTs (except into steps) name columns explicitly X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This makes the code more robust against schema updates. Specifically, if any columns were to be deleted, these runes would break. (Also if any column was inserted other than after the existing columns, although this is not something Postgres can currently do AIUI.) Affected tables are: flights_harness_touched jobs resources runvars steps Signed-off-by: Ian Jackson --- Osstest/JobDB/Executive.pm | 4 +++- Osstest/TestSupport.pm | 12 +++++++++--- cs-adjust-flight | 7 ++++--- cs-bisection-step | 3 ++- mg-allocate | 2 +- mg-hosts | 1 + tcl/JobDB-Executive.tcl | 4 +++- 7 files changed, 23 insertions(+), 10 deletions(-) diff --git a/Osstest/JobDB/Executive.pm b/Osstest/JobDB/Executive.pm index 45aabd4..0d1b3be 100644 --- a/Osstest/JobDB/Executive.pm +++ b/Osstest/JobDB/Executive.pm @@ -191,7 +191,9 @@ END if (!$already) { $dbh_tests->do(<do(<do(<do(<selectrow_hashref(<prepare($_) } - ("INSERT INTO jobs". + ("INSERT INTO jobs (flight, job, recipe, status)". " SELECT ?, job, recipe, 'queued'". " FROM jobs". " WHERE flight = ? AND job = ?", - "INSERT INTO runvars". + "INSERT INTO runvars (flight, job, name, val, synth)". " SELECT ?, job, name, val, 'f'". " FROM runvars". " WHERE flight = ? AND job = ? AND NOT synth"); @@ -246,7 +246,8 @@ sub change__copy_jobs { our $runvar_rm_q = $dbh_tests->prepare ("DELETE FROM runvars WHERE flight = ? AND job = ? AND name = ?"); our $runvar_insert_q = $dbh_tests->prepare - ("INSERT INTO runvars VALUES (?, ?, ?, ?, 'f')"); + ("INSERT INTO runvars (flight, job, name, val, synth)". + " VALUES (?, ?, ?, ?, 'f')"); sub runvar_set ($$$;$) { my ($job, $name, $val, $xwhat) = @_; diff --git a/cs-bisection-step b/cs-bisection-step index 76f5010..13ccd7a 100755 --- a/cs-bisection-step +++ b/cs-bisection-step @@ -1255,7 +1255,8 @@ END " from $copyflight)\n"; $dbh_tests->do(<do(<do(<do(<