patch clickhouse sql

PeerDB-io · May 6, 2024 · baea02b · baea02b
1 parent 9a857f7
commit baea02b
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 62 deletions.
diff --git a/nexus/Cargo.lock b/nexus/Cargo.lock
diff --git a/nexus/analyzer/src/lib.rs b/nexus/analyzer/src/lib.rs
@@ -728,24 +728,23 @@ fn parse_db_options(db_type: DbType, with_options: &[SqlOption]) -> anyhow::Resu
                     .to_string(),
                 s3_path: opts
                     .get("s3_path")
-                    .context("no s3 path specified")?
-                    .to_string(),
+                    .map(|s| s.to_string())
+                    .unwrap_or_default(),
                 access_key_id: opts
                     .get("access_key_id")
-                    .context("no access key id specified")?
-                    .to_string(),
+                    .map(|s| s.to_string())
+                    .unwrap_or_default(),
                 secret_access_key: opts
                     .get("secret_access_key")
-                    .context("no secret access key specified")?
-                    .to_string(),
+                    .map(|s| s.to_string())
+                    .unwrap_or_default(),
                 region: opts
                     .get("region")
-                    .context("no region specified")?
-                    .to_string(),
+                    .map(|s| s.to_string())
+                    .unwrap_or_default(),
                 disable_tls: opts
                     .get("disable_tls")
-                    .and_then(|s| s.parse::<bool>().ok())
-                    .unwrap_or_default(),
+                    .map(|s| s.parse::<bool>().unwrap_or_default()).unwrap_or_default(),
                 endpoint: opts.get("endpoint").map(|s| s.to_string()),
             };
             Config::ClickhouseConfig(clickhouse_config)

diff --git a/nexus/pt/src/lib.rs b/nexus/pt/src/lib.rs
@@ -31,6 +31,7 @@ impl From<PeerType> for DbType {
             PeerType::Eventhubs => DbType::Eventhubs,
             PeerType::PubSub => DbType::Pubsub,
             PeerType::Elasticsearch => DbType::Elasticsearch,
+            PeerType::Clickhouse => DbType::Clickhouse,
         }
     }
 }