Fix test cases so that they work with the new EXPLAIN QUERY PLAN output

format.  Only some of the cases have been fixed.  This is an incremental
check-in.

FossilOrigin-Name: 5f0e803e33aa557865d5fc830d9202d628de9a94c9757058ca48f1a560702cd3

1 files changed, 9 insertions, 3 deletions

diff --git a/test/with1.test b/test/with1.test
index 92fbc58fc..f1a062504 100644
--- a/test/with1.test
+++ b/test/with1.test
@@ -992,16 +992,22 @@ do_execsql_test 18.2 {
 
 # EXPLAIN QUERY PLAN on a self-join of a CTE
 #
-do_execsql_test 19.1 {
+do_execsql_test 19.1a {
   DROP TABLE IF EXISTS t1;
   CREATE TABLE t1(x);
-  EXPLAIN QUERY PLAN
+}
+do_eqp_test 19.1b {
   WITH
     x1(a) AS (values(100))
   INSERT INTO t1(x)
     SELECT * FROM (WITH x2(y) AS (SELECT * FROM x1) SELECT y+a FROM x1, x2);
   SELECT * FROM t1;
-} {0 0 0 {SCAN SUBQUERY 1} 0 1 1 {SCAN SUBQUERY 1}}
+} {
+  QUERY PLAN
+  |--MATERIALIZE xxxxxx
+  |--SCAN SUBQUERY xxxxxx
+  `--SCAN SUBQUERY xxxxxx
+}
 
 # 2017-10-28.
 # See check-in https://sqlite.org/src/info/0926df095faf72c2