Small sql refactoring
Merge branch 'master' of https://github.com/tsivarev/vk-test-work