odata-filter: use sql.identifier() in preference to raw() (#1238)

getodk · Oct 30, 2024 · ee3cd5a · ee3cd5a
1 parent 1833f82
commit ee3cd5a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/data/odata-filter.js b/lib/data/odata-filter.js
@@ -30,7 +30,7 @@ const odataFilter = (expr, odataToColumnMap) => {
     const lowerName = fn.toLowerCase();
     const params = node.value.parameters;
     if (extractFunctions.includes(lowerName)) {
-      return sql`extract(${raw(lowerName)} from ${op(params[0])})`; // eslint-disable-line no-use-before-define
+      return sql`extract(${sql.identifier([lowerName])} from ${op(params[0])})`; // eslint-disable-line no-use-before-define
     } else if (fn === 'now') {
       return sql`now()`;
     } else {

diff --git a/test/unit/data/odata-filter.js b/test/unit/data/odata-filter.js
@@ -41,12 +41,12 @@ describe('OData filter query transformer', () => {
   });
 
   it('should transform date extraction method calls', () => {
-    odataFilter('2020 eq year(2020-01-01)').should.eql(sql`(${'2020'} is not distinct from extract(year from ${'2020-01-01'}))`);
-    odataFilter('2020 eq year(__system/submissionDate)').should.eql(sql`(${'2020'} is not distinct from extract(year from ${sql.identifier([ 'submissions', 'createdAt' ])}))`);
+    odataFilter('2020 eq year(2020-01-01)').should.eql(sql`(${'2020'} is not distinct from extract("year" from ${'2020-01-01'}))`);
+    odataFilter('2020 eq year(__system/submissionDate)').should.eql(sql`(${'2020'} is not distinct from extract("year" from ${sql.identifier([ 'submissions', 'createdAt' ])}))`);
   });
 
   it('should transform now method calls', () => {
-    odataFilter('2020 eq year(now())').should.eql(sql`(${'2020'} is not distinct from extract(year from now()))`);
+    odataFilter('2020 eq year(now())').should.eql(sql`(${'2020'} is not distinct from extract("year" from now()))`);
   });
 
   it('should reject unparseable expressions', () => {