Also, can you switch any occurrence you see of schemaName + QueryConstants.NAME_SEPARATOR + tableName + QueryConstants.NAME_SEPARATOR + columnName with our SchemaUtil utility function? Might need to add one that includes columnName too. It takes care of null/empty schema name.