From 6d4d6dff12636f364d7efa49e61671b8bf2f31c7 Mon Sep 17 00:00:00 2001 From: Alexander Lehnert Date: Tue, 1 Oct 2024 13:45:21 +0200 Subject: [PATCH 1/3] CDR-1550 AQL on Folder additional cases --- FOLDER.md | 136 +++++++++++++++++++++------ folder/folder_simple.json | 13 +++ folder/folder_with_compositions.json | 2 +- 3 files changed, 123 insertions(+), 28 deletions(-) create mode 100644 folder/folder_simple.json diff --git a/FOLDER.md b/FOLDER.md index 2dc8b1e..2fb17ee 100644 --- a/FOLDER.md +++ b/FOLDER.md @@ -1,6 +1,7 @@ # FOLDER -## FROM Folder +## FROM Folder + ### Find all @@ -15,6 +16,23 @@ | d936409e-901f-4994-8d33-ed104d460151 | subfolder1 | openEHR-EHR-FOLDER.generic.v1 | | 0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3 | subsubfolder1 | openEHR-EHR-FOLDER.episode_of_care.v1 | + +### Find by ehr id + +1. Create ehr and save {ehr_id1} +2. Create directory `folder_simple_hierarchy` in {ehr_id1} +3. Create ehr and save {ehr_id2} +4. Create directory `folder_simple` in {ehr_id2} +5. Run Query `SELECT e/ehr_id/value, f/uid/value FROM EHR e CONTAINS FOLDER f WHERE e/ehr_id/value = {ehr_id1}` +6. check result is in any order + +| e/ehr_id/value | f/uid/value | +|----------------|--------------------------------------| +| {ehr_id1} | 10e952ca-a5b2-4f24-8d37-59240fd37020 | +| {ehr_id1} | d936409e-901f-4994-8d33-ed104d460151 | +| {ehr_id1} | 0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3 | + + ### Find by name 1. Create ehr @@ -22,13 +40,11 @@ 3. Run Query `SELECT f/uid/value from FOLDER f where f/name/value = {name}` 4. check for each parameter - | {name} | f/uid/value | - |---------------|--------------------------------------| - | root1 | 10e952ca-a5b2-4f24-8d37-59240fd37020 | - | subfolder1 | d936409e-901f-4994-8d33-ed104d460151 | - | subsubfolder1 | 0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3 | - - +| {name} | f/uid/value | +|---------------|--------------------------------------| +| root1 | 10e952ca-a5b2-4f24-8d37-59240fd37020 | +| subfolder1 | d936409e-901f-4994-8d33-ed104d460151 | +| subsubfolder1 | 0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3 | ### Find by archetype @@ -38,6 +54,20 @@ 3. Run Query `SELECT f/uid/value from FOLDER f[openEHR-EHR-FOLDER.episode_of_care.v1]` 4. Check result one row with 0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3 + +### Find by Folder id + +1. Create ehr +2. Create directory `folder_simple_hierarchy` +3. Run Query `SELECT f/name/value, f/uid/value FROM FOLDER f WHERE f/uid/value = '0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3'` +4. Check result matches single row + +| f/name/value | f/uid/value | +|---------------|--------------------------------------| +| subsubfolder1 | 0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3 | + + + ## FOLDER contains FOLDER ### Find all @@ -60,6 +90,7 @@ | ac1e12cb-b9db-4f15-a8aa-4e62a9d97231 | subfolder2 | 13661fe2-1e16-4c75-a10d-9b8040487a72 | subsubfolder1 | | ac1e12cb-b9db-4f15-a8aa-4e62a9d97231 | subfolder2 | e9ae5700-d969-430a-b4f2-445e3091a901 | subsubfolder2 | + ### Find by 1. Create ehr @@ -73,14 +104,18 @@ | openEHR-EHR-FOLDER.generic.v1,'subfolder2' | openEHR-EHR-FOLDER.episode_of_care.v1 | {13661fe2-1e16-4c75-a10d-9b8040487a72, subsubfolder1 };{e9ae5700-d969-430a-b4f2-445e3091a901,subsubfolder2 } | | openEHR-EHR-FOLDER.generic.v1,'root1' | openEHR-EHR-FOLDER.episode_of_care.v1,'subsubfolder1' | {0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3 , subsubfolder1}; {13661fe2-1e16-4c75-a10d-9b8040487a72, subsubfolder1 } | -## multiple ehrs + + +## Multiple EHR + + +### Select by Folder archetype id and name 1. Create ehr and save {ehr_id1} 2. Create directory `folder_complex_hierarchy` 3. Create ehr and save {ehr_id2} 4. Create directory `folder_complex_hierarchy2` -5. Run Query - `SELECT e/ehr_id/value, f/uid/value FROM EHR e CONTAINS FOLDER f[openEHR-EHR-FOLDER.episode_of_care.v1,'subsubfolder1']` +5. Run Query `SELECT e/ehr_id/value, f/uid/value FROM EHR e CONTAINS FOLDER f[openEHR-EHR-FOLDER.episode_of_care.v1,'subsubfolder1']` 6. Check result is in any order | e/uid/value | f/uid/value | @@ -90,8 +125,25 @@ | {ehr_id2} | 04689137-90bf-456b-8afc-7c5774843919 | | {ehr_id2} | 59bbd141-c51b-435a-9cbb-85d953ebfcd3 | + +### Select by Folder and EHR id + +1. Create ehr and save {ehr_id1} +2. Create directory `folder_complex_hierarchy` +3. Create ehr and save {ehr_id2} +4. Create directory `folder_complex_hierarchy2` +5. Run Query `SELECT e/ehr_id/value, f/uid/value FROM EHR e CONTAINS FOLDER f WHERE e/ehr_id/value = {ehr_id1} AND f/uid/value = '13661fe2-1e16-4c75-a10d-9b8040487a72'` +6. Check result is in any order + +| e/uid/value | f/uid/value | +|-------------|--------------------------------------| +| {ehr_id1} | 13661fe2-1e16-4c75-a10d-9b8040487a72 | + + + ## Contains COMPOSITION + ### Select all 1. Upload `conformance_ehrbase.de.v0.opt` if not exist @@ -101,7 +153,7 @@ 5. Create composition `conformance_ehrbase.de.v0_max.json` and save `{comp_id3}`. 6. Create composition `conformance_ehrbase.de.v0_max.json` and save `{comp_id4}`. 7. Create directory `folder_with_compositions.json` replacing the parameters -8. Run Query `SELECT c/uid/value , f/name/value from FOLDER f contains COMPOSITION c` +8. Run Query `SELECT c/uid/value, f/name/value from FOLDER f contains COMPOSITION c` 9. Check result is in any order | f/name/value | c/uid/value | @@ -119,6 +171,7 @@ | subsubfolder2 | {comp_id3} | | subsubsubfolder1 | {comp_id4} | + ### Select by name 1. Upload `conformance_ehrbase.de.v0.opt` if not exist @@ -128,7 +181,7 @@ 5. Create composition `conformance_ehrbase.de.v0_max.json` and save `{comp_id3}`. 6. Create composition `conformance_ehrbase.de.v0_max.json` and save `{comp_id4}`. 7. Create directory `folder_with_compositions.json` replacing the parameters -8. Run Query `SELECT c/uid/value from FOLDER f contains COMPOSITION c where f/name/value = {name}` +8. Run Query `SELECT c/uid/value from FOLDER f contains COMPOSITION c where f/name/value = {name}` | {name} | result in any order | |------------------|------------------------------------------------| @@ -138,6 +191,7 @@ | subsubfolder2 | {comp_id3} | | subsubsubfolder1 | {comp_id4} | + ### Folder in Folder 1. Upload `conformance_ehrbase.de.v0.opt` if not exist @@ -147,11 +201,11 @@ 5. Create composition `conformance_ehrbase.de.v0_max.json` and save `{comp_id3}`. 6. Create composition `conformance_ehrbase.de.v0_max.json` and save `{comp_id4}`. 7. Create directory `folder_with_compositions.json` replacing the parameters -8. Run Query - `SELECT c/uid/value from FOLDER f1[openEHR-EHR-FOLDER.episode_of_care.v1] contains Folder f2[openEHR-EHR-FOLDER.episode_of_care.v1] contains COMPOSITION c` +8. Run Query `SELECT c/uid/value FROM FOLDER f1[openEHR-EHR-FOLDER.episode_of_care.v1] CONTAINS FOLDER f2[openEHR-EHR-FOLDER.episode_of_care.v1] CONTAINS COMPOSITION c` 9. Check result is one row with `{comp_id4}`. -### over multiple ehrs + +### Multiple EHR Select by Folder name 1. Upload `conformance_ehrbase.de.v0.opt` if not exist 2. Create ehr save {ehr_id1} @@ -168,30 +222,56 @@ 13. Create composition `conformance_ehrbase.de.v0_max.json` and save `{comp_id4b}`. 14. Create directory `folder_with_compositions.json` replacing the parameters 15. Create composition `conformance_ehrbase.de.v0_max.json` -16. Run Query - `SELECT e/ehr_id/value ,c/uid/value from EHR e contains FOLDER f contains COMPOSITION c where f/name/value = 'subsubsubfolder1'` +16. Run Query `SELECT e/ehr_id/value, c/uid/value FROM EHR e CONTAINS FOLDER f CONTAINS COMPOSITION c WHERE f/name/value = 'subsubsubfolder1'` 17. Result in any order | e/ehr_id/value | c/uid/value | |----------------|-------------| -| ehr_id1} | {comp_id4} | -| ehr_id2} | {comp_id4b} | +| {ehr_id1} | {comp_id4} | +| {ehr_id2} | {comp_id4b} | + + +### Multiple EHR and Compositions Select by IDs + +1. Upload `conformance_ehrbase.de.v0.opt` if not exist +2. Create ehr save {ehr_id1} +3. Create composition `conformance_ehrbase.de.v0_max.json` and save `{comp_id1}`. +4. Create composition `conformance_ehrbase.de.v0_max.json` and save `{comp_id2}`. +5. Create composition `conformance_ehrbase.de.v0_max.json` and save `{comp_id3}`. +6. Create composition `conformance_ehrbase.de.v0_max.json` and save `{comp_id4}`. +7. Create directory `folder_with_compositions.json` replacing the parameters +8. Create composition `conformance_ehrbase.de.v0_max.json` +9. Create ehr save {ehr_id2} +10. Create composition `conformance_ehrbase.de.v0_max.json` and save `{comp_id1b}`. +11. Create composition `conformance_ehrbase.de.v0_max.json` and save `{comp_id2b}`. +12. Create composition `conformance_ehrbase.de.v0_max.json` and save `{comp_id3b}`. +13. Create composition `conformance_ehrbase.de.v0_max.json` and save `{comp_id4b}`. +14. Create directory `folder_with_compositions.json` replacing the parameters +15. Create composition `conformance_ehrbase.de.v0_max.json` +16. Run Query `SELECT e/ehr_id/value, f/uid/value, c/uid/value FROM EHR e CONTAINS FOLDER f CONTAINS COMPOSITION c WHERE e/ehr_id/value = {ehr_id2} AND f/uid/value = '70939d97-8add-4419-b27c-516e64b1c744' AND c/uid/value = {comp_id4b}` +7Result in any order + +| e/ehr_id/value | f/uid/value | c/uid/value | +|----------------|---------------------------------------|-------------| +| {ehr_id2} | 70939d97-8add-4419-b27c-516e64b1c744 | {comp_id4b} | + + +### Multi Compositions in a Folder -### multi comp in a folder 1. Upload `conformance_ehrbase.de.v0.opt` if not exist 2. Create ehr 3. Create composition `conformance_ehrbase.de.v0_max.json` and save `{comp_id1}`. 4. Create composition `conformance_ehrbase.de.v0_max.json` and save `{comp_id2}`. 5. Create directory `folder_multi_compositions` replacing the parameters 6. Create composition `conformance_ehrbase.de.v0_max.json` -7. Run Query `SELECT c/uid/value from FOLDER f contains COMPOSITION c` +7. Run Query `SELECT c/uid/value FROM FOLDER f CONTAINS COMPOSITION c` 8. Result is in any order `{comp_id1}`,`{comp_id2}` -## Select paths in folder +## Select paths in FOLDER -### Select paths in folder +### Select paths in Folder 1. Create ehr 2. Create directory `folder_details` @@ -205,6 +285,7 @@ | f/details | 2 rows with json of type ITEM_TREE | | f/details[at0003]/items[at0004]/value/value | value1,value2 | + ### Find items 1. Create ehr @@ -221,6 +302,7 @@ | 10e952ca-a5b2-4f24-8d37-59240fd37020 | root1 | openEHR-EHR-FOLDER.generic.v1 | {comp_id1} | | 10e952ca-a5b2-4f24-8d37-59240fd37020 | root1 | openEHR-EHR-FOLDER.generic.v1 | {comp_id2} | + ### Find by specific item id - VERSIONED_COMPOSITION - HIER_OBJECT_ID 1. Create ehr @@ -228,6 +310,6 @@ 3. Run Query `SELECT f/uid/value, f/name/value, f/items/id/value FROM FOLDER f WHERE f/items/id/value = '7c0a9df0-564f-4f34-8e65-92586c64ef56'` 4. Check result to be the same as below - | f/uid/value | f/name/value | f/items/id/value | - |--------------------------------------|--------------|--------------------------------------| - | d936409e-901f-4994-8d33-ed104d460151 | subfolder1 | 7c0a9df0-564f-4f34-8e65-92586c64ef56 | \ No newline at end of file +| f/uid/value | f/name/value | f/items/id/value | +|--------------------------------------|--------------|--------------------------------------| +| d936409e-901f-4994-8d33-ed104d460151 | subfolder1 | 7c0a9df0-564f-4f34-8e65-92586c64ef56 | \ No newline at end of file diff --git a/folder/folder_simple.json b/folder/folder_simple.json new file mode 100644 index 0000000..58eb98a --- /dev/null +++ b/folder/folder_simple.json @@ -0,0 +1,13 @@ +{ + "_type": "FOLDER", + "uid": { + "_type": "HIER_OBJECT_ID", + "value": "9655f56f-16c7-4d48-8dfd-8457d9789e40" + }, + "name": { + "_type": "DV_TEXT", + "value": "simple" + }, + "archetype_node_id": "openEHR-EHR-FOLDER.generic.v1", + "folders": [ ] +} diff --git a/folder/folder_with_compositions.json b/folder/folder_with_compositions.json index 7d31433..37d3054 100644 --- a/folder/folder_with_compositions.json +++ b/folder/folder_with_compositions.json @@ -37,7 +37,7 @@ "_type": "FOLDER", "uid": { "_type": "HIER_OBJECT_ID", - "value": "70939d97-8add-4419-b27c-516e64b1c744 " + "value": "70939d97-8add-4419-b27c-516e64b1c744" }, "name": { "_type": "DV_TEXT", From 0e2f99b8e00738952cfdeff5a1aa944eaefc9c5d Mon Sep 17 00:00:00 2001 From: Alexander Lehnert Date: Wed, 2 Oct 2024 15:43:57 +0200 Subject: [PATCH 2/3] CDR-1550 Fix invalid folder test UIDs --- FOLDER.md | 22 +++++++++++----------- folder/folder_complex_hierarchy.json | 2 +- folder/folder_details.json | 2 +- folder/folder_multi_compositions.json | 2 +- folder/folder_simple.json | 2 +- folder/folder_simple_hierarchy.json | 2 +- folder/folder_with_compositions.json | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/FOLDER.md b/FOLDER.md index 2fb17ee..20cb6ff 100644 --- a/FOLDER.md +++ b/FOLDER.md @@ -12,7 +12,7 @@ | f/uid/value | f/name/value | f/archetype_node_id | |--------------------------------------|---------------|---------------------------------------| -| 10e952ca-a5b2-4f24-8d37-59240fd37020 | root1 | openEHR-EHR-FOLDER.generic.v1 | +| 60e952ca-a5b2-4f24-8d37-59240fd37020 | root1 | openEHR-EHR-FOLDER.generic.v1 | | d936409e-901f-4994-8d33-ed104d460151 | subfolder1 | openEHR-EHR-FOLDER.generic.v1 | | 0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3 | subsubfolder1 | openEHR-EHR-FOLDER.episode_of_care.v1 | @@ -28,7 +28,7 @@ | e/ehr_id/value | f/uid/value | |----------------|--------------------------------------| -| {ehr_id1} | 10e952ca-a5b2-4f24-8d37-59240fd37020 | +| {ehr_id1} | 60e952ca-a5b2-4f24-8d37-59240fd37020 | | {ehr_id1} | d936409e-901f-4994-8d33-ed104d460151 | | {ehr_id1} | 0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3 | @@ -42,7 +42,7 @@ | {name} | f/uid/value | |---------------|--------------------------------------| -| root1 | 10e952ca-a5b2-4f24-8d37-59240fd37020 | +| root1 | 60e952ca-a5b2-4f24-8d37-59240fd37020 | | subfolder1 | d936409e-901f-4994-8d33-ed104d460151 | | subsubfolder1 | 0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3 | @@ -79,12 +79,12 @@ | f1/uid/value | f1/name/value | f2/uid/value | f2/name/value | |--------------------------------------|---------------|--------------------------------------|---------------| -| 10e952ca-a5b2-4f24-8d37-59240fd37020 | root1 | d936409e-901f-4994-8d33-ed104d460151 | subfolder1 | -| 10e952ca-a5b2-4f24-8d37-59240fd37020 | root1 | 0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3 | subsubfolder1 | -| 10e952ca-a5b2-4f24-8d37-59240fd37020 | root1 | 3cb9efa5-fe71-49e9-a02f-d38835c27d1b | subsubfolder2 | -| 10e952ca-a5b2-4f24-8d37-59240fd37020 | root1 | ac1e12cb-b9db-4f15-a8aa-4e62a9d97231 | subfolder2 | -| 10e952ca-a5b2-4f24-8d37-59240fd37020 | root1 | 13661fe2-1e16-4c75-a10d-9b8040487a72 | subsubfolder1 | -| 10e952ca-a5b2-4f24-8d37-59240fd37020 | root1 | e9ae5700-d969-430a-b4f2-445e3091a901 | subsubfolder2 | +| 00e952ca-a5b2-4f24-8d37-59240fd37020 | root1 | d936409e-901f-4994-8d33-ed104d460151 | subfolder1 | +| 00e952ca-a5b2-4f24-8d37-59240fd37020 | root1 | 0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3 | subsubfolder1 | +| 00e952ca-a5b2-4f24-8d37-59240fd37020 | root1 | 3cb9efa5-fe71-49e9-a02f-d38835c27d1b | subsubfolder2 | +| 00e952ca-a5b2-4f24-8d37-59240fd37020 | root1 | ac1e12cb-b9db-4f15-a8aa-4e62a9d97231 | subfolder2 | +| 00e952ca-a5b2-4f24-8d37-59240fd37020 | root1 | 13661fe2-1e16-4c75-a10d-9b8040487a72 | subsubfolder1 | +| 00e952ca-a5b2-4f24-8d37-59240fd37020 | root1 | e9ae5700-d969-430a-b4f2-445e3091a901 | subsubfolder2 | | d936409e-901f-4994-8d33-ed104d460151 | subfolder1 | 0cc504b1-4d6d-4cd5-81d9-0ef1b870edb3 | subsubfolder1 | | d936409e-901f-4994-8d33-ed104d460151 | subfolder1 | 3cb9efa5-fe71-49e9-a02f-d38835c27d1b | subsubfolder2 | | ac1e12cb-b9db-4f15-a8aa-4e62a9d97231 | subfolder2 | 13661fe2-1e16-4c75-a10d-9b8040487a72 | subsubfolder1 | @@ -299,8 +299,8 @@ | f/uid/value | f/name/value | f/archetype_node_id | f/items/id/value | |--------------------------------------|--------------|-------------------------------|------------------| -| 10e952ca-a5b2-4f24-8d37-59240fd37020 | root1 | openEHR-EHR-FOLDER.generic.v1 | {comp_id1} | -| 10e952ca-a5b2-4f24-8d37-59240fd37020 | root1 | openEHR-EHR-FOLDER.generic.v1 | {comp_id2} | +| 40e952ca-a5b2-4f24-8d37-59240fd37020 | root1 | openEHR-EHR-FOLDER.generic.v1 | {comp_id1} | +| 40e952ca-a5b2-4f24-8d37-59240fd37020 | root1 | openEHR-EHR-FOLDER.generic.v1 | {comp_id2} | ### Find by specific item id - VERSIONED_COMPOSITION - HIER_OBJECT_ID diff --git a/folder/folder_complex_hierarchy.json b/folder/folder_complex_hierarchy.json index 199dedf..708a1e2 100644 --- a/folder/folder_complex_hierarchy.json +++ b/folder/folder_complex_hierarchy.json @@ -2,7 +2,7 @@ "_type": "FOLDER", "uid": { "_type": "HIER_OBJECT_ID", - "value": "10e952ca-a5b2-4f24-8d37-59240fd37020" + "value": "00e952ca-a5b2-4f24-8d37-59240fd37020" }, "name": { "_type": "DV_TEXT", diff --git a/folder/folder_details.json b/folder/folder_details.json index 4b91c8a..863c023 100644 --- a/folder/folder_details.json +++ b/folder/folder_details.json @@ -2,7 +2,7 @@ "_type": "FOLDER", "uid": { "_type": "HIER_OBJECT_ID", - "value": "10e952ca-a5b2-4f24-8d37-59240fd37020" + "value": "30e952ca-a5b2-4f24-8d37-59240fd37020" }, "name": { "_type": "DV_TEXT", diff --git a/folder/folder_multi_compositions.json b/folder/folder_multi_compositions.json index b5ca254..26d673a 100644 --- a/folder/folder_multi_compositions.json +++ b/folder/folder_multi_compositions.json @@ -2,7 +2,7 @@ "_type": "FOLDER", "uid": { "_type": "HIER_OBJECT_ID", - "value": "10e952ca-a5b2-4f24-8d37-59240fd37020" + "value": "40e952ca-a5b2-4f24-8d37-59240fd37020" }, "name": { "_type": "DV_TEXT", diff --git a/folder/folder_simple.json b/folder/folder_simple.json index 58eb98a..c34004e 100644 --- a/folder/folder_simple.json +++ b/folder/folder_simple.json @@ -2,7 +2,7 @@ "_type": "FOLDER", "uid": { "_type": "HIER_OBJECT_ID", - "value": "9655f56f-16c7-4d48-8dfd-8457d9789e40" + "value": "5655f56f-16c7-4d48-8dfd-8457d9789e40" }, "name": { "_type": "DV_TEXT", diff --git a/folder/folder_simple_hierarchy.json b/folder/folder_simple_hierarchy.json index fea2d55..371f693 100644 --- a/folder/folder_simple_hierarchy.json +++ b/folder/folder_simple_hierarchy.json @@ -2,7 +2,7 @@ "_type": "FOLDER", "uid": { "_type": "HIER_OBJECT_ID", - "value": "10e952ca-a5b2-4f24-8d37-59240fd37020" + "value": "60e952ca-a5b2-4f24-8d37-59240fd37020" }, "name": { "_type": "DV_TEXT", diff --git a/folder/folder_with_compositions.json b/folder/folder_with_compositions.json index 37d3054..9fa21c9 100644 --- a/folder/folder_with_compositions.json +++ b/folder/folder_with_compositions.json @@ -2,7 +2,7 @@ "_type": "FOLDER", "uid": { "_type": "HIER_OBJECT_ID", - "value": "10e952ca-a5b2-4f24-8d37-59240fd37020" + "value": "70e952ca-a5b2-4f24-8d37-59240fd37020" }, "name": { "_type": "DV_TEXT", From 60b9b696f5ce46fe9a3ac3cf57728474be9842a0 Mon Sep 17 00:00:00 2001 From: Alexander Lehnert Date: Wed, 9 Oct 2024 10:47:35 +0200 Subject: [PATCH 3/3] CDR-1550 Fix invalid assert --- FOLDER.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/FOLDER.md b/FOLDER.md index 20cb6ff..457a033 100644 --- a/FOLDER.md +++ b/FOLDER.md @@ -132,12 +132,12 @@ 2. Create directory `folder_complex_hierarchy` 3. Create ehr and save {ehr_id2} 4. Create directory `folder_complex_hierarchy2` -5. Run Query `SELECT e/ehr_id/value, f/uid/value FROM EHR e CONTAINS FOLDER f WHERE e/ehr_id/value = {ehr_id1} AND f/uid/value = '13661fe2-1e16-4c75-a10d-9b8040487a72'` +5. Run Query `SELECT e/ehr_id/value, f/name/value, f/uid/value FROM EHR e CONTAINS FOLDER f WHERE e/ehr_id/value = {ehr_id1} AND f/uid/value = 'd936409e-901f-4994-8d33-ed104d460151'` 6. Check result is in any order -| e/uid/value | f/uid/value | -|-------------|--------------------------------------| -| {ehr_id1} | 13661fe2-1e16-4c75-a10d-9b8040487a72 | +| e/uid/value | f/name/value | f/uid/value | +|-------------|--------------|---------------------------------------| +| {ehr_id1} | subfolder1 | d936409e-901f-4994-8d33-ed104d460151 |