Merge pull request #89 from hasura/gavin/oracle-clob-cast-issue

Fix regression in column casting logic that forced VARCHAR(4000)

Author: GavinRay97

Makefile

@@ -49,6 +49,17 @@ run-oracle-connector:
 	export HASURA_CONFIGURATION_DIRECTORY=$(shell pwd)/ndc-connector-oracle && \
 	./gradlew :ndc-connector-oracle:quarkusDev --console=plain
 
+run-oracle-cli-introspection:
+ifndef JDBC_URL
+	$(error JDBC_URL is not set)
+endif
+	HASURA_CONFIGURATION_DIRECTORY=./ndc-connector-oracle \
+	./gradlew :ndc-cli:run --args="\
+update $(JDBC_URL) \
+--fully-qualify-names=false \
+--outfile '../ndc-connector-oracle/configuration.json' \
+--database=ORACLE"
+
 build-and-push-cli:
 	ifndef NDC_JVM_CLI_VERSION
 		$(error NDC_JVM_CLI_VERSION is not set)

ndc-connector-oracle/src/main/kotlin/io/hasura/oracle/JSONGenerator.kt

@@ -150,11 +150,7 @@ object JsonQueryGenerator : BaseQueryGenerator() {
                                                             request.collection,
                                                             field
                                                         )
-                                                        val castedField = castToSQLDataType(
-                                                            DatabaseType.ORACLE,
-                                                            columnField,
-                                                            ndcScalar
-                                                        )
+                                                        val castedField = columnField.cast(columnType)
                                                         DSL.jsonEntry(
                                                             alias,
                                                             // Oracle JSON functions convert DATE to ISO8601 format, which includes a timestamp