WO 877

Add GF txn type to where clause, add DDL for datamart table