flecomte/postgres-json
1
1
Fork 0
Code Issues 10 Pull Requests 2 Actions Packages Projects Releases 2 Wiki Activity

fix return function definition

Browse Source
This commit is contained in:
Fabrice Lecomte
2019-09-16 23:12:28 +02:00
parent 2f9f397f50
commit 88c45aaf77
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/fr/postgresjson/connexion/Connection.kt
View File

@@ -252,7 +252,7 @@ class Connection(
val start = System.currentTimeMillis() val start = System.currentTimeMillis()
val result = callback() val result = callback()
val duration = (System.currentTimeMillis() - start) val duration = (System.currentTimeMillis() - start)
logger?.debug("$duration ms for query: $sqlForLog", values) logger?.debug("$duration ms for query: $sqlForLog \n {}", values.joinToString(", "))
return result return result
} catch (e: Throwable) { } catch (e: Throwable) {
logger?.info("Query Error: $sqlForLog, $values", e) logger?.info("Query Error: $sqlForLog, $values", e)

8
src/main/kotlin/fr/postgresjson/definition/Function.kt
View File

@@ -6,7 +6,7 @@ import java.io.File
open class Function( open class Function(
override val script: String override val script: String
): Resource, ParametersInterface { ): Resource, ParametersInterface {
val returns: String? val returns: String
override val name: String override val name: String
override val parameters: List<Parameter> override val parameters: List<Parameter>
override var source: File? = null override var source: File? = null
@@ -22,9 +22,9 @@ open class Function(
val queryMatch = functionRegex.find(script) val queryMatch = functionRegex.find(script)
if (queryMatch !== null) { if (queryMatch !== null) {
val functionName = queryMatch.groups.get("name")?.value?.trim() val functionName = queryMatch.groups.get("name")?.value?.trim() ?: error("Function name not found")
val functionParameters = queryMatch.groups["params"]?.value?.trim() val functionParameters = queryMatch.groups["params"]?.value?.trim()
this.returns = queryMatch.groups["return"]?.value?.trim() this.returns = queryMatch.groups["return"]?.value?.trim() ?:""
/* Create parameters definition */ /* Create parameters definition */
val parameters = if (functionParameters !== null) { val parameters = if (functionParameters !== null) {
@@ -40,7 +40,7 @@ open class Function(
} else { } else {
listOf() listOf()
} }
this.name = functionName!! this.name = functionName
this.parameters = parameters this.parameters = parameters
} else { } else {
throw FunctionNotFound() throw FunctionNotFound()