remove returns in function definition
This commit is contained in:
@@ -13,7 +13,7 @@ open class Function(
|
|||||||
|
|
||||||
init {
|
init {
|
||||||
val functionRegex =
|
val functionRegex =
|
||||||
"""create (or replace )?(procedure|function) *(?<name>[^(\s]+)\s*\((?<params>(\s*((IN|OUT|INOUT|VARIADIC)?\s+)?([^\s,)]+\s+)?([^\s,)]+)(\s+(?:default\s|=)\s*[^\s,)]+)?\s*(,|(?=\))))*)\) *(?<return>RETURNS *[^ ]+)?"""
|
"""create (or replace )?(procedure|function) *(?<name>[^(\s]+)\s*\((?<params>(\s*((IN|OUT|INOUT|VARIADIC)?\s+)?([^\s,)]+\s+)?([^\s,)]+)(\s+(?:default\s|=)\s*[^\s,)]+)?\s*(,|(?=\))))*)\) *(?<return>RETURNS *[^ \n]+)?"""
|
||||||
.toRegex(setOf(RegexOption.IGNORE_CASE, RegexOption.MULTILINE))
|
.toRegex(setOf(RegexOption.IGNORE_CASE, RegexOption.MULTILINE))
|
||||||
|
|
||||||
val paramsRegex =
|
val paramsRegex =
|
||||||
@@ -54,7 +54,7 @@ open class Function(
|
|||||||
return parameters
|
return parameters
|
||||||
.filter { it.direction == Parameter.Direction.IN }
|
.filter { it.direction == Parameter.Direction.IN }
|
||||||
.joinToString(", ") { "${it.name} ${it.type}" }.let {
|
.joinToString(", ") { "${it.name} ${it.type}" }.let {
|
||||||
"$name ($it) $returns"
|
"$name ($it)"
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
CREATE OR REPLACE FUNCTION test_function_duplicate (name text default 'plop', out result json)
|
CREATE OR REPLACE FUNCTION test_function_duplicate (name text default 'plop') returns json
|
||||||
LANGUAGE plpgsql
|
LANGUAGE plpgsql
|
||||||
AS
|
AS
|
||||||
$$
|
$$
|
||||||
BEGIN
|
BEGIN
|
||||||
result = json_build_object('id', 3, 'name', name);
|
return json_build_object('id', 3, 'name', name);
|
||||||
END;
|
END;
|
||||||
$$
|
$$
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
CREATE OR REPLACE FUNCTION test_function_duplicate (name text default 'plop') returns text
|
CREATE OR REPLACE FUNCTION test_function_duplicate (name text default 'plop', out result text)
|
||||||
LANGUAGE plpgsql
|
LANGUAGE plpgsql
|
||||||
AS
|
AS
|
||||||
$$
|
$$
|
||||||
BEGIN
|
BEGIN
|
||||||
return name;
|
result = name;
|
||||||
END;
|
END;
|
||||||
$$
|
$$
|
||||||
Reference in New Issue
Block a user