merge wip-sql-mapping