/ - Diff - BIEN 3 - NCEAS Projects

« Previous | Next »

Revision 14381

schemas/util.sql: view_def_to_orig(): use util.col_re() for clarity

+    ,
     /* unexpand expanded * expressions. any list of 6+ cols from the same table is
     treated as a * expression. */
     '((?:"[^"\s]+"|\w+)\.)(?:"[^"\s]+"|\w+)'||
     '('||col||'\.)'||col||
     	/* 1st col, which lacks separator before.
     	*note*: can't prepend \y because it considers only \w chars, not " */
     '(,[[:blank:]]*
     [[:blank:]]*)\1(?:"[^"\s]+"|\w+)'|| -- 2nd col, which has separator before
     '(?:\2\1(?:"[^"\s]+"|\w+)){4,}', -- later cols, w/ same table name and separator
     [[:blank:]]*)\1'||col|| -- 2nd col, which has separator before
     '(?:\2\1'||col||'){4,}', -- later cols, w/ same table name and separator
     '\1*'/*prefix w/ table*/,
     'g')
+    ,
     /* merge .* expressions resulting from a SELECT * of a join. any list of
     multiple .* expressions is treated as a SELECT * . */
     '(?:"[^"\s]+"|\w+)\.\*'||
     ''||col||'\.\*'||
     	/* 1st table, which lacks separator before.
     	*note*: can't prepend \y because it considers only \w chars, not " */
     '(,[[:blank:]]*
     [[:blank:]]*)(?:"[^"\s]+"|\w+)\.\*'|| -- 2nd table, which has separator before
     '(?:\1(?:"[^"\s]+"|\w+)\.\*)*', -- later tables, w/ same separator
     [[:blank:]]*)'||col||'\.\*'|| -- 2nd table, which has separator before
     '(?:\1'||col||'\.\*)*', -- later tables, w/ same separator
     '*',
     'g')
     END
     FROM (SELECT util.col_re() AS col) s
     $_$;

Also available in: Unified diff