update schema-next and migrate the last column to enumcol

Change-Id: I31dd262fc6b9732fd118b6e699b546ea0cef7c49