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

Fix/function with same name #34

Open
flecomte wants to merge 3 commits from fix/function_with_same_name into master
pull from: fix/function_with_same_name
merge into: flecomte:master
Conversation 0 Commits 3 Files Changed 7 +7 -9
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 551b860464 - Show all commits

9
src/main/kotlin/fr/postgresjson/connexion/Requester.kt
View File

@@ -10,13 +10,13 @@ class Requester(
private val queries: MutableMap<String, Query> = mutableMapOf(), private val queries: MutableMap<String, Query> = mutableMapOf(),
private val functions: MutableMap<String, Function> = mutableMapOf() private val functions: MutableMap<String, Function> = mutableMapOf()
) { ) {
constructor(connection: Connection): this(connection, mutableMapOf(), mutableMapOf()) constructor(connection: Connection) : this(connection, mutableMapOf(), mutableMapOf())
constructor( constructor(
connection: Connection, connection: Connection,
queriesDirectory: URI? = null, queriesDirectory: URI? = null,
functionsDirectory: URI? = null functionsDirectory: URI? = null
): this( ) : this(
connection = connection, connection = connection,
queries = queriesDirectory?.toQuery(connection) ?: mutableMapOf(), queries = queriesDirectory?.toQuery(connection) ?: mutableMapOf(),
functions = functionsDirectory?.toFunction(connection) ?: mutableMapOf(), functions = functionsDirectory?.toFunction(connection) ?: mutableMapOf(),
@@ -63,11 +63,10 @@ class Requester(
fun getQuery(path: String): Query = queries[path] ?: throw NoQueryDefined(path) fun getQuery(path: String): Query = queries[path] ?: throw NoQueryDefined(path)
fun <A> inTransaction(block: Requester.() -> A?): A? = connection.inTransaction { fun <A> inTransaction(block: Requester.() -> A?): A? = connection.inTransaction {
this@Requester.block() this@Requester.block()
} }
class NoFunctionDefined(name: String): Exception("No function defined for $name") class NoFunctionDefined(name: String) : Exception("No function defined for $name")
class NoQueryDefined(path: String): Exception("No query defined in $path") class NoQueryDefined(path: String) : Exception("No query defined in $path")
} }

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

@@ -7,7 +7,7 @@ import java.nio.file.Path
class Function( class Function(
override val script: String, override val script: String,
override val source: Path? = null override val source: Path? = null
): 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>
@@ -48,7 +48,7 @@ class Function(
} }
} }
class FunctionNotFound(cause: Throwable? = null): Resource.ParseException("Function not found in script", cause) class FunctionNotFound(cause: Throwable? = null) : Resource.ParseException("Function not found in script", cause)
val definition: String val definition: String
get() { get() {
@@ -76,4 +76,3 @@ class Function(
return other.script != this.script return other.script != this.script
} }
} }

2
src/main/kotlin/fr/postgresjson/utils/md5.kt
View File

@@ -9,4 +9,4 @@ internal enum class Algorithm(name: String) {
internal fun String.hash(algorithm: Algorithm): String { internal fun String.hash(algorithm: Algorithm): String {
val md = MessageDigest.getInstance(algorithm.name) val md = MessageDigest.getInstance(algorithm.name)
return BigInteger(1, md.digest(toByteArray())).toString(16).padStart(32, '0') return BigInteger(1, md.digest(toByteArray())).toString(16).padStart(32, '0')
} }