add support for casei and accenti (#256)

Author: bitner

src/pgstac/migrations/pgstac.0.8.5-unreleased.sql

@@ -1 +1 @@
-migrations/pgstac.0.8.5.sql
+migrations/pgstac.unreleased.sql

src/pgstac/migrations/pgstac.unreleased.sql

@@ -8,6 +8,9 @@ BEGIN
   IF NOT EXISTS (SELECT 1 FROM pg_extension WHERE extname='btree_gist') THEN
     CREATE EXTENSION IF NOT EXISTS btree_gist;
   END IF;
+  IF NOT EXISTS (SELECT 1 FROM pg_extension WHERE extname='btree_gist') THEN
+    CREATE EXTENSION IF NOT EXISTS unaccent;
+  END IF;
 END;
 $$ LANGUAGE PLPGSQL;
 

src/pgstac/pgstac.sql

@@ -242,7 +242,9 @@ INSERT INTO cql2_ops (op, template, types) VALUES
     ('between', '%s BETWEEN %s AND %s', NULL),
     ('isnull', '%s IS NULL', NULL),
     ('upper', 'upper(%s)', NULL),
-    ('lower', 'lower(%s)', NULL)
+    ('lower', 'lower(%s)', NULL),
+    ('casei', 'upper(%s)', NULL),
+    ('accenti', 'unaccent(%s)', NULL)
 ON CONFLICT (op) DO UPDATE
     SET
         template = EXCLUDED.template

src/pgstac/sql/000_idempotent_pre.sql

@@ -44,6 +44,43 @@ INSERT INTO pgstac_settings (name, value) VALUES
 ON CONFLICT DO NOTHING
 ;
 
+
+INSERT INTO cql2_ops (op, template, types) VALUES
+    ('eq', '%s = %s', NULL),
+    ('neq', '%s != %s', NULL),
+    ('ne', '%s != %s', NULL),
+    ('!=', '%s != %s', NULL),
+    ('<>', '%s != %s', NULL),
+    ('lt', '%s < %s', NULL),
+    ('lte', '%s <= %s', NULL),
+    ('gt', '%s > %s', NULL),
+    ('gte', '%s >= %s', NULL),
+    ('le', '%s <= %s', NULL),
+    ('ge', '%s >= %s', NULL),
+    ('=', '%s = %s', NULL),
+    ('<', '%s < %s', NULL),
+    ('<=', '%s <= %s', NULL),
+    ('>', '%s > %s', NULL),
+    ('>=', '%s >= %s', NULL),
+    ('like', '%s LIKE %s', NULL),
+    ('ilike', '%s ILIKE %s', NULL),
+    ('+', '%s + %s', NULL),
+    ('-', '%s - %s', NULL),
+    ('*', '%s * %s', NULL),
+    ('/', '%s / %s', NULL),
+    ('not', 'NOT (%s)', NULL),
+    ('between', '%s BETWEEN %s AND %s', NULL),
+    ('isnull', '%s IS NULL', NULL),
+    ('upper', 'upper(%s)', NULL),
+    ('lower', 'lower(%s)', NULL),
+    ('casei', 'upper(%s)', NULL),
+    ('accenti', 'unaccent(%s)', NULL)
+ON CONFLICT (op) DO UPDATE
+    SET
+        template = EXCLUDED.template
+;
+
+
 ALTER FUNCTION to_text COST 5000;
 ALTER FUNCTION to_float COST 5000;
 ALTER FUNCTION to_int COST 5000;

src/pgstac/sql/002b_cql.sql

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

src/pgstac/sql/998_idempotent_post.sql

@@ -17,7 +17,7 @@ CREATE EXTENSION IF NOT EXISTS pgtap;
 SET SEARCH_PATH TO pgstac, pgtap, public;
 
 -- Plan the tests.
-SELECT plan(218);
+SELECT plan(225);
 --SELECT * FROM no_plan();
 
 -- Run the tests.

src/pgstac/sql/999_version.sql

@@ -474,6 +474,46 @@ SELECT results_eq($$
     $$, 'Test lower'
 );
 
+SELECT results_eq($$
+    SELECT BTRIM(stac_search_to_where($q$
+    {
+        "filter-lang": "cql2-json",
+        "filter": {
+            "op": "eq",
+            "args": [
+            {"op": "casei", "args":[{ "property": "mission" }]},
+            {"op": "casei", "args":["sentinel"]}
+            ]
+        }
+    }
+    $q$),E' \n');
+    $$, $$
+    SELECT BTRIM($r$
+    upper(to_text(content->'properties'->'mission')) = upper(to_text('"sentinel"'))
+    $r$,E' \n');
+    $$, 'Test casei'
+);
+
+SELECT results_eq($$
+    SELECT BTRIM(stac_search_to_where($q$
+    {
+        "filter-lang": "cql2-json",
+        "filter": {
+            "op": "eq",
+            "args": [
+            {"op": "accenti", "args":[{ "property": "mission" }]},
+            {"op": "accenti", "args":["sentinel"]}
+            ]
+        }
+    }
+    $q$),E' \n');
+    $$, $$
+    SELECT BTRIM($r$
+    unaccent(to_text(content->'properties'->'mission')) = unaccent(to_text('"sentinel"'))
+    $r$,E' \n');
+    $$, 'Test accenti'
+);
+
 
 
 /* template

src/pgstac/tests/pgtap.sql

@@ -1,6 +1,6 @@
 [project]
 name = "pypgstac"
-version = "0.8.5"
+version = "0.8.5-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"