added support for @ in sql blocks and removing whitespaces after @ and : in sql blocks