[PATCH 1/2] Avoid adding a non-null column with a null default value