fix sql

upcase all sql key word
add u.Pubkeys & u.Roles