dirsql 0.4.88__tar.gz → 0.4.89__tar.gz

{dirsql-0.4.88 → dirsql-0.4.89}/Cargo.lock

@@ -552,7 +552,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
 [[package]]
 name = "dirsql"
-version = "0.4.88"
+version = "0.4.89"
 dependencies = [
  "assert_cmd",
  "axum",
@@ -603,7 +603,7 @@ dependencies = [
 
 [[package]]
 name = "dirsql-py-ext"
-version = "0.4.88"
+version = "0.4.89"
 dependencies = [
  "dirsql",
  "pyo3",

{dirsql-0.4.88 → dirsql-0.4.89}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dirsql
-Version: 0.4.88
+Version: 0.4.89
 Requires-Dist: bin-shim>=0.1
 Summary: Ephemeral SQL index over a local directory
 Keywords: sql,filesystem,directory,sqlite,index

{dirsql-0.4.88 → dirsql-0.4.89}/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.4.88"
+version = "0.4.89"
 # abi3 note: the `abi3-py310` pyo3 feature (below) builds ONE stable-ABI
 # `cp310-abi3` wheel per platform that loads on every CPython >= 3.10
 # (matching `pyproject.toml`'s `requires-python = ">=3.10"`), instead of

dirsql-0.4.89/packages/python/changelog.d/2026-10-06-config-directory.md

@@ -0,0 +1,3 @@
+**Changed** A declared `[[table]] glob` that names a directory, `glob = "docs"`
+or `glob = "docs/"`, lists the files directly inside it, like `FROM './docs'`.
+It used to match nothing.

dirsql-0.4.89/packages/python/e2e-attestations/claude-1258-config-directory.json

@@ -0,0 +1,7 @@
+{
+  "command": "uv run python -m pytest tests/e2e/glob_speed_one_level_test.py tests/e2e/glob_speed_matchers_test.py tests/e2e/glob_speed_recursive_test.py tests/e2e/query_contract_test.py -x -q",
+  "ran_at": 1791331926,
+  "exit_code": 0,
+  "commit": "04430dd3eae48a6936b5ff45c9c51a38900fbacc",
+  "branch": "claude/1258-config-directory"
+}

dirsql-0.4.89/packages/python/migrations.d/2026-10-06-config-directory.md

@@ -0,0 +1,39 @@
+### A config glob naming a directory lists its files
+
+#### Summary
+
+`glob = "docs"` used to match nothing, because no file is named `docs`. It now
+lists the files directly inside `docs`, as `FROM './docs'` does. A config that
+relied on the empty result gains rows.
+
+#### Required changes
+
+| Before | After |
+| --- | --- |
+| `glob = "docs"` (no rows) | `glob = "docs"` lists `docs/*`; write `docs/**` for every depth |
+
+#### Deprecations removed
+
+_None._
+
+#### Behavior changes without code changes
+
+- A glob with no wildcard that names a directory expands to `<dir>/*`.
+- A glob with no wildcard that names a file still names only that file.
+
+#### Verification
+
+```bash
+cd "$(mktemp -d)"
+mkdir docs
+echo '[{"p":"a"}]' > docs/a.json
+cat > .dirsql.toml <<'TOML'
+[[table]]
+name = "t"
+glob = "docs"
+ddl = "CREATE TABLE t (p TEXT)"
+on-file = "jq -sc add"
+TOML
+dirsql query "SELECT p FROM t" -c .dirsql.toml
+# expected: [{"p":"a"}]
+```

{dirsql-0.4.88 → dirsql-0.4.89}/packages/rust/Cargo.toml

@@ -6,7 +6,7 @@ description = "Ephemeral SQL index over a local directory"
 # version stays for the binding crates (publish = false). The literal
 # intentionally lags the published version: putitoutthere rewrites it to
 # the planned release version at build time and never commits it back.
-version = "0.4.88"
+version = "0.4.89"
 edition.workspace = true
 # Literal `license` (not `license.workspace = true`) because
 # putitoutthere's preflight check reads `[package].license` directly

{dirsql-0.4.88 → dirsql-0.4.89}/packages/rust/src/lib.rs

@@ -2011,7 +2011,10 @@ fn compile_groups(
             }
             None => root.to_path_buf(),
         };
-        let mapping = (table.glob.clone(), table_name.clone());
+        let mapping = (
+            path_table::directory_as_glob(&table.glob, &anchor, &|p| p.is_dir()),
+            table_name.clone(),
+        );
         match grouped
             .iter_mut()
             .find(|(a, i, _)| *a == anchor && *i == table.ignore)

{dirsql-0.4.88 → dirsql-0.4.89}/packages/rust/src/path_table.rs

@@ -149,6 +149,17 @@ fn resolve_as<S: Syntax>(
     }
 }
 
+/// `glob` as a path-table reads the same string after `FROM './`: a trailing
+/// separator or a wholly literal name that is a directory under `index_root`
+/// lists the files directly inside it.
+pub fn directory_as_glob(glob: &str, index_root: &Path, is_dir: &dyn Fn(&Path) -> bool) -> String {
+    let target = trailing_separator_as_star::<Utf8UnixEncoding>(glob);
+    if !target.is_empty() && !has_glob_metacharacter(&target) && is_dir(&index_root.join(&target)) {
+        return format!("{target}/{DIRECTORY_GLOB}");
+    }
+    target
+}
+
 /// Where a config `[[table]] glob` anchors, and the glob to match beneath it.
 ///
 /// A glob with a path-table prefix (`/`, `../`, `~/`, a drive or UNC root)
@@ -360,6 +371,45 @@ mod tests {
         }
     }
 
+    fn directory_glob(glob: &str, is_dir: &dyn Fn(&Path) -> bool) -> String {
+        directory_as_glob(glob, Path::new(ROOT), is_dir)
+    }
+
+    #[test]
+    fn a_literal_directory_name_lists_one_level() {
+        assert_eq!(directory_glob("docs", &everything_is_a_dir), "docs/*");
+    }
+
+    #[test]
+    fn a_literal_directory_is_looked_up_under_the_index_root() {
+        let only_docs = |p: &Path| p == Path::new("/index/docs");
+        assert_eq!(directory_glob("docs", &only_docs), "docs/*");
+        assert_eq!(directory_glob("other", &only_docs), "other");
+    }
+
+    #[test]
+    fn a_literal_file_name_is_left_alone() {
+        assert_eq!(directory_glob("top.md", &nothing_is_a_dir), "top.md");
+    }
+
+    #[test]
+    fn a_glob_is_left_alone_even_when_a_directory_has_its_name() {
+        assert_eq!(
+            directory_glob("docs/*.md", &everything_is_a_dir),
+            "docs/*.md"
+        );
+    }
+
+    #[test]
+    fn a_trailing_separator_lists_one_level() {
+        assert_eq!(directory_glob("docs/", &nothing_is_a_dir), "docs/*");
+    }
+
+    #[test]
+    fn an_empty_glob_is_left_alone() {
+        assert_eq!(directory_glob("", &everything_is_a_dir), "");
+    }
+
     #[test]
     fn default_ignores_cover_vcs_and_dependency_directories() {
         assert_eq!(DEFAULT_IGNORES, ["**/node_modules/**", "**/.git/**"]);