dumpling-cli 0.4.2__tar.gz → 0.5.0__tar.gz

{dumpling_cli-0.4.2 → dumpling_cli-0.5.0}/.dumplingconf.example

@@ -31,12 +31,12 @@ salt = "${DUMPLING_GLOBAL_SALT}"
 #   Faker modules: https://docs.rs/fake/latest/fake/faker/index.html
 #   Upstream repo: https://github.com/cksac/fake-rs
 [rules."public.users"]
-# email  — fake email via Rust `fake` crate; force quoted string output
-email         = { strategy = "faker", faker = "internet::SafeEmail", domain = "customer_identity", unique_within_domain = true }
-# name   — locale-aware full name (see `locale`); other generators use `faker = "module::Type"`
-full_name     = { strategy = "faker", faker = "name::Name" }
-first_name    = { strategy = "faker", faker = "name::FirstName" }
-last_name     = { strategy = "faker", faker = "name::LastName" }
+# email  — safe fake email (built-in); force quoted string output
+email         = { strategy = "email", domain = "customer_identity", unique_within_domain = true }
+# name   — locale-aware full name (see `locale`)
+full_name     = { strategy = "name" }
+first_name    = { strategy = "first_name" }
+last_name     = { strategy = "last_name" }
 # phone  — US-style (xxx) xxx-xxxx
 phone         = { strategy = "phone" }
 # ssn    — SHA-256 hex of original; use per-column salt for extra protection

{dumpling_cli-0.4.2 → dumpling_cli-0.5.0}/CHANGELOG.md

@@ -7,6 +7,27 @@ and this project follows [Semantic Versioning](https://semver.org/spec/v2.0.0.ht
 
 ## [Unreleased]
 
+## [0.5.0] - 2026-05-03
+
+### Added
+
+- **First-class strategies** `email`, `name`, `first_name`, `last_name`, and `phone` in config (same generators as `faker = "internet::SafeEmail"`, `name::Name`, `name::FirstName`, `name::LastName`, and locale-aware phone). Strategy names are normalized to lowercase at load.
+
+### Changed
+
+- **Random-path faker/phone/PII**: one reused `StdRng` on `AnonymizerRegistry` instead of re-seeding per cell.
+- **`faker` locale resolution**: `resolved_locale_key` avoids allocating a `String` per faker call when locale is `en` or absent.
+
+### Performance
+
+- Larger default I/O buffers; fewer per-line and per-row allocations on the SQL stream path (INSERT/COPY parsing and row filters).
+
+## [0.4.3] - 2026-05-03
+
+### Fixed
+
+- **COPY row integrity after anonymization**: Control characters in anonymized COPY text fields are escaped so tab/newline/etc. cannot break column alignment or row boundaries ([#53](https://github.com/ababic/dumpling/pull/53)).
+
 ## [0.4.2] - 2026-05-03
 
 ### Fixed
@@ -68,6 +89,8 @@ and this project follows [Semantic Versioning](https://semver.org/spec/v2.0.0.ht
 - Configurable output scan severities and per-category thresholds via `[output_scan]`.
 - JSON report section for output scan findings including category, count, threshold, severity, and sample locations.
 
+[0.5.0]: https://github.com/ababic/dumpling/compare/v0.4.3...v0.5.0
+[0.4.3]: https://github.com/ababic/dumpling/compare/v0.4.2...v0.4.3
 [0.4.2]: https://github.com/ababic/dumpling/compare/v0.4.1...v0.4.2
 [0.4.1]: https://github.com/ababic/dumpling/compare/v0.4.0...v0.4.1
 [0.4.0]: https://github.com/ababic/dumpling/compare/v0.3.0...v0.4.0

{dumpling_cli-0.4.2 → dumpling_cli-0.5.0}/Cargo.lock

@@ -262,7 +262,7 @@ dependencies = [
 
 [[package]]
 name = "dumpling"
-version = "0.4.2"
+version = "0.5.0"
 dependencies = [
  "anyhow",
  "chrono",

{dumpling_cli-0.4.2 → dumpling_cli-0.5.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dumpling"
-version = "0.4.2"
+version = "0.5.0"
 edition = "2021"
 readme = "README.md"
 

{dumpling_cli-0.4.2 → dumpling_cli-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dumpling-cli
-Version: 0.4.2
+Version: 0.5.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -142,8 +142,8 @@ salt = "${DUMPLING_GLOBAL_SALT}"
 
 # Rules are keyed by either "table" or "schema.table"
 [rules."public.users"]
-email = { strategy = "faker", faker = "internet::SafeEmail", domain = "customer_identity", unique_within_domain = true }
-name  = { strategy = "faker", faker = "name::Name", locale = "de_de" }   # German-locale name
+email = { strategy = "email", domain = "customer_identity", unique_within_domain = true }
+name  = { strategy = "name", locale = "de_de" }   # German-locale name
 ssn   = { strategy = "hash", salt = "${env:DUMPLING_USERS_SSN_SALT}", as_string = true }   # SHA-256 of original (salted)
 age   = { strategy = "int_range", min = 18, max = 90 }
 
@@ -183,8 +183,12 @@ token = "high"
 | `redact` | Replace with `REDACTED` (string) |
 | `uuid` | Random UUIDv4-like string |
 | `hash` | SHA-256 hex of original value; supports per-column `salt` and global `salt` |
-| `faker` | Values from the Rust [`fake`](https://crates.io/crates/fake) crate ([docs.rs](https://docs.rs/fake/latest/fake/), [`faker` modules](https://docs.rs/fake/latest/fake/faker/index.html)), chosen by a **string identifier** only (`faker = "module::Type"`, e.g. `internet::SafeEmail`). Config is **data only**: nothing from TOML is compiled or executed as Rust at runtime. Use `locale` for locale-aware generators; optional `min`/`max`, `length`, `format` as documented. Unsupported targets fail at config load. New generators require a **new Dumpling release** (or your own fork), not config-side code. |
+| `email` | Safe email address (same generator as `faker = "internet::SafeEmail"`); supports `locale` |
+| `name` | Full name (same as `faker = "name::Name"`); supports `locale` |
+| `first_name` | First name (same as `faker = "name::FirstName"`); supports `locale` |
+| `last_name` | Last name (same as `faker = "name::LastName"`); supports `locale` |
 | `phone` | Locale-aware fake phone number (configurable via `locale`); defaults to English format |
+| `faker` | Values from the Rust [`fake`](https://crates.io/crates/fake) crate ([docs.rs](https://docs.rs/fake/latest/fake/), [`faker` modules](https://docs.rs/fake/latest/fake/faker/index.html)), chosen by a **string identifier** only (`faker = "module::Type"`, e.g. `internet::SafeEmail`). Config is **data only**: nothing from TOML is compiled or executed as Rust at runtime. Use `locale` for locale-aware generators; optional `min`/`max`, `length`, `format` as documented. Unsupported targets fail at config load. New generators require a **new Dumpling release** (or your own fork), not config-side code. |
 | `int_range` | Random integer in `[min, max]` |
 | `string` | Random alphanumeric string (`length = 12` by default) |
 | `date_fuzz` | Shifts a date by a random number of days in `[min_days, max_days]` (defaults: `-30..30`) |
@@ -244,7 +248,7 @@ dumpling --security-profile hardened --input dump.sql --check
 - `unique_within_domain`: when true, different source values are assigned unique pseudonyms within the configured `domain`. NULL values are unaffected and always remain NULL.
 - `min_days` / `max_days`: used by `date_fuzz`.
 - `min_seconds` / `max_seconds`: used by `time_fuzz` and `datetime_fuzz`.
-- `locale`: selects the language/regional format for the `faker` and `phone` strategies. Supported values: `en`, `fr_fr`, `de_de`, `it_it`, `pt_br`, `pt_pt`, `ar_sa`, `zh_cn`, `zh_tw`, `ja_jp`, `cy_gb`. Defaults to `en` when not specified.
+- `locale`: selects the language/regional format for `email`, `name`, `first_name`, `last_name`, `faker`, and `phone`. Supported values: `en`, `fr_fr`, `de_de`, `it_it`, `pt_br`, `pt_pt`, `ar_sa`, `zh_cn`, `zh_tw`, `ja_jp`, `cy_gb`. Defaults to `en` when not specified.
 - `faker`: required when `strategy = "faker"`. A plain string `"module::Type"` (case-insensitive) that maps to a **built-in** generator compiled into Dumpling—not arbitrary Rust or expressions. Names follow [`fake::faker`](https://docs.rs/fake/latest/fake/faker/index.html) (e.g. `internet::SafeEmail` → `faker::internet::SafeEmail` in the crate).
 - `format`: used with `faker = "number::NumberWithFormat"`; pattern uses `#` (0–9) and `^` (1–9) per the [`fake` crate docs](https://docs.rs/fake/latest/fake/).
 
@@ -415,7 +419,7 @@ Define default strategies in `rules."<table>"` and add ordered per-column cases
 ```toml
 [rules."public.users"]
 email = { strategy = "hash", as_string = true }   # default
-name  = { strategy = "faker", faker = "name::Name" }
+name  = { strategy = "name" }
 
 [[column_cases."public.users".email]]
 when.any = [{ column = "is_admin", op = "eq", value = "true" }]
@@ -466,7 +470,7 @@ salt = "${DUMPLING_HMAC_KEY}"
 
 [rules."public.users"]
 ssn = { strategy = "hash", as_string = true }
-email = { strategy = "faker", faker = "internet::SafeEmail", domain = "users" }
+email = { strategy = "email", domain = "users" }
 ```
 
 ```bash

{dumpling_cli-0.4.2 → dumpling_cli-0.5.0}/README.md

@@ -121,8 +121,8 @@ salt = "${DUMPLING_GLOBAL_SALT}"
 
 # Rules are keyed by either "table" or "schema.table"
 [rules."public.users"]
-email = { strategy = "faker", faker = "internet::SafeEmail", domain = "customer_identity", unique_within_domain = true }
-name  = { strategy = "faker", faker = "name::Name", locale = "de_de" }   # German-locale name
+email = { strategy = "email", domain = "customer_identity", unique_within_domain = true }
+name  = { strategy = "name", locale = "de_de" }   # German-locale name
 ssn   = { strategy = "hash", salt = "${env:DUMPLING_USERS_SSN_SALT}", as_string = true }   # SHA-256 of original (salted)
 age   = { strategy = "int_range", min = 18, max = 90 }
 
@@ -162,8 +162,12 @@ token = "high"
 | `redact` | Replace with `REDACTED` (string) |
 | `uuid` | Random UUIDv4-like string |
 | `hash` | SHA-256 hex of original value; supports per-column `salt` and global `salt` |
-| `faker` | Values from the Rust [`fake`](https://crates.io/crates/fake) crate ([docs.rs](https://docs.rs/fake/latest/fake/), [`faker` modules](https://docs.rs/fake/latest/fake/faker/index.html)), chosen by a **string identifier** only (`faker = "module::Type"`, e.g. `internet::SafeEmail`). Config is **data only**: nothing from TOML is compiled or executed as Rust at runtime. Use `locale` for locale-aware generators; optional `min`/`max`, `length`, `format` as documented. Unsupported targets fail at config load. New generators require a **new Dumpling release** (or your own fork), not config-side code. |
+| `email` | Safe email address (same generator as `faker = "internet::SafeEmail"`); supports `locale` |
+| `name` | Full name (same as `faker = "name::Name"`); supports `locale` |
+| `first_name` | First name (same as `faker = "name::FirstName"`); supports `locale` |
+| `last_name` | Last name (same as `faker = "name::LastName"`); supports `locale` |
 | `phone` | Locale-aware fake phone number (configurable via `locale`); defaults to English format |
+| `faker` | Values from the Rust [`fake`](https://crates.io/crates/fake) crate ([docs.rs](https://docs.rs/fake/latest/fake/), [`faker` modules](https://docs.rs/fake/latest/fake/faker/index.html)), chosen by a **string identifier** only (`faker = "module::Type"`, e.g. `internet::SafeEmail`). Config is **data only**: nothing from TOML is compiled or executed as Rust at runtime. Use `locale` for locale-aware generators; optional `min`/`max`, `length`, `format` as documented. Unsupported targets fail at config load. New generators require a **new Dumpling release** (or your own fork), not config-side code. |
 | `int_range` | Random integer in `[min, max]` |
 | `string` | Random alphanumeric string (`length = 12` by default) |
 | `date_fuzz` | Shifts a date by a random number of days in `[min_days, max_days]` (defaults: `-30..30`) |
@@ -223,7 +227,7 @@ dumpling --security-profile hardened --input dump.sql --check
 - `unique_within_domain`: when true, different source values are assigned unique pseudonyms within the configured `domain`. NULL values are unaffected and always remain NULL.
 - `min_days` / `max_days`: used by `date_fuzz`.
 - `min_seconds` / `max_seconds`: used by `time_fuzz` and `datetime_fuzz`.
-- `locale`: selects the language/regional format for the `faker` and `phone` strategies. Supported values: `en`, `fr_fr`, `de_de`, `it_it`, `pt_br`, `pt_pt`, `ar_sa`, `zh_cn`, `zh_tw`, `ja_jp`, `cy_gb`. Defaults to `en` when not specified.
+- `locale`: selects the language/regional format for `email`, `name`, `first_name`, `last_name`, `faker`, and `phone`. Supported values: `en`, `fr_fr`, `de_de`, `it_it`, `pt_br`, `pt_pt`, `ar_sa`, `zh_cn`, `zh_tw`, `ja_jp`, `cy_gb`. Defaults to `en` when not specified.
 - `faker`: required when `strategy = "faker"`. A plain string `"module::Type"` (case-insensitive) that maps to a **built-in** generator compiled into Dumpling—not arbitrary Rust or expressions. Names follow [`fake::faker`](https://docs.rs/fake/latest/fake/faker/index.html) (e.g. `internet::SafeEmail` → `faker::internet::SafeEmail` in the crate).
 - `format`: used with `faker = "number::NumberWithFormat"`; pattern uses `#` (0–9) and `^` (1–9) per the [`fake` crate docs](https://docs.rs/fake/latest/fake/).
 
@@ -394,7 +398,7 @@ Define default strategies in `rules."<table>"` and add ordered per-column cases
 ```toml
 [rules."public.users"]
 email = { strategy = "hash", as_string = true }   # default
-name  = { strategy = "faker", faker = "name::Name" }
+name  = { strategy = "name" }
 
 [[column_cases."public.users".email]]
 when.any = [{ column = "is_admin", op = "eq", value = "true" }]
@@ -445,7 +449,7 @@ salt = "${DUMPLING_HMAC_KEY}"
 
 [rules."public.users"]
 ssn = { strategy = "hash", as_string = true }
-email = { strategy = "faker", faker = "internet::SafeEmail", domain = "users" }
+email = { strategy = "email", domain = "users" }
 ```
 
 ```bash

{dumpling_cli-0.4.2 → dumpling_cli-0.5.0}/docs/src/releasing.md

@@ -11,7 +11,7 @@ This project uses **tag-driven releases**.
 ## Maintainer checklist
 
 1. Ensure `main` is green in CI.
-2. Update `Cargo.toml` version and `CHANGELOG.md`.
+2. Update `Cargo.toml` and `pyproject.toml` versions and `CHANGELOG.md`.
 3. Open and merge a release preparation PR.
 4. Create and push a tag from `main`:
 

{dumpling_cli-0.4.2 → dumpling_cli-0.5.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "dumpling-cli"
-version = "0.4.2"
+version = "0.5.0"
 description = "Static anonymizer for plain SQL dumps (PostgreSQL, SQLite, SQL Server)."
 readme = "README.md"
 requires-python = ">=3.8"

{dumpling_cli-0.4.2 → dumpling_cli-0.5.0}/src/faker_dispatch.rs

@@ -89,6 +89,71 @@ pub fn parse_faker_path(faker: &str) -> Option<(&str, &str)> {
     Some((module, typ))
 }
 
+/// Normalized locale key for `faker`, `phone`, and built-in PII strategies (`email`, `name`, …).
+/// Uses ASCII case-insensitive matching without allocating.
+pub fn resolved_locale_key(spec: &AnonymizerSpec) -> &'static str {
+    let s = spec.locale.as_deref().map(str::trim).unwrap_or("");
+    if s.is_empty() || s.eq_ignore_ascii_case("en") {
+        return "en";
+    }
+    if s.eq_ignore_ascii_case("fr_fr") {
+        return "fr_fr";
+    }
+    if s.eq_ignore_ascii_case("de_de") {
+        return "de_de";
+    }
+    if s.eq_ignore_ascii_case("it_it") {
+        return "it_it";
+    }
+    if s.eq_ignore_ascii_case("pt_br") {
+        return "pt_br";
+    }
+    if s.eq_ignore_ascii_case("pt_pt") {
+        return "pt_pt";
+    }
+    if s.eq_ignore_ascii_case("ar_sa") {
+        return "ar_sa";
+    }
+    if s.eq_ignore_ascii_case("zh_cn") {
+        return "zh_cn";
+    }
+    if s.eq_ignore_ascii_case("zh_tw") {
+        return "zh_tw";
+    }
+    if s.eq_ignore_ascii_case("ja_jp") {
+        return "ja_jp";
+    }
+    if s.eq_ignore_ascii_case("cy_gb") {
+        return "cy_gb";
+    }
+    "en"
+}
+
+/// Built-in `strategy = "email"` — same generator as `faker = "internet::SafeEmail"`.
+pub fn pii_safe_email(loc: &str, rng: &mut StdRng) -> String {
+    fl!(loc, rng, SafeEmail)
+}
+
+/// Built-in `strategy = "name"` — full name.
+pub fn pii_full_name(loc: &str, rng: &mut StdRng) -> String {
+    fl!(loc, rng, Name)
+}
+
+/// Built-in `strategy = "first_name"`.
+pub fn pii_first_name(loc: &str, rng: &mut StdRng) -> String {
+    fl!(loc, rng, FirstName)
+}
+
+/// Built-in `strategy = "last_name"`.
+pub fn pii_last_name(loc: &str, rng: &mut StdRng) -> String {
+    fl!(loc, rng, LastName)
+}
+
+/// Built-in `strategy = "phone"` — same generator as `faker` phone_number fakers.
+pub fn pii_phone_number(loc: &str, rng: &mut StdRng) -> String {
+    fl!(loc, rng, PhoneNumber)
+}
+
 pub fn faker_string_with_rng(spec: &AnonymizerSpec, rng: &mut StdRng) -> Option<String> {
     let faker = spec.faker.as_deref()?.trim();
     if faker.is_empty() {
@@ -97,12 +162,7 @@ pub fn faker_string_with_rng(spec: &AnonymizerSpec, rng: &mut StdRng) -> Option<
     let (module, typ) = parse_faker_path(faker)?;
     let module_lc = module.to_ascii_lowercase();
     let typ_lc = typ.to_ascii_lowercase();
-    let locale = spec
-        .locale
-        .as_deref()
-        .map(|l| l.trim().to_ascii_lowercase())
-        .unwrap_or_else(|| "en".to_string());
-    let loc = locale.as_str();
+    let loc = resolved_locale_key(spec);
 
     let s: String = match (module_lc.as_str(), typ_lc.as_str()) {
         ("name", "firstname") => fl!(loc, rng, FirstName),

{dumpling_cli-0.4.2 → dumpling_cli-0.5.0}/src/filter.rs

@@ -13,7 +13,7 @@ pub fn should_keep_row(
     schema: Option<&str>,
     table: &str,
     columns: &[String],
-    cells: &[Option<String>], // unescaped strings; None for NULL
+    cells: &[Option<&str>], // unescaped strings; None for NULL
 ) -> bool {
     let set = match lookup_row_filters(cfg, schema, table) {
         Some(s) => s,
@@ -43,7 +43,7 @@ pub fn should_keep_row(
     true
 }
 
-fn predicate_matches(pred: &Predicate, columns: &[String], cells: &[Option<String>]) -> bool {
+fn predicate_matches(pred: &Predicate, columns: &[String], cells: &[Option<&str>]) -> bool {
     let targets = match extract_predicate_targets(pred, columns, cells) {
         Some(values) => values,
         None => return false, // top-level column missing -> does not match
@@ -121,13 +121,14 @@ fn predicate_matches(pred: &Predicate, columns: &[String], cells: &[Option<Strin
 fn extract_predicate_targets(
     pred: &Predicate,
     columns: &[String],
-    cells: &[Option<String>],
+    cells: &[Option<&str>],
 ) -> Option<Vec<Option<String>>> {
     if let Some(i) = columns
         .iter()
         .position(|c| c.eq_ignore_ascii_case(&pred.column))
     {
-        return Some(vec![cells.get(i).cloned().unwrap_or(None)]);
+        let cell = cells.get(i).copied().flatten();
+        return Some(vec![cell.map(|s| s.to_string())]);
     }
 
     let (base_column, path) = parse_json_column_key(&pred.column);
@@ -413,7 +414,7 @@ where
     Ok(())
 }
 
-pub fn when_matches(when: &When, columns: &[String], cells: &[Option<String>]) -> bool {
+pub fn when_matches(when: &When, columns: &[String], cells: &[Option<&str>]) -> bool {
     // If any is non-empty, require at least one to match
     if !when.any.is_empty() {
         let mut matched_any = false;
@@ -603,11 +604,7 @@ mod tests {
             Some("public"),
             "users",
             &cols,
-            &[
-                Some("1".to_string()),
-                Some("alice@myco.com".to_string()),
-                Some("US".to_string())
-            ]
+            &[Some("1"), Some("alice@myco.com"), Some("US")]
         ));
         // Case-insensitive keep (iregex)
         assert!(should_keep_row(
@@ -615,11 +612,7 @@ mod tests {
             Some("public"),
             "users",
             &cols,
-            &[
-                Some("2".to_string()),
-                Some("Carol@MYCO.COM".to_string()),
-                Some("GB".to_string())
-            ]
+            &[Some("2"), Some("Carol@MYCO.COM"), Some("GB")]
         ));
         // Delete example.com
         assert!(!should_keep_row(
@@ -627,11 +620,7 @@ mod tests {
             Some("public"),
             "users",
             &cols,
-            &[
-                Some("3".to_string()),
-                Some("bob@example.com".to_string()),
-                Some("US".to_string())
-            ]
+            &[Some("3"), Some("bob@example.com"), Some("US")]
         ));
     }
 
@@ -668,14 +657,14 @@ mod tests {
             Some("public"),
             "events",
             &cols,
-            &[Some(r#"{"profile":{"tier":"gold"}}"#.to_string())]
+            &[Some(r#"{"profile":{"tier":"gold"}}"#)]
         ));
         assert!(!should_keep_row(
             &cfg,
             Some("public"),
             "events",
             &cols,
-            &[Some(r#"{"profile":{"tier":"silver"}}"#.to_string())]
+            &[Some(r#"{"profile":{"tier":"silver"}}"#)]
         ));
     }
 
@@ -713,7 +702,7 @@ mod tests {
             "events",
             &cols,
             &[Some(
-                r#"{"items":[{"kind":"secondary"},{"kind":"primary"}]}"#.to_string()
+                r#"{"items":[{"kind":"secondary"},{"kind":"primary"}]}"#
             )]
         ));
         assert!(!should_keep_row(
@@ -721,7 +710,7 @@ mod tests {
             Some("public"),
             "events",
             &cols,
-            &[Some(r#"{"items":[{"kind":"secondary"}]}"#.to_string())]
+            &[Some(r#"{"items":[{"kind":"secondary"}]}"#)]
         ));
     }
 

{dumpling_cli-0.4.2 → dumpling_cli-0.5.0}/src/main.rs

@@ -1,5 +1,8 @@
 use std::fs::File;
 use std::io::{self, BufRead, BufReader, BufWriter, Write};
+
+/// Larger than default 8 KiB to reduce syscall overhead on big dumps.
+const IO_BUF_CAPACITY: usize = 256 * 1024;
 use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
 
@@ -343,7 +346,10 @@ fn run_anonymize(cli: Cli) -> anyhow::Result<()> {
             .take()
             .ok_or_else(|| anyhow::anyhow!("pg_restore stdout missing"))?;
         pg_restore_child = Some(child);
-        (Box::new(BufReader::new(stdout)), Some(archive_path.clone()))
+        (
+            Box::new(BufReader::with_capacity(IO_BUF_CAPACITY, stdout)),
+            Some(archive_path.clone()),
+        )
     } else {
         match &cli.input {
             Some(path) => {
@@ -360,13 +366,19 @@ fn run_anonymize(cli: Cli) -> anyhow::Result<()> {
                     );
                 }
                 let f = File::open(path)?;
-                (Box::new(BufReader::new(f)), Some(path.clone()))
+                (
+                    Box::new(BufReader::with_capacity(IO_BUF_CAPACITY, f)),
+                    Some(path.clone()),
+                )
             }
             None => {
                 if !cli.allow_ext.is_empty() {
                     eprintln!("dumpling: --allow-ext provided but no --input file; extension check is ignored for stdin");
                 }
-                (Box::new(BufReader::new(io::stdin())), None)
+                (
+                    Box::new(BufReader::with_capacity(IO_BUF_CAPACITY, io::stdin())),
+                    None,
+                )
             }
         }
     };
@@ -380,9 +392,15 @@ fn run_anonymize(cli: Cli) -> anyhow::Result<()> {
             .ok_or_else(|| anyhow::anyhow!("--in-place requires an --input path"))?;
         let mut tmp = input_path.clone();
         tmp.set_extension("sql.dumpling.tmp");
-        Box::new(BufWriter::new(File::create(&tmp)?))
+        Box::new(BufWriter::with_capacity(
+            IO_BUF_CAPACITY,
+            File::create(&tmp)?,
+        ))
     } else if let Some(path) = &cli.output {
-        Box::new(BufWriter::new(File::create(path)?))
+        Box::new(BufWriter::with_capacity(
+            IO_BUF_CAPACITY,
+            File::create(path)?,
+        ))
     } else {
         Box::new(BufWriter::new(io::stdout()))
     };

{dumpling_cli-0.4.2 → dumpling_cli-0.5.0}/src/settings.rs

@@ -32,7 +32,7 @@ pub struct RawConfig {
 
 #[derive(Debug, Clone, Deserialize)]
 pub struct AnonymizerSpec {
-    /// Strategy name: redact|null|uuid|hash|faker|phone|int_range|string|date_fuzz|time_fuzz|datetime_fuzz
+    /// Strategy name: redact|null|uuid|hash|email|name|first_name|last_name|phone|faker|int_range|string|date_fuzz|time_fuzz|datetime_fuzz
     pub strategy: String,
     /// if strategy=hash: optional per-column salt override; otherwise ignored
     pub salt: Option<String>,
@@ -56,11 +56,12 @@ pub struct AnonymizerSpec {
     /// Force the replacement to be rendered as a SQL string literal
     /// If unset, we attempt to preserve the original quoting style.
     pub as_string: Option<bool>,
-    /// Locale for locale-aware strategies: `faker` (passed to the `fake` crate) and `phone`.
+    /// Locale for locale-aware strategies: built-in PII (`email`, `name`, `first_name`, `last_name`), `faker`, and `phone`.
     /// Supported values: en, fr_fr, de_de, it_it, pt_br, pt_pt, ar_sa, zh_cn, zh_tw, ja_jp, cy_gb.
     /// Defaults to "en" when not specified.
     pub locale: Option<String>,
     /// When `strategy = "faker"`, selects the `fake` generator as `"module::Type"` (e.g. `internet::SafeEmail`, `name::FirstName`).
+    /// Only read when `strategy = "faker"` (other strategies must not set `faker`).
     /// See [`fake::faker`](https://docs.rs/fake/latest/fake/faker/index.html) and the [crate docs](https://docs.rs/fake/latest/fake/).
     #[serde(default)]
     pub faker: Option<String>,
@@ -448,31 +449,6 @@ fn is_simple_key(key: &str) -> bool {
             .all(|ch| ch.is_ascii_alphanumeric() || ch == '_')
 }
 
-/// Map removed built-in strategies to `faker` + `faker` path for backwards compatibility.
-fn normalize_anonymizer_spec(mut spec: AnonymizerSpec) -> AnonymizerSpec {
-    let s = spec.strategy.to_ascii_lowercase();
-    match s.as_str() {
-        "email" => {
-            spec.strategy = "faker".to_string();
-            spec.faker = Some("internet::SafeEmail".to_string());
-        }
-        "name" => {
-            spec.strategy = "faker".to_string();
-            spec.faker = Some("name::Name".to_string());
-        }
-        "first_name" => {
-            spec.strategy = "faker".to_string();
-            spec.faker = Some("name::FirstName".to_string());
-        }
-        "last_name" => {
-            spec.strategy = "faker".to_string();
-            spec.faker = Some("name::LastName".to_string());
-        }
-        _ => {}
-    }
-    spec
-}
-
 fn resolve(raw: RawConfig, source_path: Option<PathBuf>) -> ResolvedConfig {
     let RawConfig {
         salt,
@@ -497,8 +473,9 @@ fn resolve(raw: RawConfig, source_path: Option<PathBuf>) -> ResolvedConfig {
     for (table_key, cols) in rules.into_iter() {
         let table_key_norm = table_key.to_lowercase();
         let mut col_map: HashMap<String, AnonymizerSpec> = HashMap::new();
-        for (col, spec) in cols.into_iter() {
-            col_map.insert(col.to_lowercase(), normalize_anonymizer_spec(spec));
+        for (col, mut spec) in cols.into_iter() {
+            spec.strategy = spec.strategy.to_ascii_lowercase();
+            col_map.insert(col.to_lowercase(), spec);
         }
         normalized_rules.insert(table_key_norm, col_map);
     }
@@ -514,7 +491,7 @@ fn resolve(raw: RawConfig, source_path: Option<PathBuf>) -> ResolvedConfig {
             let cases: Vec<ColumnCase> = cases
                 .into_iter()
                 .map(|mut c| {
-                    c.strategy = normalize_anonymizer_spec(c.strategy.clone());
+                    c.strategy.strategy = c.strategy.strategy.to_ascii_lowercase();
                     c
                 })
                 .collect();
@@ -570,8 +547,12 @@ const KNOWN_STRATEGIES: &[&str] = &[
     "redact",
     "uuid",
     "hash",
-    "faker",
+    "email",
+    "name",
+    "first_name",
+    "last_name",
     "phone",
+    "faker",
     "int_range",
     "string",
     "date_fuzz",
@@ -673,10 +654,8 @@ fn is_valid_severity(value: &str) -> bool {
 }
 
 fn validate_anonymizer_spec(spec: &AnonymizerSpec, path: &str) -> anyhow::Result<()> {
-    // Legacy strategy names (`email`, `name`, …) normalize to `faker` during `resolve()`; apply the
-    // same mapping here so file validation matches runtime behavior.
-    let spec = normalize_anonymizer_spec(spec.clone());
-    let strategy = spec.strategy.as_str();
+    let strategy = spec.strategy.to_ascii_lowercase();
+    let strategy = strategy.as_str();
     if !KNOWN_STRATEGIES.contains(&strategy) {
         anyhow::bail!(
             "{}.strategy has unknown strategy '{}'; expected one of {}",
@@ -739,7 +718,12 @@ fn validate_anonymizer_spec(spec: &AnonymizerSpec, path: &str) -> anyhow::Result
             unsupported.push("max_seconds");
         }
     }
-    if spec.locale.is_some() && !matches!(strategy, "faker" | "phone") {
+    if spec.locale.is_some()
+        && !matches!(
+            strategy,
+            "faker" | "phone" | "email" | "name" | "first_name" | "last_name"
+        )
+    {
         unsupported.push("locale");
     }
 
@@ -843,7 +827,7 @@ fn validate_anonymizer_spec(spec: &AnonymizerSpec, path: &str) -> anyhow::Result
                     faker
                 );
             }
-            if !crate::faker_dispatch::faker_path_supported(&spec) {
+            if !crate::faker_dispatch::faker_path_supported(spec) {
                 anyhow::bail!(
                     "{}.faker {:?} is not a supported generator; see README and \
                      https://docs.rs/fake/latest/fake/faker/index.html for upstream module names. \
@@ -853,6 +837,7 @@ fn validate_anonymizer_spec(spec: &AnonymizerSpec, path: &str) -> anyhow::Result
                 );
             }
         }
+        "email" | "name" | "first_name" | "last_name" | "phone" => {}
         _ => {}
     }
 
@@ -1633,7 +1618,7 @@ salt = "${vault:secret/dumpling#key}"
         let path = write_temp_config(
             r#"
 [rules."public.users"]
-full_name = { strategy = "faker", faker = "name::Name", locale = "de_de" }
+full_name = { strategy = "name", locale = "de_de" }
 "#,
         );
         let cfg = load_config(Some(&path), false).expect("locale=de_de should be valid");
@@ -1643,8 +1628,8 @@ full_name = { strategy = "faker", faker = "name::Name", locale = "de_de" }
             .and_then(|c| c.get("full_name"))
             .expect("expected full_name rule");
         assert_eq!(spec.locale.as_deref(), Some("de_de"));
-        assert_eq!(spec.strategy, "faker");
-        assert_eq!(spec.faker.as_deref(), Some("name::Name"));
+        assert_eq!(spec.strategy, "name");
+        assert!(spec.faker.is_none());
         let _ = fs::remove_file(path);
     }
 
@@ -1682,7 +1667,7 @@ full_name = { strategy = "faker", faker = "name::Name", locale = "klingon" }
     }
 
     #[test]
-    fn locale_on_non_name_phone_strategy_fails_validation() {
+    fn locale_on_non_locale_strategy_fails_validation() {
         let path = write_temp_config(
             r#"
 [rules."public.users"]