Simplify the row value misuse error message.

FossilOrigin-Name: 838c50a5bf46fd0340839d577fa28ba02b4f2034

diff --git a/manifest b/manifest
index d4c268de95847bf4b02615dc3e7c2634fb3a08f6..90d05b40fd2a6b16bde70a1a4e024abf68505398 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\srowvalue\sUPDATE\swhen\sthe\srowvalue\sis\snot\sthe\sleft-most\sand\nthe\sRHS\sis\sa\smulti-column\ssubquery.
-D 2016-08-23T18:30:10.697
+C Simplify\sthe\srow\svalue\smisuse\serror\smessage.
+D 2016-08-23T19:02:55.746
 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -338,7 +338,7 @@ F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
 F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b
 F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
 F src/delete.c 76c084f0265f4a3cd1ecf17eee112a94f1ccbc05
-F src/expr.c 3d3cc24386929991ff0c4264a8dde45b298c599e
+F src/expr.c e67849c475435a2d8268a660aaeff7d1df505a2f
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c e2be0968c1adc679c87e467aa5b4f167588f38a8
 F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771
@@ -1019,11 +1019,11 @@ F test/rollbackfault.test 0e646aeab8840c399cfbfa43daab46fd609cf04a
 F test/rowallock.test 3f88ec6819489d0b2341c7a7528ae17c053ab7cc
 F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
 F test/rowid.test 5b7509f384f4f6fae1af3c8c104c8ca299fea18d
-F test/rowvalue.test 56b34d31d91340a6e922e753b798880170cc1aa7
+F test/rowvalue.test c2b4d043f4253711c8a2c6aa126a3f6d71182969
 F test/rowvalue2.test 875068299fd4dd50ef0a47786462c8e1f4065f9a
-F test/rowvalue3.test dbe935260851b197dfbbbcb0ac2a15cb5f324fd4
-F test/rowvalue4.test 318cdd40e66dfae686537eea581ae49cbb01195d
-F test/rowvalue5.test 01c7e0bc4048f30b58e6eb27ecd26e5bd312635e
+F test/rowvalue3.test 01399b7bf150b0d41abce76c18072da777c2500c
+F test/rowvalue4.test 9b40c9be9bdde30fc66cddbfdf6a5af37de4ccac
+F test/rowvalue5.test a440d490c8c0bf606034c09d5c6bbf7840b98f95
 F test/rowvalue6.test d19b54feb604d5601f8614b15e214e0774c01087
 F test/rowvalue7.test 5d06ff19d9e6969e574a2e662a531dd0c67801a8
 F test/rowvalue8.test 5900eddad9e2c3c2e26f1a95f74aafc1232ee5e0
@@ -1520,7 +1520,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 c8ffae05e13033ec7425bf0f002df31f550bb7f1
-R 8c42685900faf8a76ebfa8d4883d872e
+P e149e6b93a9afb3d574309c0db60e221e24078f7
+R 4cb3db3c4cfd8c4158ffeb6116b28260
 U drh
-Z b8c84bcbf71dd1d1d9c9f62200ebb8ca
+Z 62ec580862aeb7b6a1de73caa33d9d9e

diff --git a/manifest.uuid b/manifest.uuid
index bd556e03a82cc466454593bc95ac30589027502a..f1ac3fff869f5c1fb8af0ad2790aab358103d403 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e149e6b93a9afb3d574309c0db60e221e24078f7
\ No newline at end of file
+838c50a5bf46fd0340839d577fa28ba02b4f2034
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 2e09d07982ba2c93c7828fb3d6b1741c59516391..8c0d8b3cce9b6cbf9dc14f55b3697ac95ee4866c 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -517,7 +517,7 @@ static void codeVectorCompare(
   /* Check that both sides of the comparison are vectors, and that
   ** both are the same length.  */
   if( nLeft!=nRight ){
-    sqlite3ErrorMsg(pParse, "invalid use of row value");
+    sqlite3ErrorMsg(pParse, "row value misused");
   }else{
     int i;
     int regLeft = 0;
@@ -2610,7 +2610,7 @@ int sqlite3ExprCheckIN(Parse *pParse, Expr *pIn){
     if( (pIn->pLeft->flags & EP_xIsSelect) ){
       sqlite3SubselectError(pParse, nVector, 1);
     }else{
-      sqlite3ErrorMsg(pParse, "invalid use of row value");
+      sqlite3ErrorMsg(pParse, "row value misused");
     }
     return 1;
   }
@@ -3775,7 +3775,7 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
     }
 
     case TK_VECTOR: {
-      sqlite3ErrorMsg(pParse, "invalid use of row value");
+      sqlite3ErrorMsg(pParse, "row value misused");
       break;
     }
 

diff --git a/test/rowvalue.test b/test/rowvalue.test
index a1faba97ab655e2c52f55f40ea883b80e203f94f..642a7843aa01c83ba70d15499ac780c9ff2414fc 100644 (file)
--- a/test/rowvalue.test
+++ b/test/rowvalue.test
@@ -150,10 +150,10 @@ do_execsql_test 6.5 {
 } {i ii}
 do_catchsql_test 6.6 {
   SELECT c FROM hh WHERE (a, b) = (SELECT 'abc', 1) COLLATE nocase;
-} {1 {invalid use of row value}}
+} {1 {row value misused}}
 do_catchsql_test 6.7 {
   SELECT c FROM hh WHERE (a, b) = 1;
-} {1 {invalid use of row value}}
+} {1 {row value misused}}
 do_execsql_test 6.8 {
   SELECT c FROM hh WHERE (a COLLATE nocase, b) = (SELECT 'def', 2);
 } {iii iv}
@@ -221,4 +221,3 @@ foreach {tn q res} {
 
 
 finish_test
-

diff --git a/test/rowvalue3.test b/test/rowvalue3.test
index 17bf96a0f48bdc7b31b3f51b0dbb9a249e363f71..b050e70dde646c4aca09c8e78541490309e48204 100644 (file)
--- a/test/rowvalue3.test
+++ b/test/rowvalue3.test
@@ -204,5 +204,3 @@ foreach {tn idx} {
 
 
 finish_test
-
-

diff --git a/test/rowvalue4.test b/test/rowvalue4.test
index c4581d5562ba37739df57983aed0172fe6dcf820..a30edcc262476af1582bb7221c897891ca4624fb 100644 (file)
--- a/test/rowvalue4.test
+++ b/test/rowvalue4.test
@@ -34,14 +34,14 @@ foreach {tn e} {
   2 "1 + (1, 2)"
   3 "(1,2,3) == (1, 2)"
 } {
-  do_catchsql_test 1.$tn "SELECT $e" {1 {invalid use of row value}}
+  do_catchsql_test 1.$tn "SELECT $e" {1 {row value misused}}
 }
 
 foreach {tn s error} {
-  1 "SELECT * FROM t1 WHERE a = (1, 2)"       {invalid use of row value}
-  2 "SELECT * FROM t1 WHERE b = (1, 2)"       {invalid use of row value}
-  3 "SELECT * FROM t1 WHERE NOT (b = (1, 2))" {invalid use of row value}
-  4 "SELECT * FROM t1 LIMIT (1, 2)"           {invalid use of row value}
+  1 "SELECT * FROM t1 WHERE a = (1, 2)"       {row value misused}
+  2 "SELECT * FROM t1 WHERE b = (1, 2)"       {row value misused}
+  3 "SELECT * FROM t1 WHERE NOT (b = (1, 2))" {row value misused}
+  4 "SELECT * FROM t1 LIMIT (1, 2)"           {row value misused}
   5 "SELECT (a, b) IN (SELECT * FROM t1) FROM t1" 
                              {sub-select returns 3 columns - expected 2}
 
@@ -309,4 +309,3 @@ do_catchsql_test 8.2 {
 } {1 {sub-select returns 2 columns - expected 1}}
 
 finish_test
-

diff --git a/test/rowvalue5.test b/test/rowvalue5.test
index c961cf7424565dada564350f375cd68187141799..d5976ccb8909d5214d5c933f8781199ad978d66c 100644 (file)
--- a/test/rowvalue5.test
+++ b/test/rowvalue5.test
@@ -110,4 +110,3 @@ foreach {tn where res} {
 }
 
 finish_test
-