update erd; datejoin => not nullable