Added support for latest version of DDN

Cargo.toml

@@ -22,15 +22,8 @@ must_use_candidate = { level = "allow" }
 wildcard_imports = { level = "allow" }
 
 [workspace.dependencies]
-indexmap = "2.2.6"
 jni = { version = "0.21.1", features = ["invocation"] }
-ndc-models = { git = "http://github.com/hasura/ndc-spec.git", tag = "v0.1.4" }
-ndc-sdk = { git = "https://github.com/hasura/ndc-sdk-rs.git", tag = "v0.1.4" }
-async-trait = "0.1.79"
-axum = { version = "0.6.20", features = ["http2"] }
 axum-extra = "0.8.0"
-bytes = "1.6.0"
-clap = { version = "4.5.4", features = ["derive", "env"] }
 http = "0.2"
 mime = "0.3.17"
 opentelemetry = "0.22.0"
@@ -39,22 +32,46 @@ opentelemetry-otlp = { version = "0.15.0", features = ["reqwest-client", "gzip-t
 opentelemetry-semantic-conventions = "0.14.0"
 opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio"] }
 opentelemetry-zipkin = "0.20.0"
-prometheus = "0.13.3"
-reqwest = "0.11.27"
-serde = { version = "1.0.197", features = ["derive"] }
-serde_json = { version = "1.0.115", features = ["raw_value"] }
-schemars = "0.8.1"
-thiserror = "1.0"
-tokio = { version = "1.36.0", features = ["fs", "macros", "rt-multi-thread", "signal"] }
 tower-http = { version = "0.4.4", features = ["cors", "trace", "validate-request"] }
-tracing = "0.1.40"
 tracing-opentelemetry = "0.23.0"
 tracing-subscriber = { version = "0.3", default-features = false, features = ["ansi", "env-filter", "fmt", "json"] }
-url = "2.5.0"
 dotenv = "0.15.0"
 once_cell = "1.19.0"
-anyhow = "1.0.86"
-serde_yaml = "0.9"
+ndc-models = { git = "https://github.com/hasura/ndc-spec.git", tag = "v0.1.5" }
+ndc-sdk = { git = "https://github.com/hasura/ndc-sdk-rs.git", tag = "v0.2.2" }
+ndc-test = { git = "https://github.com/hasura/ndc-spec.git", tag = "v0.1.5" }
+
+anyhow = "1"
+async-trait = "0.1"
+axum = "0.6"
+axum-test-helper = "0.3"
+build-data = "0.2"
+bytes = "1"
+clap = "4"
+env_logger = "0.11"
+hyper = "0.14"
+indexmap = "2"
 insta = "1"
+jsonschema = "0.17"
+log = "0.4.22"
+multimap = "0.9"
+nonempty = "0.10"
+percent-encoding = "2"
+prometheus = "0.13"
+ref-cast = "1"
+reqwest = "0.11"
+schemars = "0.8"
+serde = "1"
+serde_json = "1"
+serde_yaml = "0.9"
+similar-asserts = "1"
+smol_str = "0.1"
+sqlformat = "0.2"
+sqlx = "0.7"
 tempfile = "3"
-build-data = "0.2"
+test-each = "0.2"
+thiserror = "1"
+tokio = "1"
+tracing = "0.1"
+url = "2"
+uuid = "1"

adapters/arrow/dev.local.configuration.json

@@ -1,5 +1,5 @@
 {
-  "version": "4",
+  "version": "5",
   "$schema": "schema.json",
   "model_file_path": "./model.json",
   "fixes": true

adapters/arrow/schema.json

@@ -126,7 +126,7 @@
     "Version": {
       "type": "string",
       "enum": [
-        "4"
+        "5"
       ]
     }
   }

adapters/cassandra/dev.local.configuration.json

@@ -1,5 +1,5 @@
 {
-  "version": "4",
+  "version": "5",
   "$schema": "schema.json",
   "model": {
     "version": "1.0",

adapters/cassandra/root.crt

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl
+MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp
+U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw
+NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE
+ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp
+ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3
+DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf
+8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN
++lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0
+X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa
+K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA
+1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G
+A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR
+zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0
+YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD
+bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3
+L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D
+eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp
+VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY
+WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----

adapters/cassandra/schema.json

@@ -126,7 +126,7 @@
     "Version": {
       "type": "string",
       "enum": [
-        "4"
+        "5"
       ]
     }
   }

adapters/csv/configuration.json

@@ -1,5 +1,5 @@
 {
-  "version": "4",
+  "version": "5",
   "$schema": "schema.json",
   "model": {
     "version": "1.0",

adapters/csv/dev.local.configuration.json

@@ -1,5 +1,5 @@
 {
-  "version": "4",
+  "version": "5",
   "$schema": "schema.json",
   "model": {
     "version": "1.0",

adapters/csv/schema.json

@@ -41,6 +41,9 @@
               "jdbcUrl": {
                 "type": "string"
               },
+              "sqlDialectFactory": {
+                "type": "string"
+              },
               "jdbcCatalog": {
                 "type": "string"
               },
@@ -123,7 +126,7 @@
     "Version": {
       "type": "string",
       "enum": [
-        "4"
+        "5"
       ]
     }
   }

adapters/db2/.env

@@ -0,0 +1,6 @@
+JAR_DEPENDENCY_FOLDER=../../calcite-rs-jni/target/dependency
+CALCITE_JAR=../../calcite-rs-jni/target/calcite-rs-jni-1.0-SNAPSHOT.jar
+RUST_LOG=info
+OTEL_LOGS_EXPORTER=console
+OTEL_LOG_LEVEL=trace
+LOG4J_CONFIGURATION_FILE=../../calcite-rs-jni/target/classes/log4j2.xml

adapters/db2/dev.local.configuration.json

@@ -0,0 +1,90 @@
+{
+  "version": "5",
+  "$schema": "schema.json",
+  "model": {
+    "version": "1.0",
+    "defaultSchema": "db2",
+    "schemas": [
+      {
+        "type": "jdbc",
+        "name": "db2",
+        "jdbcUser": "db2inst1",
+        "jdbcPassword": "mypassword",
+        "jdbcUrl": "jdbc:db2://192.168.86.233:50000/testdb"
+      }
+    ]
+  },
+  "model_file_path": "./model.json",
+  "fixes": true,
+  "metadata": {
+    "PROJECTS": {
+      "schema": "db2",
+      "name": "PROJECTS",
+      "columns": {
+        "PROJECTID": {
+          "name": "PROJECTID",
+          "scalarType": "INTEGER",
+          "nullable": false
+        },
+        "PROJECTNAME": {
+          "name": "PROJECTNAME",
+          "scalarType": "VARCHAR",
+          "nullable": true
+        },
+        "DEPARTMENTID": {
+          "name": "DEPARTMENTID",
+          "scalarType": "INTEGER",
+          "nullable": true
+        }
+      },
+      "primaryKeys": [],
+      "exportedKeys": []
+    },
+    "EMPLOYEES": {
+      "schema": "db2",
+      "name": "EMPLOYEES",
+      "columns": {
+        "FIRSTNAME": {
+          "name": "FIRSTNAME",
+          "scalarType": "VARCHAR",
+          "nullable": true
+        },
+        "LASTNAME": {
+          "name": "LASTNAME",
+          "scalarType": "VARCHAR",
+          "nullable": true
+        },
+        "EMPLOYEEID": {
+          "name": "EMPLOYEEID",
+          "scalarType": "INTEGER",
+          "nullable": false
+        },
+        "DEPARTMENTID": {
+          "name": "DEPARTMENTID",
+          "scalarType": "INTEGER",
+          "nullable": true
+        }
+      },
+      "primaryKeys": [],
+      "exportedKeys": []
+    },
+    "DEPARTMENTS": {
+      "schema": "db2",
+      "name": "DEPARTMENTS",
+      "columns": {
+        "DEPARTMENTNAME": {
+          "name": "DEPARTMENTNAME",
+          "scalarType": "VARCHAR",
+          "nullable": true
+        },
+        "DEPARTMENTID": {
+          "name": "DEPARTMENTID",
+          "scalarType": "INTEGER",
+          "nullable": false
+        }
+      },
+      "primaryKeys": [],
+      "exportedKeys": []
+    }
+  }
+}

config-templates/schema.json → adapters/db2/schema.json

@@ -126,7 +126,7 @@
     "Version": {
       "type": "string",
       "enum": [
-        "4"
+        "5"
       ]
     }
   }

adapters/file/configuration.json

@@ -1,5 +1,5 @@
 {
-  "version": "4",
+  "version": "5",
   "$schema": "schema.json",
   "model": {
     "version": "1.0",