2022-11-26 12:46:40 +03:00
|
|
|
use ctor::ctor;
|
2022-12-10 23:11:11 +03:00
|
|
|
use itertools::Itertools;
|
2022-12-27 09:56:27 +03:00
|
|
|
use martin::pg::{get_function_sources, Schemas};
|
|
|
|
use martin::Xyz;
|
2021-10-23 17:02:18 +03:00
|
|
|
|
2023-01-01 08:03:21 +03:00
|
|
|
#[path = "pg_utils.rs"]
|
2022-11-26 12:46:40 +03:00
|
|
|
mod utils;
|
2022-12-19 05:24:06 +03:00
|
|
|
#[allow(clippy::wildcard_imports)]
|
2022-11-26 12:46:40 +03:00
|
|
|
use utils::*;
|
|
|
|
|
|
|
|
#[ctor]
|
2021-10-23 17:02:18 +03:00
|
|
|
fn init() {
|
|
|
|
let _ = env_logger::builder().is_test(true).try_init();
|
|
|
|
}
|
|
|
|
|
|
|
|
#[actix_rt::test]
|
Support z,x,y and record-returning funcs, table rework (#380)
Can now handle several additional Postgres functions to get a tile, plus
tons of small fixes
### Multiple result variants
* `getmvt(z,x,y) -> [bytea,md5]` (single row with two columns)
* `getmvt(z,x,y) -> [bytea]` (single row with a single column)
* `getmvt(z,x,y) -> bytea` (value)
### Multiple input parameter variants
* `getmvt(z, x, y)` or `getmvt(zoom, x, y)` (all 3 vars must be
integers)
* `getmvt(z, x, y, url_query)`, where instead of `url_query` it could be
any other name, but must be of type JSON
### Breaking
* srid is now the same type as PG -- `i32`
* renamed config vals `table_sources` and `function_sources` into
`tables` and `functions`
### Features and fixes
* if postgis is v3.1+, uses margin parameter to extend the search box by
the size of the buffer. I think we should make 3.1 minimal required.
* fixes feature ID issue from #466
* fixes mixed case names for schemas, tables and columns, functions and
parameter names per #389
### Notes
* More dynamic SQL generation in code instead of using external SQL
files. Those should only be used when they are not parametrized.
* The new function/table discovery mechanism: query for all functions in
the database, and match up those functions with the ones configured (if
any), plus adds all the rest of the un-declared ones if discovery mode
is on.
* During table and function discovery, the code generates a map of
`(PgSqlInfo, FunctionInfo)` (or table) tupples containing SQL needed to
get the tile.
* Auto-discovery mode is currently hidden - the discovery is on only
when no tables or functions are configured. TBD - how to configure it in
the future
* The new system allows for an easy way to auto-discover for the
specific schemas only, solving #47
* predictable order of table/function instantiation
* bounding boxes computed in parallel for all tables (when not
configured)
* proper identifier escaping
* test cleanup
fixes #378
fixes #466
fixes #65
fixes #389
2022-12-10 17:20:42 +03:00
|
|
|
async fn get_function_sources_ok() {
|
2022-11-26 12:46:40 +03:00
|
|
|
let pool = mock_pool().await;
|
Support z,x,y and record-returning funcs, table rework (#380)
Can now handle several additional Postgres functions to get a tile, plus
tons of small fixes
### Multiple result variants
* `getmvt(z,x,y) -> [bytea,md5]` (single row with two columns)
* `getmvt(z,x,y) -> [bytea]` (single row with a single column)
* `getmvt(z,x,y) -> bytea` (value)
### Multiple input parameter variants
* `getmvt(z, x, y)` or `getmvt(zoom, x, y)` (all 3 vars must be
integers)
* `getmvt(z, x, y, url_query)`, where instead of `url_query` it could be
any other name, but must be of type JSON
### Breaking
* srid is now the same type as PG -- `i32`
* renamed config vals `table_sources` and `function_sources` into
`tables` and `functions`
### Features and fixes
* if postgis is v3.1+, uses margin parameter to extend the search box by
the size of the buffer. I think we should make 3.1 minimal required.
* fixes feature ID issue from #466
* fixes mixed case names for schemas, tables and columns, functions and
parameter names per #389
### Notes
* More dynamic SQL generation in code instead of using external SQL
files. Those should only be used when they are not parametrized.
* The new function/table discovery mechanism: query for all functions in
the database, and match up those functions with the ones configured (if
any), plus adds all the rest of the un-declared ones if discovery mode
is on.
* During table and function discovery, the code generates a map of
`(PgSqlInfo, FunctionInfo)` (or table) tupples containing SQL needed to
get the tile.
* Auto-discovery mode is currently hidden - the discovery is on only
when no tables or functions are configured. TBD - how to configure it in
the future
* The new system allows for an easy way to auto-discover for the
specific schemas only, solving #47
* predictable order of table/function instantiation
* bounding boxes computed in parallel for all tables (when not
configured)
* proper identifier escaping
* test cleanup
fixes #378
fixes #466
fixes #65
fixes #389
2022-12-10 17:20:42 +03:00
|
|
|
let sources = get_function_sources(&pool).await.unwrap();
|
2021-10-23 17:02:18 +03:00
|
|
|
|
2022-11-30 19:57:27 +03:00
|
|
|
assert!(!sources.is_empty());
|
Support z,x,y and record-returning funcs, table rework (#380)
Can now handle several additional Postgres functions to get a tile, plus
tons of small fixes
### Multiple result variants
* `getmvt(z,x,y) -> [bytea,md5]` (single row with two columns)
* `getmvt(z,x,y) -> [bytea]` (single row with a single column)
* `getmvt(z,x,y) -> bytea` (value)
### Multiple input parameter variants
* `getmvt(z, x, y)` or `getmvt(zoom, x, y)` (all 3 vars must be
integers)
* `getmvt(z, x, y, url_query)`, where instead of `url_query` it could be
any other name, but must be of type JSON
### Breaking
* srid is now the same type as PG -- `i32`
* renamed config vals `table_sources` and `function_sources` into
`tables` and `functions`
### Features and fixes
* if postgis is v3.1+, uses margin parameter to extend the search box by
the size of the buffer. I think we should make 3.1 minimal required.
* fixes feature ID issue from #466
* fixes mixed case names for schemas, tables and columns, functions and
parameter names per #389
### Notes
* More dynamic SQL generation in code instead of using external SQL
files. Those should only be used when they are not parametrized.
* The new function/table discovery mechanism: query for all functions in
the database, and match up those functions with the ones configured (if
any), plus adds all the rest of the un-declared ones if discovery mode
is on.
* During table and function discovery, the code generates a map of
`(PgSqlInfo, FunctionInfo)` (or table) tupples containing SQL needed to
get the tile.
* Auto-discovery mode is currently hidden - the discovery is on only
when no tables or functions are configured. TBD - how to configure it in
the future
* The new system allows for an easy way to auto-discover for the
specific schemas only, solving #47
* predictable order of table/function instantiation
* bounding boxes computed in parallel for all tables (when not
configured)
* proper identifier escaping
* test cleanup
fixes #378
fixes #466
fixes #65
fixes #389
2022-12-10 17:20:42 +03:00
|
|
|
|
2023-01-01 08:03:21 +03:00
|
|
|
let funcs = sources.get("public").unwrap();
|
|
|
|
let source = funcs.get("function_zxy_query").unwrap();
|
Support z,x,y and record-returning funcs, table rework (#380)
Can now handle several additional Postgres functions to get a tile, plus
tons of small fixes
### Multiple result variants
* `getmvt(z,x,y) -> [bytea,md5]` (single row with two columns)
* `getmvt(z,x,y) -> [bytea]` (single row with a single column)
* `getmvt(z,x,y) -> bytea` (value)
### Multiple input parameter variants
* `getmvt(z, x, y)` or `getmvt(zoom, x, y)` (all 3 vars must be
integers)
* `getmvt(z, x, y, url_query)`, where instead of `url_query` it could be
any other name, but must be of type JSON
### Breaking
* srid is now the same type as PG -- `i32`
* renamed config vals `table_sources` and `function_sources` into
`tables` and `functions`
### Features and fixes
* if postgis is v3.1+, uses margin parameter to extend the search box by
the size of the buffer. I think we should make 3.1 minimal required.
* fixes feature ID issue from #466
* fixes mixed case names for schemas, tables and columns, functions and
parameter names per #389
### Notes
* More dynamic SQL generation in code instead of using external SQL
files. Those should only be used when they are not parametrized.
* The new function/table discovery mechanism: query for all functions in
the database, and match up those functions with the ones configured (if
any), plus adds all the rest of the un-declared ones if discovery mode
is on.
* During table and function discovery, the code generates a map of
`(PgSqlInfo, FunctionInfo)` (or table) tupples containing SQL needed to
get the tile.
* Auto-discovery mode is currently hidden - the discovery is on only
when no tables or functions are configured. TBD - how to configure it in
the future
* The new system allows for an easy way to auto-discover for the
specific schemas only, solving #47
* predictable order of table/function instantiation
* bounding boxes computed in parallel for all tables (when not
configured)
* proper identifier escaping
* test cleanup
fixes #378
fixes #466
fixes #65
fixes #389
2022-12-10 17:20:42 +03:00
|
|
|
assert_eq!(source.1.schema, "public");
|
|
|
|
assert_eq!(source.1.function, "function_zxy_query");
|
|
|
|
assert_eq!(source.1.minzoom, None);
|
|
|
|
assert_eq!(source.1.maxzoom, None);
|
|
|
|
assert_eq!(source.1.bounds, None);
|
2022-12-27 09:56:27 +03:00
|
|
|
|
2023-01-01 08:03:21 +03:00
|
|
|
let source = funcs.get("function_zxy_query_jsonb").unwrap();
|
2022-12-27 09:56:27 +03:00
|
|
|
assert_eq!(source.1.schema, "public");
|
|
|
|
assert_eq!(source.1.function, "function_zxy_query_jsonb");
|
2021-10-23 17:02:18 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
#[actix_rt::test]
|
2022-11-26 12:46:40 +03:00
|
|
|
async fn function_source_tilejson() {
|
2023-01-01 08:03:21 +03:00
|
|
|
let mock = mock_sources(mock_cfg("connection_string: $DATABASE_URL")).await;
|
Support z,x,y and record-returning funcs, table rework (#380)
Can now handle several additional Postgres functions to get a tile, plus
tons of small fixes
### Multiple result variants
* `getmvt(z,x,y) -> [bytea,md5]` (single row with two columns)
* `getmvt(z,x,y) -> [bytea]` (single row with a single column)
* `getmvt(z,x,y) -> bytea` (value)
### Multiple input parameter variants
* `getmvt(z, x, y)` or `getmvt(zoom, x, y)` (all 3 vars must be
integers)
* `getmvt(z, x, y, url_query)`, where instead of `url_query` it could be
any other name, but must be of type JSON
### Breaking
* srid is now the same type as PG -- `i32`
* renamed config vals `table_sources` and `function_sources` into
`tables` and `functions`
### Features and fixes
* if postgis is v3.1+, uses margin parameter to extend the search box by
the size of the buffer. I think we should make 3.1 minimal required.
* fixes feature ID issue from #466
* fixes mixed case names for schemas, tables and columns, functions and
parameter names per #389
### Notes
* More dynamic SQL generation in code instead of using external SQL
files. Those should only be used when they are not parametrized.
* The new function/table discovery mechanism: query for all functions in
the database, and match up those functions with the ones configured (if
any), plus adds all the rest of the un-declared ones if discovery mode
is on.
* During table and function discovery, the code generates a map of
`(PgSqlInfo, FunctionInfo)` (or table) tupples containing SQL needed to
get the tile.
* Auto-discovery mode is currently hidden - the discovery is on only
when no tables or functions are configured. TBD - how to configure it in
the future
* The new system allows for an easy way to auto-discover for the
specific schemas only, solving #47
* predictable order of table/function instantiation
* bounding boxes computed in parallel for all tables (when not
configured)
* proper identifier escaping
* test cleanup
fixes #378
fixes #466
fixes #65
fixes #389
2022-12-10 17:20:42 +03:00
|
|
|
let tilejson = source(&mock, "function_zxy_query").get_tilejson();
|
2021-10-23 17:02:18 +03:00
|
|
|
|
|
|
|
assert_eq!(tilejson.tilejson, "2.2.0");
|
2022-12-27 09:56:27 +03:00
|
|
|
assert_eq!(tilejson.version, some("1.0.0"));
|
|
|
|
assert_eq!(tilejson.name, some("public.function_zxy_query"));
|
|
|
|
assert_eq!(tilejson.scheme, some("xyz"));
|
2021-10-23 17:02:18 +03:00
|
|
|
assert_eq!(tilejson.minzoom, Some(0));
|
|
|
|
assert_eq!(tilejson.maxzoom, Some(30));
|
|
|
|
assert!(tilejson.bounds.is_some());
|
|
|
|
assert!(tilejson.tiles.is_empty());
|
|
|
|
}
|
|
|
|
|
|
|
|
#[actix_rt::test]
|
2022-11-26 12:46:40 +03:00
|
|
|
async fn function_source_tile() {
|
2023-01-01 08:03:21 +03:00
|
|
|
let mock = mock_sources(mock_cfg("connection_string: $DATABASE_URL")).await;
|
Support z,x,y and record-returning funcs, table rework (#380)
Can now handle several additional Postgres functions to get a tile, plus
tons of small fixes
### Multiple result variants
* `getmvt(z,x,y) -> [bytea,md5]` (single row with two columns)
* `getmvt(z,x,y) -> [bytea]` (single row with a single column)
* `getmvt(z,x,y) -> bytea` (value)
### Multiple input parameter variants
* `getmvt(z, x, y)` or `getmvt(zoom, x, y)` (all 3 vars must be
integers)
* `getmvt(z, x, y, url_query)`, where instead of `url_query` it could be
any other name, but must be of type JSON
### Breaking
* srid is now the same type as PG -- `i32`
* renamed config vals `table_sources` and `function_sources` into
`tables` and `functions`
### Features and fixes
* if postgis is v3.1+, uses margin parameter to extend the search box by
the size of the buffer. I think we should make 3.1 minimal required.
* fixes feature ID issue from #466
* fixes mixed case names for schemas, tables and columns, functions and
parameter names per #389
### Notes
* More dynamic SQL generation in code instead of using external SQL
files. Those should only be used when they are not parametrized.
* The new function/table discovery mechanism: query for all functions in
the database, and match up those functions with the ones configured (if
any), plus adds all the rest of the un-declared ones if discovery mode
is on.
* During table and function discovery, the code generates a map of
`(PgSqlInfo, FunctionInfo)` (or table) tupples containing SQL needed to
get the tile.
* Auto-discovery mode is currently hidden - the discovery is on only
when no tables or functions are configured. TBD - how to configure it in
the future
* The new system allows for an easy way to auto-discover for the
specific schemas only, solving #47
* predictable order of table/function instantiation
* bounding boxes computed in parallel for all tables (when not
configured)
* proper identifier escaping
* test cleanup
fixes #378
fixes #466
fixes #65
fixes #389
2022-12-10 17:20:42 +03:00
|
|
|
let src = source(&mock, "function_zxy_query");
|
|
|
|
let tile = src
|
|
|
|
.get_tile(&Xyz { z: 0, x: 0, y: 0 }, &None)
|
2022-08-15 16:54:48 +03:00
|
|
|
.await
|
2021-10-23 17:02:18 +03:00
|
|
|
.unwrap();
|
2022-12-27 09:56:27 +03:00
|
|
|
assert!(!tile.is_empty());
|
2021-10-23 17:02:18 +03:00
|
|
|
|
2022-12-27 09:56:27 +03:00
|
|
|
let src = source(&mock, "function_zxy_query_jsonb");
|
|
|
|
let tile = src
|
|
|
|
.get_tile(&Xyz { z: 0, x: 0, y: 0 }, &None)
|
|
|
|
.await
|
|
|
|
.unwrap();
|
2021-10-23 17:02:18 +03:00
|
|
|
assert!(!tile.is_empty());
|
|
|
|
}
|
2022-12-10 23:11:11 +03:00
|
|
|
|
|
|
|
#[actix_rt::test]
|
|
|
|
async fn function_source_schemas() {
|
2023-01-01 08:03:21 +03:00
|
|
|
let mut cfg = mock_cfg("connection_string: $DATABASE_URL");
|
2022-12-10 23:11:11 +03:00
|
|
|
cfg.auto_functions = Some(Schemas::List(vec!["MixedCase".to_owned()]));
|
|
|
|
cfg.auto_tables = Some(Schemas::Bool(false));
|
|
|
|
let sources = mock_sources(cfg).await.0;
|
|
|
|
assert_eq!(
|
|
|
|
sources.keys().sorted().collect::<Vec<_>>(),
|
|
|
|
vec!["function_Mixed_Name"],
|
|
|
|
);
|
|
|
|
}
|