Fix unit test failures introduced in UCM refactoring
Resync MySQL and PostgreSQL DDLs and updates