* Adds a view to `points1.sql` fixture
* Replaces `table` with `view` in log statements relating to views
---------
Co-authored-by: Chris Thiange <cthiange@gmail.com>
Warn users when a PG table geometry column has no index - thus accessing it would be slow. This is only done for tables. Issues with the views are not printed.
## Implementation
This adds two fields to `TableInfo`:
* `geom_idx: Option<bool>` to tell if a geo column has a spatial index
* `is_view: Option<bool>` to distinguish views from other relations
Missing spatial index warnings are logged for non-view relations. Views
will never have indexed columns and, if referencing a table with a
missing index, it will be logged already.
Couldn't figure out how to make `just test` accept the new warning (from
missing index), so I have them logged as INFO for now :)
fixes#540
---------
Co-authored-by: Christophe Thiange <cthiange@gmail.com>
Co-authored-by: Yuri Astrakhan <YuriAstrakhan@gmail.com>
This is a partial fix for #496
* BREAKING: Now Martin behaves the same way as `psql` -- by default, if
SSL is available on the server, it will be used, even though it will not
verify that the server has a valid SSL certificate
* Martin now understands `PGSSLCERT`, `PGSSLKEY`, and `PGSSLROOTCERT`
env vars (and corresponding config keys) - same as psql.
* Martin can now process `?sslmode=verify-ca` and `verify-full` (just
like psql). The verify modes require root and/or client cert & key.
* remove `danger_accept_invalid_certs` -- turns out that behavior is
expected by default unless ssl mode is set to verify - which upstream
lib [does not
support](https://github.com/sfackler/rust-postgres/issues/768) - PR
[submitted](https://github.com/sfackler/rust-postgres/pull/988).
* added connection_timeout_ms option for postgres and set it to 5
seconds by default. This way it will fail out earlier.
* added error reporting to bb8 - but it is currently [broken
upstream](https://github.com/djc/bb8/issues/151) - not sure we can fix
it easily, so may need to switch to deadpool later.
* added docker-based TLS test (horray!) - wasn't trivial at all, despite
ending up fairly simple.
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.91 to
1.0.92.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/serde-rs/json/releases">serde_json's
releases</a>.</em></p>
<blockquote>
<h2>v1.0.92</h2>
<ul>
<li>Documentation improvements</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="a9c984f13e"><code>a9c984f</code></a>
Release 1.0.92</li>
<li><a
href="c42b724c14"><code>c42b724</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/serde-rs/json/issues/980">#980</a>
from serde-rs/docrepr</li>
<li><a
href="eaa287cb3a"><code>eaa287c</code></a>
Hide repr attribute from documentation</li>
<li><a
href="7bc6c86310"><code>7bc6c86</code></a>
RawValue -> repr(transparent)</li>
<li><a
href="e41ee42d92"><code>e41ee42</code></a>
Update indoc dev-dependency to version 2</li>
<li><a
href="8cebe89500"><code>8cebe89</code></a>
Speed up cargo fuzz CI job</li>
<li><a
href="74f510e56d"><code>74f510e</code></a>
Sync license text with rust-lang repos</li>
<li><a
href="557f45c404"><code>557f45c</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/serde-rs/json/issues/964">#964</a>
from dtolnay/docsrs</li>
<li><a
href="9edf7fa9b3"><code>9edf7fa</code></a>
Replace docs.serde.rs links with intra-rustdoc links</li>
<li><a
href="9947ae606e"><code>9947ae6</code></a>
Point documentation links to docs.rs instead of docs.serde.rs</li>
<li>See full diff in <a
href="https://github.com/serde-rs/json/compare/v1.0.91...v1.0.92">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [indoc](https://github.com/dtolnay/indoc) from 1.0.8 to 2.0.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/dtolnay/indoc/releases">indoc's
releases</a>.</em></p>
<blockquote>
<h2>2.0.0</h2>
<ul>
<li>Change handling of final newline at zero levels of indentation (<a
href="https://github-redirect.dependabot.com/dtolnay/indoc/issues/55">#55</a>)</li>
<li>Add <a
href="https://docs.rs/indoc/2/indoc/macro.concatdoc.html"><code>concatdoc!</code></a>
macro (<a
href="https://github-redirect.dependabot.com/dtolnay/indoc/issues/56">#56</a>)</li>
<li>Raise oldest supported rustc to 1.56</li>
</ul>
<h2>1.0.9</h2>
<ul>
<li>Fix parsing of some edge cases involving angle brackets in
writedoc's expr argument (<a
href="https://github-redirect.dependabot.com/dtolnay/indoc/issues/54">#54</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="bbbec14e9d"><code>bbbec14</code></a>
Release 2.0.0</li>
<li><a
href="24a804e0cf"><code>24a804e</code></a>
Add concatdoc docs</li>
<li><a
href="476b937436"><code>476b937</code></a>
Delete paths from .cargo/config</li>
<li><a
href="b5fb2dc83f"><code>b5fb2dc</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/dtolnay/indoc/issues/57">#57</a>
from dtolnay/fromstr</li>
<li><a
href="623d666afa"><code>623d666</code></a>
Replace TokenStream::from_str with Literal::from_str</li>
<li><a
href="28d6d25d20"><code>28d6d25</code></a>
Switch to 2021 edition</li>
<li><a
href="46d38c0fcd"><code>46d38c0</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/dtolnay/indoc/issues/56">#56</a>
from dtolnay/concat</li>
<li><a
href="4fec8a91e9"><code>4fec8a9</code></a>
Add concatdoc macro</li>
<li><a
href="1f705293a5"><code>1f70529</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/dtolnay/indoc/issues/55">#55</a>
from dtolnay/trailing</li>
<li><a
href="31694b5dca"><code>31694b5</code></a>
Preserve last newline even if not indented</li>
<li>Additional commits viewable in <a
href="https://github.com/dtolnay/indoc/compare/1.0.8...2.0.0">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.63
to 0.1.64.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/dtolnay/async-trait/releases">async-trait's
releases</a>.</em></p>
<blockquote>
<h2>0.1.64</h2>
<ul>
<li>Suppress async_yields_async clippy correctness lint in generated
code (<a
href="https://github-redirect.dependabot.com/dtolnay/async-trait/issues/236">#236</a>,
<a
href="https://github-redirect.dependabot.com/dtolnay/async-trait/issues/237">#237</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="6a13fce882"><code>6a13fce</code></a>
Release 0.1.64</li>
<li><a
href="ea573a3823"><code>ea573a3</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/dtolnay/async-trait/issues/237">#237</a>
from dtolnay/asyncyieldsasync</li>
<li><a
href="54cc1ce438"><code>54cc1ce</code></a>
Suppress async_yields_async clippy correctness lint in generated
code</li>
<li><a
href="e6e736f8df"><code>e6e736f</code></a>
Add regression test for issue 236</li>
<li>See full diff in <a
href="https://github.com/dtolnay/async-trait/compare/0.1.63...0.1.64">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [clap](https://github.com/clap-rs/clap) from 4.1.3 to 4.1.4.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/clap-rs/clap/releases">clap's
releases</a>.</em></p>
<blockquote>
<h2>v4.1.4</h2>
<h2>[4.1.4] - 2023-01-24</h2>
<h3>Fixes</h3>
<ul>
<li><em>(help)</em> Respect <code>disable_colored_help</code> when using
<code>arg_required_else_help</code></li>
</ul>
<h3>Performance</h3>
<ul>
<li>Speed up compiling <code>arg!</code> macro</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/clap-rs/clap/blob/master/CHANGELOG.md">clap's
changelog</a>.</em></p>
<blockquote>
<h2>[4.1.4] - 2023-01-24</h2>
<h3>Fixes</h3>
<ul>
<li><em>(help)</em> Respect <code>disable_colored_help</code> when using
<code>arg_required_else_help</code></li>
</ul>
<h3>Performance</h3>
<ul>
<li>Speed up compiling <code>arg!</code> macro</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="a59a53503e"><code>a59a535</code></a>
chore: Release</li>
<li><a
href="4348f43b21"><code>4348f43</code></a>
docs: Update changelog</li>
<li><a
href="7c4c6586d0"><code>7c4c658</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4673">#4673</a>
from epage/arg</li>
<li><a
href="bbe5eaa709"><code>bbe5eaa</code></a>
perf: Speed up compiling <code>arg!</code> macro</li>
<li><a
href="b3c4b4016c"><code>b3c4b40</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4672">#4672</a>
from epage/help</li>
<li><a
href="dc89379ff6"><code>dc89379</code></a>
fix(help): Respect <code>disable_colored_help</code> for
<code>arg_required_else_help</code></li>
<li>See full diff in <a
href="https://github.com/clap-rs/clap/compare/v4.1.3...v4.1.4">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [clap](https://github.com/clap-rs/clap) from 4.1.1 to 4.1.3.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/clap-rs/clap/releases">clap's
releases</a>.</em></p>
<blockquote>
<h2>v4.1.3</h2>
<h2>[4.1.3] - 2023-01-23</h2>
<h3>Fixes</h3>
<ul>
<li><em>(error)</em> Improve suggested flag/value/subcommand when two
share a long preifx</li>
<li><em>(error)</em> When suggesting one of several subcommands, use the
plural <code>subcommands</code>, rather than
<code>subcommand</code></li>
</ul>
<h2>v4.1.2</h2>
<h2>[4.1.2] - 2023-01-23</h2>
<h3>Fixes</h3>
<ul>
<li>In documentation, refer to <code>get_flag</code>, rather than
<code>get_one::<bool></code></li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/clap-rs/clap/blob/master/CHANGELOG.md">clap's
changelog</a>.</em></p>
<blockquote>
<h2>[4.1.3] - 2023-01-23</h2>
<h3>Fixes</h3>
<ul>
<li><em>(error)</em> Improve suggested flag/value/subcommand when two
share a long preifx</li>
<li><em>(error)</em> When suggesting one of several subcommands, use the
plural <code>subcommands</code>, rather than
<code>subcommand</code></li>
</ul>
<h2>[4.1.2] - 2023-01-23</h2>
<h3>Fixes</h3>
<ul>
<li>In documentation, refer to <code>get_flag</code>, rather than
<code>get_one::<bool></code></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="10a87c662d"><code>10a87c6</code></a>
chore: Release</li>
<li><a
href="8ee9242a0e"><code>8ee9242</code></a>
docs: Update changelog</li>
<li><a
href="125dbe0cfd"><code>125dbe0</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4667">#4667</a>
from corneliusroemer/fix-4666</li>
<li><a
href="401d86fb9c"><code>401d86f</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4668">#4668</a>
from corneliusroemer/fix-4660</li>
<li><a
href="f5540d2646"><code>f5540d2</code></a>
fix(suggestions): Replace wrong Jaro-Winkler</li>
<li><a
href="5dcc5c9509"><code>5dcc5c9</code></a>
fix: Add plural s in suggestions</li>
<li>See full diff in <a
href="https://github.com/clap-rs/clap/compare/clap_complete-v4.1.1...v4.1.3">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.62
to 0.1.63.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="36bcff4c0d"><code>36bcff4</code></a>
Release 0.1.63</li>
<li><a
href="f88c287dff"><code>f88c287</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/dtolnay/async-trait/issues/235">#235</a>
from dtolnay/patterns</li>
<li><a
href="1c2e90a984"><code>1c2e90a</code></a>
Make expansion of nested _ and .. patterns edition independent</li>
<li><a
href="80a9c2c8af"><code>80a9c2c</code></a>
Add regression test for issue 234</li>
<li><a
href="125917ffe0"><code>125917f</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/dtolnay/async-trait/issues/233">#233</a>
from dtolnay/reference</li>
<li><a
href="ba930258fa"><code>ba93025</code></a>
Bypass Sync bound implied by non-existent drop of reference</li>
<li><a
href="70bf4b0243"><code>70bf4b0</code></a>
Add regression test for issue 232</li>
<li>See full diff in <a
href="https://github.com/dtolnay/async-trait/compare/0.1.62...0.1.63">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* clean up reporting of the un-used config params - instead of printing,
collect them and print in one place if needed (allows testing too)
* remove `vector_layer` in catalog - too verbose, not needed - can be
received via tilejson for individual source
* clean up tests so that they all use the same config yaml
Adds a new [.mbtiles](https://github.com/mapbox/mbtiles-spec/blob/master/1.3/spec.md)
backend, without the grid support. Uses extensive tile content
detection, i.e. if the content is gzipped, png, jpeg, gif, webp.
From CLI, can be as easy as adding a path to a directory that contains a
.mbtiles file (works just like pmtiles support)
```bash
# All *.mbtiles files in this dir will be published.
# The filename will be used as the source ID
martin ./tests/fixtures
```
From configuration file, the path can be specified in a number of ways
(same as pmtiles)
```yaml
mbtiles:
paths:
# scan this whole dir, matching all *.mbtiles files
- /dir-path
# specific mbtiles file will be published as mbtiles2 source
- /path/to/mbtiles2.mbtiles
sources:
# named source matching source name to a single file
pm-src1: /tmp/mbtiles.mbtiles
# named source, where the filename is explicitly set. This way we will be able to add more options later
pm-src2:
path: /tmp/mbtiles.mbtiles
```
Fixes#494
Merge after #548
Adds a new [.pmtiles](https://protomaps.com/docs/pmtiles/) backend.
Supports all formats like png, vector, etc.
From CLI, can be as easy as adding a path to a directory that contains a
.pmtiles file:
```bash
# All *.pmtiles files in this dir will be published.
# The filename will be used as the source ID
martin ./tests/fixtures
```
From configuration file, the path can be specified in a number of ways:
```yaml
pmtiles:
paths:
# scan this whole dir, matching all *.pmtiles files
- /dir-path
# specific pmtiles file will be published as pmtiles2 source
- /path/to/pmtiles2.pmtiles
sources:
# named source matching source name to a single file
pm-src1: /tmp/pmtiles.pmtiles
# named source, where the filename is explicitly set. This way we will be able to add more options later
pm-src2:
path: /tmp/pmtiles.pmtiles
```
Fixes#508
* introduce a new Connections object to track all positional strings
passed as the CLI arguments
* each tile provider can now indicate if it can take a positional CLI
arg, and if the value can be shared between multiple providers, i.e. if
its a directory that could contain files for multiple providers
* make xyz use better types - u8 for zoom, u32 for x&y. Postgres casts
those to INT2 and INT8
* minor bug in pre-push git hook to abort in case of a testingerror
* added GIF detection/type
* combine MVT and compression concepts into one enum more explicitly. It
is not ideal (technically they are separate concerns), but it keeps it a
bit simpler for now for multiple providers.
* set content encoding and content type on HTTP responses if known, and
also include them in the `/catalog` response (json)
* raise an error if the user attempts to merge non-concatenatable tiles
from multiple sources. We may want to implement it in the future, e.g.
combine multiple semi-transparent PNGs. Or even combine GIF & PNG & JPEG
* do not set content-type on empty responses (http 204)
* add tilejson outputs to testing
* NEW: support for #512 - pg table/function auto-discovery
* can filter schemas
* can use patterns like `{schema}.{table}.{column}` and
`{schema}.{function}`
* NEW: add `disable_bounds` bool flag to allow disabling of the bounds
computation
* reworked integration tests to use yaml
* fixed SQL to work on older PG versions
* re-enable CI to test expected `test.sh` output against the one stored
in the `tests/expected`
* add postgres in docker tests on linux - one for the oldest supported
DB, and another using the more recent version
* minor justfile cleanup
* ensure config files are sorted alphabetically
* added manual coverage justfile command
* a lot of small refactorings of config and argument parsing
* feature: support jsonb query param for functions
* cleaned up public/private access
* make all tests populate with a predefined values to avoid issues with
random data
* Support `postgres` config key to be either a list or an object
* Use `PathBuf` instead of `String` where dealing with files
* Merge `SrvConfigBuilder` into `SrvConfig`
* Parse keep_alive as u64
* More config tests
Bumps [clap](https://github.com/clap-rs/clap) from 4.0.29 to 4.0.30.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/clap-rs/clap/releases">clap's
releases</a>.</em></p>
<blockquote>
<h2>v4.0.30</h2>
<h2>[4.0.30] - 2022-12-21</h2>
<h3>Fixes</h3>
<ul>
<li><em>(error)</em> Improve error for
<code>args_conflicts_with_subcommand</code></li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/clap-rs/clap/blob/master/CHANGELOG.md">clap's
changelog</a>.</em></p>
<blockquote>
<h2>[4.0.30] - 2022-12-21</h2>
<h3>Fixes</h3>
<ul>
<li><em>(error)</em> Improve error for
<code>args_conflicts_with_subcommand</code></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="d2d022248b"><code>d2d0222</code></a>
chore: Release</li>
<li><a
href="56a0bb624f"><code>56a0bb6</code></a>
docs: Update changelog</li>
<li><a
href="b941a3eaef"><code>b941a3e</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4567">#4567</a>
from epage/error</li>
<li><a
href="453ac0bfb9"><code>453ac0b</code></a>
fix(parser): Be less confusing with args/subcommand conflicts</li>
<li><a
href="2a374db639"><code>2a374db</code></a>
test(parser): Show bad behavior</li>
<li><a
href="f632424e65"><code>f632424</code></a>
test(parser): Consolidate args_conflicts_with tests</li>
<li><a
href="a72f962d35"><code>a72f962</code></a>
docs(builder): Escape non-tags</li>
<li><a
href="ac48e2d5e4"><code>ac48e2d</code></a>
docs: Make less brittle for rust versions</li>
<li><a
href="a3381a2c05"><code>a3381a2</code></a>
docs(readme): Fix build status badge (<a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4559">#4559</a>)</li>
<li><a
href="aa5420469e"><code>aa54204</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4555">#4555</a>
from epage/reset</li>
<li>Additional commits viewable in <a
href="https://github.com/clap-rs/clap/compare/v4.0.29...v4.0.30">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [num_cpus](https://github.com/seanmonstar/num_cpus) from 1.14.0 to
1.15.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/seanmonstar/num_cpus/releases">num_cpus's
releases</a>.</em></p>
<blockquote>
<h2>v1.15.0</h2>
<h2>Fixes</h2>
<ul>
<li>update hermit-abi</li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/striezel"><code>@striezel</code></a>
made their first contribution in <a
href="https://github-redirect.dependabot.com/seanmonstar/num_cpus/pull/126">seanmonstar/num_cpus#126</a></li>
<li><a href="https://github.com/buffet"><code>@buffet</code></a> made
their first contribution in <a
href="https://github-redirect.dependabot.com/seanmonstar/num_cpus/pull/127">seanmonstar/num_cpus#127</a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/seanmonstar/num_cpus/blob/master/CHANGELOG.md">num_cpus's
changelog</a>.</em></p>
<blockquote>
<h2>v1.15.0</h2>
<h3>Fixes</h3>
<ul>
<li>update hermit-abi</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="5bea3c7986"><code>5bea3c7</code></a>
v1.15.0</li>
<li><a
href="ccb5a67925"><code>ccb5a67</code></a>
chore: update hermit-abi to 0.2.6 (<a
href="https://github-redirect.dependabot.com/seanmonstar/num_cpus/issues/127">#127</a>)</li>
<li><a
href="e437b9d908"><code>e437b9d</code></a>
ci: update actions/checkout in GitHub Actions workflows to v3 (<a
href="https://github-redirect.dependabot.com/seanmonstar/num_cpus/issues/126">#126</a>)</li>
<li>See full diff in <a
href="https://github.com/seanmonstar/num_cpus/compare/v1.14.0...v1.15.0">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.44
to 0.10.45.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="7df56869c5"><code>7df5686</code></a>
Release openssl v0.10.45</li>
<li><a
href="f32af9f4aa"><code>f32af9f</code></a>
Release openssl-sys v0.9.80</li>
<li><a
href="deac6b7b86"><code>deac6b7</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1763">#1763</a>
from CfirTsabari/cfirtsabari/deperecated-functions-1745</li>
<li><a
href="27edce9340"><code>27edce9</code></a>
Mark Openssl # deprecated functions</li>
<li><a
href="f0ff8a7e48"><code>f0ff8a7</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1762">#1762</a>
from wiktor-k/fix-broken-relaxation</li>
<li><a
href="45e5dce285"><code>45e5dce</code></a>
Expose <code>Cipher::cipher_final_unchecked</code></li>
<li><a
href="71013f7efd"><code>71013f7</code></a>
Fix output buffer check introduced in <a
href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1733">#1733</a></li>
<li><a
href="64ba480226"><code>64ba480</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1761">#1761</a>
from vishwin/master</li>
<li><a
href="0d8d502258"><code>0d8d502</code></a>
Expose EVP_PKEY_security_bits for LibreSSL 3.6.0 and later</li>
<li><a
href="e01fbac4b3"><code>e01fbac</code></a>
openssl-sys: add LibreSSL 3.6.0 to cfgs</li>
<li>Additional commits viewable in <a
href="https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.44...openssl-v0.10.45">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Pedantic lints often offer some good insight into the code. It is
usually easier to sprinkle a few "allow"-s around, than to miss some
important life hack offered by clippy.
Also, make use a different martin port when running integration tests
locally (make sure `git push` works even if martin is running).
* Ensure the source ID only contains ascii alphanumerics, dots, dashes,
and underscores.
* optimize the most common case of getting a single source
* optimize the case of sources with no query parameters
