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/expr.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/expr.c')
| -rw-r--r-- | src/expr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/expr.c b/src/expr.c index c28f19622..817975ab3 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1414,7 +1414,8 @@ int sqlite3ExprCanBeNull(const Expr *p){ return 0; case TK_COLUMN: assert( p->pTab!=0 ); - return p->iColumn>=0 && p->pTab->aCol[p->iColumn].notNull==0; + return ExprHasProperty(p, EP_CanBeNull) || + (p->iColumn>=0 && p->pTab->aCol[p->iColumn].notNull==0); default: return 1; } |