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

Improved names for flags on the Expr object: EP_FromJoin becames

Browse Source 
EP_OuterON and EP_InnerJoin becomes EP_InnerON.

FossilOrigin-Name: 1ffea07ff98b894729c698b681cc7433df3bbfccd8a0529a706908602a636937
This commit is contained in:
drh
2022-05-13 14:52:04 +00:00
parent 8b0e5c3c7e
commit 67a99dbee8
11 changed files with 98 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
manifest
View File

@@ -1,5 +1,5 @@
C Fix\sa\sharmless\scompiler\swarning\sin\sthe\sCLI. C Improved\snames\sfor\sflags\son\sthe\sExpr\sobject:\s\sEP_FromJoin\sbecames\nEP_OuterON\sand\sEP_InnerJoin\sbecomes\sEP_InnerON.
D 2022-05-12T17:09:33.863 D 2022-05-13T14:52:04.811
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 LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -504,7 +504,7 @@ F src/date.c 15082566229d4b1e5f24fdb490bf9bcc68824b911d70e3573ef075a1b9e2d26f
F src/dbpage.c 90661a87e1db8bfbc8d2ebbdcd3749651ddb287c555c07a28fb17c7c591ffb68 F src/dbpage.c 90661a87e1db8bfbc8d2ebbdcd3749651ddb287c555c07a28fb17c7c591ffb68
F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
F src/delete.c a8e844af211a48b13b5b358be77a12c860c6a557c21990ad51a548e2536500ce F src/delete.c a8e844af211a48b13b5b358be77a12c860c6a557c21990ad51a548e2536500ce
F src/expr.c d955e8954e03e637c19033241806b04f6a937d0657f6261f2d9e4cdfe674b478 F src/expr.c 8c5ca4fb4089cc3a3441f25087356702a45c6aca417b76fcb82622428fb7265e
F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
F src/fkey.c d965ede15d8360c09ed59348940649ee647b192e784466837d7aefa836d1d91e F src/fkey.c d965ede15d8360c09ed59348940649ee647b192e784466837d7aefa836d1d91e
F src/func.c a3407a6fbb0d4088d8d502e46f0ace63e0aeae7467ae23a9ca9815bbf9239761 F src/func.c a3407a6fbb0d4088d8d502e46f0ace63e0aeae7467ae23a9ca9815bbf9239761
@@ -549,16 +549,16 @@ F src/pcache1.c 54881292a9a5db202b2c0ac541c5e3ef9a5e8c4f1c1383adb2601d5499a60e65
F src/pragma.c d1aead03e8418ff586c7cfca344c50a914b8eb06abd841e8e91a982d823671da F src/pragma.c d1aead03e8418ff586c7cfca344c50a914b8eb06abd841e8e91a982d823671da
F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
F src/prepare.c c62820c15dcb63013519c8e41d9f928d7478672cc902cfd0581c733c271dbf45 F src/prepare.c c62820c15dcb63013519c8e41d9f928d7478672cc902cfd0581c733c271dbf45
F src/printf.c 512574910a45341c8ad244bd3d4939968ebdfde215645b676fff01cc46e90757 F src/printf.c 320fd82b2b203e584c87e5a85e80a4be8d926f8aacbccc53ec6b01bbc305ef8c
F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
F src/resolve.c e9ee235c4151d2b7fa47435a219bfd30bf516a804d2f004639858087ebf3137b F src/resolve.c a4eb3c617027fd049b07432f3b942ea7151fa793a332a11a7d0f58c9539e104f
F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
F src/select.c 5096a2e8ab0511a413e7f5e45453fea4102d99c5636c46792581ae67899a76d7 F src/select.c 74060a09f66c0c056f3c61627e22cb484af0bbfa29d7d14dcf17c684742c15de
F src/shell.c.in 176cad562152cbbafe7ecc9c83c82850e2c3d0cf33ec0a52d67341d35c842f22 F src/shell.c.in 176cad562152cbbafe7ecc9c83c82850e2c3d0cf33ec0a52d67341d35c842f22
F src/sqlite.h.in 2a35f62185eb5e7ecc64a2f68442b538ce9be74f80f28a00abc24837edcf1c17 F src/sqlite.h.in 2a35f62185eb5e7ecc64a2f68442b538ce9be74f80f28a00abc24837edcf1c17
F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
F src/sqlite3ext.h f49e28c25bd941e79794db5415fdf7b202deb3bc072ed6f1ed273d578703684e F src/sqlite3ext.h f49e28c25bd941e79794db5415fdf7b202deb3bc072ed6f1ed273d578703684e
F src/sqliteInt.h 7c8146fc57f2e009152eb93ad41eab28490f9c31691559f281a80f9077ec1f2a F src/sqliteInt.h ba4057968afd2fbd0fd72c1a6d6cc5a7b568437f47b476106993da32bde5645b
F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
F src/status.c 4a3da6d77eeb3531cb0dbdf7047772a2a1b99f98c69e90ce009c75fe6328b2c0 F src/status.c 4a3da6d77eeb3531cb0dbdf7047772a2a1b99f98c69e90ce009c75fe6328b2c0
F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -618,7 +618,7 @@ F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394
F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
F src/tokenize.c a38f52058b517929e264094abd0b5fd1e8e145a1aa43bc6f6a72ae5218f96c98 F src/tokenize.c a38f52058b517929e264094abd0b5fd1e8e145a1aa43bc6f6a72ae5218f96c98
F src/treeview.c 4153f2f044d13a3216e64271dfd1e59a3fa40222a45e6da248708088634e6f06 F src/treeview.c ae4a3c115c630ab5b779b66590a2d029329f2df050c2f35195cf1bbd2922decb
F src/trigger.c 4fe4c1ac811755aff49d669d2e52e414eb5dfa6e172e849ab7b6825e70a571c0 F src/trigger.c 4fe4c1ac811755aff49d669d2e52e414eb5dfa6e172e849ab7b6825e70a571c0
F src/update.c 2cfaded82ca80ff56afb8c3ae5e88284e0824bfd86119827cc22481959f96f92 F src/update.c 2cfaded82ca80ff56afb8c3ae5e88284e0824bfd86119827cc22481959f96f92
F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937 F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
@@ -640,10 +640,10 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
F src/where.c aa585b89bd65a81e44bdfb871b55f65bf8fda88e1bc85efda6c236fe8d2bd788 F src/where.c d4d543f06b09ff8bac05072b015a2181f9c48561b1a146158aaaf09e40817567
F src/whereInt.h 8da918f392bf202ccc0ee61291455b33ad171d209445f1ff3eaf62e0b6f6b363 F src/whereInt.h 8da918f392bf202ccc0ee61291455b33ad171d209445f1ff3eaf62e0b6f6b363
F src/wherecode.c c1f7210872a75f0c79323133168faef4bafd4ecbd78594374f21738fdb9bb72e F src/wherecode.c 51aba5a09657c0400f76453e221aebe2abf488f6ef6345ae89c32468e36a0639
F src/whereexpr.c e036477ac8424de50ae5b36a71103405d3f86b33ba11125ec7a2a99d501b0622 F src/whereexpr.c 98e4e3fb3d10be2039de9b059ba04c6f5a500d17e9bd2ccc470d14f44b2a317d
F src/window.c fff1b51757438c664e471d5184634e48dcdf8ea34b640f3b1b0810b1e06de18c F src/window.c fff1b51757438c664e471d5184634e48dcdf8ea34b640f3b1b0810b1e06de18c
F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627 F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@ -1953,8 +1953,8 @@ 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 c7e3a13a3288c577209be99c630fbe924e19880e8af1aa8a83b517acaa8b43d7 P 7a2ac303d1436a423a635db63d195097c88160ff46855194f6e630f9d3b3fa82
R 0a3845fefd0ad6aac7e45fbf280fa0ff R 76628c449717fbf73d51bf54cb4d3e31
U drh U drh
Z 54875c2875e3e9b4c71ab954fb3fc0b2 Z db742fa17a2891de768f2e234d496fc9
# Remove this line to create a well-formed Fossil manifest. # Remove this line to create a well-formed Fossil manifest.

2
manifest.uuid
View File

@@ -1 +1 @@
7a2ac303d1436a423a635db63d195097c88160ff46855194f6e630f9d3b3fa82 1ffea07ff98b894729c698b681cc7433df3bbfccd8a0529a706908602a636937

16
src/expr.c
View File

@@ -1347,7 +1347,7 @@ static int dupedExprStructSize(const Expr *p, int flags){
nSize = EXPR_FULLSIZE; nSize = EXPR_FULLSIZE;
}else{ }else{
assert( !ExprHasProperty(p, EP_TokenOnly|EP_Reduced) ); assert( !ExprHasProperty(p, EP_TokenOnly|EP_Reduced) );
assert( !ExprHasProperty(p, EP_FromJoin) ); assert( !ExprHasProperty(p, EP_OuterON) );
assert( !ExprHasProperty(p, EP_MemToken) ); assert( !ExprHasProperty(p, EP_MemToken) );
assert( !ExprHasVVAProperty(p, EP_NoReduce) ); assert( !ExprHasVVAProperty(p, EP_NoReduce) );
if( p->pLeft || p->x.pList ){ if( p->pLeft || p->x.pList ){
@@ -2173,7 +2173,7 @@ static int exprNodeIsConstant(Walker *pWalker, Expr *pExpr){
/* If pWalker->eCode is 2 then any term of the expression that comes from /* If pWalker->eCode is 2 then any term of the expression that comes from
** the ON or USING clauses of an outer join disqualifies the expression ** the ON or USING clauses of an outer join disqualifies the expression
** from being considered constant. */ ** from being considered constant. */
if( pWalker->eCode==2 && ExprHasProperty(pExpr, EP_FromJoin) ){ if( pWalker->eCode==2 && ExprHasProperty(pExpr, EP_OuterON) ){
pWalker->eCode = 0; pWalker->eCode = 0;
return WRC_Abort; return WRC_Abort;
} }
@@ -2320,10 +2320,10 @@ int sqlite3ExprIsTableConstraint(Expr *pExpr, const SrcItem *pSrc){
return 0; /* rule (3) */ return 0; /* rule (3) */
} }
if( pSrc->fg.jointype & JT_LEFT ){ if( pSrc->fg.jointype & JT_LEFT ){
if( !ExprHasProperty(pExpr, EP_FromJoin) ) return 0; /* rule (4a) */ if( !ExprHasProperty(pExpr, EP_OuterON) ) return 0; /* rule (4a) */
if( pExpr->w.iJoin!=pSrc->iCursor ) return 0; /* rule (4b) */ if( pExpr->w.iJoin!=pSrc->iCursor ) return 0; /* rule (4b) */
}else{ }else{
if( ExprHasProperty(pExpr, EP_FromJoin) ) return 0; /* rule (5) */ if( ExprHasProperty(pExpr, EP_OuterON) ) return 0; /* rule (5) */
} }
return sqlite3ExprIsTableConstant(pExpr, pSrc->iCursor); /* rules (1), (2) */ return sqlite3ExprIsTableConstant(pExpr, pSrc->iCursor); /* rules (1), (2) */
} }
@@ -5078,8 +5078,8 @@ static void exprCodeBetween(
** so that the sqlite3ExprCodeTarget() routine will not attempt to move ** so that the sqlite3ExprCodeTarget() routine will not attempt to move
** it into the Parse.pConstExpr list. We should use a new bit for this, ** it into the Parse.pConstExpr list. We should use a new bit for this,
** for clarity, but we are out of bits in the Expr.flags field so we ** for clarity, but we are out of bits in the Expr.flags field so we
** have to reuse the EP_FromJoin bit. Bummer. */ ** have to reuse the EP_OuterON bit. Bummer. */
pDel->flags |= EP_FromJoin; pDel->flags |= EP_OuterON;
sqlite3ExprCodeTarget(pParse, &exprAnd, dest); sqlite3ExprCodeTarget(pParse, &exprAnd, dest);
} }
sqlite3ReleaseTempReg(pParse, regFree1); sqlite3ReleaseTempReg(pParse, regFree1);
@@ -5764,7 +5764,7 @@ int sqlite3ExprImpliesExpr(
static int impliesNotNullRow(Walker *pWalker, Expr *pExpr){ static int impliesNotNullRow(Walker *pWalker, Expr *pExpr){
testcase( pExpr->op==TK_AGG_COLUMN ); testcase( pExpr->op==TK_AGG_COLUMN );
testcase( pExpr->op==TK_AGG_FUNCTION ); testcase( pExpr->op==TK_AGG_FUNCTION );
if( ExprHasProperty(pExpr, EP_FromJoin) ) return WRC_Prune; if( ExprHasProperty(pExpr, EP_OuterON) ) return WRC_Prune;
switch( pExpr->op ){ switch( pExpr->op ){
case TK_ISNOT: case TK_ISNOT:
case TK_ISNULL: case TK_ISNULL:
@@ -5861,7 +5861,7 @@ static int impliesNotNullRow(Walker *pWalker, Expr *pExpr){
** False positives are not allowed, however. A false positive may result ** False positives are not allowed, however. A false positive may result
** in an incorrect answer. ** in an incorrect answer.
** **
** Terms of p that are marked with EP_FromJoin (and hence that come from ** Terms of p that are marked with EP_OuterON (and hence that come from
** the ON or USING clauses of OUTER JOINS) are excluded from the analysis. ** the ON or USING clauses of OUTER JOINS) are excluded from the analysis.
** **
** This routine is used to check if a LEFT JOIN can be converted into ** This routine is used to check if a LEFT JOIN can be converted into

2
src/printf.c
View File

@@ -954,7 +954,7 @@ void sqlite3RecordErrorByteOffset(sqlite3 *db, const char *z){
** as the error offset. ** as the error offset.
*/ */
void sqlite3RecordErrorOffsetOfExpr(sqlite3 *db, const Expr *pExpr){ void sqlite3RecordErrorOffsetOfExpr(sqlite3 *db, const Expr *pExpr){
while( pExpr && (ExprHasProperty(pExpr,EP_FromJoin) || pExpr->w.iOfst<=0) ){ while( pExpr && (ExprHasProperty(pExpr,EP_OuterON) || pExpr->w.iOfst<=0) ){
pExpr = pExpr->pLeft; pExpr = pExpr->pLeft;
} }
if( pExpr==0 ) return; if( pExpr==0 ) return;

2
src/resolve.c
View File

@@ -928,7 +928,7 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
} }
sqlite3WalkExpr(pWalker, pExpr->pLeft); sqlite3WalkExpr(pWalker, pExpr->pLeft);
if( 0==sqlite3ExprCanBeNull(pExpr->pLeft) && !IN_RENAME_OBJECT ){ if( 0==sqlite3ExprCanBeNull(pExpr->pLeft) && !IN_RENAME_OBJECT ){
testcase( ExprHasProperty(pExpr, EP_FromJoin) ); testcase( ExprHasProperty(pExpr, EP_OuterON) );
assert( !ExprHasProperty(pExpr, EP_IntValue) ); assert( !ExprHasProperty(pExpr, EP_IntValue) );
if( pExpr->op==TK_NOTNULL ){ if( pExpr->op==TK_NOTNULL ){
pExpr->u.zToken = "true"; pExpr->u.zToken = "true";

42
src/select.c
View File

@@ -378,11 +378,11 @@ static int tableAndColumnIndex(
} }
/* /*
** Set the EP_FromJoin property on all terms of the given expression. ** Set the EP_OuterON property on all terms of the given expression.
** And set the Expr.w.iJoin to iTable for every term in the ** And set the Expr.w.iJoin to iTable for every term in the
** expression. ** expression.
** **
** The EP_FromJoin property is used on terms of an expression to tell ** The EP_OuterON property is used on terms of an expression to tell
** the OUTER JOIN processing logic that this term is part of the ** the OUTER JOIN processing logic that this term is part of the
** join restriction specified in the ON or USING clause and not a part ** join restriction specified in the ON or USING clause and not a part
** of the more general WHERE clause. These terms are moved over to the ** of the more general WHERE clause. These terms are moved over to the
@@ -404,7 +404,7 @@ static int tableAndColumnIndex(
** the output, which is incorrect. ** the output, which is incorrect.
*/ */
void sqlite3SetJoinExpr(Expr *p, int iTable, u32 joinFlag){ void sqlite3SetJoinExpr(Expr *p, int iTable, u32 joinFlag){
assert( joinFlag==EP_FromJoin || joinFlag==EP_InnerJoin ); assert( joinFlag==EP_OuterON || joinFlag==EP_InnerON );
while( p ){ while( p ){
ExprSetProperty(p, joinFlag); ExprSetProperty(p, joinFlag);
assert( !ExprHasProperty(p, EP_TokenOnly|EP_Reduced) ); assert( !ExprHasProperty(p, EP_TokenOnly|EP_Reduced) );
@@ -425,17 +425,17 @@ void sqlite3SetJoinExpr(Expr *p, int iTable, u32 joinFlag){
} }
/* Undo the work of sqlite3SetJoinExpr(). In the expression p, convert every /* Undo the work of sqlite3SetJoinExpr(). In the expression p, convert every
** term that is marked with EP_FromJoin and w.iJoin==iTable into ** term that is marked with EP_OuterON and w.iJoin==iTable into
** an ordinary term that omits the EP_FromJoin mark. ** an ordinary term that omits the EP_OuterON mark.
** **
** This happens when a LEFT JOIN is simplified into an ordinary JOIN. ** This happens when a LEFT JOIN is simplified into an ordinary JOIN.
*/ */
static void unsetJoinExpr(Expr *p, int iTable){ static void unsetJoinExpr(Expr *p, int iTable){
while( p ){ while( p ){
if( ExprHasProperty(p, EP_FromJoin) if( ExprHasProperty(p, EP_OuterON)
&& (iTable<0 || p->w.iJoin==iTable) ){ && (iTable<0 || p->w.iJoin==iTable) ){
ExprClearProperty(p, EP_FromJoin); ExprClearProperty(p, EP_OuterON);
ExprSetProperty(p, EP_InnerJoin); ExprSetProperty(p, EP_InnerON);
} }
if( p->op==TK_COLUMN && p->iTable==iTable ){ if( p->op==TK_COLUMN && p->iTable==iTable ){
ExprClearProperty(p, EP_CanBeNull); ExprClearProperty(p, EP_CanBeNull);
@@ -463,8 +463,8 @@ static void unsetJoinExpr(Expr *p, int iTable){
** **
** * ON and USING clauses result in extra terms being added to the ** * ON and USING clauses result in extra terms being added to the
** WHERE clause to enforce the specified constraints. The extra ** WHERE clause to enforce the specified constraints. The extra
** WHERE clause terms will be tagged with EP_FromJoin or ** WHERE clause terms will be tagged with EP_OuterON or
** EP_InnerJoin so that we know that they originated in ON/USING. ** EP_InnerON so that we know that they originated in ON/USING.
** **
** The terms of a FROM clause are contained in the Select.pSrc structure. ** The terms of a FROM clause are contained in the Select.pSrc structure.
** The left most table is the first entry in Select.pSrc. The right-most ** The left most table is the first entry in Select.pSrc. The right-most
@@ -489,7 +489,7 @@ static int sqlite3ProcessJoin(Parse *pParse, Select *p){
u32 joinType; u32 joinType;
if( NEVER(pLeft->pTab==0 || pRightTab==0) ) continue; if( NEVER(pLeft->pTab==0 || pRightTab==0) ) continue;
joinType = (pRight->fg.jointype & JT_OUTER)!=0 ? EP_FromJoin : EP_InnerJoin; joinType = (pRight->fg.jointype & JT_OUTER)!=0 ? EP_OuterON : EP_InnerON;
/* If this is a NATURAL join, synthesize an approprate USING clause /* If this is a NATURAL join, synthesize an approprate USING clause
** to specify which columns should be joined. ** to specify which columns should be joined.
@@ -3762,7 +3762,7 @@ static Expr *substExpr(
Expr *pExpr /* Expr in which substitution occurs */ Expr *pExpr /* Expr in which substitution occurs */
){ ){
if( pExpr==0 ) return 0; if( pExpr==0 ) return 0;
if( ExprHasProperty(pExpr, EP_FromJoin) if( ExprHasProperty(pExpr, EP_OuterON)
&& pExpr->w.iJoin==pSubst->iTable && pExpr->w.iJoin==pSubst->iTable
){ ){
pExpr->w.iJoin = pSubst->iNewTable; pExpr->w.iJoin = pSubst->iNewTable;
@@ -3803,9 +3803,9 @@ static Expr *substExpr(
if( pSubst->isOuterJoin ){ if( pSubst->isOuterJoin ){
ExprSetProperty(pNew, EP_CanBeNull); ExprSetProperty(pNew, EP_CanBeNull);
} }
if( ExprHasProperty(pExpr,EP_FromJoin|EP_InnerJoin) ){ if( ExprHasProperty(pExpr,EP_OuterON|EP_InnerON) ){
sqlite3SetJoinExpr(pNew, pExpr->w.iJoin, sqlite3SetJoinExpr(pNew, pExpr->w.iJoin,
pExpr->flags & (EP_FromJoin|EP_InnerJoin)); pExpr->flags & (EP_OuterON|EP_InnerON));
} }
sqlite3ExprDelete(db, pExpr); sqlite3ExprDelete(db, pExpr);
pExpr = pNew; pExpr = pNew;
@@ -3969,7 +3969,7 @@ static int renumberCursorsCb(Walker *pWalker, Expr *pExpr){
if( op==TK_COLUMN || op==TK_IF_NULL_ROW ){ if( op==TK_COLUMN || op==TK_IF_NULL_ROW ){
renumberCursorDoMapping(pWalker, &pExpr->iTable); renumberCursorDoMapping(pWalker, &pExpr->iTable);
} }
if( ExprHasProperty(pExpr, EP_FromJoin) ){ if( ExprHasProperty(pExpr, EP_OuterON) ){
renumberCursorDoMapping(pWalker, &pExpr->w.iJoin); renumberCursorDoMapping(pWalker, &pExpr->w.iJoin);
} }
return WRC_Continue; return WRC_Continue;
@@ -4547,7 +4547,7 @@ static int flattenSubquery(
pWhere = pSub->pWhere; pWhere = pSub->pWhere;
pSub->pWhere = 0; pSub->pWhere = 0;
if( isOuterJoin>0 ){ if( isOuterJoin>0 ){
sqlite3SetJoinExpr(pWhere, iNewParent, EP_FromJoin); sqlite3SetJoinExpr(pWhere, iNewParent, EP_OuterON);
} }
if( pWhere ){ if( pWhere ){
if( pParent->pWhere ){ if( pParent->pWhere ){
@@ -4680,7 +4680,7 @@ static void constInsert(
static void findConstInWhere(WhereConst *pConst, Expr *pExpr){ static void findConstInWhere(WhereConst *pConst, Expr *pExpr){
Expr *pRight, *pLeft; Expr *pRight, *pLeft;
if( NEVER(pExpr==0) ) return; if( NEVER(pExpr==0) ) return;
if( ExprHasProperty(pExpr, EP_FromJoin) ) return; if( ExprHasProperty(pExpr, EP_OuterON) ) return;
if( pExpr->op==TK_AND ){ if( pExpr->op==TK_AND ){
findConstInWhere(pConst, pExpr->pRight); findConstInWhere(pConst, pExpr->pRight);
findConstInWhere(pConst, pExpr->pLeft); findConstInWhere(pConst, pExpr->pLeft);
@@ -4716,9 +4716,9 @@ static int propagateConstantExprRewriteOne(
int i; int i;
if( pConst->pOomFault[0] ) return WRC_Prune; if( pConst->pOomFault[0] ) return WRC_Prune;
if( pExpr->op!=TK_COLUMN ) return WRC_Continue; if( pExpr->op!=TK_COLUMN ) return WRC_Continue;
if( ExprHasProperty(pExpr, EP_FixedCol|EP_FromJoin) ){ if( ExprHasProperty(pExpr, EP_FixedCol|EP_OuterON) ){
testcase( ExprHasProperty(pExpr, EP_FixedCol) ); testcase( ExprHasProperty(pExpr, EP_FixedCol) );
testcase( ExprHasProperty(pExpr, EP_FromJoin) ); testcase( ExprHasProperty(pExpr, EP_OuterON) );
return WRC_Continue; return WRC_Continue;
} }
for(i=0; i<pConst->nConst; i++){ for(i=0; i<pConst->nConst; i++){
@@ -5003,12 +5003,12 @@ static int pushDownWhereTerms(
#if 0 /* Legacy code. Checks now done by sqlite3ExprIsTableConstraint() */ #if 0 /* Legacy code. Checks now done by sqlite3ExprIsTableConstraint() */
if( isLeftJoin if( isLeftJoin
&& (ExprHasProperty(pWhere,EP_FromJoin)==0 && (ExprHasProperty(pWhere,EP_OuterON)==0
|| pWhere->w.iJoin!=iCursor) || pWhere->w.iJoin!=iCursor)
){ ){
return 0; /* restriction (4) */ return 0; /* restriction (4) */
} }
if( ExprHasProperty(pWhere,EP_FromJoin) if( ExprHasProperty(pWhere,EP_OuterON)
&& pWhere->w.iJoin!=iCursor && pWhere->w.iJoin!=iCursor
){ ){
return 0; /* restriction (5) */ return 0; /* restriction (5) */

48
src/sqliteInt.h
View File

@@ -2847,7 +2847,7 @@ struct Expr {
** TK_SELECT_COLUMN: column of the result vector */ ** TK_SELECT_COLUMN: column of the result vector */
i16 iAgg; /* Which entry in pAggInfo->aCol[] or ->aFunc[] */ i16 iAgg; /* Which entry in pAggInfo->aCol[] or ->aFunc[] */
union { union {
int iJoin; /* If EP_FromJoin, the right table of the join */ int iJoin; /* If EP_OuterON, the right table of the join */
int iOfst; /* else: start of token from start of statement */ int iOfst; /* else: start of token from start of statement */
} w; } w;
AggInfo *pAggInfo; /* Used by TK_AGG_COLUMN and TK_AGG_FUNCTION */ AggInfo *pAggInfo; /* Used by TK_AGG_COLUMN and TK_AGG_FUNCTION */
@@ -2868,29 +2868,29 @@ struct Expr {
** EP_Agg == NC_HasAgg == SF_HasAgg ** EP_Agg == NC_HasAgg == SF_HasAgg
** EP_Win == NC_HasWin ** EP_Win == NC_HasWin
*/ */
#define EP_FromJoin 0x000001 /* Originates in ON/USING clause of outer join */ #define EP_OuterON 0x000001 /* Originates in ON/USING clause of outer join */
#define EP_Distinct 0x000002 /* Aggregate function with DISTINCT keyword */ #define EP_InnerON 0x000002 /* Originates in ON/USING of an inner join */
#define EP_HasFunc 0x000004 /* Contains one or more functions of any kind */ #define EP_Distinct 0x000004 /* Aggregate function with DISTINCT keyword */
#define EP_FixedCol 0x000008 /* TK_Column with a known fixed value */ #define EP_HasFunc 0x000008 /* Contains one or more functions of any kind */
#define EP_Agg 0x000010 /* Contains one or more aggregate functions */ #define EP_Agg 0x000010 /* Contains one or more aggregate functions */
#define EP_VarSelect 0x000020 /* pSelect is correlated, not constant */ #define EP_FixedCol 0x000020 /* TK_Column with a known fixed value */
#define EP_DblQuoted 0x000040 /* token.z was originally in "..." */ #define EP_VarSelect 0x000040 /* pSelect is correlated, not constant */
#define EP_InfixFunc 0x000080 /* True for an infix function: LIKE, GLOB, etc */ #define EP_DblQuoted 0x000080 /* token.z was originally in "..." */
#define EP_Collate 0x000100 /* Tree contains a TK_COLLATE operator */ #define EP_InfixFunc 0x000100 /* True for an infix function: LIKE, GLOB, etc */
#define EP_Commuted 0x000200 /* Comparison operator has been commuted */ #define EP_Collate 0x000200 /* Tree contains a TK_COLLATE operator */
#define EP_IntValue 0x000400 /* Integer value contained in u.iValue */ #define EP_Commuted 0x000400 /* Comparison operator has been commuted */
#define EP_xIsSelect 0x000800 /* x.pSelect is valid (otherwise x.pList is) */ #define EP_IntValue 0x000800 /* Integer value contained in u.iValue */
#define EP_Skip 0x001000 /* Operator does not contribute to affinity */ #define EP_xIsSelect 0x001000 /* x.pSelect is valid (otherwise x.pList is) */
#define EP_Reduced 0x002000 /* Expr struct EXPR_REDUCEDSIZE bytes only */ #define EP_Skip 0x002000 /* Operator does not contribute to affinity */
#define EP_TokenOnly 0x004000 /* Expr struct EXPR_TOKENONLYSIZE bytes only */ #define EP_Reduced 0x004000 /* Expr struct EXPR_REDUCEDSIZE bytes only */
#define EP_Win 0x008000 /* Contains window functions */ #define EP_Win 0x008000 /* Contains window functions */
#define EP_MemToken 0x010000 /* Need to sqlite3DbFree() Expr.zToken */ #define EP_TokenOnly 0x010000 /* Expr struct EXPR_TOKENONLYSIZE bytes only */
#define EP_IfNullRow 0x020000 /* The TK_IF_NULL_ROW opcode */ #define EP_MemToken 0x020000 /* Need to sqlite3DbFree() Expr.zToken */
#define EP_Unlikely 0x040000 /* unlikely() or likelihood() function */ #define EP_IfNullRow 0x040000 /* The TK_IF_NULL_ROW opcode */
#define EP_ConstFunc 0x080000 /* A SQLITE_FUNC_CONSTANT or _SLOCHNG function */ #define EP_Unlikely 0x080000 /* unlikely() or likelihood() function */
#define EP_CanBeNull 0x100000 /* Can be null despite NOT NULL constraint */ #define EP_ConstFunc 0x100000 /* A SQLITE_FUNC_CONSTANT or _SLOCHNG function */
#define EP_Subquery 0x200000 /* Tree contains a TK_SELECT operator */ #define EP_CanBeNull 0x200000 /* Can be null despite NOT NULL constraint */
#define EP_InnerJoin 0x400000 /* Originates in ON/USING of an inner join */ #define EP_Subquery 0x400000 /* Tree contains a TK_SELECT operator */
#define EP_Leaf 0x800000 /* Expr.pLeft, .pRight, .u.pSelect all NULL */ #define EP_Leaf 0x800000 /* Expr.pLeft, .pRight, .u.pSelect all NULL */
#define EP_WinFunc 0x1000000 /* TK_FUNCTION with Expr.y.pWin set */ #define EP_WinFunc 0x1000000 /* TK_FUNCTION with Expr.y.pWin set */
#define EP_Subrtn 0x2000000 /* Uses Expr.y.sub. TK_IN, _SELECT, or _EXISTS */ #define EP_Subrtn 0x2000000 /* Uses Expr.y.sub. TK_IN, _SELECT, or _EXISTS */
@@ -2913,8 +2913,8 @@ struct Expr {
#define ExprHasAllProperty(E,P) (((E)->flags&(P))==(P)) #define ExprHasAllProperty(E,P) (((E)->flags&(P))==(P))
#define ExprSetProperty(E,P) (E)->flags|=(P) #define ExprSetProperty(E,P) (E)->flags|=(P)
#define ExprClearProperty(E,P) (E)->flags&=~(P) #define ExprClearProperty(E,P) (E)->flags&=~(P)
#define ExprAlwaysTrue(E) (((E)->flags&(EP_FromJoin|EP_IsTrue))==EP_IsTrue) #define ExprAlwaysTrue(E) (((E)->flags&(EP_OuterON|EP_IsTrue))==EP_IsTrue)
#define ExprAlwaysFalse(E) (((E)->flags&(EP_FromJoin|EP_IsFalse))==EP_IsFalse) #define ExprAlwaysFalse(E) (((E)->flags&(EP_OuterON|EP_IsFalse))==EP_IsFalse)
/* Macros used to ensure that the correct members of unions are accessed /* Macros used to ensure that the correct members of unions are accessed
** in Expr. ** in Expr.

5
src/treeview.c
View File

@@ -489,9 +489,12 @@ void sqlite3TreeViewExpr(TreeView *pView, const Expr *pExpr, u8 moreToFollow){
sqlite3StrAccumInit(&x, 0, zFlgs, sizeof(zFlgs), 0); sqlite3StrAccumInit(&x, 0, zFlgs, sizeof(zFlgs), 0);
sqlite3_str_appendf(&x, " fg.af=%x.%c", sqlite3_str_appendf(&x, " fg.af=%x.%c",
pExpr->flags, pExpr->affExpr ? pExpr->affExpr : 'n'); pExpr->flags, pExpr->affExpr ? pExpr->affExpr : 'n');
if( ExprHasProperty(pExpr, EP_FromJoin) ){ if( ExprHasProperty(pExpr, EP_OuterON) ){
sqlite3_str_appendf(&x, " iJoin=%d", pExpr->w.iJoin); sqlite3_str_appendf(&x, " iJoin=%d", pExpr->w.iJoin);
} }
if( ExprHasProperty(pExpr, EP_InnerON) ){
sqlite3_str_appendf(&x, " inner-ON");
}
if( ExprHasProperty(pExpr, EP_FromDDL) ){ if( ExprHasProperty(pExpr, EP_FromDDL) ){
sqlite3_str_appendf(&x, " DDL"); sqlite3_str_appendf(&x, " DDL");
} }

16
src/where.c
View File

@@ -330,7 +330,7 @@ static WhereTerm *whereScanNext(WhereScan *pScan){
&& (iColumn!=XN_EXPR && (iColumn!=XN_EXPR
|| sqlite3ExprCompareSkip(pTerm->pExpr->pLeft, || sqlite3ExprCompareSkip(pTerm->pExpr->pLeft,
pScan->pIdxExpr,iCur)==0) pScan->pIdxExpr,iCur)==0)
&& (pScan->iEquiv<=1 || !ExprHasProperty(pTerm->pExpr, EP_FromJoin)) && (pScan->iEquiv<=1 || !ExprHasProperty(pTerm->pExpr, EP_OuterON))
){ ){
if( (pTerm->eOperator & WO_EQUIV)!=0 if( (pTerm->eOperator & WO_EQUIV)!=0
&& pScan->nEquiv<ArraySize(pScan->aiCur) && pScan->nEquiv<ArraySize(pScan->aiCur)
@@ -757,7 +757,7 @@ static int termCanDriveIndex(
if( pTerm->leftCursor!=pSrc->iCursor ) return 0; if( pTerm->leftCursor!=pSrc->iCursor ) return 0;
if( (pTerm->eOperator & (WO_EQ|WO_IS))==0 ) return 0; if( (pTerm->eOperator & (WO_EQ|WO_IS))==0 ) return 0;
if( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ))!=0 if( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ))!=0
&& !ExprHasProperty(pTerm->pExpr, EP_FromJoin) && !ExprHasProperty(pTerm->pExpr, EP_OuterON)
&& (pTerm->eOperator & WO_IS) && (pTerm->eOperator & WO_IS)
){ ){
/* Cannot use an IS term from the WHERE clause as an index driver for /* Cannot use an IS term from the WHERE clause as an index driver for
@@ -1181,7 +1181,7 @@ static sqlite3_index_info *allocateIndexInfo(
** RIGHT JOIN. See tag-20191211-001 for the ** RIGHT JOIN. See tag-20191211-001 for the
** equivalent restriction for ordinary tables. */ ** equivalent restriction for ordinary tables. */
if( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ))!=0 if( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ))!=0
&& !ExprHasProperty(pTerm->pExpr, EP_FromJoin) && !ExprHasProperty(pTerm->pExpr, EP_OuterON)
){ ){
continue; continue;
} }
@@ -2059,7 +2059,7 @@ void sqlite3WhereTermPrint(WhereTerm *pTerm, int iTerm){
memcpy(zType, "....", 5); memcpy(zType, "....", 5);
if( pTerm->wtFlags & TERM_VIRTUAL ) zType[0] = 'V'; if( pTerm->wtFlags & TERM_VIRTUAL ) zType[0] = 'V';
if( pTerm->eOperator & WO_EQUIV ) zType[1] = 'E'; if( pTerm->eOperator & WO_EQUIV ) zType[1] = 'E';
if( ExprHasProperty(pTerm->pExpr, EP_FromJoin) ) zType[2] = 'L'; if( ExprHasProperty(pTerm->pExpr, EP_OuterON) ) zType[2] = 'L';
if( pTerm->wtFlags & TERM_CODED ) zType[3] = 'C'; if( pTerm->wtFlags & TERM_CODED ) zType[3] = 'C';
if( pTerm->eOperator & WO_SINGLE ){ if( pTerm->eOperator & WO_SINGLE ){
assert( (pTerm->eOperator & (WO_OR|WO_AND))==0 ); assert( (pTerm->eOperator & (WO_OR|WO_AND))==0 );
@@ -2836,7 +2836,7 @@ static int whereLoopAddBtreeIndex(
** RIGHT JOIN. Only constraints in the ** RIGHT JOIN. Only constraints in the
** ON clause are allowed. See tag-20191211-002 for the vtab equivalent. */ ** ON clause are allowed. See tag-20191211-002 for the vtab equivalent. */
if( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ))!=0 if( (pSrc->fg.jointype & (JT_LEFT|JT_LTORJ))!=0
&& !ExprHasProperty(pTerm->pExpr, EP_FromJoin|EP_InnerJoin) && !ExprHasProperty(pTerm->pExpr, EP_OuterON|EP_InnerON)
){ ){
continue; continue;
} }
@@ -3205,8 +3205,8 @@ static int whereUsablePartialIndex(
for(i=0, pTerm=pWC->a; i<pWC->nTerm; i++, pTerm++){ for(i=0, pTerm=pWC->a; i<pWC->nTerm; i++, pTerm++){
Expr *pExpr; Expr *pExpr;
pExpr = pTerm->pExpr; pExpr = pTerm->pExpr;
if( (!ExprHasProperty(pExpr, EP_FromJoin) || pExpr->w.iJoin==iTab) if( (!ExprHasProperty(pExpr, EP_OuterON) || pExpr->w.iJoin==iTab)
&& (isLeft==0 || ExprHasProperty(pExpr, EP_FromJoin)) && (isLeft==0 || ExprHasProperty(pExpr, EP_OuterON))
&& sqlite3ExprImpliesExpr(pParse, pExpr, pWhere, iTab) && sqlite3ExprImpliesExpr(pParse, pExpr, pWhere, iTab)
&& (pTerm->wtFlags & TERM_VNULL)==0 && (pTerm->wtFlags & TERM_VNULL)==0
){ ){
@@ -5214,7 +5214,7 @@ static SQLITE_NOINLINE Bitmask whereOmitNoopJoin(
pEnd = pWInfo->sWC.a + pWInfo->sWC.nTerm; pEnd = pWInfo->sWC.a + pWInfo->sWC.nTerm;
for(pTerm=pWInfo->sWC.a; pTerm<pEnd; pTerm++){ for(pTerm=pWInfo->sWC.a; pTerm<pEnd; pTerm++){
if( (pTerm->prereqAll & pLoop->maskSelf)!=0 ){ if( (pTerm->prereqAll & pLoop->maskSelf)!=0 ){
if( !ExprHasProperty(pTerm->pExpr, EP_FromJoin) if( !ExprHasProperty(pTerm->pExpr, EP_OuterON)
|| pTerm->pExpr->w.iJoin!=pItem->iCursor || pTerm->pExpr->w.iJoin!=pItem->iCursor
){ ){
break; break;

14
src/wherecode.c
View File

@@ -350,7 +350,7 @@ static void disableTerm(WhereLevel *pLevel, WhereTerm *pTerm){
int nLoop = 0; int nLoop = 0;
assert( pTerm!=0 ); assert( pTerm!=0 );
while( (pTerm->wtFlags & TERM_CODED)==0 while( (pTerm->wtFlags & TERM_CODED)==0
&& (pLevel->iLeftJoin==0 || ExprHasProperty(pTerm->pExpr, EP_FromJoin)) && (pLevel->iLeftJoin==0 || ExprHasProperty(pTerm->pExpr, EP_OuterON))
&& (pLevel->notReady & pTerm->prereqAll)==0 && (pLevel->notReady & pTerm->prereqAll)==0
){ ){
if( nLoop && (pTerm->wtFlags & TERM_LIKE)!=0 ){ if( nLoop && (pTerm->wtFlags & TERM_LIKE)!=0 ){
@@ -1072,7 +1072,7 @@ static void codeCursorHint(
*/ */
if( pTabItem->fg.jointype & JT_LEFT ){ if( pTabItem->fg.jointype & JT_LEFT ){
Expr *pExpr = pTerm->pExpr; Expr *pExpr = pTerm->pExpr;
if( !ExprHasProperty(pExpr, EP_FromJoin) if( !ExprHasProperty(pExpr, EP_OuterON)
|| pExpr->w.iJoin!=pTabItem->iCursor || pExpr->w.iJoin!=pTabItem->iCursor
){ ){
sWalker.eCode = 0; sWalker.eCode = 0;
@@ -1081,7 +1081,7 @@ static void codeCursorHint(
if( sWalker.eCode ) continue; if( sWalker.eCode ) continue;
} }
}else{ }else{
if( ExprHasProperty(pTerm->pExpr, EP_FromJoin) ) continue; if( ExprHasProperty(pTerm->pExpr, EP_OuterON) ) continue;
} }
/* All terms in pWLoop->aLTerm[] except pEndRange are used to initialize /* All terms in pWLoop->aLTerm[] except pEndRange are used to initialize
@@ -2412,7 +2412,7 @@ Bitmask sqlite3WhereCodeOneLoopStart(
Expr *pDelete; /* Local copy of OR clause term */ Expr *pDelete; /* Local copy of OR clause term */
int jmp1 = 0; /* Address of jump operation */ int jmp1 = 0; /* Address of jump operation */
testcase( (pTabItem[0].fg.jointype & JT_LEFT)!=0 testcase( (pTabItem[0].fg.jointype & JT_LEFT)!=0
&& !ExprHasProperty(pOrExpr, EP_FromJoin) && !ExprHasProperty(pOrExpr, EP_OuterON)
); /* See TH3 vtab25.400 and ticket 614b25314c766238 */ ); /* See TH3 vtab25.400 and ticket 614b25314c766238 */
pDelete = pOrExpr = sqlite3ExprDup(db, pOrExpr, 0); pDelete = pOrExpr = sqlite3ExprDup(db, pOrExpr, 0);
if( db->mallocFailed ){ if( db->mallocFailed ){
@@ -2621,7 +2621,7 @@ Bitmask sqlite3WhereCodeOneLoopStart(
pE = pTerm->pExpr; pE = pTerm->pExpr;
assert( pE!=0 ); assert( pE!=0 );
if( (pTabItem->fg.jointype & (JT_LEFT|JT_LTORJ)) if( (pTabItem->fg.jointype & (JT_LEFT|JT_LTORJ))
&& (!ExprHasProperty(pE,EP_FromJoin|EP_InnerJoin) && (!ExprHasProperty(pE,EP_OuterON|EP_InnerON)
|| pE->w.iJoin!=pTabItem->iCursor) || pE->w.iJoin!=pTabItem->iCursor)
){ ){
continue; continue;
@@ -2693,7 +2693,7 @@ Bitmask sqlite3WhereCodeOneLoopStart(
sqlite3WhereTermPrint(pTerm, pWC->nTerm-j); sqlite3WhereTermPrint(pTerm, pWC->nTerm-j);
} }
#endif #endif
assert( !ExprHasProperty(pE, EP_FromJoin) ); assert( !ExprHasProperty(pE, EP_OuterON) );
assert( (pTerm->prereqRight & pLevel->notReady)!=0 ); assert( (pTerm->prereqRight & pLevel->notReady)!=0 );
assert( (pTerm->eOperator & (WO_OR|WO_AND))==0 ); assert( (pTerm->eOperator & (WO_OR|WO_AND))==0 );
pAlt = sqlite3WhereFindTerm(pWC, iCur, pTerm->u.x.leftColumn, notReady, pAlt = sqlite3WhereFindTerm(pWC, iCur, pTerm->u.x.leftColumn, notReady,
@@ -2846,7 +2846,7 @@ SQLITE_NOINLINE void sqlite3WhereRightJoinLoop(
WhereTerm *pTerm = &pWC->a[k]; WhereTerm *pTerm = &pWC->a[k];
if( pTerm->wtFlags & TERM_VIRTUAL ) break; if( pTerm->wtFlags & TERM_VIRTUAL ) break;
if( pTerm->prereqAll & ~mAll ) continue; if( pTerm->prereqAll & ~mAll ) continue;
if( ExprHasProperty(pTerm->pExpr, EP_FromJoin|EP_InnerJoin) ) continue; if( ExprHasProperty(pTerm->pExpr, EP_OuterON|EP_InnerON) ) continue;
pSubWhere = sqlite3ExprAnd(pParse, pSubWhere, pSubWhere = sqlite3ExprAnd(pParse, pSubWhere,
sqlite3ExprDup(pParse->db, pTerm->pExpr, 0)); sqlite3ExprDup(pParse->db, pTerm->pExpr, 0));
} }

18
src/whereexpr.c
View File

@@ -462,7 +462,7 @@ static int isAuxiliaryVtabOperator(
*/ */
static void transferJoinMarkings(Expr *pDerived, Expr *pBase){ static void transferJoinMarkings(Expr *pDerived, Expr *pBase){
if( pDerived ){ if( pDerived ){
pDerived->flags |= pBase->flags & EP_FromJoin; pDerived->flags |= pBase->flags & EP_OuterON;
pDerived->w.iJoin = pBase->w.iJoin; pDerived->w.iJoin = pBase->w.iJoin;
} }
} }
@@ -917,7 +917,7 @@ static int termIsEquivalence(Parse *pParse, Expr *pExpr){
CollSeq *pColl; CollSeq *pColl;
if( !OptimizationEnabled(pParse->db, SQLITE_Transitive) ) return 0; if( !OptimizationEnabled(pParse->db, SQLITE_Transitive) ) return 0;
if( pExpr->op!=TK_EQ && pExpr->op!=TK_IS ) return 0; if( pExpr->op!=TK_EQ && pExpr->op!=TK_IS ) return 0;
if( ExprHasProperty(pExpr, EP_FromJoin) ) return 0; if( ExprHasProperty(pExpr, EP_OuterON) ) return 0;
aff1 = sqlite3ExprAffinity(pExpr->pLeft); aff1 = sqlite3ExprAffinity(pExpr->pLeft);
aff2 = sqlite3ExprAffinity(pExpr->pRight); aff2 = sqlite3ExprAffinity(pExpr->pRight);
if( aff1!=aff2 if( aff1!=aff2
@@ -1109,7 +1109,7 @@ static void exprAnalyze(
} }
#endif #endif
if( ExprHasProperty(pExpr, EP_FromJoin) ){ if( ExprHasProperty(pExpr, EP_OuterON) ){
Bitmask x = sqlite3WhereGetMask(pMaskSet, pExpr->w.iJoin); Bitmask x = sqlite3WhereGetMask(pMaskSet, pExpr->w.iJoin);
prereqAll |= x; prereqAll |= x;
extraRight = x-1; /* ON clause terms may not be used with an index extraRight = x-1; /* ON clause terms may not be used with an index
@@ -1184,7 +1184,7 @@ static void exprAnalyze(
pNew->eOperator = (operatorMask(pDup->op) + eExtraOp) & opMask; pNew->eOperator = (operatorMask(pDup->op) + eExtraOp) & opMask;
}else }else
if( op==TK_ISNULL if( op==TK_ISNULL
&& !ExprHasProperty(pExpr,EP_FromJoin) && !ExprHasProperty(pExpr,EP_OuterON)
&& 0==sqlite3ExprCanBeNull(pLeft) && 0==sqlite3ExprCanBeNull(pLeft)
){ ){
assert( !ExprHasProperty(pExpr, EP_IntValue) ); assert( !ExprHasProperty(pExpr, EP_IntValue) );
@@ -1255,7 +1255,7 @@ static void exprAnalyze(
else if( pExpr->op==TK_NOTNULL ){ else if( pExpr->op==TK_NOTNULL ){
if( pExpr->pLeft->op==TK_COLUMN if( pExpr->pLeft->op==TK_COLUMN
&& pExpr->pLeft->iColumn>=0 && pExpr->pLeft->iColumn>=0
&& !ExprHasProperty(pExpr, EP_FromJoin) && !ExprHasProperty(pExpr, EP_OuterON)
){ ){
Expr *pNewExpr; Expr *pNewExpr;
Expr *pLeft = pExpr->pLeft; Expr *pLeft = pExpr->pLeft;
@@ -1459,8 +1459,8 @@ static void exprAnalyze(
Expr *pNewExpr; Expr *pNewExpr;
pNewExpr = sqlite3PExpr(pParse, TK_MATCH, pNewExpr = sqlite3PExpr(pParse, TK_MATCH,
0, sqlite3ExprDup(db, pRight, 0)); 0, sqlite3ExprDup(db, pRight, 0));
if( ExprHasProperty(pExpr, EP_FromJoin) && pNewExpr ){ if( ExprHasProperty(pExpr, EP_OuterON) && pNewExpr ){
ExprSetProperty(pNewExpr, EP_FromJoin); ExprSetProperty(pNewExpr, EP_OuterON);
pNewExpr->w.iJoin = pExpr->w.iJoin; pNewExpr->w.iJoin = pExpr->w.iJoin;
} }
idxNew = whereClauseInsert(pWC, pNewExpr, TERM_VIRTUAL|TERM_DYNAMIC); idxNew = whereClauseInsert(pWC, pNewExpr, TERM_VIRTUAL|TERM_DYNAMIC);
@@ -1827,9 +1827,9 @@ void sqlite3WhereTabFuncArgs(
sqlite3ExprDup(pParse->db, pArgs->a[j].pExpr, 0), 0); sqlite3ExprDup(pParse->db, pArgs->a[j].pExpr, 0), 0);
pTerm = sqlite3PExpr(pParse, TK_EQ, pColRef, pRhs); pTerm = sqlite3PExpr(pParse, TK_EQ, pColRef, pRhs);
if( pItem->fg.jointype & (JT_LEFT|JT_LTORJ) ){ if( pItem->fg.jointype & (JT_LEFT|JT_LTORJ) ){
joinType = EP_FromJoin; joinType = EP_OuterON;
}else{ }else{
joinType = EP_InnerJoin; joinType = EP_InnerON;
} }
sqlite3SetJoinExpr(pTerm, pItem->iCursor, joinType); sqlite3SetJoinExpr(pTerm, pItem->iCursor, joinType);
whereClauseInsert(pWC, pTerm, TERM_DYNAMIC); whereClauseInsert(pWC, pTerm, TERM_DYNAMIC);