aboutsummaryrefslogtreecommitdiff
path: root/src/expr.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2014-12-04 16:27:17 +0000
committerdrh <drh@noemail.net>2014-12-04 16:27:17 +0000
commit72673a24e2d38c1699d911cfca0203f5e545f78c (patch)
tree90f4ce666016c55d5f17f3b409f4c1240611e298 /src/expr.c
parentd8922052b27a3d2d62ccf3cf0ef1ea9b7272124d (diff)
downloadsqlite-72673a24e2d38c1699d911cfca0203f5e545f78c.tar.gz
sqlite-72673a24e2d38c1699d911cfca0203f5e545f78c.zip
If a table is the right operand of a LEFT JOIN, then any column of that
table can be NULL even if that column as a NOT NULL constraint. Fix for ticket [6f2222d550f5b0ee7ed]. FossilOrigin-Name: 6f6fcbe4736b9468a495c684d5eebc8bfe5c566a
Diffstat (limited to 'src/expr.c')
-rw-r--r--src/expr.c3
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;
}