Switch to use ilike operator for WHERE filters #731

ral-facilities · Oct 28, 2021 · 8534879 · 8534879
1 parent 7795715
commit 8534879
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 28 deletions.
diff --git a/packages/datagateway-common/src/api/datafiles.test.tsx b/packages/datagateway-common/src/api/datafiles.test.tsx
@@ -78,7 +78,7 @@ describe('datafile api functions', () => {
       params.append(
         'where',
         JSON.stringify({
-          name: { like: 'test' },
+          name: { ilike: 'test' },
         })
       );
       params.append('skip', JSON.stringify(20));
@@ -159,7 +159,7 @@ describe('datafile api functions', () => {
       params.append(
         'where',
         JSON.stringify({
-          name: { like: 'test' },
+          name: { ilike: 'test' },
         })
       );
       params.append('skip', JSON.stringify(0));
@@ -260,7 +260,7 @@ describe('datafile api functions', () => {
       params.append(
         'where',
         JSON.stringify({
-          name: { like: 'test' },
+          name: { ilike: 'test' },
         })
       );
       params.append('distinct', JSON.stringify(['name', 'title']));

diff --git a/packages/datagateway-common/src/api/datasets.test.tsx b/packages/datagateway-common/src/api/datasets.test.tsx
@@ -147,7 +147,7 @@ describe('dataset api functions', () => {
       params.append(
         'where',
         JSON.stringify({
-          name: { like: 'test' },
+          name: { ilike: 'test' },
         })
       );
       params.append('skip', JSON.stringify(20));
@@ -228,7 +228,7 @@ describe('dataset api functions', () => {
       params.append(
         'where',
         JSON.stringify({
-          name: { like: 'test' },
+          name: { ilike: 'test' },
         })
       );
       params.append('skip', JSON.stringify(0));
@@ -706,7 +706,7 @@ describe('dataset api functions', () => {
       params.append(
         'where',
         JSON.stringify({
-          name: { like: 'test' },
+          name: { ilike: 'test' },
         })
       );
       params.append('distinct', JSON.stringify(['name', 'title']));

diff --git a/packages/datagateway-common/src/api/facilityCycles.test.tsx b/packages/datagateway-common/src/api/facilityCycles.test.tsx
@@ -102,7 +102,7 @@ describe('facility cycle api functions', () => {
       params.append(
         'where',
         JSON.stringify({
-          name: { like: 'test' },
+          name: { ilike: 'test' },
         })
       );
       params.append('skip', JSON.stringify(20));
@@ -172,7 +172,7 @@ describe('facility cycle api functions', () => {
       params.append(
         'where',
         JSON.stringify({
-          name: { like: 'test' },
+          name: { ilike: 'test' },
         })
       );
       params.append('skip', JSON.stringify(0));
@@ -261,7 +261,7 @@ describe('facility cycle api functions', () => {
       params.append(
         'where',
         JSON.stringify({
-          name: { like: 'test' },
+          name: { ilike: 'test' },
         })
       );
 

diff --git a/packages/datagateway-common/src/api/index.test.tsx b/packages/datagateway-common/src/api/index.test.tsx
@@ -158,7 +158,7 @@ describe('generic api functions', () => {
       const params = new URLSearchParams();
       params.append('order', JSON.stringify('name asc'));
       params.append('order', JSON.stringify('id asc'));
-      params.append('where', JSON.stringify({ name: { like: 'test' } }));
+      params.append('where', JSON.stringify({ name: { ilike: 'test' } }));
       params.append('where', JSON.stringify({ title: { nlike: 'test' } }));
       params.append(
         'where',

diff --git a/packages/datagateway-common/src/api/index.tsx b/packages/datagateway-common/src/api/index.tsx
@@ -191,7 +191,7 @@ export const getApiParams = (props: {
           if (filter.type === 'include') {
             searchParams.append(
               'where',
-              JSON.stringify({ [column]: { like: filter.value } })
+              JSON.stringify({ [column]: { ilike: filter.value } })
             );
           } else {
             searchParams.append(

diff --git a/packages/datagateway-common/src/api/instruments.test.tsx b/packages/datagateway-common/src/api/instruments.test.tsx
@@ -58,7 +58,7 @@ describe('instrument api functions', () => {
       params.append(
         'where',
         JSON.stringify({
-          name: { like: 'test' },
+          name: { ilike: 'test' },
         })
       );
       params.append('skip', JSON.stringify(20));
@@ -122,7 +122,7 @@ describe('instrument api functions', () => {
       params.append(
         'where',
         JSON.stringify({
-          name: { like: 'test' },
+          name: { ilike: 'test' },
         })
       );
       params.append('skip', JSON.stringify(0));
@@ -208,7 +208,7 @@ describe('instrument api functions', () => {
       params.append(
         'where',
         JSON.stringify({
-          name: { like: 'test' },
+          name: { ilike: 'test' },
         })
       );
 

diff --git a/packages/datagateway-common/src/api/investigations.test.tsx b/packages/datagateway-common/src/api/investigations.test.tsx
@@ -157,7 +157,7 @@ describe('investigation api functions', () => {
       params.append(
         'where',
         JSON.stringify({
-          name: { like: 'test' },
+          name: { ilike: 'test' },
         })
       );
       params.append('skip', JSON.stringify(20));
@@ -241,7 +241,7 @@ describe('investigation api functions', () => {
       params.append(
         'where',
         JSON.stringify({
-          name: { like: 'test' },
+          name: { ilike: 'test' },
         })
       );
       params.append('skip', JSON.stringify(0));
@@ -733,7 +733,7 @@ describe('investigation api functions', () => {
       params.append(
         'where',
         JSON.stringify({
-          name: { like: 'test' },
+          name: { ilike: 'test' },
         })
       );
       params.append('distinct', JSON.stringify(['name', 'title']));
@@ -847,7 +847,7 @@ describe('investigation api functions', () => {
         params.append(
           'where',
           JSON.stringify({
-            name: { like: 'test' },
+            name: { ilike: 'test' },
           })
         );
         params.append('skip', JSON.stringify(20));
@@ -891,7 +891,7 @@ describe('investigation api functions', () => {
         params.append(
           'where',
           JSON.stringify({
-            name: { like: 'test' },
+            name: { ilike: 'test' },
           })
         );
         params.append('skip', JSON.stringify(20));
@@ -987,7 +987,7 @@ describe('investigation api functions', () => {
         params.append(
           'where',
           JSON.stringify({
-            name: { like: 'test' },
+            name: { ilike: 'test' },
           })
         );
         params.append('skip', JSON.stringify(0));
@@ -1059,7 +1059,7 @@ describe('investigation api functions', () => {
         params.append(
           'where',
           JSON.stringify({
-            name: { like: 'test' },
+            name: { ilike: 'test' },
           })
         );
         params.append('skip', JSON.stringify(0));
@@ -1177,7 +1177,7 @@ describe('investigation api functions', () => {
         params.append(
           'where',
           JSON.stringify({
-            name: { like: 'test' },
+            name: { ilike: 'test' },
           })
         );
 
@@ -1210,7 +1210,7 @@ describe('investigation api functions', () => {
         params.append(
           'where',
           JSON.stringify({
-            name: { like: 'test' },
+            name: { ilike: 'test' },
           })
         );
         params.append(
@@ -1283,7 +1283,7 @@ describe('investigation api functions', () => {
         params.append(
           'where',
           JSON.stringify({
-            name: { like: 'test' },
+            name: { ilike: 'test' },
           })
         );
 
@@ -1317,7 +1317,7 @@ describe('investigation api functions', () => {
         params.append(
           'where',
           JSON.stringify({
-            name: { like: 'test' },
+            name: { ilike: 'test' },
           })
         );
         params.append(

diff --git a/packages/datagateway-common/src/api/studies.test.tsx b/packages/datagateway-common/src/api/studies.test.tsx
@@ -77,7 +77,7 @@ describe('study api functions', () => {
       params.append(
         'where',
         JSON.stringify({
-          name: { like: 'test' },
+          name: { ilike: 'test' },
         })
       );
       params.append('skip', JSON.stringify(20));
@@ -162,7 +162,7 @@ describe('study api functions', () => {
       params.append(
         'where',
         JSON.stringify({
-          name: { like: 'test' },
+          name: { ilike: 'test' },
         })
       );
       params.append('skip', JSON.stringify(0));
@@ -358,7 +358,7 @@ describe('study api functions', () => {
       params.append(
         'where',
         JSON.stringify({
-          name: { like: 'test' },
+          name: { ilike: 'test' },
         })
       );
       params.append(