Refactor regex part of macros

[fridgepoet]

This will extract the matching of macro name and the extraction of fields in rawSQL in a separate function to facilitate testing.