From 06c7cc7694efd610ca6bb16ab27fbb8011d724f9 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 23 Mar 2021 15:07:17 +0000
Subject: [PATCH] Changes to test/analyzeG.test to conform to the new EXPLAIN
 QUERY PLAN syntax.

FossilOrigin-Name: d8afde1bf1d41a349a161a293533a9fdf23ff23b8f1bcc323e79e806c5c526f1
---
 manifest           | 12 ++++++------
 manifest.uuid      |  2 +-
 test/analyzeG.test | 32 ++++++++++++++------------------
 3 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/manifest b/manifest
index 7192b97e3b..88f5ceaa32 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stest\scase\sin\sbigmmap.test\sso\sthat\sit\sworks\swith\sthe\snew\s\nEXPLAIN\sQUERY\sPLAN\soutput\sformat.
-D 2021-03-23T14:33:35.659
+C Changes\sto\stest/analyzeG.test\sto\sconform\sto\sthe\snew\sEXPLAIN\sQUERY\sPLAN\ssyntax.
+D 2021-03-23T15:07:17.789
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -671,7 +671,7 @@ F test/analyzeC.test 1111830ad355d29a294a5dda654dd5f6a8622c6a223a4f7b7b3d091df7a
 F test/analyzeD.test 485f621cfd2ef0a8f8ac79672586651bfa495bd899db50461bb4b558400ab3c1
 F test/analyzeE.test 69d130f9ba78c9853dcd5a18317e81f462a72d704cec0c4c30afb220213acd29
 F test/analyzeF.test 40b5cc3ad7b10e81020d7ca86f1417647ecfae7477cfd88acc5aa7ae1068f949
-F test/analyzeG.test 9e1ae5c24a88761284e08f78dccb728c81641a7465009e461faae5d06a31eab2
+F test/analyzeG.test 623be33038c49648872746c8dd8b23b5792c08fef173c55e82f1b12fca259852
 F test/analyzer1.test 459fa02c445ddbf0101a3bad47b34290a35f2e49
 F test/async.test 1d0e056ba1bb9729283a0f22718d3a25e82c277b
 F test/async2.test c0a9bd20816d7d6a2ceca7b8c03d3d69c28ffb8b
@@ -1910,7 +1910,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1d3c4662c2f522ac695d97441324069f3fc65f3fa0b87194c7094dfb8cd549f2
-R b561a4fa037cab5d44b8e08ade479fb0
+P 9ac064fe2aee4aa1423e7c8043dfec52ecf2af3e8361ebb7d9c104cca82b4d23
+R 995047e473f704c6f3cc7a43bca1e224
 U drh
-Z ff135066fbd615318706026b58275ff2
+Z 3f3eddbdacbf4197236d24688551244d
diff --git a/manifest.uuid b/manifest.uuid
index 6bf42e15fb..1248b902eb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9ac064fe2aee4aa1423e7c8043dfec52ecf2af3e8361ebb7d9c104cca82b4d23
\ No newline at end of file
+d8afde1bf1d41a349a161a293533a9fdf23ff23b8f1bcc323e79e806c5c526f1
\ No newline at end of file
diff --git a/test/analyzeG.test b/test/analyzeG.test
index 4395925de3..ca65bc3b96 100644
--- a/test/analyzeG.test
+++ b/test/analyzeG.test
@@ -20,16 +20,6 @@ ifcapable !stat4 {
 }
 set testprefix analyzeG
 
-proc do_scan_order_test {tn sql expect} {
-  uplevel [list do_test $tn [subst -nocommands {
-    set res ""
-    db eval "explain query plan $sql" {
-      lappend res [set detail]
-    }
-    set res
-  }] [list {*}$expect]]
-}
-
 #-------------------------------------------------------------------------
 # Test cases 1.* seek to verify that even if an index is not used, its
 # stat4 data may be used by the planner to estimate the number of
@@ -54,15 +44,17 @@ do_execsql_test 1.0 {
 # know this, so it has no preference as to which order the tables are
 # scanned in. In practice this means that tables are scanned in the order
 # they are specified in in the FROM clause.
-do_scan_order_test 1.1.1 {
+do_eqp_test 1.1.1 {
   SELECT * FROM t1, t2 WHERE a=44 AND b=44;
 } {
-  {SCAN t1} {SCAN TABLE t2}
+
 }
-do_scan_order_test 1.1.2 {
+do_eqp_test 1.1.2 {
   SELECT * FROM t2, t1 WHERE a=44 AND b=44 
 } {
-  {SCAN TABLE t2} {SCAN TABLE t1} 
+  QUERY PLAN
+  |--SCAN t2
+  `--SCAN t1
 }
 
 do_execsql_test 1.2 {
@@ -73,15 +65,19 @@ do_execsql_test 1.2 {
 # Now, with the ANALYZE data, the planner knows that (b=44) matches a 
 # large number of rows. So it elects to scan table "t1" first, regardless
 # of the order in which the tables are specified in the FROM clause.
-do_scan_order_test 1.3.1 {
+do_eqp_test 1.3.1 {
   SELECT * FROM t1, t2 WHERE a=44 AND b=44;
 } {
-  {SCAN TABLE t1} {SCAN TABLE t2}
+  QUERY PLAN
+  |--SCAN t1
+  `--SCAN t2
 }
-do_scan_order_test 1.3.2 {
+do_eqp_test 1.3.2 {
   SELECT * FROM t2, t1 WHERE a=44 AND b=44 
 } {
-  {SCAN TABLE t1} {SCAN TABLE t2} 
+  QUERY PLAN
+  |--SCAN t1
+  `--SCAN t2
 }