Updated SQL Parser and test cases