Fix bug 959017 - Declare id as primary key