Database: rewritten joins parser (BC break!)
typo: reordered methods
Merge pull request #1012 from hrach/database-join-parser

Database join parser