From patchwork Mon Aug 10 15:24:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11707565 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2DDF1618 for ; Mon, 10 Aug 2020 15:25:20 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 13FD7208A9 for ; Mon, 10 Aug 2020 15:25:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 13FD7208A9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k59ev-00048j-5f; Mon, 10 Aug 2020 15:24:21 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k59eu-00048e-Jy for xen-devel@lists.xenproject.org; Mon, 10 Aug 2020 15:24:20 +0000 X-Inumbo-ID: 1d694ced-4a14-4482-95eb-827d14a2c1ad Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1d694ced-4a14-4482-95eb-827d14a2c1ad; Mon, 10 Aug 2020 15:24:19 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1k59er-0007Qb-VJ; Mon, 10 Aug 2020 16:24:18 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Subject: [OSSTEST PATCH] SQL: Change "... LIKE '...\_...' ..." to "... LIKE '...\\_...' ..." Date: Mon, 10 Aug 2020 16:24:04 +0100 Message-Id: <20200810152404.15325-1-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Perl's "" quotes, and corresponding < --- Osstest/Executive.pm | 2 +- cs-bisection-step | 8 ++++---- mg-force-push | 2 +- mg-report-host-usage-collect | 2 +- sg-report-flight | 4 ++-- sg-report-host-history | 8 ++++---- sg-report-job-history | 2 +- ts-logs-capture | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm index 1e94b282..0808202b 100644 --- a/Osstest/Executive.pm +++ b/Osstest/Executive.pm @@ -444,7 +444,7 @@ END $querytext .= <{Rtuple}; diff --git a/mg-force-push b/mg-force-push index 3a701a11..9c3cc786 100755 --- a/mg-force-push +++ b/mg-force-push @@ -54,7 +54,7 @@ END FROM rv url JOIN rv built ON url.job = built.job - AND url.name LIKE 'tree\_%' + AND url.name LIKE 'tree\\_%' AND built.name = 'built_revision_' || substring(url.name, 6) WHERE url.val = ? END diff --git a/mg-report-host-usage-collect b/mg-report-host-usage-collect index 1944c8d7..34d24943 100755 --- a/mg-report-host-usage-collect +++ b/mg-report-host-usage-collect @@ -166,7 +166,7 @@ END SELECT val, synth FROM runvars WHERE flight=? AND job=? - AND (name LIKE '%\_host' OR name='host') + AND (name LIKE '%\\_host' OR name='host') END my $finishq = db_prepare(</dev/null"; -my $namecond= "(name = 'host' OR name LIKE '%\_host')"; +my $namecond= "(name = 'host' OR name LIKE '%\\_host')"; csreadconfig(); while (@ARGV && $ARGV[0] =~ m/^-/) { @@ -172,7 +172,7 @@ sub mainquery ($) { SELECT flight, job, name, status FROM runvars JOIN jobs USING (flight, job) - WHERE (name = 'host' OR name LIKE '%\_host') + WHERE (name = 'host' OR name LIKE '%\\_host') AND val = ? AND $flightcond AND $restrictflight_cond @@ -246,7 +246,7 @@ END FROM runvars WHERE flight=? AND job=? AND ( - name LIKE (? || '\_power\_%') + name LIKE (? || '\\_power\\_%') ) END @@ -449,7 +449,7 @@ foreach my $host (@ARGV) { SELECT DISTINCT val FROM runvars WHERE flight=? - AND (name = 'host' OR name LIKE '%\_host') + AND (name = 'host' OR name LIKE '%\\_host') END $hostsinflightq->execute($flight); while (my $row = $hostsinflightq->fetchrow_hashref()) { diff --git a/sg-report-job-history b/sg-report-job-history index 22a28627..6008ca72 100755 --- a/sg-report-job-history +++ b/sg-report-job-history @@ -92,7 +92,7 @@ if (defined($flight)) { our $revisionsq= db_prepare(<prepare(<execute($flight, $job);