Merge pull request #12 from cipherstash/cip-1035-remove-domain-types-…

…in-examples-and-tests

Remove custome domain types from django tests/examples

.github/workflows/python-app.yml

@@ -49,8 +49,6 @@ jobs:
            sudo apt-get install -y postgresql-client
       - name: Install EQL
         run: curl -L https://github.com/cipherstash/encrypt-query-language/releases/download/eql-0.4.3/cipherstash-encrypt.sql | psql -h localhost -p 5432 -U postgres eqlpy_test
-      - name: Create appliaction types
-        run: psql -h localhost -p 5432 -U postgres eqlpy_test < tests/integration/support/application_types.sql
       - name: Create test table
         run: psql -h localhost -p 5432 -U postgres eqlpy_test < tests/integration/support/create_examples_table.sql
       - name: Print dataset ID

examples/README.md

@@ -42,7 +42,6 @@ Please note currently pscyopg2 is required with the sqlalchemy example
 * Start PostgreSQL and CipherStash Proxy using `docker compose`: `docker compose up -d`
 * Run the following commands to install eql, create domain types, and example table:
     * `$ curl -L https://github.com/cipherstash/encrypt-query-language/releases/download/eql-0.4.3/cipherstash-encrypt.sql | psql -h localhost -p 5432 -U postgres eqlpy_example`
-    * `$ psql -h localhost -p 5432 -U postgres eqlpy_example < application_types.sql`
     * `$ psql -h localhost -p 5432 -U postgres eqlpy_example < create_examples_table.sql`
 
 ## Execution

examples/create_examples_table.sql

@@ -1,11 +1,11 @@
 create table examples (
   id serial primary key,
-  encrypted_boolean examples__encrypted_boolean,
-  encrypted_date examples__encrypted_date,
-  encrypted_float examples__encrypted_float,
-  encrypted_int examples__encrypted_int,
-  encrypted_utf8_str examples__encrypted_utf8_str,
-  encrypted_jsonb examples__encrypted_jsonb
+  encrypted_boolean cs_encrypted_v1,
+  encrypted_date cs_encrypted_v1,
+  encrypted_float cs_encrypted_v1,
+  encrypted_int cs_encrypted_v1,
+  encrypted_utf8_str cs_encrypted_v1,
+  encrypted_jsonb cs_encrypted_v1
 );
 
 -- Add CipherStash indexes to Encrypt config

tests/integration/support/create_examples_table.sql

@@ -1,11 +1,11 @@
 create table customers (
   id serial primary key,
-  is_citizen customers__is_citizen,
-  start_date customers__start_date,
-  weight customers__weight,
-  age customers__age,
-  name customers__name,
-  extra_info customers__extra_info,
+  is_citizen cs_encrypted_v1,
+  start_date cs_encrypted_v1,
+  weight cs_encrypted_v1,
+  age cs_encrypted_v1,
+  name cs_encrypted_v1,
+  extra_info cs_encrypted_v1,
   visit_count integer
 );