Skip to content

Commit 01a5be8

Browse files
committed
feat: enable duckdb
1 parent 65df932 commit 01a5be8

File tree

2 files changed

+1
-16
lines changed

2 files changed

+1
-16
lines changed

Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ tokio-postgres = "0.7.13"
2424
mysql_async = { version = "0.36.1", default-features = false, features = ["rustls-tls", "default-rustls"] }
2525
humantime = "2.2.0"
2626
clickhouse = { version = "0.13.3", features = ["rustls-tls"] }
27-
duckdb = { version = "1.3.2", features = ["bundled"], optional = true }
27+
duckdb = { version = "1.3.2", features = ["bundled"] }
2828
libsql = { version = "0.9.19", features = ["remote"] }
2929
tiberius = { version = "0.12.3", default-features = false, features = ["rustls", "tds73", "tokio", "tokio-util"] }
3030
tokio-util = "0.7.15"
@@ -39,6 +39,3 @@ codegen-units = 1
3939
[profile.dist]
4040
inherits = "release"
4141
lto = "thin"
42-
43-
[features]
44-
duckdb = [ "dep:duckdb" ]

src/main.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ enum Command {
8080
},
8181

8282
/// A local DuckDB database.
83-
#[cfg(feature = "duckdb")]
8483
Duckdb {
8584
/// Path to the the duckdb file.
8685
#[arg(env)]
@@ -140,7 +139,6 @@ async fn main() -> color_eyre::Result<()> {
140139
AllDbs::Postgres(postgres::Db::open(url, schema, args.timeout.into()).await?)
141140
}
142141
Command::Mysql { url } => AllDbs::Mysql(mysql::Db::open(url, args.timeout.into()).await?),
143-
#[cfg(feature = "duckdb")]
144142
Command::Duckdb { database } => {
145143
AllDbs::Duckdb(duckdb::Db::open(database, args.timeout.into()).await?)
146144
}
@@ -337,7 +335,6 @@ enum AllDbs {
337335
Libsql(libsql::Db),
338336
Postgres(postgres::Db),
339337
Mysql(mysql::Db),
340-
#[cfg(feature = "duckdb")]
341338
Duckdb(duckdb::Db),
342339
Clickhouse(Box<clickhouse::Db>),
343340
MsSql(mssql::Db),
@@ -350,7 +347,6 @@ impl Database for AllDbs {
350347
AllDbs::Libsql(x) => x.overview().await,
351348
AllDbs::Postgres(x) => x.overview().await,
352349
AllDbs::Mysql(x) => x.overview().await,
353-
#[cfg(feature = "duckdb")]
354350
AllDbs::Duckdb(x) => x.overview().await,
355351
AllDbs::Clickhouse(x) => x.overview().await,
356352
AllDbs::MsSql(x) => x.overview().await,
@@ -363,7 +359,6 @@ impl Database for AllDbs {
363359
AllDbs::Libsql(x) => x.tables().await,
364360
AllDbs::Postgres(x) => x.tables().await,
365361
AllDbs::Mysql(x) => x.tables().await,
366-
#[cfg(feature = "duckdb")]
367362
AllDbs::Duckdb(x) => x.tables().await,
368363
AllDbs::Clickhouse(x) => x.tables().await,
369364
AllDbs::MsSql(x) => x.tables().await,
@@ -376,7 +371,6 @@ impl Database for AllDbs {
376371
AllDbs::Libsql(x) => x.table(name).await,
377372
AllDbs::Postgres(x) => x.table(name).await,
378373
AllDbs::Mysql(x) => x.table(name).await,
379-
#[cfg(feature = "duckdb")]
380374
AllDbs::Duckdb(x) => x.table(name).await,
381375
AllDbs::Clickhouse(x) => x.table(name).await,
382376
AllDbs::MsSql(x) => x.table(name).await,
@@ -393,7 +387,6 @@ impl Database for AllDbs {
393387
AllDbs::Libsql(x) => x.table_data(name, page).await,
394388
AllDbs::Postgres(x) => x.table_data(name, page).await,
395389
AllDbs::Mysql(x) => x.table_data(name, page).await,
396-
#[cfg(feature = "duckdb")]
397390
AllDbs::Duckdb(x) => x.table_data(name, page).await,
398391
AllDbs::Clickhouse(x) => x.table_data(name, page).await,
399392
AllDbs::MsSql(x) => x.table_data(name, page).await,
@@ -406,7 +399,6 @@ impl Database for AllDbs {
406399
AllDbs::Libsql(x) => x.tables_with_columns().await,
407400
AllDbs::Postgres(x) => x.tables_with_columns().await,
408401
AllDbs::Mysql(x) => x.tables_with_columns().await,
409-
#[cfg(feature = "duckdb")]
410402
AllDbs::Duckdb(x) => x.tables_with_columns().await,
411403
AllDbs::Clickhouse(x) => x.tables_with_columns().await,
412404
AllDbs::MsSql(x) => x.tables_with_columns().await,
@@ -419,7 +411,6 @@ impl Database for AllDbs {
419411
AllDbs::Libsql(x) => x.query(query).await,
420412
AllDbs::Postgres(x) => x.query(query).await,
421413
AllDbs::Mysql(x) => x.query(query).await,
422-
#[cfg(feature = "duckdb")]
423414
AllDbs::Duckdb(x) => x.query(query).await,
424415
AllDbs::Clickhouse(x) => x.query(query).await,
425416
AllDbs::MsSql(x) => x.query(query).await,
@@ -2356,7 +2347,6 @@ mod mysql {
23562347
}
23572348
}
23582349

2359-
#[cfg(feature = "duckdb")]
23602350
mod duckdb {
23612351
use color_eyre::eyre;
23622352
use color_eyre::eyre::OptionExt;
@@ -3713,7 +3703,6 @@ mod mssql {
37133703
}
37143704

37153705
mod helpers {
3716-
#[cfg(feature = "duckdb")]
37173706
use duckdb::types::ValueRef as DuckdbValue;
37183707
use libsql::Value as LibsqlValue;
37193708
use tiberius::ColumnData;
@@ -3753,7 +3742,6 @@ mod helpers {
37533742
}
37543743
}
37553744

3756-
#[cfg(feature = "duckdb")]
37573745
pub fn duckdb_value_to_json(v: DuckdbValue) -> serde_json::Value {
37583746
use DuckdbValue::*;
37593747
match v {

0 commit comments

Comments
 (0)