Merge branch 'scc-5168' into qa2

danamansana · danamansana · commit d4c655aeba8f · 2026-03-20T12:12:41.000-04:00
diff --git a/lib/elasticsearch/cql_query_builder.js b/lib/elasticsearch/cql_query_builder.js
@@ -302,18 +302,16 @@ function dateQueries ({ fields, relation, terms, term }) {
       break
   }
 
-  return [
-    {
-      nested: {
-        path: 'dates',
-        query: {
-          range: {
-            'dates.range': range
-          }
+  return {
+    nested: {
+      path: 'dates',
+      query: {
+        range: {
+          'dates.range': range
         }
       }
     }
-  ]
+  }
 }
 
 function termQuery (field, term) {
diff --git a/test/fixtures/cql_fixtures.js b/test/fixtures/cql_fixtures.js
@@ -961,14 +961,12 @@ const dateAfterQuery = {
       {
         bool: {
           should: [
-            [
-              {
-                nested: {
-                  path: 'dates',
-                  query: { range: { 'dates.range': { gt: '1990' } } }
-                }
+            {
+              nested: {
+                path: 'dates',
+                query: { range: { 'dates.range': { gt: '1990' } } }
               }
-            ]
+            }
           ]
         }
       }
@@ -982,14 +980,12 @@ const dateBeforeQuery = {
       {
         bool: {
           should: [
-            [
-              {
-                nested: {
-                  path: 'dates',
-                  query: { range: { 'dates.range': { lt: '1990' } } }
-                }
+            {
+              nested: {
+                path: 'dates',
+                query: { range: { 'dates.range': { lt: '1990' } } }
               }
-            ]
+            }
           ]
         }
       }
@@ -1003,14 +999,12 @@ const dateBeforeOrOnQuery = {
       {
         bool: {
           should: [
-            [
-              {
-                nested: {
-                  path: 'dates',
-                  query: { range: { 'dates.range': { lte: '1990' } } }
-                }
+            {
+              nested: {
+                path: 'dates',
+                query: { range: { 'dates.range': { lte: '1990' } } }
               }
-            ]
+            }
           ]
         }
       }
@@ -1024,14 +1018,12 @@ const dateAfterOrOnQuery = {
       {
         bool: {
           should: [
-            [
-              {
-                nested: {
-                  path: 'dates',
-                  query: { range: { 'dates.range': { gte: '1990' } } }
-                }
+            {
+              nested: {
+                path: 'dates',
+                query: { range: { 'dates.range': { gte: '1990' } } }
               }
-            ]
+            }
           ]
         }
       }
@@ -1045,16 +1037,14 @@ const dateWithinQuery = {
       {
         bool: {
           should: [
-            [
-              {
-                nested: {
-                  path: 'dates',
-                  query: {
-                    range: { 'dates.range': { gte: '1990', lte: '2000' } }
-                  }
+            {
+              nested: {
+                path: 'dates',
+                query: {
+                  range: { 'dates.range': { gte: '1990', lte: '2000' } }
                 }
               }
-            ]
+            }
           ]
         }
       }
@@ -1068,16 +1058,14 @@ const dateEnclosesQuery = {
       {
         bool: {
           should: [
-            [
-              {
-                nested: {
-                  path: 'dates',
-                  query: {
-                    range: { 'dates.range': { gt: '1990', lt: '2000' } }
-                  }
+            {
+              nested: {
+                path: 'dates',
+                query: {
+                  range: { 'dates.range': { gt: '1990', lt: '2000' } }
                 }
               }
-            ]
+            }
           ]
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -302,18 +302,16 @@ function dateQueries ({ fields, relation, terms, term }) {`
`302`	`302`	`break`
`303`	`303`	`}`
`304`	`304`
`305`		`- return [`
`306`		`- {`
`307`		`- nested: {`
`308`		`- path: 'dates',`
`309`		`- query: {`
`310`		`- range: {`
`311`		`- 'dates.range': range`
`312`		`- }`
	`305`	`+ return {`
	`306`	`+ nested: {`
	`307`	`+ path: 'dates',`
	`308`	`+ query: {`
	`309`	`+ range: {`
	`310`	`+ 'dates.range': range`
`313`	`311`	`}`
`314`	`312`	`}`
`315`	`313`	`}`
`316`		`- ]`
	`314`	`+ }`
`317`	`315`	`}`
`318`	`316`
`319`	`317`	`function termQuery (field, term) {`
Original file line number	Diff line number	Diff line change
`@@ -961,14 +961,12 @@ const dateAfterQuery = {`
`961`	`961`	`{`
`962`	`962`	`bool: {`
`963`	`963`	`should: [`
`964`		`- [`
`965`		`- {`
`966`		`- nested: {`
`967`		`- path: 'dates',`
`968`		`- query: { range: { 'dates.range': { gt: '1990' } } }`
`969`		`- }`
	`964`	`+ {`
	`965`	`+ nested: {`
	`966`	`+ path: 'dates',`
	`967`	`+ query: { range: { 'dates.range': { gt: '1990' } } }`
`970`	`968`	`}`
`971`		`- ]`
	`969`	`+ }`
`972`	`970`	`]`
`973`	`971`	`}`
`974`	`972`	`}`
`@@ -982,14 +980,12 @@ const dateBeforeQuery = {`
`982`	`980`	`{`
`983`	`981`	`bool: {`
`984`	`982`	`should: [`
`985`		`- [`
`986`		`- {`
`987`		`- nested: {`
`988`		`- path: 'dates',`
`989`		`- query: { range: { 'dates.range': { lt: '1990' } } }`
`990`		`- }`
	`983`	`+ {`
	`984`	`+ nested: {`
	`985`	`+ path: 'dates',`
	`986`	`+ query: { range: { 'dates.range': { lt: '1990' } } }`
`991`	`987`	`}`
`992`		`- ]`
	`988`	`+ }`
`993`	`989`	`]`
`994`	`990`	`}`
`995`	`991`	`}`
`@@ -1003,14 +999,12 @@ const dateBeforeOrOnQuery = {`
`1003`	`999`	`{`
`1004`	`1000`	`bool: {`
`1005`	`1001`	`should: [`
`1006`		`- [`
`1007`		`- {`
`1008`		`- nested: {`
`1009`		`- path: 'dates',`
`1010`		`- query: { range: { 'dates.range': { lte: '1990' } } }`
`1011`		`- }`
	`1002`	`+ {`
	`1003`	`+ nested: {`
	`1004`	`+ path: 'dates',`
	`1005`	`+ query: { range: { 'dates.range': { lte: '1990' } } }`
`1012`	`1006`	`}`
`1013`		`- ]`
	`1007`	`+ }`
`1014`	`1008`	`]`
`1015`	`1009`	`}`
`1016`	`1010`	`}`
`@@ -1024,14 +1018,12 @@ const dateAfterOrOnQuery = {`
`1024`	`1018`	`{`
`1025`	`1019`	`bool: {`
`1026`	`1020`	`should: [`
`1027`		`- [`
`1028`		`- {`
`1029`		`- nested: {`
`1030`		`- path: 'dates',`
`1031`		`- query: { range: { 'dates.range': { gte: '1990' } } }`
`1032`		`- }`
	`1021`	`+ {`
	`1022`	`+ nested: {`
	`1023`	`+ path: 'dates',`
	`1024`	`+ query: { range: { 'dates.range': { gte: '1990' } } }`
`1033`	`1025`	`}`
`1034`		`- ]`
	`1026`	`+ }`
`1035`	`1027`	`]`
`1036`	`1028`	`}`
`1037`	`1029`	`}`
`@@ -1045,16 +1037,14 @@ const dateWithinQuery = {`
`1045`	`1037`	`{`
`1046`	`1038`	`bool: {`
`1047`	`1039`	`should: [`
`1048`		`- [`
`1049`		`- {`
`1050`		`- nested: {`
`1051`		`- path: 'dates',`
`1052`		`- query: {`
`1053`		`- range: { 'dates.range': { gte: '1990', lte: '2000' } }`
`1054`		`- }`
	`1040`	`+ {`
	`1041`	`+ nested: {`
	`1042`	`+ path: 'dates',`
	`1043`	`+ query: {`
	`1044`	`+ range: { 'dates.range': { gte: '1990', lte: '2000' } }`
`1055`	`1045`	`}`
`1056`	`1046`	`}`
`1057`		`- ]`
	`1047`	`+ }`
`1058`	`1048`	`]`
`1059`	`1049`	`}`
`1060`	`1050`	`}`
`@@ -1068,16 +1058,14 @@ const dateEnclosesQuery = {`
`1068`	`1058`	`{`
`1069`	`1059`	`bool: {`
`1070`	`1060`	`should: [`
`1071`		`- [`
`1072`		`- {`
`1073`		`- nested: {`
`1074`		`- path: 'dates',`
`1075`		`- query: {`
`1076`		`- range: { 'dates.range': { gt: '1990', lt: '2000' } }`
`1077`		`- }`
	`1061`	`+ {`
	`1062`	`+ nested: {`
	`1063`	`+ path: 'dates',`
	`1064`	`+ query: {`
	`1065`	`+ range: { 'dates.range': { gt: '1990', lt: '2000' } }`
`1078`	`1066`	`}`
`1079`	`1067`	`}`
`1080`		`- ]`
	`1068`	`+ }`
`1081`	`1069`	`]`
`1082`	`1070`	`}`
`1083`	`1071`	`}`