Tests

Author: tobyhede

.github/workflows/test-eql.yml

@@ -31,14 +31,19 @@ jobs:
         postgres-version: [17, 16, 15, 14]
 
     env:
-      CS_DATABASE__PASSWORD:
-      CS_DATABASE__PORT: 5432
       CS_DATABASE__NAME: test
+      CS_DATABASE__PASSWORD:
+      CS_DATABASE__PORT: 5532
+
 
     steps:
       - uses: actions/checkout@v4
 
-      - uses: extractions/setup-just@v1
+      - uses: jdx/mise-action@v2
+        with:
+          version: 2024.12.11 # [default: latest] mise version to install
+          install: true # [default: true] run `mise install`
+          cache: true # [default: true] cache mise using GitHub's cache
 
       - uses: ankane/setup-postgres@v1
         with:
@@ -47,5 +52,5 @@ jobs:
 
       - name: Test EQL
         run: |
-          just build test
+          mise run test
 

mise.toml

@@ -12,8 +12,8 @@ includes = ["tasks"]
 
 [env]
 # Default configuration for running cipherstash-proxy out of the box
-CS_DATABASE__NAME = "cipherstash"
-CS_DATABASE__USERNAME = "cipherstash"
-CS_DATABASE__PASSWORD = "password"
-CS_DATABASE__HOST = "localhost"
-CS_DATABASE__PORT = "5532"
+# CS_DATABASE__NAME = "cipherstash"
+# CS_DATABASE__USERNAME = "cipherstash"
+# CS_DATABASE__PASSWORD = "password"
+# CS_DATABASE__HOST = "localhost"
+# CS_DATABASE__PORT = "5532"

sql/015-operators-unique.sql

@@ -91,26 +91,6 @@ CREATE OPERATOR <> (
   MERGES
 );
 
-
--- DROP OPERATOR IF EXISTS <> (cs_encrypted_v1, jsonb);
--- DROP FUNCTION IF EXISTS cs_encrypted_neq_v1(a cs_encrypted_v1, b jsonb);
-
--- CREATE FUNCTION cs_encrypted_neq_v1(a cs_encrypted_v1, b jsonb)
--- RETURNS boolean AS $$
---   SELECT cs_unique_v1(a) <> cs_unique_v1(b);
--- $$ LANGUAGE SQL;
-
--- CREATE OPERATOR <> (
---   PROCEDURE="cs_encrypted_neq_v1",
---   LEFTARG=cs_encrypted_v1,
---   RIGHTARG=jsonb,
---   NEGATOR = =,
---   RESTRICT = eqsel,
---   JOIN = eqjoinsel,
---   HASHES,
---   MERGES
--- );
-
 DROP OPERATOR IF EXISTS <> (cs_encrypted_v1, cs_unique_index_v1);
 DROP FUNCTION IF EXISTS cs_encrypted_neq_v1(a cs_encrypted_v1, b cs_unique_index_v1);
 

tasks/test.sh

@@ -8,13 +8,12 @@
   connection_url=postgresql://${CS_DATABASE__USERNAME:-$USER}:@localhost:$CS_DATABASE__PORT/$CS_DATABASE__NAME
 
   # tests
+  PGPASSWORD=$CS_DATABASE__PASSWORD psql $connection_url -f tests/core.sql
+  PGPASSWORD=$CS_DATABASE__PASSWORD psql $connection_url -f tests/core-functions.sql
+  PGPASSWORD=$CS_DATABASE__PASSWORD psql $connection_url -f tests/config.sql
+  PGPASSWORD=$CS_DATABASE__PASSWORD psql $connection_url -f tests/encryptindex.sql
   PGPASSWORD=$CS_DATABASE__PASSWORD psql $connection_url -f tests/operators.sql
 
-  # PGPASSWORD=$CS_DATABASE__PASSWORD psql $connection_url -f tests/core.sql
-  # PGPASSWORD=$CS_DATABASE__PASSWORD psql $connection_url -f tests/core-functions.sql
-  # PGPASSWORD=$CS_DATABASE__PASSWORD psql $connection_url -f tests/config.sql
-  # PGPASSWORD=$CS_DATABASE__PASSWORD psql $connection_url -f tests/encryptindex.sql
-
   # Uninstall
-  # PGPASSWORD=$CS_DATABASE__PASSWORD psql $connection_url -f release/cipherstash-encrypt-uninstall.sql
+  PGPASSWORD=$CS_DATABASE__PASSWORD psql $connection_url -f release/cipherstash-encrypt-uninstall.sql
 

tests/operators.sql

@@ -12,7 +12,6 @@ CREATE TABLE users
 
 TRUNCATE TABLE users;
 
-
 INSERT INTO users (name_encrypted) VALUES (
   '{
     "v": 1,
@@ -29,26 +28,6 @@ INSERT INTO users (name_encrypted) VALUES (
 );
 
 
--- SELECT id FROM users WHERE ARRAY[1,2]::cs_match_index_v1 <@ name_encrypted;
--- SELECT ARRAY[1,2,3,4]::cs_match_index_v1 <@ ARRAY[1,2,3]::cs_match_index_v1;
-
-
--- SELECT id FROM users WHERE name_encrypted @> '{"m":[1,2]}'::jsonb;
--- SELECT id FROM users WHERE name_encrypted @> ARRAY[1,2]::smallint[];
--- SELECT id FROM users WHERE name_encrypted @> ARRAY[1,2]::cs_match_index_v1;
-
--- SELECT id FROM users WHERE name_encrypted @> '{
---             "v": 1,
---             "k": "ct",
---             "c": "ciphertext",
---             "i": {
---             "t": "users",
---             "c": "name"
---             },
---             "m": [1, 2]
---         }'::cs_encrypted_v1;
-
-
 
 -- MATCH @> OPERATORS
 DO $$