diff options
| author | drh <drh@noemail.net> | 2014-12-04 23:35:08 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-12-04 23:35:08 +0000 |
| commit | 34794c3d0cd985100f5fe3f4ff8e6ffa9ffa18da (patch) | |
| tree | 39986308fca5eaa2515c2dcaa2a92dc76fbb3133 /src/resolve.c | |
| parent | 6e09b16852d92fa44582ca69882f2f2b6501cd51 (diff) | |
| parent | dea7d70d1b9516956a7550d0ffde1b4560fc77ca (diff) | |
| download | sqlite-34794c3d0cd985100f5fe3f4ff8e6ffa9ffa18da.tar.gz sqlite-34794c3d0cd985100f5fe3f4ff8e6ffa9ffa18da.zip | |
Incorporate the SQLITE_CHECKPOINT_TRUNCATE enhancement and a couple of
obscure bug fixes from trunk.
FossilOrigin-Name: 34ffa3b3c002b0e87d8382ad76e87dbaec0b2bc6
Diffstat (limited to 'src/resolve.c')
| -rw-r--r-- | src/resolve.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/resolve.c b/src/resolve.c index 8fb580b3a..d4bd548c9 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -320,6 +320,10 @@ static int lookupName( if( pMatch ){ pExpr->iTable = pMatch->iCursor; pExpr->pTab = pMatch->pTab; + assert( (pMatch->jointype & JT_RIGHT)==0 ); /* RIGHT JOIN not (yet) supported */ + if( (pMatch->jointype & JT_LEFT)!=0 ){ + ExprSetProperty(pExpr, EP_CanBeNull); + } pSchema = pExpr->pTab->pSchema; } } /* if( pSrcList ) */ |