Merge pull request #11607 from cbuescher/feature/query-refactoring-rangequery-fix

Fixing edge case in RangeQueryBuilder when using time zone

core/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java

@@ -304,6 +304,10 @@ public class RangeQueryBuilder extends MultiTermQueryBuilder<RangeQueryBuilder>
         }
 
         if (query == null) {
+            if (this.timeZone != null) {
+                throw new QueryParsingException(parseContext, "[range] time_zone can not be applied to non date field ["
+                        + fieldName + "]");
+            }
             query = new TermRangeQuery(this.fieldName, BytesRefs.toBytesRef(from), BytesRefs.toBytesRef(to), includeLower, includeUpper);
         }