256f4a10a7
Bumps [sqlx](https://github.com/launchbadge/sqlx) from 0.7.1 to 0.7.2. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/launchbadge/sqlx/blob/main/CHANGELOG.md">sqlx's changelog</a>.</em></p> <blockquote> <h2>0.7.2 - 2023-09-25</h2> <p>23 pull requests were merged this release cycle.</p> <h3>Added</h3> <ul> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2121">#2121</a>]: Add JSON support to <code>FromRow</code> derive [[<a href="https://github.com/95ulisse"><code>@95ulisse</code></a>]]</li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2533">#2533</a>]: Implement mysql_clear_password [[<a href="https://github.com/ldanilek"><code>@ldanilek</code></a>]]</li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2538">#2538</a>]: cli: add --target-version CLI flags for migrate run/revert [[<a href="https://github.com/inahga"><code>@inahga</code></a>]]</li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2577">#2577</a>]: supplement Postgres listen example with a small chat example [[<a href="https://github.com/JockeM"><code>@JockeM</code></a>]]</li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2602">#2602</a>]: Support naming migrations sequentially [[<a href="https://github.com/vmax"><code>@vmax</code></a>]]</li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2634">#2634</a>]: Adding PgHasArrayType for &[u8;N] [[<a href="https://github.com/snf"><code>@snf</code></a>]]</li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2646">#2646</a>]: Support for setting client certificate and key from bytes [[<a href="https://github.com/wyhaya"><code>@wyhaya</code></a>]]</li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2664">#2664</a>]: Automatically infer migration type [[<a href="https://github.com/vmax"><code>@vmax</code></a>]]</li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2712">#2712</a>]: Add impl for <code>Type</code>, <code>Decode</code>, and <code>Encode</code> for <code>Box<str></code> and <code>Box<[u8]></code> [[<a href="https://github.com/grant0417"><code>@grant0417</code></a>]]</li> </ul> <h3>Changed</h3> <ul> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2650">#2650</a>]: Cleanup format arguments [[<a href="https://github.com/nyurik"><code>@nyurik</code></a>]]</li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2695">#2695</a>]: remove &mut PoolConnection from Executor docs [[<a href="https://github.com/olback"><code>@olback</code></a>]] <ul> <li>This impl was removed in 0.7.0 because of coherence issues.</li> </ul> </li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2706">#2706</a>]: Clarify where optional features should be enabled [[<a href="https://github.com/kryptan"><code>@kryptan</code></a>]]</li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2717">#2717</a>]: Update README.md [[<a href="https://github.com/fermanjj"><code>@fermanjj</code></a>]]</li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2739">#2739</a>]: Bump mariadb CI images + mysql unpin [[<a href="https://github.com/grooverdan"><code>@grooverdan</code></a>]]</li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2742">#2742</a>]: Implemented poll_flush for Box<!-- raw HTML omitted --> [[<a href="https://github.com/bobozaur"><code>@bobozaur</code></a>]]</li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2740">#2740</a>]: Remove sealed trait comments from documentation [[<a href="https://github.com/bobozaur"><code>@bobozaur</code></a>]]</li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2750">#2750</a>]: Fix <a href="https://redirect.github.com/launchbadge/sqlx/issues/2384">#2384</a>, bump flume to v0.11.0 [[<a href="https://github.com/madadam"><code>@madadam</code></a>]]</li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2757">#2757</a>]: Remove unused <code>remove_dir_all</code> crate from <code>sqlx-cli</code>, fixes RUSTSEC-2023-0018 [[<a href="https://github.com/aldur"><code>@aldur</code></a>]]</li> </ul> <h3>Fixed</h3> <ul> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2624">#2624</a>]: Documentation typo: BYTE -> BINARY [[<a href="https://github.com/sebastianv89"><code>@sebastianv89</code></a>]]</li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2628">#2628</a>]: docs: 0.7 is stable in the entire README [[<a href="https://github.com/marcusirgens"><code>@marcusirgens</code></a>]]</li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2630">#2630</a>]: fix(postgres): fix buffer management in PgCopyIn::read_from [[<a href="https://github.com/tsing"><code>@tsing</code></a>]]</li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2651">#2651</a>]: Chore: Fix few build warnings, and make CI fail on warn [[<a href="https://github.com/nyurik"><code>@nyurik</code></a>]]</li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2670">#2670</a>]: fix: ignore extra fields in Postgres describe parsing [[<a href="https://github.com/abonander"><code>@abonander</code></a>]]</li> <li>[<a href="https://redirect.github.com/launchbadge/sqlx/issues/2687">#2687</a>]: docs: Fix description of <code>min_connections</code> [[<a href="https://github.com/hakoerber"><code>@hakoerber</code></a>]]</li> </ul> <p><a href="https://redirect.github.com/launchbadge/sqlx/issues/2121">#2121</a>: <a href="https://redirect.github.com/launchbadge/sqlx/pull/2121">launchbadge/sqlx#2121</a> <a href="https://redirect.github.com/launchbadge/sqlx/issues/2533">#2533</a>: <a href="https://redirect.github.com/launchbadge/sqlx/pull/2533">launchbadge/sqlx#2533</a> <a href="https://redirect.github.com/launchbadge/sqlx/issues/2538">#2538</a>: <a href="https://redirect.github.com/launchbadge/sqlx/pull/2538">launchbadge/sqlx#2538</a> <a href="https://redirect.github.com/launchbadge/sqlx/issues/2577">#2577</a>: <a href="https://redirect.github.com/launchbadge/sqlx/pull/2577">launchbadge/sqlx#2577</a> <a href="https://redirect.github.com/launchbadge/sqlx/issues/2602">#2602</a>: <a href="https://redirect.github.com/launchbadge/sqlx/pull/2602">launchbadge/sqlx#2602</a> <a href="https://redirect.github.com/launchbadge/sqlx/issues/2624">#2624</a>: <a href="https://redirect.github.com/launchbadge/sqlx/pull/2624">launchbadge/sqlx#2624</a> <a href="https://redirect.github.com/launchbadge/sqlx/issues/2628">#2628</a>: <a href="https://redirect.github.com/launchbadge/sqlx/pull/2628">launchbadge/sqlx#2628</a> <a href="https://redirect.github.com/launchbadge/sqlx/issues/2630">#2630</a>: <a href="https://redirect.github.com/launchbadge/sqlx/pull/2630">launchbadge/sqlx#2630</a> <a href="https://redirect.github.com/launchbadge/sqlx/issues/2634">#2634</a>: <a href="https://redirect.github.com/launchbadge/sqlx/pull/2634">launchbadge/sqlx#2634</a> <a href="https://redirect.github.com/launchbadge/sqlx/issues/2646">#2646</a>: <a href="https://redirect.github.com/launchbadge/sqlx/pull/2646">launchbadge/sqlx#2646</a> <a href="https://redirect.github.com/launchbadge/sqlx/issues/2650">#2650</a>: <a href="https://redirect.github.com/launchbadge/sqlx/pull/2650">launchbadge/sqlx#2650</a> <a href="https://redirect.github.com/launchbadge/sqlx/issues/2651">#2651</a>: <a href="https://redirect.github.com/launchbadge/sqlx/pull/2651">launchbadge/sqlx#2651</a> <a href="https://redirect.github.com/launchbadge/sqlx/issues/2664">#2664</a>: <a href="https://redirect.github.com/launchbadge/sqlx/pull/2664">launchbadge/sqlx#2664</a></p> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li>See full diff in <a href="https://github.com/launchbadge/sqlx/commits">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=sqlx&package-manager=cargo&previous-version=0.7.1&new-version=0.7.2)](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 show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@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> |
||
---|---|---|
.cargo-husky/hooks | ||
.github | ||
debian | ||
demo | ||
docs | ||
homebrew-formula | ||
martin | ||
martin-mbtiles | ||
martin-tile-utils | ||
tests | ||
.dockerignore | ||
.gitignore | ||
arm64.Dockerfile | ||
Cargo.lock | ||
Cargo.toml | ||
CHANGELOG.md | ||
CODE_OF_CONDUCT.md | ||
docker-compose.yml | ||
Dockerfile | ||
justfile | ||
LICENSE-APACHE | ||
LICENSE-MIT | ||
logo.png | ||
multi-platform.Dockerfile | ||
README.md | ||
rustfmt.toml | ||
SECURITY_POLICY.txt |
Martin
Martin is a tile server able to generate and serve vector tiles on the fly from large PostGIS databases, PMTile, and MBTile files, allowing multiple tile sources to be dynamically combined into one. Martin optimizes for speed and heavy traffic, and is written in Rust.
See Martin book for complete documentation.
Installation
See installation instructions in the Martin book.
Prerequisites: If using Martin with PostgreSQL database, you must install PostGIS with at least v3.0+, v3.1+ recommended.
You can download martin from GitHub releases page.
Platform | Downloads (latest) |
---|---|
Linux | 64-bit |
macOS | 64-bit |
Windows | 64-bit |
If you are using macOS and Homebrew you can install martin using Homebrew tap.
brew tap maplibre/martin https://github.com/maplibre/martin.git
brew install maplibre/martin/martin
Running Martin Service
See running instructions in the Martin book.
Martin supports any number of PostgreSQL/PostGIS database connections with geospatial-enabled tables and tile-producing SQL functions, as well as PMTile and MBTile files as tile sources.
Martin can auto-discover tables and functions using a connection string. A PG connection string can also be passed via the DATABASE_URL
environment variable.
Each tile source will have a TileJSON endpoint.
Examples
# publish all tables and functions from a single database
export DATABASE_URL="postgresql://user:password@host:port/database"
martin
# same as above, but passing connection string via CLI, together with a directory of .mbtiles/.pmtiles files
martin postgresql://user:password@host:port/database path/to/dir
# publish all discovered tables/funcs from two DBs
# and generate config file with all detected sources
martin postgres://... postgres://... --save-config config.yaml
# use configuration file instead of auto-discovery
martin --config config.yaml
Docker Example
See Docker instructions in the Martin book.
Martin is also available as a Docker image. You could either share a configuration file from the host with the container via the -v
param, or you can let Martin auto-discover all sources e.g. by passing DATABASE_URL
or specifying the .mbtiles/.pmtiles files.
export PGPASSWORD=postgres # secret!
docker run -p 3000:3000 \
-e PGPASSWORD \
-e DATABASE_URL=postgresql://user@host:port/db \
-v /path/to/config/dir:/config \
ghcr.io/maplibre/martin --config /config/config.yaml
API
See API documentation in the Martin book.
Martin data is available via the HTTP GET
endpoints:
URL | Description |
---|---|
/ |
Status text, that will eventually show web UI |
/catalog |
List of all sources |
/{sourceID} |
Source TileJSON |
/{sourceID}/{z}/{x}/{y} |
Map Tiles |
/{source1},...,{sourceN} |
Composite Source TileJSON |
/{source1},...,{sourceN}/{z}/{x}/{y} |
Composite Source Tiles |
/sprite/{spriteID}[@2x].{json,png} |
Sprites (low and high DPI, index/png) |
/health |
Martin server health check: returns 200 OK |
Documentation
See Martin book for complete documentation.
License
Licensed under either of
- Apache License, Version 2.0 (LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0)
- MIT license (LICENSE-MIT or http://opensource.org/licenses/MIT) at your option.
Contribution
Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.