handle null better

Signed-off-by: Praneeth Bedapudi <praneeth@bpraneeth.com>
notAI-tech · Jul 23, 2024 · fa7f1c7 · fa7f1c7
1 parent b8eda41
commit fa7f1c7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 19 deletions.
diff --git a/liteindex/query_parser.py b/liteindex/query_parser.py
@@ -29,11 +29,10 @@ def process_nested_query(value, prefix):
             for sub_key, sub_value in value.items():
                 if sub_value is None and sub_key == "$ne":
                     sub_conditions.append(
-                        f'"{column}" IS NOT NULL'
+                        f'("{column}" IS NOT NULL)'
                         if column_type is not None
-                        else f"{column} IS NOT NULL"
+                        else f"({column} IS NOT NULL)"
                     )
-
                 elif sub_key in ["$ne", "$like", "$gt", "$lt", "$gte", "$lte"]:
                     operator = {
                         "$ne": "!=",
@@ -50,26 +49,32 @@ def process_nested_query(value, prefix):
                             f"JSON_EXTRACT({column}, '$[*]') {operator} ?"
                         )
                     else:
-                        sub_conditions.append(
-                            f'"{column}" {operator} ?'
-                            if column_type is not None
-                            else f"{column} {operator} ?"
-                        )
+                        if sub_key == "$ne":
+                            sub_conditions.append(
+                                f'("{column}" {operator} ? OR "{column}" IS NULL)'
+                                if column_type is not None
+                                else f"({column} {operator} ? OR {column} IS NULL)"
+                            )
+                        else:
+                            sub_conditions.append(
+                                f'"{column}" {operator} ?'
+                                if column_type is not None
+                                else f"{column} {operator} ?"
+                            )
 
                     params.append(sub_value)
                 elif sub_key == "$in":
                     sub_conditions.append(
-                        f""""{column}" IN ({', '.join(['?' for _ in sub_value])})"""
+                        f"""("{column}" IN ({', '.join(['?' for _ in sub_value])}) OR "{column}" IS NULL)"""
                         if column_type is not None
-                        else f"{column} IN ({', '.join(['?' for _ in sub_value])})"
+                        else f"({column} IN ({', '.join(['?' for _ in sub_value])}) OR {column} IS NULL)"
                     )
-
                     params.extend(sub_value)
                 elif sub_key == "$nin":
                     sub_conditions.append(
-                        f""""{column}" NOT IN ({', '.join(['?' for _ in sub_value])})"""
+                        f"""("{column}" NOT IN ({', '.join(['?' for _ in sub_value])}) OR "{column}" IS NULL)"""
                         if column_type is not None
-                        else f"{column} NOT IN ({', '.join(['?' for _ in sub_value])})"
+                        else f"({column} NOT IN ({', '.join(['?' for _ in sub_value])}) OR {column} IS NULL)"
                     )
                     params.extend(sub_value)
                 else:
@@ -80,18 +85,20 @@ def process_nested_query(value, prefix):
         elif isinstance(value, list):
             if schema[prefix[0]] == "json":
                 json_conditions = [f"JSON_CONTAINS({column}, ?)" for _ in value]
-
-                # Add parentheses around the OR condition
                 where_conditions.append(f"({ ' OR '.join(json_conditions) })")
                 params.extend(json.dumps(val) for val in value)
             else:
                 where_conditions.append(
-                    f""""{column}" IN ({', '.join(['?' for _ in value])})"""
+                    f"""("{column}" IN ({', '.join(['?' for _ in value])}) OR "{column}" IS NULL)"""
                 )
                 params.extend(value)
 
         elif value is None:
-            where_conditions.append(f'"{column}" IS NULL' if column_type is not None else f"{column} IS NULL")
+            where_conditions.append(
+                f'"{column}" IS NULL'
+                if column_type is not None
+                else f"{column} IS NULL"
+            )
         else:
             if column_type == "other":
                 column = f"__hash_{column}"
@@ -119,7 +126,6 @@ def process_nested_query(value, prefix):
             sub_conditions, sub_params = zip(
                 *(parse_query(cond, schema) for cond in value)
             )
-            # Flatten the sub_conditions
             sub_conditions = [cond for sublist in sub_conditions for cond in sublist]
             where_conditions.append(
                 f"({' OR '.join(sub_conditions) if key == '$or' else ' AND '.join(sub_conditions)})"

diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@
 EMAIL = "praneeth@bpraneeth.com"
 AUTHOR = "BEDAPUDI PRANEETH"
 REQUIRES_PYTHON = ">=3.6.0"
-VERSION = "0.0.2.dev63"
+VERSION = "0.0.2.dev64"
 
 # What packages are required for this module to be executed?
 REQUIRED = []