@@ -99,8 +99,8 @@ my $chkq= db_prepare("SELECT * FROM flights WHERE flight=?");
my $refq= db_prepare(<<END);
SELECT flight, val
FROM runvars
- WHERE name like '%job'
- AND val like '%.%'
+ WHERE name LIKE '%job'
+ AND val LIKE '%.%'
AND flight >= ?
END
@@ -526,7 +526,7 @@ sub change__repro_buildjobs {
}
}
my $testq = db_prepare(<<END);
-SELECT name, val FROM runvars WHERE flight=? AND job=? AND name like '%job';
+SELECT name, val FROM runvars WHERE flight=? AND job=? AND name LIKE '%job';
END
my $buildq_txt = <<END;
SELECT name FROM runvars WHERE flight=? AND job=? AND ('f'
@@ -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
@@ -154,10 +154,10 @@ END
SELECT finished prep_finished,
status prep_status
FROM steps prep
- WHERE flight=? and job=?
+ WHERE flight=? AND job=?
AND prep.finished IS NOT NULL
AND (prep.step='ts-host-build-prep'
- OR prep.step like 'ts-host-install%')
+ OR prep.step LIKE 'ts-host-install%')
ORDER BY stepno DESC
LIMIT 1
END
@@ -165,14 +165,14 @@ END
my $hostsq = db_prepare(<<END);
SELECT val, synth
FROM runvars
- WHERE flight=? and job=?
- AND (name like '%_host' or name='host')
+ WHERE flight=? AND job=?
+ AND (name LIKE '%_host' OR name='host')
END
my $finishq = db_prepare(<<END);
SELECT max(finished) AS finished
FROM steps
- WHERE flight=? and job=?
+ WHERE flight=? AND job=?
END
progress1 "minflight $minflight executing...";
@@ -72,7 +72,7 @@ sub allocations ($$) {
ON owntaskid = taskid
WHERE NOT (tasks.type='magic' AND
tasks.refkey='allocatable')
- AND NOT (resources.restype like 'share-%'
+ AND NOT (resources.restype LIKE 'share-%'
AND NOT EXISTS (
SELECT 1 FROM resource_sharing sh
WHERE sh.restype = substring(resources.restype from 7)
@@ -513,7 +513,7 @@ END
my $revh= db_prepare(<<END);
SELECT * FROM runvars
WHERE flight=$flight AND job='$j->{job}'
- AND name like 'built_revision_%'
+ AND name LIKE 'built_revision_%'
ORDER BY name
END
# We report in jobtext revisions in non-main-revision jobs, too.
@@ -37,7 +37,7 @@ our @blessings;
open DEBUG, ">/dev/null";
-my $namecond= "(name = 'host' or name like '%_host')";
+my $namecond= "(name = 'host' OR name LIKE '%_host')";
csreadconfig();
while (@ARGV && $ARGV[0] =~ m/^-/) {
@@ -456,7 +456,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()) {
This is more like the rest of the style. It will also make it easier to find instances of the mistaken LIKE syntax. I found these with "git grep" and manually edited them. I have checked the before-and-after result of find * -type f | xargs perl -i~ -pe 's/\bLIKE\b/like/g' and it has only the few expected changes to ANDs and ORs. No functional change. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> --- New in v2. --- cr-ensure-disk-space | 4 ++-- cs-adjust-flight | 2 +- mg-force-push | 2 +- mg-report-host-usage-collect | 10 +++++----- ms-planner | 2 +- sg-report-flight | 2 +- sg-report-host-history | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-)