Skip to content

Parse multi-word PostgreSQL function argument types #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PhotonData-oss wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −2
Open

Parse multi-word PostgreSQL function argument types #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/scala/za/co/absa/ultet/util/parsers/PgFunctionFileParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ object PgFunctionFileParser extends GenericFileParser[FunctionFromSource] {
// 7 - capturing-group #3 - parameters are matched there as a block - \s also covers line-breaks => parsed further later


private val singleParamCapturingRx = """(?i)\s*(IN|OUT)\s+(\w+)\s+(\w+)\s*""".r // used to break up params from ^^
// 1--1 2------2 3---3 4---4
private val singleParamCapturingRx = """(?i)\s*(IN|OUT)\s+(\w+)\s+(.+)\s*""".r // used to break up params from ^^
// 1--1 2------2 3--3 4---4
// 1 - case insensitive matching
// 2 - capturing-group #1 IN/OUT param
// 3 - capturing-group #2 for param name
Expand Down
24 changes: 24 additions & 0 deletions src/test/scala/za/co/absa/ultet/util/parsers/PgFunctionFileParserTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,30 @@ class PgFunctionFileParserTest extends AnyFlatSpec with Matchers {

}

it should "parse multi-word IN parameter type" in {
val functionString =
"""/* comment here and there **/
|-- owner:
| owner_user123
|-- database: eXample_db ( )
|CREATE or REPLACE FUNCTION my_schema1.public_functionX(
| IN param_name TIMESTAMP WITH TIME ZONE
|) RETURNS record AS
|$$
|-------------------------------------------------------------------------------
|--""".stripMargin

PgFunctionFileParser.parseSource(functionString).head shouldBe FunctionFromSource(
fnName = FunctionName("public_functionX"),
paramTypes = Seq(FunctionArgumentType("TIMESTAMP WITH TIME ZONE")),
owner = UserName("owner_user123"),
users = Set.empty,
schema = SchemaName("my_schema1"),
database = DatabaseName("eXample_db"),
sqlBody = functionString
)
}

it should "parse example function example file" in {
val testFileUri = getClass.getClassLoader.getResource("public_function_example.sql").toURI

Expand Down