fixed QueryTest::TestSelectMustBeFirstAssert (d58553ec) · Commits · github_fork / Clip

src/query/parser.cc

+5 −5

Original line number	Diff line number	Diff line
		@@ -204,7 +204,7 @@ ASTNode* Parser::statement() {

		RAISE(
		ParseError,
		"unexpected token '%s', expected one of SELECT, CREATE or BEGIN\n",
		"unexpected token '%s', expected one of SELECT, CREATE or BEGIN",
		Token::getTypeName(cur_token_->getType()));

		return nullptr;
		@@ -300,7 +300,7 @@ ASTNode* Parser::createStatement() {
		default:
		RAISE(
		ParseError,
		"unexpected token '%s', expected one of SERIES or AXIS\n",
		"unexpected token '%s', expected one of SERIES or AXIS",
		Token::getTypeName(cur_token_->getType()));
		}

		@@ -320,7 +320,7 @@ ASTNode* Parser::beginStatement() {
		default:
		RAISE(
		ParseError,
		"unexpected token '%s', expected one of BAR, LINE or AREA\n",
		"unexpected token '%s', expected one of BAR, LINE or AREA",
		Token::getTypeName(cur_token_->getType()));
		return nullptr;
		}
		@@ -356,7 +356,7 @@ ASTNode* Parser::selectSublist() {
		if (value_expr == nullptr) {
		RAISE(
		ParseError,
		"unexpected token '%s', expected: value expression\n",
		"unexpected token '%s', expected: value expression",
		Token::getTypeName(cur_token_->getType()));
		delete derived;
		return nullptr;
		@@ -633,7 +633,7 @@ bool Parser::assertExpectation(Token::kTokenType expectation) {
		if (!(*cur_token_ == expectation)) {
		RAISE(
		ParseError,
		"unexpected token '%s', expected: '%s'\n",
		"unexpected token '%s', expected: '%s'",
		Token::getTypeName(cur_token_->getType()),
		Token::getTypeName(expectation));
		return false;

+22 −25

Original line number	Diff line number	Diff line
		@@ -70,10 +70,6 @@ class TestTable2Ref : public TableRef {
		}
		};



		// TEST_CASE(CSVInputStreamTest, TestOpenFile, [] () {

		TEST_CASE(QueryTest, TestSimpleValueExpression, [] () {
		auto parser = parseTestQuery("SELECT 23 + 5.123 FROM sometable;");
		EXPECT(parser.getErrors().size() == 0);
		@@ -316,13 +312,14 @@ TEST_CASE(QueryTest, TestSelectDerivedColumnWithTableName, [] () {
		EXPECT(*from == ASTNode::T_FROM);
		});

		/*
		TEST_CASE(QueryTest, TestSelectMustBeFirstAssert, [] () {
		const char* err_msg = "unexpected token 'T_GROUP', expected one of SELECT, "
		"CREATE or BEGIN";

		EXPECT_EXCEPTION(err_msg, [] () {
		auto parser = parseTestQuery("GROUP BY SELECT");
		EXPECT(parser.getErrors().size() == 1);
		EXPECT(parser.getErrors()[0].type == Parser::ERR_UNEXPECTED_TOKEN);
		});
		*/
		});

		TEST_CASE(QueryTest, TestFromList, [] () {
		auto parser = parseTestQuery("SELECT a FROM tbl1, tbl2;");