Merge pull request #42 from hasura/gavin/qualified-name-handling

Handle FQN's like DB.SCHEMA.TABLE during SQL generation

Author: gneeri

ndc-connector-snowflake/src/main/kotlin/io/hasura/snowflake/CTEQueryGenerator.kt

@@ -68,7 +68,7 @@ object CTEQueryGenerator : BaseQueryGenerator() {
                         DSL.rowNumber().over(
                             DSL.partitionBy(
                                 mkJoinKeyFields(
-                                    relationship, request.collection
+                                    relationship, DSL.name(request.collection.split("."))
                                 )
                             ).orderBy(
                                 run {
@@ -98,11 +98,11 @@ object CTEQueryGenerator : BaseQueryGenerator() {
                                 && (relationship.column_mapping.isNotEmpty() || relationship.arguments.isNotEmpty())
                             ) {
                                 from(DSL.name(genCTEName(relSource ?: request.collection)))
-                                    .innerJoin(DSL.name(relationship.target_collection))
+                                    .innerJoin(DSL.name(relationship.target_collection.split(".")))
                                     .on(
                                         mkSQLJoin(
                                             relationship,
-                                            sourceCollection = genCTEName(relSource ?: request.collection)
+                                            sourceCollection = genCTEName(relSource ?: request.collection),
                                         )
                                     )
                             } else from(getCollectionAsjOOQName(request.collection))

ndc-connector-snowflake/src/main/kotlin/io/hasura/snowflake/SnowflakeDataConnectorService.kt

@@ -61,7 +61,7 @@ class SnowflakeDataConnectorService @Inject constructor(
 
     override val jooqDialect = SQLDialect.SNOWFLAKE
     override val jooqSettings =
-        commonDSLContextSettings.withRenderQuotedNames(RenderQuotedNames.EXPLICIT_DEFAULT_UNQUOTED)
+            commonDSLContextSettings.withRenderQuotedNames(RenderQuotedNames.EXPLICIT_DEFAULT_QUOTED)
     override val sqlGenerator = CTEQueryGenerator
     override val mutationTranslator = MutationTranslator
 }

ndc-sqlgen/src/main/kotlin/io/hasura/ndc/sqlgen/BaseGenerator.kt

@@ -16,11 +16,11 @@ sealed interface BaseGenerator {
         return DSL.and(
             rel.column_mapping.map { (sourceColumn, targetColumn) ->
                 DSL.field(DSL.name(listOf(sourceCollection, sourceColumn)))
-                    .eq(DSL.field(DSL.name(listOf(targetTableFQN, targetColumn))))
+                    .eq(DSL.field(DSL.name(targetTableFQN.split(".") + targetColumn)))
             }
                     + rel.arguments.map { (targetColumn, argument) ->
                 DSL.field(DSL.name(listOf(sourceCollection, (argument as Argument.Column).name)))
-                    .eq(DSL.field(DSL.name(listOf(targetTableFQN, targetColumn))))
+                    .eq(DSL.field(DSL.name(targetTableFQN.split(".") + targetColumn)))
             }
         )
     }

ndc-sqlgen/src/main/kotlin/io/hasura/ndc/sqlgen/BaseQueryGenerator.kt

@@ -232,9 +232,9 @@ abstract class BaseQueryGenerator : BaseGenerator {
                         val relName = elem.target.path.map { it.relationship }.last()
                         val rel = relationships[relName] ?: throw Exception("Relationship not found")
                         val targetTable = rel.target_collection
-                        DSL.field(DSL.name(listOf(targetTable, target.name)))
+                        DSL.field(DSL.name(targetTable.split(".") + target.name))
                     } else {
-                        DSL.field(DSL.name(listOf(currentCollection, target.name)))
+                        DSL.field(DSL.name(currentCollection.split(".") + target.name))
                     }
                 }