Remove obsolete vector-IN test cases. Fix a bad testcase() macro.

FossilOrigin-Name: ab3f8f193a7ec36018bf26c9231a1a6a58b6a523

diff --git a/manifest b/manifest
index 8def3253ea9069cd8ca9fa5770c0e628ea93bffb..b6583d963c013f52fa69edb6736b38384c968421 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\scorer\scases\sof\svector\sIN\soperators\swhere\sthe\sRHS\sis\sa\scompound\sSELECT\nthat\sincludes\san\sORDER\sBY\sclause.
-D 2016-09-06T18:51:25.666
+C Remove\sobsolete\svector-IN\stest\scases.\s\sFix\sa\sbad\stestcase()\smacro.
+D 2016-09-06T19:08:21.705
 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5017381e4853b1472e01d5bb926be1268eba429c
@@ -385,7 +385,7 @@ F src/printf.c a5f0ca08ddede803c241266abb46356ec748ded1
 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c 24f40fd0c3475821d1ad762a3f2c3455cc839b42
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
-F src/select.c d6c1a6463a5e34352691e77f1475a63406c3984f
+F src/select.c 244f9cc5e4662987cd2ef5c22d1b7027560f3425
 F src/shell.c 79dda477be6c96eba6e952a934957ad36f87acc7
 F src/sqlite.h.in 4a030e254e204570444b34bf7d40fb4a5416089e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1024,7 +1024,7 @@ F test/rowvalue.test 753eb744b7efeb5ac643d35d6e1e5066452ccf79
 F test/rowvalue2.test 060d238b7e5639a7c5630cb5e63e311b44efef2b
 F test/rowvalue3.test 01399b7bf150b0d41abce76c18072da777c2500c
 F test/rowvalue4.test 4b556d7de161a0dd8cff095c336e913986398bea
-F test/rowvalue5.test a440d490c8c0bf606034c09d5c6bbf7840b98f95
+F test/rowvalue5.test c1adfb2ea104e181f70d55bbd80d803b9917b22b
 F test/rowvalue6.test d19b54feb604d5601f8614b15e214e0774c01087
 F test/rowvalue7.test 5d06ff19d9e6969e574a2e662a531dd0c67801a8
 F test/rowvalue8.test 5900eddad9e2c3c2e26f1a95f74aafc1232ee5e0
@@ -1522,7 +1522,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 7cc9746c5414e02012efb8180f9eca2646800e74
-R 36f92754f7a81ed3dc243351ed6e664e
+P 8329ac6f8d1edcc19c3e0559abe9a8011dbe1497
+R c63acfebc9bb94150dde03620f804079
 U drh
-Z 50c7e7d129c621501eed665f9216f5e0
+Z 4492b1886315f856574968e31e230cb0

diff --git a/manifest.uuid b/manifest.uuid
index 6e1c09ed3defc3713e86b834a1ac0d7e59738c1b..130764cfa2e847d1e1b48f224fbcb125bf3cc773 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8329ac6f8d1edcc19c3e0559abe9a8011dbe1497
\ No newline at end of file
+ab3f8f193a7ec36018bf26c9231a1a6a58b6a523
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index aa714ceb4895b2c834d98c7b453469827a0c8399..2d4e901ba49d68c9a8d42cbbc4d2a31e322b76a3 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -2635,7 +2635,7 @@ static int generateOutputSubroutine(
     */
     case SRT_Set: {
       int r1;
-      testcase( pIn->nSdst>1 && pParse->nErr==0 );
+      testcase( pIn->nSdst>1 );
       r1 = sqlite3GetTempReg(pParse);
       sqlite3VdbeAddOp4(v, OP_MakeRecord, pIn->iSdst, pIn->nSdst, 
           r1, pDest->zAffSdst, pIn->nSdst);

diff --git a/test/rowvalue5.test b/test/rowvalue5.test
index d5976ccb8909d5214d5c933f8781199ad978d66c..45d501b55a83ee242c63da74b38788d3cba4cd7e 100644 (file)
--- a/test/rowvalue5.test
+++ b/test/rowvalue5.test
@@ -96,15 +96,13 @@ foreach {tn where res} {
   6 "(a, b) = (SELECT 9, 10)"        {{a = 9 AND b = 10}}
   7 "(+a, b) = (SELECT 'a', 'b')"    {{b = 'b'}}
   8 "(a, +b) = (SELECT 'a', 'b')"    {{a = 'a'}}
-  10 "(a, b) IN (SELECT 9, 10 UNION SELECT 11, 12)" 
-      {{a = 9 AND b = 10} {a = 11 AND b = 12}}
-  11 "(+a, b) IN (SELECT 'a', 'b')" {{b = 'b'}}
-  12 "(a, +b) IN (SELECT 'a', 'b')" {{a = 'a'}}
+  11 "(+a, b) IN (SELECT 'a', 'b')"  {{b = 'b'}}
+  12 "(a, +b) IN (SELECT 'a', 'b')"  {{a = 'a'}}
 
-  13 "(a, b) < ('d', 'e')"  {{a <= 'd'}}
-  14 "(a, b) < ('a', 'c')"  {{a <= 'a'}}
-  15 "(a, b) <= ('a', 'b')" {{a <= 'a'}}
-  16 "(a, b) < ('a', 'b')"  {}
+  13 "(a, b) < ('d', 'e')"           {{a <= 'd'}}
+  14 "(a, b) < ('a', 'c')"           {{a <= 'a'}}
+  15 "(a, b) <= ('a', 'b')"          {{a <= 'a'}}
+  16 "(a, b) < ('a', 'b')"           {}
 } {
   do_execsql_test 1.$tn "SELECT expr FROM x1 WHERE $where" $res
 }