/ - Diff - BIEN 3 - NCEAS Projects

« Previous | Next »

Revision 14387

fix: schemas/util.sql: view_def_to_orig(): need to support aliased columns (produced when a column is renamed)

+    ,
     /* unexpand expanded * expressions. any list of 6+ cols from the same table is
     treated as a * expression. */
     '('||util.col_re()||'\.)'||util.col_re()||
     '('||util.aliased_col_re()||'\.)'||util.aliased_col_re()||
     	/* 1st col, which lacks separator before.
     	*note*: can't prepend \y because it considers only \w chars, not " */
     '(,[[:blank:]]*
     [[:blank:]]*)\1'||util.col_re()|| -- 2nd col, which has separator before
     '(?:\2\1'||util.col_re()||'){4,}', -- later cols, w/ same table name & separator
     [[:blank:]]*)\1'||util.aliased_col_re()|| -- 2nd col, which has separator before
     '(?:\2\1'||util.aliased_col_re()||'){4,}', --later cols, w/ same table/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 * . */
     ''||util.col_re()||'\.\*'||
     ''||util.aliased_col_re()||'\.\*'||
     	/* 1st table, which lacks separator before.
     	*note*: can't prepend \y because it considers only \w chars, not " */
     '(,[[:blank:]]*
     [[:blank:]]*)'||util.col_re()||'\.\*'|| -- 2nd table, which has separator before
     '(?:\1'||util.col_re()||'\.\*)*', -- later tables, w/ same separator
     [[:blank:]]*)'||util.aliased_col_re()||'\.\*'|| --2nd table, w/ separator before
     '(?:\1'||util.aliased_col_re()||'\.\*)*', -- later tables, w/ same separator
     '*',
     'g')
     END

Also available in: Unified diff