diff options
| -rw-r--r-- | manifest | 14 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/resolve.c | 1 | ||||
| -rw-r--r-- | test/misc1.test | 5 |
4 files changed, 14 insertions, 8 deletions
@@ -1,5 +1,5 @@ -C Add\sa\stest\scase\sfor\swhat\swas\sformerly\sthought\sto\sbe\san\sunreachable\scondition:\nwhen\sthe\sLHS\sof\san\sOR\soperator\scontains\san\serror\sand\sthe\sRHS\scontains\san\sIN\noperator. -D 2015-04-15T04:20:58.065 +C When\sdoing\sthe\s(dubious)\sconversion\sof\sdouble-quoted\sidentifier\sinto\sstring\nliteral\sfor\sMySQL\scompatibility,\sbe\ssure\sto\salso\sclear\sthe\siTable\svalue\sfrom\nthe\sExpr\sentry\sto\savoid\san\sassert. +D 2015-04-15T04:51:28.676 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -228,7 +228,7 @@ F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9 F src/printf.c 8ae1fa9d30c1200a9268a390ba9e9cea9197b27a F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 -F src/resolve.c 41aa91af56d960e9414ce1d7c17cfb68e0d1c6cb +F src/resolve.c 7bd67ded824a2fe8b356cd45e053d9c94b1874c2 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e F src/select.c 117e0f9ac9254a6f7472fac5144eba21ba0b2ec1 F src/shell.c 84a1593bd86aaa14f4da8a8f9b16fbc239d262aa @@ -743,7 +743,7 @@ F test/minmax.test 42fbad0e81afaa6e0de41c960329f2b2c3526efd F test/minmax2.test b44bae787fc7b227597b01b0ca5575c7cb54d3bc F test/minmax3.test cc1e8b010136db0d01a6f2a29ba5a9f321034354 F test/minmax4.test 936941484ebdceb8adec7c86b6cd9b6e5e897c1f -F test/misc1.test f3f59b3941c84a10860c06c07e86ad367a74ec92 +F test/misc1.test 9abcae9a0b8785d6fa92925dbb19c309ae9ea077 F test/misc2.test 00d7de54eda90e237fc9a38b9e5ccc769ebf6d4d F test/misc3.test cf3dda47d5dda3e53fc5804a100d3c82be736c9d F test/misc4.test 9c078510fbfff05a9869a0b6d8b86a623ad2c4f6 @@ -1250,7 +1250,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P a084690b4fcabba20d9770ebf3a014dda84e2954 -R fcf0b4147f04a74e05def15e3b1a56b8 +P 3872742591add4e94033484c2844e7d7ab69674b +R 3d936303913ff5357294410059be6467 U drh -Z 041867bd4c7c23a09c20a9ae6f8ff29f +Z adb676b9f25e7eed8c83dbf9762c49f4 diff --git a/manifest.uuid b/manifest.uuid index f94b10f78..f2359bbae 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3872742591add4e94033484c2844e7d7ab69674b
\ No newline at end of file +d7211b68107ea669de39e0aa81a1be40901e1487
\ No newline at end of file diff --git a/src/resolve.c b/src/resolve.c index a7b14cd00..d66de2795 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -460,6 +460,7 @@ static int lookupName( if( cnt==0 && zTab==0 && ExprHasProperty(pExpr,EP_DblQuoted) ){ pExpr->op = TK_STRING; pExpr->pTab = 0; + pExpr->iTable = -1; return WRC_Prune; } diff --git a/test/misc1.test b/test/misc1.test index 0f4881fb6..1b98eafc6 100644 --- a/test/misc1.test +++ b/test/misc1.test @@ -639,4 +639,9 @@ do_catchsql_test misc1-21.2 { VALUES(0,0x0MATCH#0; } {1 {near ";": syntax error}} +# 2015-04-15 +do_execsql_test misc1-22.1 { + SELECT ""+3 FROM (SELECT ""+5); +} {3} + finish_test |