Mailing List Archive

[OSSTEST PATCH v2 38/41] SQL: Change LIKE E'...\\_...' to LIKE '...\_...'
E'...' means to interpret \-escapes. But we don't want them: without
E, we can avoid some toothpick-doubling.

No functional change.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v2: New patch.
---
cs-bisection-step | 8 ++++----
sg-report-job-history | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cs-bisection-step b/cs-bisection-step
index 718c87b0..a82cbfb8 100755
--- a/cs-bisection-step
+++ b/cs-bisection-step
@@ -185,15 +185,15 @@ sub flight_rmap ($$) {
my $qtxt_common_rev_ok = sub {
my ($table) = @_;
[<<END];
- ($table.name LIKE E'built\\_revision\\_%' OR
- $table.name LIKE E'revision\\_%')
+ ($table.name LIKE 'built\_revision\_%' OR
+ $table.name LIKE 'revision\_%')
END
};

my $qtxt_common_tree_ok = sub {
my ($table) = @_;
[<<END];
- $table.name LIKE E'tree\\_%'
+ $table.name LIKE 'tree\_%'
END
};

@@ -1220,7 +1220,7 @@ sub preparejob ($$$$) {
INTO TEMP bisection_runvars
FROM runvars
WHERE flight=? AND job=? AND synth='f'
- AND name NOT LIKE E'revision\\_%'
+ AND name NOT LIKE 'revision\_%'
AND name NOT LIKE '%host'
END
my (@trevisions) = split / /, $choose->{Rtuple};
diff --git a/sg-report-job-history b/sg-report-job-history
index d5f91ff1..22a28627 100755
--- a/sg-report-job-history
+++ b/sg-report-job-history
@@ -92,7 +92,7 @@ if (defined($flight)) {
our $revisionsq= db_prepare(<<END);
SELECT * FROM runvars
WHERE flight=? AND job=?
- AND name LIKE E'built\\_revision\\_\%'
+ AND name LIKE 'built\_revision\_%'
END
# (We report on non-main-revision jobs just as for main-revision ones.)

@@ -109,7 +109,7 @@ sub add_revisions ($$$$) {
our $buildsq= db_prepare(<<END);
SELECT * FROM runvars
WHERE flight=? AND job=?
- AND name LIKE E'\%buildjob'
+ AND name LIKE '%buildjob'
END

sub processjobbranch ($$) {
--
2.20.1