Merge pull request #30 from hasura/gavin/snowflake-native-query-support

Add Native Query support to Snowflake

Author: GavinRay97

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

@@ -1,5 +1,6 @@
 package io.hasura
 
+import io.hasura.ndc.common.ConnectorConfiguration
 import io.hasura.ndc.ir.*
 import io.hasura.ndc.ir.extensions.isVariablesRequest
 import io.hasura.ndc.sqlgen.BaseQueryGenerator
@@ -18,9 +19,9 @@ object CTEQueryGenerator : BaseQueryGenerator() {
     override fun queryRequestToSQL(
         request: QueryRequest
     ): Select<*> {
-        return buildCTEs(request)
-            .select(DSL.jsonArrayAgg(DSL.field(DSL.name(listOf("data", ROWS_AND_AGGREGATES)))))
-            .from(buildSelections(request).asTable("data"))
+           return buildCTEs(request)
+                .select(DSL.jsonArrayAgg(DSL.field(DSL.name(listOf("data", ROWS_AND_AGGREGATES)))))
+                .from(buildSelections(request).asTable("data"))
     }
 
 
@@ -44,10 +45,11 @@ object CTEQueryGenerator : BaseQueryGenerator() {
     }
 
     private fun buildCTEs(request: QueryRequest, varCTE: List<CommonTableExpression<*>> = emptyList()): WithStep {
-        return DSL.with(
-            varCTE +
-                    forEachQueryLevelRecursively(request, CTEQueryGenerator::buildCTE).distinct()
-        )
+        val withStep = mkNativeQueryCTEs(request)
+            .with(varCTE)
+            .with(forEachQueryLevelRecursively(request, CTEQueryGenerator::buildCTE).distinct())
+
+        return withStep
     }
 
     private fun getCollectionAsjOOQName(collection: String): Name {

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

@@ -128,42 +128,6 @@ abstract class BaseQueryGenerator : BaseGenerator {
         return withStep
     }
 
-    fun mkNativeQueryCTE(
-        request: QueryRequest
-    ): org.jooq.WithStep {
-        val config = ConnectorConfiguration.Loader.config
-
-        fun renderNativeQuerySQL(
-            nativeQuery: NativeQueryInfo,
-            arguments: Map<String, Argument>
-        ): String {
-            val sql = nativeQuery.sql
-            val parts = sql.parts
-
-            return parts.joinToString("") { part ->
-                when (part) {
-                    is NativeQueryPart.Text -> part.value
-                    is NativeQueryPart.Parameter -> {
-                        val argument = arguments[part.value] ?: error("Argument ${part.value} not found")
-                        when (argument) {
-                            is Argument.Literal -> argument.value.toString()
-                            else -> error("Only literals are supported in Native Queries in this version")
-                        }
-                    }
-                }
-            }
-        }
-
-        val nativeQuery = config.nativeQueries[request.collection]!!
-        val nativeQuerySQL = renderNativeQuerySQL(nativeQuery, request.arguments)
-
-        return DSL.with(
-            DSL.name(request.collection)
-        ).`as`(
-            DSL.resultQuery(nativeQuerySQL)
-        )
-    }
-
     fun getQueryColumnFields(fields: Map<String, IRField>): Map<String, IRField.ColumnField> {
         return fields
             .filterValues { it is IRField.ColumnField }