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

rename interface UpdatedBy to EntityUpdatedBy

Browse Source
This commit is contained in:
Fabrice Lecomte
2019-08-27 22:57:49 +02:00
parent 65d8e00902
commit 215c054f27
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/fr/postgresjson/connexion/Function.kt
View File

@@ -195,11 +195,11 @@ class Function(val definition: Function, override val connection: Connection): E
val parameters = definition.getParametersIndexedByName()
val placeholders = values
.filter { entry ->
val parameter = parameters[entry.key] ?: parameters["_"+entry.key] ?: error("Parameter ${entry.key} not exist")
val parameter = parameters[entry.key] ?: parameters["_"+entry.key] ?: error("Parameter ${entry.key} of function ${definition.name} not exist")
parameter.default === null || entry.value !== null
}
.map { entry ->
val parameter = parameters[entry.key] ?: parameters["_"+entry.key] ?: error("Parameter ${entry.key} not exist")
val parameter = parameters[entry.key] ?: parameters["_"+entry.key] ?: error("Parameter ${entry.key} of function ${definition.name} not exist")
""""${parameter.name}" := :${parameter.name}::${parameter.type}"""
}

12
src/main/kotlin/fr/postgresjson/entity/Entity.kt
View File

@@ -45,21 +45,21 @@ class EntityUpdatedAtImp: EntityUpdatedAt {
}
/* Author */
interface CreatedBy<T: EntityI<*>> {
interface EntityCreatedBy<T: EntityI<*>> {
var createdBy: T?
}
interface UpdatedBy<T: EntityI<*>> {
interface EntityUpdatedBy<T: EntityI<*>> {
var updatedBy: T?
}
class EntityCreatedByImp<UserT: EntityI<*>>(
override var createdBy: UserT?
): CreatedBy<UserT>
): EntityCreatedBy<UserT>
class EntityUpdatedByImp<UserT: EntityI<*>>(
override var updatedBy: UserT?
): UpdatedBy<UserT>
): EntityUpdatedBy<UserT>
/* Published */
interface Published<UserT: EntityI<*>> {
@@ -79,8 +79,8 @@ abstract class EntityImp<T, UserT: EntityI<*>>(
): Entity<T>(),
EntityCreatedAt by EntityCreatedAtImp(),
EntityUpdatedAt by EntityUpdatedAtImp(),
CreatedBy<UserT> by EntityCreatedByImp(updatedBy),
UpdatedBy<UserT> by EntityUpdatedByImp(updatedBy)
EntityCreatedBy<UserT> by EntityCreatedByImp(updatedBy),
EntityUpdatedBy<UserT> by EntityUpdatedByImp(updatedBy)
abstract class UuidEntityExtended<T, UserT: EntityI<*>>(
updatedBy: UserT?,