1 files changed, 20 insertions, 1 deletions
diff --git a/lib/statement.cpp b/lib/statement.cpp
index 52fa00d..f8d5346 100644
--- a/lib/statement.cpp
+++ b/lib/statement.cpp

@@ -723,7 +723,26 @@ namespace verbly {
      
      case type::singleton:
      {
-        return {singleton_.value_};
+        switch (singleton_.comparison_)
+        {
+          case comparison::equals:
+          case comparison::does_not_equal:
+          case comparison::is_greater_than:
+          case comparison::is_at_most:
+          case comparison::is_less_than:
+          case comparison::is_at_least:
+          case comparison::is_like:
+          case comparison::is_not_like:
+          {
+            return {singleton_.value_};
+          }
+          
+          case comparison::is_not_null:
+          case comparison::is_null:
+          {
+            return {};
+          }
+        }
      }
      
      case type::group:

diff --git a/lib/statement.cpp b/lib/statement.cpp index 52fa00d..f8d5346 100644 --- a/lib/statement.cpp +++ b/lib/statement.cpp
@@ -723,7 +723,26 @@ namespace verbly {
723		723
724	case type::singleton:	724	case type::singleton:
725	{	725	{
726	return {singleton_.value_};	726	switch (singleton_.comparison_)
		727	{
		728	case comparison::equals:
		729	case comparison::does_not_equal:
		730	case comparison::is_greater_than:
		731	case comparison::is_at_most:
		732	case comparison::is_less_than:
		733	case comparison::is_at_least:
		734	case comparison::is_like:
		735	case comparison::is_not_like:
		736	{
		737	return {singleton_.value_};
		738	}
		739
		740	case comparison::is_not_null:
		741	case comparison::is_null:
		742	{
		743	return {};
		744	}
		745	}
727	}	746	}
728		747
729	case type::group:	748	case type::group: