From 71064d07ad84b1d31471298f8cc5b497cbe85505 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Mon, 23 Jan 2017 11:16:03 -0500 Subject: Fixed nullity/non-nullity filters on join fields --- lib/field.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/field.cpp b/lib/field.cpp index d7adbb3..168935c 100644 --- a/lib/field.cpp +++ b/lib/field.cpp @@ -70,12 +70,22 @@ namespace verbly { field::operator filter() const { - return filter(*this, filter::comparison::is_not_null); + if (isJoin()) + { + return filter(*this, filter::comparison::matches, filter()); + } else { + return filter(*this, filter::comparison::is_not_null); + } } filter field::operator!() const { - return filter(*this, filter::comparison::is_null); + if (isJoin()) + { + return filter(*this, filter::comparison::does_not_match, filter()); + } else { + return filter(*this, filter::comparison::is_null); + } } filter field::operator%=(filter joinCondition) const -- cgit 1.4.1