jimmy/postgrest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Make recursive view parsing work with XMLTABLE + DEFAULT

Browse Source
This commit is contained in:
Wolfgang Walther
2021-12-24 19:01:20 +01:00
committed by Wolfgang Walther
parent ac3655df1d
commit b99c8c897c
4 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PostgREST/DbStructure.hs
+8 -6
View File
@@ -792,7 +792,6 @@ pfkSourceColumns cols =
replace(
replace(
replace(
replace(
regexp_replace(
replace(
replace(
@@ -803,6 +802,7 @@ pfkSourceColumns cols =
replace(
replace(
replace(
replace(
replace(
view_definition::text,
-- This conversion to json is heavily optimized for performance.
@@ -814,9 +814,15 @@ pfkSourceColumns cols =
-- -----------------------------------------------
-- pattern | replacement | flags
-- -----------------------------------------------
-- `<>` in pg_node_tree is the same as `null` in JSON, but due to very poor performance of json_typeof
-- we need to make this an empty array here to prevent json_array_elements from throwing an error
-- when the targetList is null.
-- We'll need to put it first, to make the node protection below work for node lists that start with
-- null: `(<> ...`, too. This is the case for coldefexprs, when the first column does not have a default value.
'<>' , '()'
-- `,` is not part of the pg_node_tree format, but used in the regex.
-- This removes all `,` that might be part of column names.
',' , ''
), ',' , ''
-- The same applies for `{` and `}`, although those are used a lot in pg_node_tree.
-- We remove the escaped ones, which might be part of column names again.
), E'\\{' , ''
@@ -851,10 +857,6 @@ pfkSourceColumns cols =
), ')' , ']'
-- pg_node_tree has ` ` between list items, but JSON uses `,`
), ' ' , ','
-- `<>` in pg_node_tree is the same as `null` in JSON, but due to very poor performance of json_typeof
-- we need to make this an empty array here to prevent json_array_elements from throwing an error
-- when the targetList is null.
), '<>' , '[]'
)::json as view_definition
from views
),