fix: combine space-separated terms with & operator in free-text search

src/pgstac/pgstac.sql

@@ -3099,6 +3099,18 @@ BEGIN
     -- - ->  !
     processed_text := regexp_replace(processed_text, '^\s*\-([a-zA-Z0-9_]+)', '! \1', 'g'); -- -term at start
     processed_text := regexp_replace(processed_text, '\s*\-([a-zA-Z0-9_]+)', ' & ! \1', 'g'); -- -term elsewhere
+
+    -- terms separated with spaces are assumed to represent an AND clause. loop through these
+    -- occurrences and replace them with &
+    LOOP
+        temp_text := regexp_replace(processed_text, '([a-zA-Z0-9_]+)\s+([a-zA-Z0-9_]+)(?!\s*[&|<>])', '\1 & \2', 'g');
+        IF temp_text = processed_text THEN
+            EXIT; -- No more replacements were made
+        END IF;
+        processed_text := temp_text;
+    END LOOP;
+
+
     -- Replace placeholders back with quoted phrases if there were any
     IF array_length(quote_array, 1) IS NOT NULL THEN
         FOR i IN array_lower(quote_array, 1) .. array_upper(quote_array, 1) LOOP
@@ -4578,4 +4590,4 @@ RESET ROLE;
 
 SET ROLE pgstac_ingest;
 SELECT update_partition_stats_q(partition) FROM partitions_view;
-SELECT set_version('0.9.8');
+SELECT set_version('unreleased');

src/pgstac/sql/004_search.sql

@@ -179,6 +179,18 @@ BEGIN
     -- - ->  !
     processed_text := regexp_replace(processed_text, '^\s*\-([a-zA-Z0-9_]+)', '! \1', 'g'); -- -term at start
     processed_text := regexp_replace(processed_text, '\s*\-([a-zA-Z0-9_]+)', ' & ! \1', 'g'); -- -term elsewhere
+
+    -- terms separated with spaces are assumed to represent an AND clause. loop through these
+    -- occurrences and replace them with &
+    LOOP
+        temp_text := regexp_replace(processed_text, '([a-zA-Z0-9_]+)\s+([a-zA-Z0-9_]+)(?!\s*[&|<>])', '\1 & \2', 'g');
+        IF temp_text = processed_text THEN
+            EXIT; -- No more replacements were made
+        END IF;
+        processed_text := temp_text;
+    END LOOP;
+
+
     -- Replace placeholders back with quoted phrases if there were any
     IF array_length(quote_array, 1) IS NOT NULL THEN
         FOR i IN array_lower(quote_array, 1) .. array_upper(quote_array, 1) LOOP

src/pgstac/sql/999_version.sql

@@ -1 +1 @@
-SELECT set_version('0.9.8');
+SELECT set_version('unreleased');

src/pgstac/tests/basic/free_text.sql

@@ -107,3 +107,7 @@ select collection_search('{"q": "\"bear or stranger\""}');
 select collection_search('{"q": "office"}');
 
 select collection_search('{"q": ["bear", "stranger"]}');
+
+select collection_search('{"q": "large lizard"}');
+
+select collection_search('{"q": "teenagers fight monsters"}');

src/pgstac/tests/basic/free_text.sql.out

@@ -129,3 +129,10 @@ select collection_search('{"q": "office"}');
 
 select collection_search('{"q": ["bear", "stranger"]}');
  {"links": [], "collections": [{"id": "testcollection_1", "type": "Collection", "title": "Stranger Things", "extent": {"spatial": [[-180, -90, 180, 90]], "temporal": [["2016-01-01T00:00:00+00:00", "2025-12-31T23:59:59+00:00"]]}, "keywords": null, "description": "Some teenagers drop out of school to fight scary monsters", "stac_extensions": []}, {"id": "testcollection_2", "type": "Collection", "title": "The Bear", "extent": {"spatial": [[-180, -90, 180, 90]], "temporal": [["2022-01-01T00:00:00+00:00", "2025-12-31T23:59:59+00:00"]]}, "keywords": ["restaurant", "funny", "sad", "great"], "description": "Another story about why you should not start a restaurant", "stac_extensions": []}], "numberMatched": 2, "numberReturned": 2}
+
+select collection_search('{"q": "large lizard"}');
+ {"links": [], "collections": [{"id": "testcollection_3", "type": "Collection", "title": "Godzilla", "extent": {"spatial": [[-180, -90, 180, 90]], "temporal": [["1954-01-01T00:00:00+00:00", null]]}, "keywords": ["scary", "lizard", "monster"], "description": "A large lizard takes its revenge", "stac_extensions": []}], "numberMatched": 1, "numberReturned": 1}
+
+select collection_search('{"q": "teenagers fight monsters"}');
+ {"links": [], "collections": [{"id": "testcollection_1", "type": "Collection", "title": "Stranger Things", "extent": {"spatial": [[-180, -90, 180, 90]], "temporal": [["2016-01-01T00:00:00+00:00", "2025-12-31T23:59:59+00:00"]]}, "keywords": null, "description": "Some teenagers drop out of school to fight scary monsters", "stac_extensions": []}], "numberMatched": 1, "numberReturned": 1}
+

src/pypgstac/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pypgstac"
-version = "0.9.8"
+version = "0.9.8-dev"
 description = "Schema, functions and a python library for storing and accessing STAC collections and items in PostgreSQL"
 readme = "README.md"
 requires-python = ">=3.8"

src/pypgstac/src/pypgstac/version.py

@@ -1,3 +1,3 @@
 """Version."""
 
-__version__ = "0.9.8"
+__version__ = "0.9.8-dev"