reorder imports
fix bug where custom declared integer primary keys fields where mistaken for serial type