database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

TK_REGISTER expressions nodes are probably not constant. Make sure

Browse Source 
sqlite3ExprIsConstant() knows this.

FossilOrigin-Name: f3d91cad929cfbee8f621425f55b5f12e79567362cf8769a786adb3e1bbef214
This commit is contained in:
drh
2018-04-17 18:50:40 +00:00
parent dedbc50811
commit 6e341b9347
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Simplification\sto\sthe\supsert\slogic. C TK_REGISTER\sexpressions\snodes\sare\sprobably\snot\sconstant.\s\sMake\ssure\nsqlite3ExprIsConstant()\sknows\sthis.
D 2018-04-17T18:18:05.768 D 2018-04-17T18:50:40.806
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439 F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439
@@ -443,7 +443,7 @@ F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
F src/dbpage.c 8db4c97f630e7d83f884ea75caf1ffd0988c160e9d530194d93721c80821e0f6 F src/dbpage.c 8db4c97f630e7d83f884ea75caf1ffd0988c160e9d530194d93721c80821e0f6
F src/dbstat.c edabb82611143727511a45ca0859b8cd037851ebe756ae3db289859dd18b6f91 F src/dbstat.c edabb82611143727511a45ca0859b8cd037851ebe756ae3db289859dd18b6f91
F src/delete.c 20c8788451dc737a967c87ea53ad43544d617f5b57d32ccce8bd52a0daf9e89b F src/delete.c 20c8788451dc737a967c87ea53ad43544d617f5b57d32ccce8bd52a0daf9e89b
F src/expr.c fc607dd6338ac73c7fdc962734575d7136966cd9dbb69f8c75104d3d272bea96 F src/expr.c 1633ff93c1261cb7f55e86585790920f95740249cf153fe3b7cf9dc737def6a1
F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
F src/fkey.c d617daf66b5515e2b42c1405b2b4984c30ca50fb705ab164271a9bf66c69e331 F src/fkey.c d617daf66b5515e2b42c1405b2b4984c30ca50fb705ab164271a9bf66c69e331
F src/func.c 94f42cba2cc1c34aeaa441022ba0170ec3fec4bba54db4e0ded085c6dc0fdc51 F src/func.c 94f42cba2cc1c34aeaa441022ba0170ec3fec4bba54db4e0ded085c6dc0fdc51
@@ -1722,7 +1722,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 27cd3b2fb2ad0cf2b36741bd1057cb7973954d40456e9db158261a38b049d2b5 P f36d07a5b24cc48e3daa8b18dd34c50d9025c6c0ba019926610538b54f7b66ec
R 837c4599d1e54bae4359625ba7dd9074 R 2592653ac9a36d5b1dfe12eeeda8279d
U drh U drh
Z 92d6b1e9c0f6d90ac70b51eff037a9bb Z a21db6874b54aa7e41558b500442b67a

2
manifest.uuid
View File

@@ -1 +1 @@
f36d07a5b24cc48e3daa8b18dd34c50d9025c6c0ba019926610538b54f7b66ec f3d91cad929cfbee8f621425f55b5f12e79567362cf8769a786adb3e1bbef214

5
src/expr.c
View File

@@ -1825,6 +1825,7 @@ static int exprNodeIsConstant(Walker *pWalker, Expr *pExpr){
} }
/* Fall through */ /* Fall through */
case TK_IF_NULL_ROW: case TK_IF_NULL_ROW:
case TK_REGISTER:
testcase( pExpr->op==TK_IF_NULL_ROW ); testcase( pExpr->op==TK_IF_NULL_ROW );
pWalker->eCode = 0; pWalker->eCode = 0;
return WRC_Abort; return WRC_Abort;
@@ -1842,8 +1843,8 @@ static int exprNodeIsConstant(Walker *pWalker, Expr *pExpr){
} }
/* Fall through */ /* Fall through */
default: default:
testcase( pExpr->op==TK_SELECT ); /* sqlite3SelectWalkFail will disallow */ testcase( pExpr->op==TK_SELECT ); /* sqlite3SelectWalkFail() disallows */
testcase( pExpr->op==TK_EXISTS ); /* sqlite3SelectWalkFail will disallow */ testcase( pExpr->op==TK_EXISTS ); /* sqlite3SelectWalkFail() disallows */
return WRC_Continue; return WRC_Continue;
} }
} }