diff --git a/Cargo.toml b/Cargo.toml index df441c7..1a421d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "csvs_convert" -version = "0.8.12" +version = "0.8.13" edition = "2021" description = "Some Datapackage Conversion" @@ -13,19 +13,19 @@ homepage = "https://github.com/kindly/csvs_convert" [dependencies] -chrono = { version = "0.4.31", default-features = false } +chrono = { version = "0.4.38", default-features = false } serde_json = { version = "1.0.107", features = ["preserve_order"] } -csv = "1.2.2" -snafu = "0.7.5" +csv = "1.3.0" +snafu = "0.8.4" tempfile = "3.8.0" -walkdir = "2.4.0" +walkdir = "2.5.0" pathdiff = "0.2.1" -petgraph = { version = "0.6.4", default-features = false, features = [ +petgraph = { version = "0.6.5", default-features = false, features = [ "graphmap", ] } -typed-builder = "0.16.2" -lazy_static = "1.4.0" -regex = { version = "1.9.6" } +typed-builder = "0.19.1" +lazy_static = "1.5.0" +regex = { version = "1.10.5" } thiserror = "1.0.49" pdatastructs = { version = "0.7.0", features = [ "rand", @@ -34,19 +34,19 @@ pdatastructs = { version = "0.7.0", features = [ "fixedbitset", ], default-features = false } streaming-stats = "0.2.3" -counter = "0.5.7" -crossbeam-channel = "0.5.8" +counter = "0.6.0" +crossbeam-channel = "0.5.13" csv-index = "0.1.6" threadpool = "1.8.1" log = "0.4.20" [target.'cfg(not(target_family = "wasm"))'.dependencies] -duckdb = { version = "0.9.0", features = ["bundled"], optional = true } -xlsxwriter = "0.6.0" +duckdb = { version = "1.0.0", features = ["bundled"], optional = true } +xlsxwriter = "0.6.1" postgres = "0.19.7" -minijinja = { version = "1.0.8" } -zip = { version = "0.6.6", default-features = false, features = ["deflate"] } -rusqlite = { version = "0.29.0", features = ["bundled"] } +minijinja = { version = "2.0.3" } +zip = { version = "2.1.4", default-features = false, features = ["deflate"] } +rusqlite = { version = "0.31.0", features = ["bundled"] } rand = "0.8.5" [profile.bench] @@ -54,7 +54,7 @@ debug = true [dev-dependencies] assert-json-diff = "2.0.2" -insta = { version = "1.33.0", features = ["redactions", "yaml"] } +insta = { version = "1.39.0", features = ["redactions", "yaml"] } [features] default = ["parquet", "converters"] diff --git a/src/snapshots/csvs_convert__converters__tests__csvs_db_no_conn.snap b/src/snapshots/csvs_convert__converters__tests__csvs_db_no_conn.snap index e5a4e68..b848884 100644 --- a/src/snapshots/csvs_convert__converters__tests__csvs_db_no_conn.snap +++ b/src/snapshots/csvs_convert__converters__tests__csvs_db_no_conn.snap @@ -13,7 +13,7 @@ expression: lines - " , \"integer\" BIGINT " - "); " - "" -- "\\copy \"all_types_semi_colon\"(\"string\", \"array\", \"object\", \"date\", \"datetime\", \"time\", \"boolean\", \"number\", \"integer\") from '/projects/datapackage_convert/src/fixtures/all_types_semi_colon.csv' WITH CSV HEADER QUOTE '\"' DELIMITER ';'" +- "\\copy \"all_types_semi_colon\"(\"string\", \"array\", \"object\", \"date\", \"datetime\", \"time\", \"boolean\", \"number\", \"integer\") from '/home/david/projects/datapackage_convert/src/fixtures/all_types_semi_colon.csv' WITH CSV HEADER QUOTE '\"' DELIMITER ';'" - "CREATE TABLE IF NOT EXISTS \"all_types\" ( \"string\" TEXT " - " , \"array\" JSONB " - " , \"object\" JSONB " @@ -25,5 +25,4 @@ expression: lines - " , \"integer\" BIGINT " - "); " - "" -- "\\copy \"all_types\"(\"string\", \"array\", \"object\", \"date\", \"datetime\", \"time\", \"boolean\", \"number\", \"integer\") from '/projects/datapackage_convert/src/fixtures/all_types.csv' WITH CSV HEADER QUOTE '\"' DELIMITER ','" - +- "\\copy \"all_types\"(\"string\", \"array\", \"object\", \"date\", \"datetime\", \"time\", \"boolean\", \"number\", \"integer\") from '/home/david/projects/datapackage_convert/src/fixtures/all_types.csv' WITH CSV HEADER QUOTE '\"' DELIMITER ','" diff --git a/src/zip_dir.rs b/src/zip_dir.rs index 7f8897a..5c93d75 100644 --- a/src/zip_dir.rs +++ b/src/zip_dir.rs @@ -1,7 +1,7 @@ use std::io::{Seek, Write}; use std::iter::Iterator; use zip::result::ZipError; -use zip::write::FileOptions; +use zip::write::{FileOptions, SimpleFileOptions}; use std::fs::File; use std::path::Path; @@ -16,7 +16,7 @@ where T: Write + Seek, { let mut zip = zip::ZipWriter::new(writer); - let options = FileOptions::default() + let options: SimpleFileOptions = FileOptions::default() .compression_method(zip::CompressionMethod::Deflated) .unix_permissions(0o755);