Fetch on SQL class should use newly added logic instead of its own type enumeration.