dirsql 0.4.99__tar.gz → 0.4.100__tar.gz

{dirsql-0.4.99 → dirsql-0.4.100}/Cargo.lock

@@ -573,7 +573,7 @@ dependencies = [
 
 [[package]]
 name = "dirsql"
-version = "0.4.99"
+version = "0.4.100"
 dependencies = [
  "assert_cmd",
  "axum",
@@ -625,7 +625,7 @@ dependencies = [
 
 [[package]]
 name = "dirsql-py-ext"
-version = "0.4.99"
+version = "0.4.100"
 dependencies = [
  "dirsql",
  "pyo3",

{dirsql-0.4.99 → dirsql-0.4.100}/PKG-INFO

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

{dirsql-0.4.99/packages/rust → dirsql-0.4.100}/docs/context/usage.md

@@ -22,7 +22,7 @@ A quoted path stands in for a table name. Paths are relative to the directory yo
 | `'./**/*.md'` | markdown at any depth |
 | `'./notes/today.md'` | that one file |
 
-`*` matches within one directory level and `**` matches any depth. A directory name lists one level, like `ls docs`, so write `'./**'` to scan the whole tree. Rows are files only, never directories. `'/var/log/*.log'`, `'../notes'` and `'~/notes/*.md'` also resolve; those report absolute `path` values.
+`*` matches within one directory level and `**` matches any depth. A directory name lists one level, like `ls docs`, so write `'./**'` to scan the whole tree. Rows are files only, never directories. `'/var/log/*.log'`, `'../notes'` and `'~/notes/*.md'` also resolve; `path` is reported as written, so `'../notes'` gives `../notes/x.md` and the others give absolute paths.
 
 Two mistakes fail every time:
 

{dirsql-0.4.99 → dirsql-0.4.100}/docs/howto/query-without-config.md

@@ -65,7 +65,7 @@ why indexes belong to only one of them, are in
   `config` nor `tables` and call `query("SELECT * FROM './'")`
   ([SDK reference](../reference/sdk.md)).
 - Paths outside the root resolve too — `'/var/log/*.log'`, `'../notes'`,
-  `'~/notes/*.md'` — reporting absolute paths
+  `'~/notes/*.md'` — reporting paths as you wrote them
   ([path-tables reference](../reference/path-tables.md#paths-outside-the-index-root)).
 - `.git/` is skipped by default, and a git repo's `.gitignore` hides what it
   lists, so a bare `'./**'` does not drown in machinery

{dirsql-0.4.99/packages/rust → dirsql-0.4.100}/docs/reference/columns.md

@@ -31,7 +31,7 @@ lazily-read hidden [`content`](./path-tables.md#columns) column.
 
 | Column | Type | Value |
 |---|---|---|
-| `path` | TEXT | The file's path relative to the scan root (e.g. `posts/hello.md`); absolute for a `/`, `../` or `~/` path-table. |
+| `path` | TEXT | The file's path relative to the scan root (e.g. `posts/hello.md`); as written for a `../` path-table, absolute for a `/` or `~/` one. |
 | `basename` | TEXT | The filename, including extension (`hello.md`). |
 | `dir` | TEXT | The parent directory relative to the root (`posts`); the empty string for files directly under the root. |
 | `ext` | TEXT | The file extension without the leading dot (`md`). Original case is preserved — `Photo.JPG` yields `JPG`; use `LOWER(ext)` for case-insensitive matching. `NULL` when the file has no extension. |

{dirsql-0.4.99/packages/rust → dirsql-0.4.100}/docs/reference/glob.md

@@ -19,7 +19,7 @@ divergence is a written decision.
 ## The fixture
 
 Every example below runs against this tree. A name ending in `/` is an empty
-directory, `a -> b` is a symlink, and `.gitignore` holds `*.log`.
+directory, `a -> b` is a symlink, and `.gitignore` holds `*.log` and `dist/`.
 
 <!-- conformance-tree -->
 ```text
@@ -48,6 +48,8 @@ docs/.draft.md
 docs/nested/deep.md
 docs/nested/.cache/x.md
 node_modules/pkg/index.js
+dist/bundle.js
+dist/sub/o.js
 real/r.md
 uni/1.md
 uni/a.md
@@ -126,13 +128,22 @@ A test runs every row against dirsql as a path-table and, with the leading
 | `./*.log` | none | gitignore |
 | `./ignored.log` | `ignored.log` |  |
 | `./{ignored,x}.log` | `ignored.log` |  |
+| `./dist/*.js` | none | gitignore |
+| `./dist/**/*.js` | none | gitignore |
+| `./dist/sub/*.js` | none | gitignore |
+| `./d*/*.js` | none | gitignore |
+| `./dist/bundle.js` | `dist/bundle.js` |  |
+| `./dist/sub/o.js` | `dist/sub/o.js` |  |
 | `./**/*.js` | `node_modules/pkg/index.js` |  |
 | `./node_modules/*/index.js` | `node_modules/pkg/index.js` |  |
 | `./docs/**/*.md` | `docs/api.md`, `docs/guide.md`, `docs/nested/deep.md` |  |
 | `./docs/*.md` | `docs/api.md`, `docs/guide.md` |  |
-| `$ROOT/docs/*.md` | `$ROOT/docs/api.md`, `$ROOT/docs/guide.md` | absolute |
-| `~/docs/*.md` | `$ROOT/docs/api.md`, `$ROOT/docs/guide.md` | absolute |
-| `../proj/docs/*.md` | `$BASE/proj/docs/api.md`, `$BASE/proj/docs/guide.md` | absolute |
+| `$ROOT/docs/*.md` | `$ROOT/docs/api.md`, `$ROOT/docs/guide.md` |  |
+| `~/docs/*.md` | `$ROOT/docs/api.md`, `$ROOT/docs/guide.md` |  |
+| `../proj/docs/*.md` | `../proj/docs/api.md`, `../proj/docs/guide.md` |  |
+| `../*/top.md` | `../proj/top.md` |  |
+| `../proj/**/deep.md` | `../proj/docs/nested/deep.md` |  |
+| `../proj/docs` | `../proj/docs/api.md`, `../proj/docs/guide.md` | directory-name |
 
 ## Divergences from bash
 
@@ -141,10 +152,17 @@ A test runs every row against dirsql as a path-table and, with the leading
 | `gitignore` | Inside a git repo, `.gitignore` files hide files and directories a wildcard matches, never one the pattern spells out. `--no-ignore` turns it off. | A query over a repo should not drown in build output. |
 | `directory-name` | A pattern's last component that names a directory lists the files directly inside it, like `ls docs`. A trailing `/` is `*` appended. | A table is rows of files, and `ls` is the shell habit. |
 | `files-only` | A pattern that matches a directory but no file returns nothing. | Every row is a file. |
-| `absolute` | `/`, `~/` and `../` patterns report absolute `path` values, with `..` folded out textually. | The scanned root is derived from the pattern, so there is no relative base. |
 
 `.git` needs no rule of its own: the dotfile rule hides it.
 
+## Syntax, not behavior
+
+A path-table starts with `./`, `/`, `~/` or `../`. That is how `FROM` tells a
+path from a table name, so `FROM './**/*.md'` is a glob and `FROM docs` is a
+table. A config `glob` has no such need and is written without the `./`.
+Bash accepts a bare `**/*.md`; dirsql does not in a path-table. This is syntax,
+not a divergence: past the prefix, the glob behaves as bash does.
+
 ## Where the glob is anchored
 
 A path-table pattern is relative to the index root and starts with `./`. A config `[[table]] glob`

{dirsql-0.4.99 → dirsql-0.4.100}/docs/reference/path-tables.md

@@ -109,19 +109,15 @@ Three other prefixes resolve, with their usual shell meanings:
 | You write | dirsql scans |
 | --- | --- |
 | `'/var/log/*.log'` | an absolute path |
-| `'../notes'` | relative to the index root's parent |
+| `'../notes'` | relative to the index root's parent, as written |
 | `'~/notes/*.md'` | relative to your home directory |
 
 A directory named this way is one level too; `'../notes/**'` descends. The
 trailing-`/` rule holds here as well: `'~/*/'` is `'~/*/*'`.
-`..` is folded out textually, not followed through symlinks, so the directory
-scanned is a function of the string you wrote.
-
-**These report absolute `path` values.** A `./` path-table reports paths
-relative to the index root, matching every other dirsql table; a `/`, `../` or
-`~/` path-table has no meaningful relative base — the root it scans is derived
-from the pattern, not named by you — so it reports the full path instead. The
-value you get back is one you can paste into another command:
+**A `../` path-table reports `path` as written**, relative to the directory
+dirsql runs in, as bash prints it: `'../notes/*.md'` gives `../notes/a.md`. A
+`/` or `~/` path-table is absolute already, so it reports the full path. Either
+value is one you can paste into another command:
 
 ```sql
 SELECT path FROM '/var/log/*.log';
@@ -144,7 +140,7 @@ table:
 
 | Column | Type | Meaning |
 | --- | --- | --- |
-| `path` | TEXT | path relative to the index root (absolute for `/`, `../`, `~/` tables) |
+| `path` | TEXT | path relative to the index root (as written for `../` tables, absolute for `/` and `~/` tables) |
 | `basename` | TEXT | filename with extension |
 | `dir` | TEXT | parent directory, relative to the index root |
 | `ext` | TEXT | extension without the dot |

{dirsql-0.4.99 → dirsql-0.4.100}/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.99"
+version = "0.4.100"
 # 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.100/packages/python/changelog.d/2026-10-07-dotdot-as-written.md

@@ -0,0 +1,3 @@
+**Changed**
+
+- A ../ path-table such as '../notes/*.md' now reports ../notes/a.md, relative to the directory dirsql runs in, instead of an absolute path. / and ~/ tables are unchanged.

{dirsql-0.4.99 → dirsql-0.4.100/packages/python}/docs/context/usage.md

@@ -22,7 +22,7 @@ A quoted path stands in for a table name. Paths are relative to the directory yo
 | `'./**/*.md'` | markdown at any depth |
 | `'./notes/today.md'` | that one file |
 
-`*` matches within one directory level and `**` matches any depth. A directory name lists one level, like `ls docs`, so write `'./**'` to scan the whole tree. Rows are files only, never directories. `'/var/log/*.log'`, `'../notes'` and `'~/notes/*.md'` also resolve; those report absolute `path` values.
+`*` matches within one directory level and `**` matches any depth. A directory name lists one level, like `ls docs`, so write `'./**'` to scan the whole tree. Rows are files only, never directories. `'/var/log/*.log'`, `'../notes'` and `'~/notes/*.md'` also resolve; `path` is reported as written, so `'../notes'` gives `../notes/x.md` and the others give absolute paths.
 
 Two mistakes fail every time:
 

{dirsql-0.4.99/packages/rust → dirsql-0.4.100/packages/python}/docs/howto/query-without-config.md

@@ -65,7 +65,7 @@ why indexes belong to only one of them, are in
   `config` nor `tables` and call `query("SELECT * FROM './'")`
   ([SDK reference](../reference/sdk.md)).
 - Paths outside the root resolve too — `'/var/log/*.log'`, `'../notes'`,
-  `'~/notes/*.md'` — reporting absolute paths
+  `'~/notes/*.md'` — reporting paths as you wrote them
   ([path-tables reference](../reference/path-tables.md#paths-outside-the-index-root)).
 - `.git/` is skipped by default, and a git repo's `.gitignore` hides what it
   lists, so a bare `'./**'` does not drown in machinery

{dirsql-0.4.99 → dirsql-0.4.100}/packages/python/docs/reference/columns.md

@@ -31,7 +31,7 @@ lazily-read hidden [`content`](./path-tables.md#columns) column.
 
 | Column | Type | Value |
 |---|---|---|
-| `path` | TEXT | The file's path relative to the scan root (e.g. `posts/hello.md`); absolute for a `/`, `../` or `~/` path-table. |
+| `path` | TEXT | The file's path relative to the scan root (e.g. `posts/hello.md`); as written for a `../` path-table, absolute for a `/` or `~/` one. |
 | `basename` | TEXT | The filename, including extension (`hello.md`). |
 | `dir` | TEXT | The parent directory relative to the root (`posts`); the empty string for files directly under the root. |
 | `ext` | TEXT | The file extension without the leading dot (`md`). Original case is preserved — `Photo.JPG` yields `JPG`; use `LOWER(ext)` for case-insensitive matching. `NULL` when the file has no extension. |

{dirsql-0.4.99 → dirsql-0.4.100/packages/python}/docs/reference/glob.md

@@ -19,7 +19,7 @@ divergence is a written decision.
 ## The fixture
 
 Every example below runs against this tree. A name ending in `/` is an empty
-directory, `a -> b` is a symlink, and `.gitignore` holds `*.log`.
+directory, `a -> b` is a symlink, and `.gitignore` holds `*.log` and `dist/`.
 
 <!-- conformance-tree -->
 ```text
@@ -48,6 +48,8 @@ docs/.draft.md
 docs/nested/deep.md
 docs/nested/.cache/x.md
 node_modules/pkg/index.js
+dist/bundle.js
+dist/sub/o.js
 real/r.md
 uni/1.md
 uni/a.md
@@ -126,13 +128,22 @@ A test runs every row against dirsql as a path-table and, with the leading
 | `./*.log` | none | gitignore |
 | `./ignored.log` | `ignored.log` |  |
 | `./{ignored,x}.log` | `ignored.log` |  |
+| `./dist/*.js` | none | gitignore |
+| `./dist/**/*.js` | none | gitignore |
+| `./dist/sub/*.js` | none | gitignore |
+| `./d*/*.js` | none | gitignore |
+| `./dist/bundle.js` | `dist/bundle.js` |  |
+| `./dist/sub/o.js` | `dist/sub/o.js` |  |
 | `./**/*.js` | `node_modules/pkg/index.js` |  |
 | `./node_modules/*/index.js` | `node_modules/pkg/index.js` |  |
 | `./docs/**/*.md` | `docs/api.md`, `docs/guide.md`, `docs/nested/deep.md` |  |
 | `./docs/*.md` | `docs/api.md`, `docs/guide.md` |  |
-| `$ROOT/docs/*.md` | `$ROOT/docs/api.md`, `$ROOT/docs/guide.md` | absolute |
-| `~/docs/*.md` | `$ROOT/docs/api.md`, `$ROOT/docs/guide.md` | absolute |
-| `../proj/docs/*.md` | `$BASE/proj/docs/api.md`, `$BASE/proj/docs/guide.md` | absolute |
+| `$ROOT/docs/*.md` | `$ROOT/docs/api.md`, `$ROOT/docs/guide.md` |  |
+| `~/docs/*.md` | `$ROOT/docs/api.md`, `$ROOT/docs/guide.md` |  |
+| `../proj/docs/*.md` | `../proj/docs/api.md`, `../proj/docs/guide.md` |  |
+| `../*/top.md` | `../proj/top.md` |  |
+| `../proj/**/deep.md` | `../proj/docs/nested/deep.md` |  |
+| `../proj/docs` | `../proj/docs/api.md`, `../proj/docs/guide.md` | directory-name |
 
 ## Divergences from bash
 
@@ -141,10 +152,17 @@ A test runs every row against dirsql as a path-table and, with the leading
 | `gitignore` | Inside a git repo, `.gitignore` files hide files and directories a wildcard matches, never one the pattern spells out. `--no-ignore` turns it off. | A query over a repo should not drown in build output. |
 | `directory-name` | A pattern's last component that names a directory lists the files directly inside it, like `ls docs`. A trailing `/` is `*` appended. | A table is rows of files, and `ls` is the shell habit. |
 | `files-only` | A pattern that matches a directory but no file returns nothing. | Every row is a file. |
-| `absolute` | `/`, `~/` and `../` patterns report absolute `path` values, with `..` folded out textually. | The scanned root is derived from the pattern, so there is no relative base. |
 
 `.git` needs no rule of its own: the dotfile rule hides it.
 
+## Syntax, not behavior
+
+A path-table starts with `./`, `/`, `~/` or `../`. That is how `FROM` tells a
+path from a table name, so `FROM './**/*.md'` is a glob and `FROM docs` is a
+table. A config `glob` has no such need and is written without the `./`.
+Bash accepts a bare `**/*.md`; dirsql does not in a path-table. This is syntax,
+not a divergence: past the prefix, the glob behaves as bash does.
+
 ## Where the glob is anchored
 
 A path-table pattern is relative to the index root and starts with `./`. A config `[[table]] glob`

{dirsql-0.4.99 → dirsql-0.4.100}/packages/python/docs/reference/path-tables.md

@@ -109,19 +109,15 @@ Three other prefixes resolve, with their usual shell meanings:
 | You write | dirsql scans |
 | --- | --- |
 | `'/var/log/*.log'` | an absolute path |
-| `'../notes'` | relative to the index root's parent |
+| `'../notes'` | relative to the index root's parent, as written |
 | `'~/notes/*.md'` | relative to your home directory |
 
 A directory named this way is one level too; `'../notes/**'` descends. The
 trailing-`/` rule holds here as well: `'~/*/'` is `'~/*/*'`.
-`..` is folded out textually, not followed through symlinks, so the directory
-scanned is a function of the string you wrote.
-
-**These report absolute `path` values.** A `./` path-table reports paths
-relative to the index root, matching every other dirsql table; a `/`, `../` or
-`~/` path-table has no meaningful relative base — the root it scans is derived
-from the pattern, not named by you — so it reports the full path instead. The
-value you get back is one you can paste into another command:
+**A `../` path-table reports `path` as written**, relative to the directory
+dirsql runs in, as bash prints it: `'../notes/*.md'` gives `../notes/a.md`. A
+`/` or `~/` path-table is absolute already, so it reports the full path. Either
+value is one you can paste into another command:
 
 ```sql
 SELECT path FROM '/var/log/*.log';
@@ -144,7 +140,7 @@ table:
 
 | Column | Type | Meaning |
 | --- | --- | --- |
-| `path` | TEXT | path relative to the index root (absolute for `/`, `../`, `~/` tables) |
+| `path` | TEXT | path relative to the index root (as written for `../` tables, absolute for `/` and `~/` tables) |
 | `basename` | TEXT | filename with extension |
 | `dir` | TEXT | parent directory, relative to the index root |
 | `ext` | TEXT | extension without the dot |

dirsql-0.4.100/packages/python/e2e-attestations/bot-1430-dotdot-as-written.json

@@ -0,0 +1,7 @@
+{
+  "command": "uv run python -m pytest tests/e2e/glob_speed_one_level_test.py -x -q",
+  "ran_at": 1791400206,
+  "exit_code": 0,
+  "commit": "5b2712c96a0bb5f59fb543918664db9b95e55094",
+  "branch": "bot/1430-dotdot-as-written"
+}

dirsql-0.4.100/packages/python/e2e-attestations/bot-1448-wildcard-ignored-prefix.json

@@ -0,0 +1,7 @@
+{
+  "command": "uv run python -m pytest tests/e2e/glob_speed_gitignore_test.py tests/e2e/glob_speed_one_level_test.py tests/e2e/glob_speed_recursive_test.py tests/e2e/query_contract_test.py tests/e2e/fanout_test.py -x -q",
+  "ran_at": 1791403526,
+  "exit_code": 0,
+  "commit": "08b154a76016e8369151b2269aa01a9331d41ed7",
+  "branch": "bot/1448-wildcard-ignored-prefix"
+}

dirsql-0.4.100/packages/python/migrations.d/2026-10-07-dotdot-as-written.md

@@ -0,0 +1,23 @@
+### ../ paths as written
+
+#### Summary
+
+A ../ path-table reports paths as written.
+
+#### Required changes
+
+_None._
+
+#### Deprecations removed
+
+_None._
+
+#### Behavior changes without code changes
+
+- A ../ path-table such as '../notes/*.md' now reports ../notes/a.md, relative to the directory dirsql runs in, instead of an absolute path. / and ~/ tables are unchanged.
+
+#### Verification
+
+```bash
+dirsql query "SELECT path FROM '../notes/*.md'"
+```

{dirsql-0.4.99 → dirsql-0.4.100}/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.99"
+version = "0.4.100"
 edition.workspace = true
 # Literal `license` (not `license.workspace = true`) because
 # putitoutthere's preflight check reads `[package].license` directly

{dirsql-0.4.99/packages/python → dirsql-0.4.100/packages/rust}/docs/context/usage.md

@@ -22,7 +22,7 @@ A quoted path stands in for a table name. Paths are relative to the directory yo
 | `'./**/*.md'` | markdown at any depth |
 | `'./notes/today.md'` | that one file |
 
-`*` matches within one directory level and `**` matches any depth. A directory name lists one level, like `ls docs`, so write `'./**'` to scan the whole tree. Rows are files only, never directories. `'/var/log/*.log'`, `'../notes'` and `'~/notes/*.md'` also resolve; those report absolute `path` values.
+`*` matches within one directory level and `**` matches any depth. A directory name lists one level, like `ls docs`, so write `'./**'` to scan the whole tree. Rows are files only, never directories. `'/var/log/*.log'`, `'../notes'` and `'~/notes/*.md'` also resolve; `path` is reported as written, so `'../notes'` gives `../notes/x.md` and the others give absolute paths.
 
 Two mistakes fail every time:
 

{dirsql-0.4.99/packages/python → dirsql-0.4.100/packages/rust}/docs/howto/query-without-config.md

@@ -65,7 +65,7 @@ why indexes belong to only one of them, are in
   `config` nor `tables` and call `query("SELECT * FROM './'")`
   ([SDK reference](../reference/sdk.md)).
 - Paths outside the root resolve too — `'/var/log/*.log'`, `'../notes'`,
-  `'~/notes/*.md'` — reporting absolute paths
+  `'~/notes/*.md'` — reporting paths as you wrote them
   ([path-tables reference](../reference/path-tables.md#paths-outside-the-index-root)).
 - `.git/` is skipped by default, and a git repo's `.gitignore` hides what it
   lists, so a bare `'./**'` does not drown in machinery

{dirsql-0.4.99 → dirsql-0.4.100/packages/rust}/docs/reference/columns.md

@@ -31,7 +31,7 @@ lazily-read hidden [`content`](./path-tables.md#columns) column.
 
 | Column | Type | Value |
 |---|---|---|
-| `path` | TEXT | The file's path relative to the scan root (e.g. `posts/hello.md`); absolute for a `/`, `../` or `~/` path-table. |
+| `path` | TEXT | The file's path relative to the scan root (e.g. `posts/hello.md`); as written for a `../` path-table, absolute for a `/` or `~/` one. |
 | `basename` | TEXT | The filename, including extension (`hello.md`). |
 | `dir` | TEXT | The parent directory relative to the root (`posts`); the empty string for files directly under the root. |
 | `ext` | TEXT | The file extension without the leading dot (`md`). Original case is preserved — `Photo.JPG` yields `JPG`; use `LOWER(ext)` for case-insensitive matching. `NULL` when the file has no extension. |

{dirsql-0.4.99/packages/python → dirsql-0.4.100/packages/rust}/docs/reference/glob.md

@@ -19,7 +19,7 @@ divergence is a written decision.
 ## The fixture
 
 Every example below runs against this tree. A name ending in `/` is an empty
-directory, `a -> b` is a symlink, and `.gitignore` holds `*.log`.
+directory, `a -> b` is a symlink, and `.gitignore` holds `*.log` and `dist/`.
 
 <!-- conformance-tree -->
 ```text
@@ -48,6 +48,8 @@ docs/.draft.md
 docs/nested/deep.md
 docs/nested/.cache/x.md
 node_modules/pkg/index.js
+dist/bundle.js
+dist/sub/o.js
 real/r.md
 uni/1.md
 uni/a.md
@@ -126,13 +128,22 @@ A test runs every row against dirsql as a path-table and, with the leading
 | `./*.log` | none | gitignore |
 | `./ignored.log` | `ignored.log` |  |
 | `./{ignored,x}.log` | `ignored.log` |  |
+| `./dist/*.js` | none | gitignore |
+| `./dist/**/*.js` | none | gitignore |
+| `./dist/sub/*.js` | none | gitignore |
+| `./d*/*.js` | none | gitignore |
+| `./dist/bundle.js` | `dist/bundle.js` |  |
+| `./dist/sub/o.js` | `dist/sub/o.js` |  |
 | `./**/*.js` | `node_modules/pkg/index.js` |  |
 | `./node_modules/*/index.js` | `node_modules/pkg/index.js` |  |
 | `./docs/**/*.md` | `docs/api.md`, `docs/guide.md`, `docs/nested/deep.md` |  |
 | `./docs/*.md` | `docs/api.md`, `docs/guide.md` |  |
-| `$ROOT/docs/*.md` | `$ROOT/docs/api.md`, `$ROOT/docs/guide.md` | absolute |
-| `~/docs/*.md` | `$ROOT/docs/api.md`, `$ROOT/docs/guide.md` | absolute |
-| `../proj/docs/*.md` | `$BASE/proj/docs/api.md`, `$BASE/proj/docs/guide.md` | absolute |
+| `$ROOT/docs/*.md` | `$ROOT/docs/api.md`, `$ROOT/docs/guide.md` |  |
+| `~/docs/*.md` | `$ROOT/docs/api.md`, `$ROOT/docs/guide.md` |  |
+| `../proj/docs/*.md` | `../proj/docs/api.md`, `../proj/docs/guide.md` |  |
+| `../*/top.md` | `../proj/top.md` |  |
+| `../proj/**/deep.md` | `../proj/docs/nested/deep.md` |  |
+| `../proj/docs` | `../proj/docs/api.md`, `../proj/docs/guide.md` | directory-name |
 
 ## Divergences from bash
 
@@ -141,10 +152,17 @@ A test runs every row against dirsql as a path-table and, with the leading
 | `gitignore` | Inside a git repo, `.gitignore` files hide files and directories a wildcard matches, never one the pattern spells out. `--no-ignore` turns it off. | A query over a repo should not drown in build output. |
 | `directory-name` | A pattern's last component that names a directory lists the files directly inside it, like `ls docs`. A trailing `/` is `*` appended. | A table is rows of files, and `ls` is the shell habit. |
 | `files-only` | A pattern that matches a directory but no file returns nothing. | Every row is a file. |
-| `absolute` | `/`, `~/` and `../` patterns report absolute `path` values, with `..` folded out textually. | The scanned root is derived from the pattern, so there is no relative base. |
 
 `.git` needs no rule of its own: the dotfile rule hides it.
 
+## Syntax, not behavior
+
+A path-table starts with `./`, `/`, `~/` or `../`. That is how `FROM` tells a
+path from a table name, so `FROM './**/*.md'` is a glob and `FROM docs` is a
+table. A config `glob` has no such need and is written without the `./`.
+Bash accepts a bare `**/*.md`; dirsql does not in a path-table. This is syntax,
+not a divergence: past the prefix, the glob behaves as bash does.
+
 ## Where the glob is anchored
 
 A path-table pattern is relative to the index root and starts with `./`. A config `[[table]] glob`

{dirsql-0.4.99 → dirsql-0.4.100}/packages/rust/docs/reference/path-tables.md

@@ -109,19 +109,15 @@ Three other prefixes resolve, with their usual shell meanings:
 | You write | dirsql scans |
 | --- | --- |
 | `'/var/log/*.log'` | an absolute path |
-| `'../notes'` | relative to the index root's parent |
+| `'../notes'` | relative to the index root's parent, as written |
 | `'~/notes/*.md'` | relative to your home directory |
 
 A directory named this way is one level too; `'../notes/**'` descends. The
 trailing-`/` rule holds here as well: `'~/*/'` is `'~/*/*'`.
-`..` is folded out textually, not followed through symlinks, so the directory
-scanned is a function of the string you wrote.
-
-**These report absolute `path` values.** A `./` path-table reports paths
-relative to the index root, matching every other dirsql table; a `/`, `../` or
-`~/` path-table has no meaningful relative base — the root it scans is derived
-from the pattern, not named by you — so it reports the full path instead. The
-value you get back is one you can paste into another command:
+**A `../` path-table reports `path` as written**, relative to the directory
+dirsql runs in, as bash prints it: `'../notes/*.md'` gives `../notes/a.md`. A
+`/` or `~/` path-table is absolute already, so it reports the full path. Either
+value is one you can paste into another command:
 
 ```sql
 SELECT path FROM '/var/log/*.log';
@@ -144,7 +140,7 @@ table:
 
 | Column | Type | Meaning |
 | --- | --- | --- |
-| `path` | TEXT | path relative to the index root (absolute for `/`, `../`, `~/` tables) |
+| `path` | TEXT | path relative to the index root (as written for `../` tables, absolute for `/` and `~/` tables) |
 | `basename` | TEXT | filename with extension |
 | `dir` | TEXT | parent directory, relative to the index root |
 | `ext` | TEXT | extension without the dot |

{dirsql-0.4.99 → dirsql-0.4.100}/packages/rust/src/db.rs

@@ -173,10 +173,12 @@ fn path_table_ddl(
             ],
         ),
     };
-    args.push(quote_literal(if gitignore {
-        scanner::GITIGNORE_ARG
-    } else {
+    args.push(quote_literal(if !gitignore {
         scanner::NO_GITIGNORE_ARG
+    } else if !table.path_prefix.is_empty() && path_table::wildcard_below_prefix(name) {
+        scanner::GITIGNORE_ROOT_ARG
+    } else {
+        scanner::GITIGNORE_ARG
     }));
     if parser.is_some() {
         args.push(quote_literal(&index_root.to_string_lossy()));
@@ -3228,7 +3230,7 @@ mod tests {
                 None,
                 Path::new("/root"),
             )
-            .contains("'/var/log', '*.log', '/var/log', 'gitignore')"),
+            .contains("'/var/log', '*.log', '/var/log', 'gitignore-root')"),
             "got: {}",
             path_table_ddl(
                 "/var/log/*.log",
@@ -3241,6 +3243,28 @@ mod tests {
         );
     }
 
+    #[test]
+    fn path_table_ddl_checks_the_root_of_a_wildcard_under_a_literal_prefix() {
+        let table = PathTable {
+            root: PathBuf::from("/root/dist"),
+            glob: "*.js".to_string(),
+            path_prefix: "dist".to_string(),
+        };
+        let ddl = path_table_ddl("./dist/*.js", &table, &[], true, None, Path::new("/root"));
+        assert!(ddl.ends_with("'dist', 'gitignore-root')"), "got: {ddl}");
+    }
+
+    #[test]
+    fn path_table_ddl_spares_the_root_of_a_literally_named_directory() {
+        let table = PathTable {
+            root: PathBuf::from("/root/dist"),
+            glob: "*".to_string(),
+            path_prefix: "dist".to_string(),
+        };
+        let ddl = path_table_ddl("./dist", &table, &[], true, None, Path::new("/root"));
+        assert!(ddl.ends_with("'dist', 'gitignore')"), "got: {ddl}");
+    }
+
     #[test]
     fn path_table_ddl_carries_the_no_gitignore_switch() {
         let ddl = path_table_ddl(
@@ -3307,7 +3331,7 @@ mod tests {
         );
         assert!(
             ddl.ends_with(
-                "USING dirsql_parsed('/var/log', '*.log', 'parse.py', 'gitignore', \
+                "USING dirsql_parsed('/var/log', '*.log', 'parse.py', 'gitignore-root', \
                  '/index', 'node_modules/**')"
             ),
             "the parser form drops the path prefix, names the index root and keeps \

{dirsql-0.4.99 → dirsql-0.4.100}/packages/rust/src/parsed_vtab.rs

@@ -28,7 +28,7 @@ use crate::Value;
 use crate::infer::{JsonRow, cell, declared_schema, infer_schema};
 use crate::matcher::TableMatcher;
 use crate::on_file;
-use crate::scanner::{PathGlob, scan_glob};
+use crate::scanner::{PathGlob, scan_glob_checking_root};
 use crate::vtab_scaffold::{self, StatementScope, TableSource};
 
 /// SQL module name a parsed path-table is created with.
@@ -51,6 +51,7 @@ struct ModuleArgs {
     glob: PathGlob,
     command: String,
     gitignore: bool,
+    check_root: bool,
     index_root: PathBuf,
     ignore: TableMatcher,
 }
@@ -77,6 +78,7 @@ fn parse_module_args(args: &[&[u8]]) -> Result<ModuleArgs> {
         glob: vtab_scaffold::compile_glob(pattern)?,
         command: command.clone(),
         gitignore: vtab_scaffold::parse_gitignore(gitignore)?,
+        check_root: vtab_scaffold::checks_root(gitignore),
         index_root: PathBuf::from(index_root),
         ignore: vtab_scaffold::compile_ignore(ignore)?,
     })
@@ -145,6 +147,7 @@ impl TableSource for ParsedTable {
             glob,
             command,
             gitignore,
+            check_root,
             index_root,
             ignore,
         } = parse_module_args(args)?;
@@ -152,7 +155,7 @@ impl TableSource for ParsedTable {
         // A parsed path-table honors the same skip rules a stat path-table does
         // (node_modules/.git, gitignore, plus any configured ignore), so a
         // parsed `SELECT * FROM './'` doesn't drown in dependency trees.
-        let rel_paths = scan_glob(&root, &glob, &ignore, gitignore);
+        let rel_paths = scan_glob_checking_root(&root, &glob, &ignore, gitignore, check_root);
         let run = |rel: &[PathBuf]| run_parser(&command, &index_root, &root, rel);
         let rows = collect_rows(&rel_paths, &run)?;