fix(odata): no quote escape required for IN operator w/non-string col…

…umn (#262)
ghiscoding · Nov 22, 2019 · 8027922 · 8027922
1 parent 5b08b6e
commit 8027922
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/aurelia-slickgrid/services/__tests__/grid-odata.service.spec.ts b/src/aurelia-slickgrid/services/__tests__/grid-odata.service.spec.ts
@@ -720,6 +720,20 @@ describe('GridOdataService', () => {
       expect(query).toBe(expectation);
     });
 
+    it('should return a query with a CSV string when the filter operator is IN for numeric column type', () => {
+      const expectation = `$top=10&$filter=(Id eq 100 or Id eq 101)`;
+      const mockColumn = { id: 'id', field: 'id', type: FieldType.number } as Column;
+      const mockColumnFilters = {
+        gender: { columnId: 'id', columnDef: mockColumn, searchTerms: [100, 101], operator: 'IN' },
+      } as ColumnFilters;
+
+      service.init(serviceOptions, paginationOptions, gridStub);
+      service.updateFilters(mockColumnFilters, false);
+      const query = service.buildQuery();
+
+      expect(query).toBe(expectation);
+    });
+
     it('should return a query with a CSV string when the filter operator is NOT_IN', () => {
       const expectation = `$top=10&$filter=(Gender ne 'female' and Gender ne 'male')`;
       const mockColumn = { id: 'gender', field: 'gender' } as Column;

diff --git a/src/aurelia-slickgrid/services/grid-odata.service.ts b/src/aurelia-slickgrid/services/grid-odata.service.ts
@@ -327,8 +327,13 @@ export class GridOdataService implements BackendService {
             if (operator === 'IN') {
               // example:: (Stage eq "Expired" or Stage eq "Renewal")
               for (let j = 0, lnj = searchTerms.length; j < lnj; j++) {
-                const searchVal = searchTerms[j].replace(`'`, `''`);
-                tmpSearchTerms.push(`${fieldName} eq '${searchVal}'`);
+                if (fieldType === FieldType.string) {
+                  const searchVal = searchTerms[j].replace(`'`, `''`);
+                  tmpSearchTerms.push(`${fieldName} eq '${searchVal}'`);
+                } else {
+                  // Single quote escape is not needed for non string type
+                  tmpSearchTerms.push(`${fieldName} eq ${searchTerms[j]}`);
+                }
               }
               searchBy = tmpSearchTerms.join(' or ');
               if (!(typeof searchBy === 'string' && searchBy[0] === '(' && searchBy.slice(-1) === ')')) {