From d832da7f40207b77fe2d313b2f7a5b8e6cb0ef78 Mon Sep 17 00:00:00 2001 From: drh Date: Sat, 20 Aug 2016 21:11:25 +0000 Subject: [PATCH] Further comment enhancements. No changes to code. FossilOrigin-Name: d4562a9e7b1eaff41466210e3a0caaf374ec5a92 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/expr.c | 6 ++++++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 63e0795631..256fcbf510 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Clarification\sof\scode\scomments\sin\sexpr.c.\s\sClean\sup\sthe\simplementations\nof\ssqlite3ExprIsVector()\sand\ssqlite3ExprVectorSize()\sslightly. -D 2016-08-20T21:02:38.224 +C Further\scomment\senhancements.\s\sNo\schanges\sto\scode. +D 2016-08-20T21:11:25.815 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 4adf875e1bfc155b107ee8e35e7cb1c5599f955b +F src/expr.c b6f0592292944a1700b503d00f588932f5683d67 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fkey.c e2be0968c1adc679c87e467aa5b4f167588f38a8 F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771 @@ -1519,7 +1519,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 9041ee4a6f0e8389297f887f1431ab5cfe783390 -R bba779342591015bf7eda1fee0ab13af +P 4fb66d6592b141a4a71359250dbd1ac454569cb9 +R 560b79caaccb19afcc4a2c629096a4bc U drh -Z 030a18789c82832c6d203bdc6c28c7db +Z f5ddde0143384b43283a729a6b1d1670 diff --git a/manifest.uuid b/manifest.uuid index d9ffa9fb0c..1bfd374437 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4fb66d6592b141a4a71359250dbd1ac454569cb9 \ No newline at end of file +d4562a9e7b1eaff41466210e3a0caaf374ec5a92 \ No newline at end of file diff --git a/src/expr.c b/src/expr.c index 69754fada6..c92179d5e4 100644 --- a/src/expr.c +++ b/src/expr.c @@ -311,6 +311,12 @@ static int codeCompare( /* ** Return true if expression pExpr is a vector, or false otherwise. +** +** A vector is defined as any expression that results in two or more +** columns of result. Every TK_VECTOR node is an vector because the +** parser will not generate a TK_VECTOR with fewer than two entries. +** But a TK_SELECT might be either a vector or a scalar. It is only +** considered a vector if it has two or more result columns. */ int sqlite3ExprIsVector(Expr *pExpr){ return sqlite3ExprVectorSize(pExpr)>1;