Improve concaternation
Merge pull request #6184 from JeroenDeDauw/sqlitegrammar

[5.0] Improve Concaternation