feature: add name into Query object

This commit is contained in:
2019-08-03 20:25:01 +02:00
parent 24aa3cf632
commit ae184cd52c
4 changed files with 11 additions and 4 deletions

View File

@@ -7,6 +7,7 @@ import fr.postgresjson.entity.EntityI
interface EmbedExecutable { interface EmbedExecutable {
val connection: Connection val connection: Connection
override fun toString(): String override fun toString(): String
val name: String
/* Select One */ /* Select One */
/** /**

View File

@@ -10,6 +10,8 @@ class Function(val definition: Function, override val connection: Connection): E
return definition.name return definition.name
} }
override val name: String = definition.name
/* Select One */ /* Select One */
/** /**

View File

@@ -5,7 +5,7 @@ import com.github.jasync.sql.db.QueryResult
import fr.postgresjson.entity.EntityI import fr.postgresjson.entity.EntityI
class Query(private val sql: String, override val connection: Connection): EmbedExecutable { class Query(override val name: String, private val sql: String, override val connection: Connection): EmbedExecutable {
override fun toString(): String { override fun toString(): String {
return sql return sql
} }

View File

@@ -8,13 +8,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()
) { ) {
fun addQuery(name: String, query: Query): Requester { fun addQuery(query: Query): Requester {
queries[name] = query queries[query.name] = query
return this return this
} }
fun addQuery(name: String, sql: String): Requester { fun addQuery(name: String, sql: String): Requester {
queries[name] = Query(sql, connection) addQuery(Query(name, sql, connection))
return this return this
} }
@@ -28,6 +28,10 @@ class Requester(
return this return this
} }
fun getQueries(): List<Query> {
return queries.map { it.value }
}
fun addFunction(definition: DefinitionFunction): Requester { fun addFunction(definition: DefinitionFunction): Requester {
functions[definition.name] = Function(definition, connection) functions[definition.name] = Function(definition, connection)
return this return this