fix exclude/include tables #131
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vincentsarago
commented
Oct 17, 2023
tipg/sql/dbcatalog.sql
Outdated
| @@ -246,10 +246,11 @@ CREATE OR REPLACE FUNCTION pg_temp.tipg_catalog( | |||
| AND relkind IN ('r','v', 'm', 'f', 'p') | |||
| AND has_table_privilege(c.oid, 'SELECT') | |||
| AND c.relname::text NOT IN ('spatial_ref_sys','geometry_columns','geography_columns') | |||
| AND (exclude_tables IS NULL OR concat(c.relnamespace::regnamespace::text,'.',c.relname::text) != ANY (exclude_tables)) | |||
| AND (exclude_tables IS NULL OR concat(c.relnamespace::regnamespace::text,'.',c.relname::text) <> ALL (exclude_tables)) | |||
There was a problem hiding this comment.
This seems to fix #130
vincentsarago
commented
Oct 17, 2023
tipg/sql/dbcatalog.sql
Outdated
| AND (functions IS NULL OR concat(p.pronamespace::regnamespace::text, '.', proname::text) = ANY (functions)) | ||
| AND (exclude_functions IS NULL OR concat(p.pronamespace::regnamespace::text,'.',proname::text) != ANY (exclude_functions)) | ||
| AND (exclude_functions IS NULL OR concat(p.pronamespace::regnamespace::text,'.',proname::text) <> ALL (exclude_functions)) | ||
| AND (functions IS NULL OR concat(p.pronamespace::regnamespace::text,'.',proname::text) = ANY (functions)) |
There was a problem hiding this comment.
I don't understand but the include/exclude filter do not work for function (see the failing tests)
cc @bitner
There was a problem hiding this comment.
Ahh, this is because the actual namespace of the function isn't pg_temp -- pg_temp is an automatic alias for a temp schema that is created behind the scenes
vincentsarago
commented
Oct 17, 2023
| @@ -140,7 +141,7 @@ def test_collections_includes(app_includes): | |||
| assert response.status_code == 200 | |||
| body = response.json() | |||
| ids = [x["id"] for x in body["collections"]] | |||
| assert ["public.nongeo_data"] == ids | |||
| assert ["public.minnesota", "public.nongeo_data"] == ids | |||
vincentsarago
commented
Oct 17, 2023
tests/routes/test_collections.py
Outdated
| assert response.status_code == 200 | ||
| body = response.json() | ||
| ids = [x["id"] for x in body["collections"]] | ||
| assert ["pg_temp.hexagons", "pg_temp.squares"] == ids |
There was a problem hiding this comment.
Those 2 tests are failing right now 🤷
|
Just checking on the progress for this bug? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #130