Phoenix update support for "IN" operator

hasura · Dec 3, 2024 · 255e9f0 · 255e9f0
1 parent 65bb657
commit 255e9f0
Show file tree

Hide file tree

Showing 5 changed files with 244 additions and 94 deletions.
diff --git a/ndc-connector-phoenix/src/main/kotlin/io/hasura/phoenix/NoRelationshipsQueryGenerator.kt b/ndc-connector-phoenix/src/main/kotlin/io/hasura/phoenix/NoRelationshipsQueryGenerator.kt
@@ -26,6 +26,7 @@ object NoRelationshipsQueryGenerator : BaseQueryGenerator() {
             ApplyBinaryComparisonOperator.IN -> col.`in`(value)
             ApplyBinaryComparisonOperator.IS_NULL -> col.isNull
             ApplyBinaryComparisonOperator.LIKE -> col.like(value as Field<String>)
+            ApplyBinaryComparisonOperator.CONTAINS -> col.contains(value as Field<String>)
         }
     }
 
@@ -50,7 +51,7 @@ object NoRelationshipsQueryGenerator : BaseQueryGenerator() {
             DSL.table(DSL.unquotedName(request.collection))
         ).apply {
             if (request.query.predicate != null) {
-                where(expressionToCondition(request.query.predicate!!, request))
+                where(expressionToConditionPhoenixNoTableNameInPredicates(request.query.predicate!!, request))
             }
             if (request.query.order_by != null) {
                 orderBy(

diff --git a/ndc-connector-phoenix/src/main/kotlin/io/hasura/phoenix/PhoenixDataConnectorService.kt b/ndc-connector-phoenix/src/main/kotlin/io/hasura/phoenix/PhoenixDataConnectorService.kt
@@ -65,7 +65,7 @@ class PhoenixDataConnectorService @Inject constructor(
     override val jooqDialect = SQLDialect.DEFAULT
     override val jooqSettings =
         commonDSLContextSettings
-            .withRenderQuotedNames(RenderQuotedNames.EXPLICIT_DEFAULT_QUOTED)
+            .withRenderQuotedNames(RenderQuotedNames.EXPLICIT_DEFAULT_UNQUOTED)
             .withRenderOptionalAsKeywordForFieldAliases(RenderOptionalKeyword.ON)
 
 

diff --git a/ndc-connector-phoenix/src/main/kotlin/io/hasura/phoenix/PhoenixJDBCSchemaGenerator.kt b/ndc-connector-phoenix/src/main/kotlin/io/hasura/phoenix/PhoenixJDBCSchemaGenerator.kt
@@ -66,6 +66,7 @@ object PhoenixJDBCSchemaGenerator : JDBCSchemaGenerator() {
                     "_eq" to ComparisonOperatorDefinition.Equal,
                     "_contains" to ComparisonOperatorDefinition.Custom(argument_type = Type.Named(NDCScalar.STRING.name)),
                     "_like" to ComparisonOperatorDefinition.Custom(argument_type = Type.Named(NDCScalar.STRING.name)),
+                    "_in" to ComparisonOperatorDefinition.In
                 ),
                 aggregate_functions = mapOf(
                     "min" to AggregateFunctionDefinition(result_type = Type.Named(NDCScalar.STRING.name)),
@@ -78,7 +79,8 @@ object PhoenixJDBCSchemaGenerator : JDBCSchemaGenerator() {
                     "_lt" to ComparisonOperatorDefinition.Custom(argument_type = Type.Named(NDCScalar.DATETIME.name)),
                     "_gte" to ComparisonOperatorDefinition.Custom(argument_type = Type.Named(NDCScalar.DATETIME.name)),
                     "_lte" to ComparisonOperatorDefinition.Custom(argument_type = Type.Named(NDCScalar.DATETIME.name)),
-                    "_eq" to ComparisonOperatorDefinition.Equal
+                    "_eq" to ComparisonOperatorDefinition.Equal,
+                    "_in" to ComparisonOperatorDefinition.In
                 ),
                 aggregate_functions = emptyMap()
             ),
@@ -88,7 +90,8 @@ object PhoenixJDBCSchemaGenerator : JDBCSchemaGenerator() {
                     "_lt" to ComparisonOperatorDefinition.Custom(argument_type = Type.Named(NDCScalar.DATE.name)),
                     "_gte" to ComparisonOperatorDefinition.Custom(argument_type = Type.Named(NDCScalar.DATE.name)),
                     "_lte" to ComparisonOperatorDefinition.Custom(argument_type = Type.Named(NDCScalar.DATE.name)),
-                    "_eq" to ComparisonOperatorDefinition.Equal
+                    "_eq" to ComparisonOperatorDefinition.Equal,
+                    "_in" to ComparisonOperatorDefinition.In
                 ),
                 aggregate_functions = emptyMap()
             ),
@@ -98,7 +101,8 @@ object PhoenixJDBCSchemaGenerator : JDBCSchemaGenerator() {
                     "_lt" to ComparisonOperatorDefinition.Custom(argument_type = Type.Named(NDCScalar.TIME.name)),
                     "_gte" to ComparisonOperatorDefinition.Custom(argument_type = Type.Named(NDCScalar.TIME.name)),
                     "_lte" to ComparisonOperatorDefinition.Custom(argument_type = Type.Named(NDCScalar.TIME.name)),
-                    "_eq" to ComparisonOperatorDefinition.Equal
+                    "_eq" to ComparisonOperatorDefinition.Equal,
+                    "_in" to ComparisonOperatorDefinition.In
                 ),
                 aggregate_functions = emptyMap()
             ),

diff --git a/ndc-ir/src/main/kotlin/io/hasura/ndc/ir/Query.kt b/ndc-ir/src/main/kotlin/io/hasura/ndc/ir/Query.kt
@@ -178,6 +178,8 @@ enum class ApplyBinaryComparisonOperator {
     IS_NULL,
     @JsonProperty("_like")
     LIKE,
+    @JsonProperty("_contains")
+    CONTAINS,
 }
 
 enum class ApplyUnaryComparisonOperator {