fix exploding as statement on joins
Merge branch 'master' of github.com:Larium/larium_database