dirsql 0.3.91__tar.gz → 0.3.93__tar.gz

{dirsql-0.3.91 → dirsql-0.3.93}/Cargo.lock

@@ -500,7 +500,7 @@ dependencies = [
 
 [[package]]
 name = "dirsql-py-ext"
-version = "0.3.91"
+version = "0.3.93"
 dependencies = [
  "dirsql",
  "pyo3",

{dirsql-0.3.91 → dirsql-0.3.93}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dirsql
-Version: 0.3.91
+Version: 0.3.93
 Summary: Ephemeral SQL index over a local directory
 Keywords: sql,filesystem,directory,sqlite,index
 Author: Kevin Scott

{dirsql-0.3.91 → dirsql-0.3.93}/dirsql/_async.py

@@ -53,10 +53,11 @@ class DirSQL:
         async for event in db.watch():
             ...
 
-    Supply a ``root``, a ``config`` path, or both. When both are set, the
-    explicit ``root`` wins over any ``[dirsql].root`` in the config file (a
-    warning is emitted on stderr). If neither is given, the initial scan
-    fails with a "no root directory" error raised by the core.
+    The index root is the explicit ``root`` when given, else the process
+    current working directory. A ``config`` file's location never sets the
+    root -- it only supplies tables, ignore patterns, and extensions. There
+    is no ``[dirsql].root`` config key. Constructing with neither ``root``
+    nor ``config`` roots at the cwd (no error is raised).
 
     Pass ``persist=True`` to keep an on-disk SQLite cache (default location:
     ``<root>/.dirsql/cache.db``). Override the location with ``persist_path``.

{dirsql-0.3.91/packages/rust → dirsql-0.3.93}/docs/reference/cli.md

@@ -45,7 +45,7 @@ requests, closes open `/events` streams, and exits.
 
 | Flag | Default | Description |
 |---|---|---|
-| `-c, --config <path>` | `./.dirsql.toml` | Path to the [config file](./config.md). The index is rooted at the directory containing this file (unless the config sets `[dirsql].root`). When the file does not exist, the server runs in [zero-config mode](#zero-config-mode). |
+| `-c, --config <path>` | `./.dirsql.toml` | Path to the [config file](./config.md). The index is always rooted at the **invocation directory** (the current working directory), regardless of where this file lives — so `--config /elsewhere/.dirsql.toml` still indexes the directory you ran `dirsql` from. When the file does not exist, the server runs in [zero-config mode](#zero-config-mode). |
 | `--host <addr>` | `localhost` | Bind address. |
 | `--port <n>` | `7117` | TCP port to bind. |
 | `--persist [<path>]` | off | Keep the SQLite index on disk between runs so a restart only re-parses files that actually changed. Bare `--persist` caches at `<root>/.dirsql/cache.db`; `--persist <path>` caches at `<path>`. Off by default (the index is ephemeral). Global — also honored by [`dirsql query`](#dirsql-query). See [Keep the index across restarts](../howto/persist.md). |

{dirsql-0.3.91/packages/rust → dirsql-0.3.93}/docs/reference/config.md

@@ -11,16 +11,16 @@ The [CLI](./cli.md) loads `./.dirsql.toml` by default (`--config <path>`
 overrides). The [SDKs](./sdk.md) load a config via the `config` constructor
 parameter.
 
-**Path resolution.** Relative paths in the config (`root`,
-`[[dirsql.extension]]` `path`) resolve against the config file's parent
-directory. The scan root defaults to that same directory when `root` is not
-set.
+**Path resolution.** Relative paths in the config (`[[dirsql.extension]]`
+`path`) resolve against the config file's parent
+directory. The **index root is not a config concern** — it is decided by the
+runner (the CLI's invocation directory, or an SDK's explicit root), never by
+the config file's location. See [`--config`](./cli.md#flags).
 
 ## `[dirsql]` keys
 
 | Key | Type | Default | Description |
 |---|---|---|---|
-| `root` | string | config file's parent directory | Directory to index. Relative values resolve against the config file's parent. An explicit `root` passed to an SDK constructor overrides this (a warning is emitted on stderr). |
 | `ignore` | array of strings | `[]` | Glob patterns matched against root-relative paths. Matched files are skipped entirely — excluded from the initial scan and from watch events. |
 | `pre-query` | string | none | Server-wide command hook: the raw `POST /query` request body is passed to this command as `{args}`, and the plain-text SQL it prints is executed instead of parsing the body as `{"sql": …}`. CLI server only; the SDKs ignore it. Must be non-empty. See [Command hooks](./hooks.md#pre-query). |
 | `post-query` | string | none | Server-wide command hook: each successful `POST /query` result set is handed to this command (as a JSON array on stdin, and as `{args}` up to 96 KiB), and the JSON body it prints is returned instead of the bare row array. CLI server only; the SDKs ignore it. Must be non-empty. See [Command hooks](./hooks.md#post-query). |
@@ -34,7 +34,6 @@ directory.
 
 ```toml
 [dirsql]
-root = "../data"
 ignore = ["node_modules/**", ".git/**"]
 hook-timeout = 300
 ```

{dirsql-0.3.91/packages/rust → dirsql-0.3.93}/docs/reference/sdk.md

@@ -92,22 +92,22 @@ DirSQL::builder()
 
 :::
 
-Creates a SQLite index over a directory. At least one of `root` or `config`
-must be supplied; with neither, construction fails with a "no root
-directory" error.
+Creates a SQLite index over a directory. The index root is the explicit
+`root` when given, else the **process cwd** — the `config` file's location
+never sets the root.
 
 **Parameters:**
 
-- `root` — Directory to index. Optional if `config` is supplied.
+- `root` — Directory to index. When omitted, the index roots at the process
+  cwd (even when `config` is supplied).
 - `tables` — Programmatic [`Table`](#table) definitions.
 - `ignore` — Glob patterns matched against root-relative paths; matched
   files are skipped entirely (scan and watch).
 - `config` — Path to a [`.dirsql.toml`](./config.md). Its `[[table]]`
   entries are appended after any programmatic `tables`; its `ignore`
-  patterns and `[[dirsql.extension]]` entries are appended likewise; its
-  `[dirsql].root` supplies the root when no explicit `root` is passed.
-  When both an explicit `root` and a config root are present, the explicit
-  value wins and a warning is emitted on stderr.
+  patterns and `[[dirsql.extension]]` entries are appended likewise. The
+  config file does **not** set the index root: with no explicit `root`, the
+  index roots at the process cwd.
 - `persist` — Keep the SQLite index on disk between runs (default off:
   ephemeral, rebuilt every startup). The cache lives at
   `<root>/.dirsql/cache.db` by default; on restart, only files whose stat

{dirsql-0.3.91 → dirsql-0.3.93}/packages/python/Cargo.toml

@@ -4,7 +4,7 @@ name = "dirsql-py-ext"
 # pypi/maturin handler can rewrite it via `write-version` before
 # `maturin build`. `pyproject.toml` declares `dynamic = ["version"]`
 # and maturin reads this field. Mirrors `packages/rust/Cargo.toml`.
-version = "0.3.91"
+version = "0.3.93"
 # abi3 note: the `abi3-py311` pyo3 feature (below) builds ONE stable-ABI
 # `cp311-abi3` wheel per platform that loads on every CPython >= 3.11
 # (matching `pyproject.toml`'s `requires-python = ">=3.11"`), instead of

{dirsql-0.3.91 → dirsql-0.3.93/packages/python}/docs/reference/cli.md

@@ -45,7 +45,7 @@ requests, closes open `/events` streams, and exits.
 
 | Flag | Default | Description |
 |---|---|---|
-| `-c, --config <path>` | `./.dirsql.toml` | Path to the [config file](./config.md). The index is rooted at the directory containing this file (unless the config sets `[dirsql].root`). When the file does not exist, the server runs in [zero-config mode](#zero-config-mode). |
+| `-c, --config <path>` | `./.dirsql.toml` | Path to the [config file](./config.md). The index is always rooted at the **invocation directory** (the current working directory), regardless of where this file lives — so `--config /elsewhere/.dirsql.toml` still indexes the directory you ran `dirsql` from. When the file does not exist, the server runs in [zero-config mode](#zero-config-mode). |
 | `--host <addr>` | `localhost` | Bind address. |
 | `--port <n>` | `7117` | TCP port to bind. |
 | `--persist [<path>]` | off | Keep the SQLite index on disk between runs so a restart only re-parses files that actually changed. Bare `--persist` caches at `<root>/.dirsql/cache.db`; `--persist <path>` caches at `<path>`. Off by default (the index is ephemeral). Global — also honored by [`dirsql query`](#dirsql-query). See [Keep the index across restarts](../howto/persist.md). |

{dirsql-0.3.91 → dirsql-0.3.93/packages/python}/docs/reference/config.md

@@ -11,16 +11,16 @@ The [CLI](./cli.md) loads `./.dirsql.toml` by default (`--config <path>`
 overrides). The [SDKs](./sdk.md) load a config via the `config` constructor
 parameter.
 
-**Path resolution.** Relative paths in the config (`root`,
-`[[dirsql.extension]]` `path`) resolve against the config file's parent
-directory. The scan root defaults to that same directory when `root` is not
-set.
+**Path resolution.** Relative paths in the config (`[[dirsql.extension]]`
+`path`) resolve against the config file's parent
+directory. The **index root is not a config concern** — it is decided by the
+runner (the CLI's invocation directory, or an SDK's explicit root), never by
+the config file's location. See [`--config`](./cli.md#flags).
 
 ## `[dirsql]` keys
 
 | Key | Type | Default | Description |
 |---|---|---|---|
-| `root` | string | config file's parent directory | Directory to index. Relative values resolve against the config file's parent. An explicit `root` passed to an SDK constructor overrides this (a warning is emitted on stderr). |
 | `ignore` | array of strings | `[]` | Glob patterns matched against root-relative paths. Matched files are skipped entirely — excluded from the initial scan and from watch events. |
 | `pre-query` | string | none | Server-wide command hook: the raw `POST /query` request body is passed to this command as `{args}`, and the plain-text SQL it prints is executed instead of parsing the body as `{"sql": …}`. CLI server only; the SDKs ignore it. Must be non-empty. See [Command hooks](./hooks.md#pre-query). |
 | `post-query` | string | none | Server-wide command hook: each successful `POST /query` result set is handed to this command (as a JSON array on stdin, and as `{args}` up to 96 KiB), and the JSON body it prints is returned instead of the bare row array. CLI server only; the SDKs ignore it. Must be non-empty. See [Command hooks](./hooks.md#post-query). |
@@ -34,7 +34,6 @@ directory.
 
 ```toml
 [dirsql]
-root = "../data"
 ignore = ["node_modules/**", ".git/**"]
 hook-timeout = 300
 ```

{dirsql-0.3.91 → dirsql-0.3.93/packages/python}/docs/reference/sdk.md

@@ -92,22 +92,22 @@ DirSQL::builder()
 
 :::
 
-Creates a SQLite index over a directory. At least one of `root` or `config`
-must be supplied; with neither, construction fails with a "no root
-directory" error.
+Creates a SQLite index over a directory. The index root is the explicit
+`root` when given, else the **process cwd** — the `config` file's location
+never sets the root.
 
 **Parameters:**
 
-- `root` — Directory to index. Optional if `config` is supplied.
+- `root` — Directory to index. When omitted, the index roots at the process
+  cwd (even when `config` is supplied).
 - `tables` — Programmatic [`Table`](#table) definitions.
 - `ignore` — Glob patterns matched against root-relative paths; matched
   files are skipped entirely (scan and watch).
 - `config` — Path to a [`.dirsql.toml`](./config.md). Its `[[table]]`
   entries are appended after any programmatic `tables`; its `ignore`
-  patterns and `[[dirsql.extension]]` entries are appended likewise; its
-  `[dirsql].root` supplies the root when no explicit `root` is passed.
-  When both an explicit `root` and a config root are present, the explicit
-  value wins and a warning is emitted on stderr.
+  patterns and `[[dirsql.extension]]` entries are appended likewise. The
+  config file does **not** set the index root: with no explicit `root`, the
+  index roots at the process cwd.
 - `persist` — Keep the SQLite index on disk between runs (default off:
   ephemeral, rebuilt every startup). The cache lives at
   `<root>/.dirsql/cache.db` by default; on restart, only files whose stat

dirsql-0.3.93/packages/python/e2e-attestations/claude-tackle-540-iju1yi.json

@@ -0,0 +1,7 @@
+{
+  "command": "uv run python -m pytest tests/e2e/ -x -q",
+  "ran_at": 1783786263,
+  "exit_code": 0,
+  "commit": "5f2c30e714a871866de1dc4ff97c190478f8478d",
+  "branch": "claude/tackle-540-iju1yi"
+}

{dirsql-0.3.91/packages/python → dirsql-0.3.93/packages/rust}/docs/reference/cli.md

@@ -45,7 +45,7 @@ requests, closes open `/events` streams, and exits.
 
 | Flag | Default | Description |
 |---|---|---|
-| `-c, --config <path>` | `./.dirsql.toml` | Path to the [config file](./config.md). The index is rooted at the directory containing this file (unless the config sets `[dirsql].root`). When the file does not exist, the server runs in [zero-config mode](#zero-config-mode). |
+| `-c, --config <path>` | `./.dirsql.toml` | Path to the [config file](./config.md). The index is always rooted at the **invocation directory** (the current working directory), regardless of where this file lives — so `--config /elsewhere/.dirsql.toml` still indexes the directory you ran `dirsql` from. When the file does not exist, the server runs in [zero-config mode](#zero-config-mode). |
 | `--host <addr>` | `localhost` | Bind address. |
 | `--port <n>` | `7117` | TCP port to bind. |
 | `--persist [<path>]` | off | Keep the SQLite index on disk between runs so a restart only re-parses files that actually changed. Bare `--persist` caches at `<root>/.dirsql/cache.db`; `--persist <path>` caches at `<path>`. Off by default (the index is ephemeral). Global — also honored by [`dirsql query`](#dirsql-query). See [Keep the index across restarts](../howto/persist.md). |

{dirsql-0.3.91/packages/python → dirsql-0.3.93/packages/rust}/docs/reference/config.md

@@ -11,16 +11,16 @@ The [CLI](./cli.md) loads `./.dirsql.toml` by default (`--config <path>`
 overrides). The [SDKs](./sdk.md) load a config via the `config` constructor
 parameter.
 
-**Path resolution.** Relative paths in the config (`root`,
-`[[dirsql.extension]]` `path`) resolve against the config file's parent
-directory. The scan root defaults to that same directory when `root` is not
-set.
+**Path resolution.** Relative paths in the config (`[[dirsql.extension]]`
+`path`) resolve against the config file's parent
+directory. The **index root is not a config concern** — it is decided by the
+runner (the CLI's invocation directory, or an SDK's explicit root), never by
+the config file's location. See [`--config`](./cli.md#flags).
 
 ## `[dirsql]` keys
 
 | Key | Type | Default | Description |
 |---|---|---|---|
-| `root` | string | config file's parent directory | Directory to index. Relative values resolve against the config file's parent. An explicit `root` passed to an SDK constructor overrides this (a warning is emitted on stderr). |
 | `ignore` | array of strings | `[]` | Glob patterns matched against root-relative paths. Matched files are skipped entirely — excluded from the initial scan and from watch events. |
 | `pre-query` | string | none | Server-wide command hook: the raw `POST /query` request body is passed to this command as `{args}`, and the plain-text SQL it prints is executed instead of parsing the body as `{"sql": …}`. CLI server only; the SDKs ignore it. Must be non-empty. See [Command hooks](./hooks.md#pre-query). |
 | `post-query` | string | none | Server-wide command hook: each successful `POST /query` result set is handed to this command (as a JSON array on stdin, and as `{args}` up to 96 KiB), and the JSON body it prints is returned instead of the bare row array. CLI server only; the SDKs ignore it. Must be non-empty. See [Command hooks](./hooks.md#post-query). |
@@ -34,7 +34,6 @@ directory.
 
 ```toml
 [dirsql]
-root = "../data"
 ignore = ["node_modules/**", ".git/**"]
 hook-timeout = 300
 ```

{dirsql-0.3.91/packages/python → dirsql-0.3.93/packages/rust}/docs/reference/sdk.md

@@ -92,22 +92,22 @@ DirSQL::builder()
 
 :::
 
-Creates a SQLite index over a directory. At least one of `root` or `config`
-must be supplied; with neither, construction fails with a "no root
-directory" error.
+Creates a SQLite index over a directory. The index root is the explicit
+`root` when given, else the **process cwd** — the `config` file's location
+never sets the root.
 
 **Parameters:**
 
-- `root` — Directory to index. Optional if `config` is supplied.
+- `root` — Directory to index. When omitted, the index roots at the process
+  cwd (even when `config` is supplied).
 - `tables` — Programmatic [`Table`](#table) definitions.
 - `ignore` — Glob patterns matched against root-relative paths; matched
   files are skipped entirely (scan and watch).
 - `config` — Path to a [`.dirsql.toml`](./config.md). Its `[[table]]`
   entries are appended after any programmatic `tables`; its `ignore`
-  patterns and `[[dirsql.extension]]` entries are appended likewise; its
-  `[dirsql].root` supplies the root when no explicit `root` is passed.
-  When both an explicit `root` and a config root are present, the explicit
-  value wins and a warning is emitted on stderr.
+  patterns and `[[dirsql.extension]]` entries are appended likewise. The
+  config file does **not** set the index root: with no explicit `root`, the
+  index roots at the process cwd.
 - `persist` — Keep the SQLite index on disk between runs (default off:
   ephemeral, rebuilt every startup). The cache lives at
   `<root>/.dirsql/cache.db` by default; on restart, only files whose stat

{dirsql-0.3.91 → dirsql-0.3.93}/packages/rust/src/bin/dirsql.rs

@@ -34,9 +34,9 @@ struct Cli {
     command: Option<Command>,
 
     /// Path to the config file (default: `./.dirsql.toml`). The index is
-    /// rooted at the directory containing this file. When the file does
-    /// not exist, a default `files` table is served. Used by server mode
-    /// and by the `query` subcommand.
+    /// rooted at the invocation directory (cwd), not this file's location
+    /// (#540). When the file does not exist, a default `files` table is
+    /// served. Used by server mode and by the `query` subcommand.
     #[arg(short = 'c', long, default_value = "./.dirsql.toml", global = true)]
     config: PathBuf,
 
@@ -238,9 +238,10 @@ fn load_state(cli: &Cli) -> AppState {
         return load_default_state(cli, config_path);
     }
 
-    // Canonicalize so the root (derived from the config's parent) is
-    // absolute — `notify` has surprising behavior when watching relative
-    // paths like `./`.
+    // Canonicalize so config-relative paths (extension libraries, hook
+    // working directories) resolve against an absolute parent — `notify` and
+    // the hook subprocesses misbehave with relative paths like `./`. The
+    // index root itself is the invocation cwd (#540), not derived from here.
     let resolved = match config_path.canonicalize() {
         Ok(p) => p,
         Err(err) => {

{dirsql-0.3.91 → dirsql-0.3.93}/packages/rust/src/config.rs

@@ -68,16 +68,13 @@ impl std::fmt::Display for Source {
 /// Order-significant; at least one entry is required and a single entry is
 /// returned unchanged. List-shaped config (`[[table]]`, `[[dirsql.extension]]`,
 /// `ignore`) concatenates in input order. A table-name collision anywhere in
-/// the combined set errors, naming both sources. Single-valued keys (`root`,
-/// `pre-query`, `post-query`, `hook-timeout`) defined by more than
+/// the combined set errors, naming both sources. Single-valued keys
+/// (`pre-query`, `post-query`, `hook-timeout`) defined by more than
 /// one config error, naming both sources — no silent shadowing, no precedence;
 /// defined in exactly one config they merge through unchanged.
 ///
 /// Tables whose DDL yields no parseable table name are concatenated without a
 /// collision check; `Db::create_table` rejects them downstream.
-///
-/// Plugin whitelist enforcement ("a fragment may not set `root`") is the
-/// discovery layer's job, per fragment, before calling this.
 pub fn combine_configs(configs: &[(Source, Config)]) -> Result<Config> {
     let (first, rest) = configs.split_first().ok_or(ConfigError::NoConfigs)?;
     if rest.is_empty() {
@@ -90,7 +87,6 @@ pub fn combine_configs(configs: &[(Source, Config)]) -> Result<Config> {
     let mut table_sources: std::collections::HashMap<String, &Source> =
         std::collections::HashMap::new();
 
-    let mut root: Option<(&Source, PathBuf)> = None;
     let mut pre_query: Option<(&Source, String)> = None;
     let mut post_query: Option<(&Source, String)> = None;
     let mut hook_timeout: Option<(&Source, Duration)> = None;
@@ -111,7 +107,6 @@ pub fn combine_configs(configs: &[(Source, Config)]) -> Result<Config> {
         ignore.extend(config.ignore.iter().cloned());
         extensions.extend(config.extensions.iter().cloned());
 
-        merge_single("root", &mut root, config.root.as_ref(), source)?;
         merge_single(
             "pre-query",
             &mut pre_query,
@@ -133,7 +128,6 @@ pub fn combine_configs(configs: &[(Source, Config)]) -> Result<Config> {
     }
 
     Ok(Config {
-        root: root.map(|(_, value)| value),
         ignore,
         tables,
         extensions,
@@ -167,11 +161,6 @@ fn merge_single<'a, T: Clone>(
 /// Parsed configuration from a `.dirsql.toml` file.
 #[derive(Debug, Clone)]
 pub struct Config {
-    /// Optional root directory override. When absent, callers derive the
-    /// root from the config file's own location. When present, it is taken
-    /// relative to the config file's parent (so a config at
-    /// `/proj/.dirsql.toml` with `root = "docs"` scans `/proj/docs`).
-    pub root: Option<PathBuf>,
     pub ignore: Vec<String>,
     pub tables: Vec<TableConfig>,
     /// SQLite extensions to load at startup, declared via
@@ -249,7 +238,6 @@ struct RawConfig {
 #[derive(Deserialize, Default)]
 #[serde(deny_unknown_fields)]
 struct RawDirsql {
-    root: Option<PathBuf>,
     ignore: Option<Vec<String>>,
     extension: Option<Vec<RawExtension>>,
     #[serde(rename = "pre-query")]
@@ -288,7 +276,6 @@ pub fn load_config_str(content: &str) -> Result<Config> {
     let raw: RawConfig = toml::from_str(content)?;
 
     let d = raw.dirsql.unwrap_or_default();
-    let root = d.root;
     let ignore = d.ignore.unwrap_or_default();
     let raw_extensions = d.extension.unwrap_or_default();
     let raw_pre_query = d.pre_query;
@@ -348,7 +335,6 @@ pub fn load_config_str(content: &str) -> Result<Config> {
     }
 
     Ok(Config {
-        root,
         ignore,
         tables,
         extensions,
@@ -463,45 +449,6 @@ glob = "*.json"
         assert!(matches!(err, ConfigError::Io(_)), "got: {err:?}");
     }
 
-    #[test]
-    fn optional_root_parses_when_present() {
-        let toml = r#"
-[dirsql]
-root = "docs"
-
-[[table]]
-ddl = "CREATE TABLE t (path TEXT)"
-glob = "*.json"
-"#;
-        let config = load_config_str(toml).unwrap();
-        assert_eq!(config.root.as_deref(), Some(Path::new("docs")));
-    }
-
-    #[test]
-    fn root_absent_by_default() {
-        let toml = r#"
-[[table]]
-ddl = "CREATE TABLE t (path TEXT)"
-glob = "*.json"
-"#;
-        let config = load_config_str(toml).unwrap();
-        assert!(config.root.is_none());
-    }
-
-    #[test]
-    fn root_can_be_absolute() {
-        let toml = r#"
-[dirsql]
-root = "/tmp/data"
-
-[[table]]
-ddl = "CREATE TABLE t (path TEXT)"
-glob = "*.json"
-"#;
-        let config = load_config_str(toml).unwrap();
-        assert_eq!(config.root.as_deref(), Some(Path::new("/tmp/data")));
-    }
-
     #[test]
     fn persist_key_is_rejected_as_unknown() {
         // Persistence moved to the `--persist` CLI flag; the TOML key is gone.
@@ -585,6 +532,19 @@ glbo = "typo"
         assert!(err.to_string().contains("glbo"), "got: {err}");
     }
 
+    #[test]
+    fn root_key_in_dirsql_section_is_rejected() {
+        // `root` is no longer a config key (#540): the runner owns the index
+        // root. An old config carrying it fails loudly, naming the key.
+        let toml = r#"
+[dirsql]
+root = "docs"
+"#;
+        let err = load_config_str(toml).unwrap_err();
+        assert!(matches!(err, ConfigError::Toml(_)), "got: {err:?}");
+        assert!(err.to_string().contains("root"), "got: {err}");
+    }
+
     #[test]
     fn unknown_key_in_extension_is_rejected() {
         // A misspelled `[[dirsql.extension]]` key (`entrypont`) errors.
@@ -807,7 +767,6 @@ post-query = "   "
     fn combine_singleton_returns_config_unchanged() {
         let config = cfg(r#"
 [dirsql]
-root = "docs"
 ignore = ["*.tmp"]
 pre-query = "to_sql {args}"
 post-query = "jq '{results: .}'"
@@ -821,7 +780,6 @@ ddl = "CREATE TABLE t (path TEXT)"
 glob = "*.json"
 "#);
         let merged = combine_configs(&[(src("/proj/.dirsql.toml"), config.clone())]).unwrap();
-        assert_eq!(merged.root, config.root);
         assert_eq!(merged.ignore, config.ignore);
         assert_eq!(merged.extensions, config.extensions);
         assert_eq!(merged.pre_query, config.pre_query);
@@ -1007,33 +965,6 @@ glob = "c/*.json"
         assert_eq!(merged.post_query.as_deref(), Some("jq -c ."));
     }
 
-    #[test]
-    fn combine_root_in_two_configs_errors_naming_both_sources() {
-        let a = cfg("[dirsql]\nroot = \"docs\"\n");
-        let b = cfg("[dirsql]\nroot = \"data\"\n");
-        let err = combine_configs(&[(src("/a"), a), (src("/b"), b)]).unwrap_err();
-        match &err {
-            ConfigError::ConflictingKey { key, first, second } => {
-                assert_eq!(*key, "root");
-                assert_eq!(first, &src("/a"));
-                assert_eq!(second, &src("/b"));
-            }
-            other => panic!("got: {other:?}"),
-        }
-        let msg = err.to_string();
-        assert!(msg.contains("'root'"), "got: {msg}");
-        assert!(msg.contains("/a"), "got: {msg}");
-        assert!(msg.contains("/b"), "got: {msg}");
-    }
-
-    #[test]
-    fn combine_root_in_one_config_merges_through() {
-        let a = cfg("[dirsql]\nignore = [\"a/**\"]\n");
-        let b = cfg("[dirsql]\nroot = \"docs\"\n");
-        let merged = combine_configs(&[(src("/a"), a), (src("/b"), b)]).unwrap();
-        assert_eq!(merged.root.as_deref(), Some(Path::new("docs")));
-    }
-
     #[test]
     fn combine_error_display_includes_package_source_verbatim() {
         let a = cfg("[[table]]\nddl = \"CREATE TABLE t (x TEXT)\"\nglob = \"a/*.json\"\n");