fix long database not int as id
Merge remote-tracking branch 'origin/feature/1.3.0' into feature/1.3.0