Reject boolean values in numeric context, catch dangling OR

- Add bool guard in _build_condition and _convert_to_numeric so
  WHERE price = true raises ValueError instead of producing
  invalid @price:[True True] syntax.
- Expand OR detection regex to match leading/trailing OR
  (e.g. 'laptop OR', 'OR tablet') so the empty-operand check
  catches these malformed inputs instead of silently dropping OR
  as a stopword.

Author: nkanu17

sql_redis/query_builder.py

@@ -175,16 +175,19 @@ def build_text_condition(
 
             escaped = self._escape_text_value(" ".join(phrase_words))
             search_value = f'"{escaped}"'
-        elif re.search(r"\s+OR\s+", value):
+        elif re.search(r"(?:^|\s+)OR(?:\s+|$)", value):
             # OR union within text field: split on uppercase-only OR with
             # flexible whitespace, escape each term, join with |.
             # Only uppercase OR is treated as a boolean operator; lowercase
             # "or" is treated as a regular search term (e.g. "bank or america"
             # stays as a multi-word AND search, not bank|america).
             # Multi-word operands (e.g. "gaming laptop OR tablet") are wrapped
             # in parentheses so each side is an atomic subexpression.
+            # The regex also matches leading/trailing OR (e.g. "laptop OR"
+            # or "OR tablet") so that the empty-operand check below catches
+            # these malformed inputs instead of silently dropping "OR".
             or_parts: list[str] = []
-            for part in re.split(r"\s+OR\s+", value):
+            for part in re.split(r"(?:^|\s+)OR(?:\s+|$)", value):
                 words = part.strip().split()
                 if not words:
                     raise ValueError(

sql_redis/translator.py

@@ -7,13 +7,9 @@
 from dataclasses import dataclass, field
 
 from sql_redis.analyzer import AnalyzedQuery, Analyzer
-from sql_redis.parser import (
-    SQL_TO_REDIS_DATE_FUNCTIONS,
-    Condition,
-    GeoDistanceCondition,
-    SQLParser,
-    parse_date_to_timestamp,
-)
+from sql_redis.parser import (SQL_TO_REDIS_DATE_FUNCTIONS, Condition,
+                              GeoDistanceCondition, SQLParser,
+                              parse_date_to_timestamp)
 from sql_redis.query_builder import QueryBuilder
 from sql_redis.schema import AsyncSchemaRegistry, SchemaRegistry
 
@@ -247,6 +243,12 @@ def _build_condition(self, condition: Condition, field_type: str | None) -> str:
                 low_val = self._convert_to_numeric(low)
                 high_val = self._convert_to_numeric(high)
                 numeric_value = (low_val, high_val)
+            elif isinstance(condition.value, bool):
+                raise ValueError(
+                    f"Boolean value {condition.value!r} is not valid in a "
+                    "numeric context. Use 1/0 instead of true/false for "
+                    "numeric fields."
+                )
             elif isinstance(condition.value, (int, float)):
                 numeric_value = condition.value
             else:
@@ -278,6 +280,11 @@ def _convert_to_numeric(self, value: object) -> int | float:
         Raises:
             ValueError: If conversion fails.
         """
+        if isinstance(value, bool):
+            raise ValueError(
+                f"Boolean value {value!r} is not valid in a numeric context. "
+                "Use 1/0 instead of true/false for numeric fields."
+            )
         if isinstance(value, (int, float)):
             return value
         if isinstance(value, str):

tests/test_query_builder.py

@@ -679,6 +679,24 @@ def test_or_extra_whitespace(self):
         )
         assert result == "@title:(laptop|tablet)"
 
+    def test_or_trailing_raises(self):
+        """Trailing OR with no operand raises ValueError."""
+        builder = QueryBuilder()
+        with pytest.raises(ValueError, match="Empty operand"):
+            builder.build_text_condition("title", "FULLTEXT", "laptop OR")
+
+    def test_or_leading_raises(self):
+        """Leading OR with no operand raises ValueError."""
+        builder = QueryBuilder()
+        with pytest.raises(ValueError, match="Empty operand"):
+            builder.build_text_condition("title", "FULLTEXT", "OR tablet")
+
+    def test_or_only_raises(self):
+        """Bare 'OR' with no operands raises ValueError."""
+        builder = QueryBuilder()
+        with pytest.raises(ValueError, match="Empty operand"):
+            builder.build_text_condition("title", "FULLTEXT", "OR")
+
     def test_escape_asterisk_in_fulltext(self):
         """Literal * in FULLTEXT is escaped to prevent wildcard."""
         builder = QueryBuilder()

tests/test_translator.py

@@ -213,6 +213,13 @@ def test_or_conditions(self, translator: Translator, basic_index: str):
 
         assert "|" in result.query_string  # OR uses pipe
 
+    def test_boolean_in_numeric_context_raises(
+        self, translator: Translator, basic_index: str
+    ):
+        """WHERE price = true should raise, not produce @price:[True True]."""
+        with pytest.raises(ValueError, match="Boolean value"):
+            translator.translate(f"SELECT * FROM {basic_index} WHERE price = true")
+
 
 class TestTranslatorAggregate:
     """Tests for FT.AGGREGATE translation."""