Several create function statements are stuck in a single statement

[JakkuSakura]

Describe the bug Several create function statements are stuck in a single statement

To Reproduce

  def parse(sql: String): Seq[AstNode] = {
    var collected = ArrayBuffer[AstNode]()

    val stmts = CCJSqlParserUtil.parseStatements(sql)
    stmts.getStatements.asScala.foreach {
      case table: CreateTable   => collected += parseCreateTable(table)
      case func: CreateFunction => collected += parseCreateFunction(func)
      case _                    =>
    }
    collected.toSeq
  }

CREATE OR REPLACE FUNCTION func_example(foo integer)
RETURNS integer AS $$
BEGIN
  RETURN foo + 1;
END
$$ LANGUAGE plpgsql;

CREATE OR REPLACE FUNCTION func_example2(IN foo integer, OUT bar integer)
AS $$
BEGIN
    SELECT foo + 1 INTO bar;
END
$$ LANGUAGE plpgsql;

Expected behavior

System

• Database you are using: Postgres
• Java Version JDK 1.8
• JSqlParser version 4.3

[wumpz]

Thats right. Look into line 6248. JSqlParser does not parse the statements but reads all tokens from $$ to $$. Unfortunately whitespaces are skipped.

[manticore-projects]

Fixed this issue via commit https://github.com/JSQLParser/JSqlParser/pull/1778/commits/5263b91f3e555b79973e4cde68373760dfe4c998, functions/procedures can end now in two ways:

1. <BEGIN> ... <END> ( ; | EOF)
2. <$$> ... <$$> ... ( ; | EOF)