Various database fixes
Added a missing new line
Fix the docblock for constructor
Merge pull request #6709 from GrahamForks/4.2-fixes

[4.2] Various Database Fixes