Merge pull request #29 from hasura/m-bilal/re-enable-range-op

Re enable range operation
hasura · Sep 25, 2024 · 35461c2 · 35461c2
2 parents 0f1e53f + a3fe04e
commit 35461c2
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/connector/static_types.go b/connector/static_types.go
@@ -1,6 +1,8 @@
 package connector
 
 import (
+	"slices"
+
 	"github.com/hasura/ndc-sdk-go/schema"
 	"github.com/hasura/ndc-sdk-go/utils"
 )
@@ -330,20 +332,25 @@ var objectTypeMap = map[string]schema.ObjectType{
 	},
 }
 
+var unsupportedRangeQueryScalars = []string{"binary", "completion", "_id", "wildcard", "match_only_text", "search_as_you_type"}
+
 // getComparisonOperatorDefinition generates and returns a map of comparison operators based on the provided data type.
 func getComparisonOperatorDefinition(dataType string) map[string]schema.ComparisonOperatorDefinition {
 	var comparisonOperators = map[string]schema.ComparisonOperatorDefinition{
 		"match":        schema.NewComparisonOperatorCustom(schema.NewNamedType(dataType)).Encode(),
 		"match_phrase": schema.NewComparisonOperatorCustom(schema.NewNamedType(dataType)).Encode(),
 		"term":         schema.NewComparisonOperatorCustom(schema.NewNamedType(dataType)).Encode(),
-		// "range":        schema.NewComparisonOperatorCustom(schema.NewNamedType("range")).Encode(), // TODO: add back once object types are supported as comparison operators
-		"terms": schema.NewComparisonOperatorCustom(schema.NewArrayType(schema.NewNamedType(dataType))).Encode(),
+		"terms":        schema.NewComparisonOperatorCustom(schema.NewArrayType(schema.NewNamedType(dataType))).Encode(),
 	}
 
-	// if dataType == "date" { // TODO: add back once object types are supported as comparison operators
-	// requiredObjectTypes["date_range_query"] = objectTypeMap["date_range_query"]
-	// comparisonOperators["range"] = schema.NewComparisonOperatorCustom(schema.NewNamedType("date_range_query")).Encode()
-	// }
+	if !slices.Contains(unsupportedRangeQueryScalars, dataType) {
+		comparisonOperators["range"] = schema.NewComparisonOperatorCustom(schema.NewNamedType("range")).Encode()
+	}
+
+	if dataType == "date" {
+		requiredObjectTypes["date_range_query"] = objectTypeMap["date_range_query"]
+		comparisonOperators["range"] = schema.NewComparisonOperatorCustom(schema.NewNamedType("date_range_query")).Encode()
+	}
 
 	if dataType == "text" {
 		comparisonOperators["match_phrase_prefix"] = schema.NewComparisonOperatorCustom(schema.NewNamedType(dataType)).Encode()