Lint

.idea/codeStyles/Project.xml

@@ -14,18 +14,8 @@
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="IMPORT_NESTED_CLASSES" value="true" />
-      <option name="ALLOW_TRAILING_COMMA" value="true" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
-    <SqlCodeStyleSettings version="6">
-      <option name="KEYWORD_CASE" value="1" />
-      <option name="IDENTIFIER_CASE" value="1" />
-      <option name="TYPE_CASE" value="1" />
-      <option name="CUSTOM_TYPE_CASE" value="1" />
-      <option name="ALIAS_CASE" value="1" />
-      <option name="BUILT_IN_CASE" value="1" />
-      <option name="QUOTE_IDENTIFIER" value="1" />
-    </SqlCodeStyleSettings>
     <codeStyleSettings language="kotlin">
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
       <indentOptions>

.idea/dataSources.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="PostgreSQL - json_test@localhost" uuid="1191ff9a-6823-4b18-af90-483ddf0e4b69">
+    <data-source source="LOCAL" name="json_test@localhost" uuid="1191ff9a-6823-4b18-af90-483ddf0e4b69">
       <driver-ref>postgresql</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>org.postgresql.Driver</jdbc-driver>
-      <jdbc-url>jdbc:postgresql://localhost:35555/json_test</jdbc-url>
+      <jdbc-url>jdbc:postgresql://localhost:5555/json_test</jdbc-url>
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
   </component>

build.gradle.kts

@@ -1,7 +1,6 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 val containerAlwaysOn: String by project
 val disableLint: String by project
-val projectName: String by project
 
 plugins {
     jacoco
@@ -76,8 +75,6 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter:5.9.0")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:1.7.20")
     testImplementation("org.amshove.kluent:kluent:1.68")
-    testImplementation("io.kotest:kotest-runner-junit5:5.5.5")
-    testImplementation("io.kotest:kotest-property:5.5.5")
 }
 
 val sourcesJar by tasks.creating(Jar::class) {
@@ -87,7 +84,7 @@ val sourcesJar by tasks.creating(Jar::class) {
 
 apply(plugin = "docker-compose")
 dockerCompose {
-    setProjectName(projectName.toString())
+    setProjectName("postgres-json")
     setProperty("useComposeFiles", listOf("docker-compose.yml"))
     setProperty("stopContainers", !containerAlwaysOn.toBoolean())
     isRequiredBy(project.tasks.test)
@@ -96,7 +93,7 @@ dockerCompose {
 publishing {
     repositories {
         maven {
-            name = projectName.toString()
+            name = "postgres-json"
             url = uri("https://maven.pkg.github.com/flecomte/postgres-json")
             credentials {
                 username = System.getenv("GITHUB_USERNAME")
@@ -106,7 +103,7 @@ publishing {
     }
 
     publications {
-        create<MavenPublication>(projectName.toString()) {
+        create<MavenPublication>("postgres-json") {
             from(components["java"])
             artifact(sourcesJar)
         }

docker-compose.yml

@@ -8,7 +8,7 @@ services:
       context: docker/postgresql
     restart: always
     ports:
-      - "35555:5432"
+      - "5555:5432"
     environment:
       POSTGRES_DB: json_test
       POSTGRES_USER: test

docker/postgresql/Dockerfile

@@ -1,4 +1,4 @@
-FROM postgres:15
+FROM postgres:13
 
 COPY postgresql.conf /tmp/postgresql.conf
 COPY extension.sh    /docker-entrypoint-initdb.d/000-extension.sh

docs/installation.md

@@ -3,6 +3,20 @@
 ## Gradle
 ```kotlin
 // build.gradle.kts
+
+buildscript {
+    repositories {
+        maven { url = uri("https://jitpack.io") }
+    }
+    dependencies {
+        classpath("com.github.flecomte:postgres-json:+")
+    }
+}
+
+repositories {
+    maven { url = uri("https://jitpack.io") }
+}
+
 dependencies {
     implementation("com.github.flecomte:postgres-json:+")
 }

docs/usage/multi-level.md

@@ -62,7 +62,7 @@ import fr.postgresjson.connexion.Requester
 val requester: Requester = TODO()
 val result: Parent = requester
     .getFunction("find_parent_by_id")
-    .execute("id" to "379e0687-9e4a-4781-b0e9-d94a62e4261f")
+    .selectOne("id" to "379e0687-9e4a-4781-b0e9-d94a62e4261f")
 ```
 
 The requester create dynamically this request

docs/usage/paginated.md

@@ -0,0 +1,19 @@
+Paginated request
+=================
+
+```kotlin
+import fr.postgresjson.connexion.Paginated
+import fr.postgresjson.connexion.Requester
+import java.util.UUID
+
+class Article(val id: UUID, val name: String)
+
+val request: Requester = TODO()
+val article: Paginated<Article> = requester
+    .getFunction("find_articles")
+    .select(
+        page = 1, 
+        limit = 10, 
+        "id" to "4a04820e-f880-4d80-b1c9-aeacccb24977"
+    )
+```

docs/usage/raw-request.md

@@ -26,10 +26,10 @@ data class Inventor(
     val id: UUID = UUID.randomUUID(),
     val name: String,
     val roles: List<String> = listOf(),
-)
+): Serializable
 
 // Select one entity
-val result: Inventor = connection.execute(
+val result: Inventor? = connection.selectOne(
     """
     SELECT json_build_object(
         'id', '9e65de49-712e-47ce-8bf2-dfffae53a82e', 
@@ -40,7 +40,7 @@ val result: Inventor = connection.execute(
 )
 
 // Select multiple entities
-val result = connection.execute<List<Inventor>>(
+val result = connection.select<List<Inventor>>(
     """
     SELECT json_build_array(
         json_build_object(
@@ -60,7 +60,7 @@ val result = connection.execute<List<Inventor>>(
 )
 
 // Select multiple with real query
-val result: List<Inventor> = connection.execute(
+val result: List<Inventor> = connection.select(
     """
         select json_agg(i)
         from inventor i
@@ -71,7 +71,7 @@ val result: List<Inventor> = connection.execute(
 
 
 // Select multiple with only some rows
-val result: List<Inventor> = connection.execute(
+val result: List<Inventor> = connection.select(
     """
         select json_agg(i)
         from (

docs/usage/stored-procedure.md

@@ -22,6 +22,7 @@ val requester = Requester(
 ```kotlin
 import java.util.UUID
 import org.joda.time.DateTime
+import fr.postgresjson.entity.Serializable
 
 enum class Roles { ROLE_USER, ROLE_ADMIN }
 
@@ -30,16 +31,15 @@ class User(
     override var username: String,
     var blockedAt: DateTime? = null,
     var roles: List<Roles> = emptyList()
-)
+): Serializable
 
-@SqlSerializable
 class UserForCreate(
     id: UUID = UUID.randomUUID(),
     username: String,
     val password: String,
     blockedAt: DateTime? = null,
     roles: List<Roles> = emptyList()
-)
+): Serializable
 ```
 3. and, define Repositories
 [See SQL function](../migrations/migrations.md)
@@ -53,14 +53,19 @@ class UserRepository(override var requester: Requester): RepositoryI {
     fun findById(id: UUID): User {
         return requester
             .getFunction("find_user_by_id") // Use the name of the function
-            .execute("id" to id) // You can pass parameters by their names. The underscore prefix on parameters is not required to be mapped. 
-            // Throw exception if user not found
+            .selectOne(
+                "id" to id // You can pass parameters by their names. The underscore prefix on parameters is not required to be mapped. 
+            ) ?: throw UserNotFound(id) // Throw exception if user not found
     }
 
     fun insert(user: UserForCreate): User {
         return requester
             .getFunction("insert_user")
-            .execute("resource" to user)
+            .selectOne("resource" to user)
+    }
+
+    class UserNotFound(override val message: String?, override val cause: Throwable?): Throwable(message, cause) {
+        constructor(id: UUID): this("No User with ID $id", null)
     }
 }
 ```

docs/usage/usage.md

@@ -3,4 +3,5 @@
 1. [Init connection](./init-connection.md)
 2. [Raw request](./raw-request.md)
 3. [Stored Procedure](./stored-procedure.md)
-4. [Multi level request](./multi-level.md)
+4. [Paginated request](./paginated.md)
+5. [Multi level request](./multi-level.md)

gradle.properties

@@ -7,5 +7,4 @@ systemProp.sonar.java.coveragePlugin=jacoco
 systemProp.sonar.coverage.jacoco.xmlReportPaths=build/reports/jacoco/test/jacocoTestReport.xml
 org.gradle.jvmargs=-Xmx4096M
 containerAlwaysOn=false
-disableLint=false
-projectName=postgres-json
+disableLint=false

src/.editorconfig

@@ -1,9 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-indent_size = 4
-indent_style = space
-insert_final_newline = true
-tab_width = 4

src/main/kotlin/fr/postgresjson/connexion/Connection.kt

@@ -3,16 +3,21 @@ package fr.postgresjson.connexion
 import com.fasterxml.jackson.core.type.TypeReference
 import com.github.jasync.sql.db.QueryResult
 import com.github.jasync.sql.db.ResultSet
+import com.github.jasync.sql.db.general.ArrayRowData
 import com.github.jasync.sql.db.pool.ConnectionPool
 import com.github.jasync.sql.db.postgresql.PostgreSQLConnection
 import com.github.jasync.sql.db.postgresql.PostgreSQLConnectionBuilder
 import com.github.jasync.sql.db.util.length
+import fr.postgresjson.entity.EntityI
+import fr.postgresjson.entity.Serializable
 import fr.postgresjson.serializer.Serializer
 import fr.postgresjson.utils.LoggerDelegate
 import org.slf4j.Logger
-import kotlin.jvm.Throws
 import kotlin.random.Random
-import kotlin.reflect.full.hasAnnotation
+
+typealias SelectOneCallback<T> = QueryResult.(T?) -> Unit
+typealias SelectCallback<T> = QueryResult.(List<T>) -> Unit
+typealias SelectPaginatedCallback<T> = QueryResult.(Paginated<T>) -> Unit
 
 class Connection(
     private val database: String,
@@ -20,18 +25,18 @@ class Connection(
     private val password: String,
     private val host: String = "localhost",
     private val port: Int = 5432
-) : ExecutableRaw {
-    private var connectionPool: ConnectionPool<PostgreSQLConnection>? = null
+) : Executable {
+    private var connection: ConnectionPool<PostgreSQLConnection>? = null
     private val serializer = Serializer()
     private val logger: Logger? by LoggerDelegate()
 
     internal fun connect(): ConnectionPool<PostgreSQLConnection> {
-        return connectionPool.let { connectionPool ->
+        return connection.let { connectionPool ->
             if (connectionPool == null || !connectionPool.isConnected()) {
                 PostgreSQLConnectionBuilder.createConnectionPool(
                     "jdbc:postgresql://$host:$port/$database?user=$username&password=$password"
                 ).also {
-                    this.connectionPool = it
+                    connection = it
                 }
             } else {
                 connectionPool
@@ -40,7 +45,7 @@ class Connection(
     }
 
     fun disconnect() {
-        connectionPool?.disconnect()
+        connection?.disconnect()
     }
 
     fun <A> inTransaction(block: Connection.() -> A?): A? = connect().run {
@@ -54,19 +59,16 @@ class Connection(
     }
 
     /**
-     * Select with unnamed parameters
+     * Select One [EntityI] with [List] of parameters
      */
-    @Throws(DataNotFoundException::class)
-    override fun <R : Any> execute(
+    override fun <R : EntityI> selectOne(
         sql: String,
         typeReference: TypeReference<R>,
         values: List<Any?>,
-        block: SelectCallback<R>
+        block: (QueryResult, R?) -> Unit
     ): R? {
-        val result: QueryResult = exec(sql, compileArgs(values))
-        if (result.rows.size == 0) throw DataNotFoundException(sql)
-
-        val json: String? = result.rows.firstOrNull()?.getString(0)
+        val result = exec(sql, compileArgs(values))
+        val json = result.rows.firstOrNull()?.getString(0)
         return if (json === null) {
             null
         } else {
@@ -77,16 +79,99 @@ class Connection(
     }
 
     /**
-     * Select with named parameters
+     * Select One [EntityI] with named parameters
      */
-    override fun <R : Any> execute(
+    override fun <R : EntityI> selectOne(
         sql: String,
         typeReference: TypeReference<R>,
         values: Map<String, Any?>,
-        block: SelectCallback<R>
+        block: (QueryResult, R?) -> Unit
     ): R? {
         return replaceArgs(sql, values) {
-            execute(this.sql, typeReference, parameters, block)
+            selectOne(this.sql, typeReference, parameters, block)
+        }
+    }
+
+    /* Select Multiples */
+
+    /**
+     * Select multiple [EntityI] with [List] of parameters
+     */
+    override fun <R : EntityI> select(
+        sql: String,
+        typeReference: TypeReference<List<R>>,
+        values: List<Any?>,
+        block: QueryResult.(List<R>) -> Unit
+    ): List<R> {
+        val result = exec(sql, values)
+        val json = result.rows[0].getString(0)
+        return if (json === null) {
+            emptyList()
+        } else {
+            serializer.deserializeList(json, typeReference)
+        }.also {
+            block(result, it)
+        }
+    }
+
+    /**
+     * Select multiple [EntityI] with [Map] of parameters
+     */
+    override fun <R : EntityI> select(
+        sql: String,
+        typeReference: TypeReference<List<R>>,
+        values: Map<String, Any?>,
+        block: QueryResult.(List<R>) -> Unit
+    ): List<R> {
+        return replaceArgs(sql, values) {
+            select(this.sql, typeReference, this.parameters, block)
+        }
+    }
+
+    /* Select Paginated */
+
+    /**
+     * Select Multiple [EntityI] with pagination
+     */
+    override fun <R : EntityI> select(
+        sql: String,
+        page: Int,
+        limit: Int,
+        typeReference: TypeReference<List<R>>,
+        values: Map<String, Any?>,
+        block: QueryResult.(Paginated<R>) -> Unit
+    ): Paginated<R> {
+        val offset = (page - 1) * limit
+        val newValues = values
+            .plus("offset" to offset)
+            .plus("limit" to limit)
+
+        val line = replaceArgs(sql, newValues) {
+            exec(this.sql, this.parameters)
+        }
+
+        return line.run {
+            val firstLine = rows.firstOrNull() ?: queryError("The query has no return", sql, newValues)
+            if (!(firstLine as ArrayRowData).mapping.keys.contains("total")) queryError("""The query not return the "total" column""", sql, newValues, rows)
+            val total = try {
+                firstLine.getInt("total") ?: queryError("The query return \"total\" must not be null", sql, newValues, rows)
+            } catch (e: ClassCastException) {
+                queryError("""Column "total" must be an integer""", sql, newValues, rows)
+            }
+            val json = firstLine.getString(0)
+            val entities = if (json == null) {
+                emptyList()
+            } else {
+                serializer.deserializeList(json, typeReference)
+            }
+            Paginated(
+                entities,
+                offset,
+                limit,
+                total
+            )
+        }.also {
+            block(line, it)
         }
     }
 
@@ -126,12 +211,10 @@ class Connection(
 
     private fun compileArgs(values: List<Any?>): List<Any?> {
         return values.map {
-            when {
-                it == null -> it
-                it is List<*> && it.isEmpty() -> it
-                it is List<*> && it.first()!!::class.hasAnnotation<SqlSerializable>() -> serializer.serialize(it)
-                it::class.hasAnnotation<SqlSerializable>() -> serializer.serialize(it)
-                else -> it
+            if (it is Serializable || (it is List<*> && it.firstOrNull() is Serializable)) {
+                serializer.serialize(it)
+            } else {
+                it
             }
         }
     }
@@ -224,11 +307,10 @@ class Connection(
         } catch (e: Throwable) {
             logger?.info(
                 """
-                |Query Error: 
-                |$sql, 
-                |Arguments (${values.length}):
-                |${values.joinToString(", ").ifBlank { "No arguments" }.prependIndent()}
-                """.trimMargin().prependIndent(" > "),
+                Query Error: 
+                ${sql.prependIndent()}, 
+                ${values.joinToString(", ").prependIndent()}
+                """.trimIndent(),
                 e
             )
             throw e

src/main/kotlin/fr/postgresjson/connexion/DataNotFoundException.kt

@@ -1,6 +0,0 @@
-package fr.postgresjson.connexion
-
-class DataNotFoundException(val queryExecuted: String) : Exception() {
-    override val message: String
-        get() = "No data return for the query"
-}

src/main/kotlin/fr/postgresjson/connexion/EmbedExecutable.kt

@@ -2,43 +2,107 @@ package fr.postgresjson.connexion
 
 import com.fasterxml.jackson.core.type.TypeReference
 import com.github.jasync.sql.db.QueryResult
-import kotlin.jvm.Throws
+import fr.postgresjson.entity.EntityI
 
-sealed interface EmbedExecutable : Executable {
+sealed interface EmbedExecutable {
     val connection: Connection
     override fun toString(): String
     val name: String
 
+    /* Select One */
+
     /**
-     * Select with unnamed parameters
+     * Update [EntityI] with one entity as argument
      */
-    @Throws(DataNotFoundException::class)
-    fun <R : Any> execute(
+    fun <R : EntityI> update(
+        typeReference: TypeReference<R>,
+        value: R,
+        block: SelectOneCallback<R> = {}
+    ): R? =
+        selectOne(typeReference, listOf(value), block)
+
+    /**
+     * Select One [EntityI] with [List] of parameters
+     */
+    fun <R : EntityI> selectOne(
         typeReference: TypeReference<R>,
         values: List<Any?>,
-        block: SelectCallback<R> = {}
+        block: SelectOneCallback<R> = {}
     ): R?
 
     /**
-     * Select with named parameters
+     * Select One [EntityI] with [Map] of parameters
      */
-    @Throws(DataNotFoundException::class)
-    fun <R : Any> execute(
+    fun <R : EntityI> selectOne(
         typeReference: TypeReference<R>,
         values: Map<String, Any?>,
-        block: SelectCallback<R> = {}
+        block: SelectOneCallback<R> = {}
     ): R?
 
     /**
-     * Select with named parameters
+     * Select One [EntityI] with multiple [Pair] of parameters
      */
-    @Throws(DataNotFoundException::class)
-    fun <R : Any> execute(
+    fun <R : EntityI> selectOne(
         typeReference: TypeReference<R>,
         vararg values: Pair<String, Any?>,
-        block: SelectCallback<R> = {}
+        block: SelectOneCallback<R> = {}
     ): R? =
-        execute(typeReference, values.toMap(), block)
+        selectOne(typeReference, values.toMap(), block)
+
+    /* Select Multiples */
+
+    /**
+     * Select Multiple [EntityI] with [List] of parameters
+     */
+    fun <R : EntityI> select(
+        typeReference: TypeReference<List<R>>,
+        values: List<Any?>,
+        block: SelectCallback<R> = {}
+    ): List<R>
+
+    /**
+     * Select Multiple [EntityI] with [Map] of parameters
+     */
+    fun <R : EntityI> select(
+        typeReference: TypeReference<List<R>>,
+        values: Map<String, Any?>,
+        block: SelectCallback<R> = {}
+    ): List<R>
+
+    /**
+     * Select Multiple [EntityI] with multiple [Pair] of parameters
+     */
+    fun <R : EntityI> select(
+        typeReference: TypeReference<List<R>>,
+        vararg values: Pair<String, Any?>,
+        block: SelectCallback<R> = {}
+    ): List<R> =
+        select(typeReference, values.toMap(), block)
+
+    /* Select Paginated */
+
+    /**
+     * Select Paginated [EntityI] with [Map] of parameters
+     */
+    fun <R : EntityI> select(
+        page: Int,
+        limit: Int,
+        typeReference: TypeReference<List<R>>,
+        values: Map<String, Any?>,
+        block: SelectPaginatedCallback<R> = {}
+    ): Paginated<R>
+
+    /**
+     * Select Paginated [EntityI] with multiple [Pair] of parameters
+     */
+    fun <R : EntityI> select(
+        page: Int,
+        limit: Int,
+        typeReference: TypeReference<List<R>>,
+        vararg values: Pair<String, Any?>,
+        block: SelectPaginatedCallback<R> = {}
+    ): Paginated<R> =
+        select(page, limit, typeReference, values.toMap(), block)
 
     fun exec(values: List<Any?>): QueryResult
     fun exec(values: Map<String, Any?>): QueryResult

src/main/kotlin/fr/postgresjson/connexion/EmbedExecutableReified.kt

@@ -1,25 +1,68 @@
 package fr.postgresjson.connexion
 
 import com.fasterxml.jackson.core.type.TypeReference
-import kotlin.jvm.Throws
+import fr.postgresjson.entity.EntityI
 
-@Throws(DataNotFoundException::class)
-inline fun <reified R : Any> EmbedExecutable.execute(
+/* Select One */
+
+inline fun <reified R : EntityI> EmbedExecutable.update(
+    value: R,
+    noinline block: SelectOneCallback<R> = {}
+): R? =
+    update(object : TypeReference<R>() {}, value, block)
+
+inline fun <reified R : EntityI> EmbedExecutable.selectOne(
+    values: List<Any?>,
+    noinline block: SelectOneCallback<R> = {}
+): R? =
+    selectOne(object : TypeReference<R>() {}, values, block)
+
+inline fun <reified R : EntityI> EmbedExecutable.selectOne(
+    values: Map<String, Any?>,
+    noinline block: SelectOneCallback<R> = {}
+): R? =
+    selectOne(object : TypeReference<R>() {}, values, block)
+
+inline fun <reified R : EntityI> EmbedExecutable.selectOne(
+    vararg values: Pair<String, Any?>,
+    noinline block: SelectOneCallback<R> = {}
+): R? =
+    selectOne(object : TypeReference<R>() {}, values = values, block)
+
+/* Select Multiples */
+
+inline fun <reified R : EntityI> EmbedExecutable.select(
     values: List<Any?>,
     noinline block: SelectCallback<R> = {}
-): R? =
-    execute(object : TypeReference<R>() {}, values, block)
+): List<R> =
+    select(object : TypeReference<List<R>>() {}, values, block)
 
-@Throws(DataNotFoundException::class)
-inline fun <reified R : Any> EmbedExecutable.execute(
+inline fun <reified R : EntityI> EmbedExecutable.select(
     values: Map<String, Any?>,
     noinline block: SelectCallback<R> = {}
-): R? =
-    execute(object : TypeReference<R>() {}, values, block)
+): List<R> =
+    select(object : TypeReference<List<R>>() {}, values, block)
 
-@Throws(DataNotFoundException::class)
-inline fun <reified R : Any> EmbedExecutable.execute(
+inline fun <reified R : EntityI> EmbedExecutable.select(
     vararg values: Pair<String, Any?>,
     noinline block: SelectCallback<R> = {}
-): R? =
-    execute(object : TypeReference<R>() {}, values = values, block)
+): List<R> =
+    select(object : TypeReference<List<R>>() {}, values = values, block)
+
+/* Select Paginated */
+
+inline fun <reified R : EntityI> EmbedExecutable.select(
+    page: Int,
+    limit: Int,
+    values: Map<String, Any?> = emptyMap(),
+    noinline block: SelectPaginatedCallback<R> = {}
+): Paginated<R> =
+    select(page, limit, object : TypeReference<List<R>>() {}, values, block)
+
+inline fun <reified R : EntityI> EmbedExecutable.select(
+    page: Int,
+    limit: Int,
+    vararg values: Pair<String, Any?>,
+    noinline block: SelectPaginatedCallback<R> = {}
+): Paginated<R> =
+    select(page, limit, object : TypeReference<List<R>>() {}, values = values, block)

src/main/kotlin/fr/postgresjson/connexion/Executable.kt

@@ -1,3 +1,136 @@
 package fr.postgresjson.connexion
 
-sealed interface Executable
+import com.fasterxml.jackson.core.type.TypeReference
+import com.github.jasync.sql.db.QueryResult
+import fr.postgresjson.entity.EntityI
+
+interface Executable {
+
+    /* Update */
+
+    /**
+     * Update [EntityI] with one entity as argument
+     */
+    fun <R : EntityI> update(
+        sql: String,
+        typeReference: TypeReference<R>,
+        value: R,
+        block: SelectOneCallback<R> = {}
+    ): R? =
+        selectOne(sql, typeReference, listOf(value), block)
+
+    /* Select One */
+
+    /**
+     * Select One [EntityI] with [List] of parameters
+     */
+    fun <R : EntityI> selectOne(
+        sql: String,
+        typeReference: TypeReference<R>,
+        values: List<Any?>,
+        block: SelectOneCallback<R> = {}
+    ): R?
+
+    /**
+     * Select One [EntityI] with [Map] of parameters
+     */
+    fun <R : EntityI> selectOne(
+        sql: String,
+        typeReference: TypeReference<R>,
+        values: Map<String, Any?>,
+        block: SelectOneCallback<R> = {}
+    ): R?
+
+    /**
+     * Select One [EntityI] with multiple [Pair] of parameters
+     */
+    fun <R : EntityI> selectOne(
+        sql: String,
+        typeReference: TypeReference<R>,
+        vararg values: Pair<String, Any?>,
+        block: SelectOneCallback<R> = {}
+    ): R? =
+        selectOne(sql, typeReference, values.toMap(), block)
+
+    /* Select Multiples */
+
+    /**
+     * Select Multiple [EntityI] with [List] of parameters
+     */
+    fun <R : EntityI> select(
+        sql: String,
+        typeReference: TypeReference<List<R>>,
+        values: List<Any?> = emptyList(),
+        block: SelectCallback<R> = {}
+    ): List<R>
+
+    /**
+     * Select Multiple [EntityI] with [Map] of parameters
+     */
+    fun <R : EntityI> select(
+        sql: String,
+        typeReference: TypeReference<List<R>>,
+        values: Map<String, Any?>,
+        block: SelectCallback<R> = {}
+    ): List<R>
+
+    /**
+     * Select Multiple [EntityI] with multiple [Pair] of parameters
+     */
+    fun <R : EntityI> select(
+        sql: String,
+        typeReference: TypeReference<List<R>>,
+        vararg values: Pair<String, Any?>,
+        block: SelectCallback<R> = {}
+    ): List<R> =
+        select(sql, typeReference, values.toMap(), block)
+
+    /* Select Paginated */
+
+    /**
+     * Select Paginated [EntityI] with [Map] of parameters
+     */
+    fun <R : EntityI> select(
+        sql: String,
+        page: Int,
+        limit: Int,
+        typeReference: TypeReference<List<R>>,
+        values: Map<String, Any?>,
+        block: SelectPaginatedCallback<R> = {}
+    ): Paginated<R>
+
+    /**
+     * Select Paginated [EntityI] with multiple [Pair] of parameters
+     */
+    fun <R : EntityI> select(
+        sql: String,
+        page: Int,
+        limit: Int,
+        typeReference: TypeReference<List<R>>,
+        vararg values: Pair<String, Any?>,
+        block: SelectPaginatedCallback<R> = {}
+    ): Paginated<R> =
+        select(sql, page, limit, typeReference, values.toMap(), block)
+
+    fun <R : EntityI> exec(sql: String, value: R): QueryResult = exec(sql, listOf(value))
+    fun exec(sql: String, values: List<Any?>): QueryResult
+    fun exec(sql: String, values: Map<String, Any?>): QueryResult
+    fun exec(sql: String, vararg values: Pair<String, Any?>): QueryResult = exec(sql, values.toMap())
+
+    /**
+     * Warning: this method not use prepared statement
+     */
+    fun <R : EntityI> sendQuery(sql: String, value: R): QueryResult = sendQuery(sql, listOf(value))
+    /**
+     * Warning: this method not use prepared statement
+     */
+    fun sendQuery(sql: String, values: List<Any?>): QueryResult
+    /**
+     * Warning: this method not use prepared statement
+     */
+    fun sendQuery(sql: String, values: Map<String, Any?>): QueryResult
+    /**
+     * Warning: this method not use prepared statement
+     */
+    fun sendQuery(sql: String, vararg values: Pair<String, Any?>): QueryResult = sendQuery(sql, values.toMap())
+}

src/main/kotlin/fr/postgresjson/connexion/ExecutableRaw.kt

@@ -1,64 +0,0 @@
-package fr.postgresjson.connexion
-
-import com.fasterxml.jackson.core.type.TypeReference
-import com.github.jasync.sql.db.QueryResult
-import kotlin.jvm.Throws
-
-typealias SelectCallback<R> = QueryResult.(R?) -> Unit
-
-sealed interface ExecutableRaw : Executable {
-    /**
-     * Select with [List] of parameters
-     */
-    @Throws(DataNotFoundException::class)
-    fun <R : Any> execute(
-        sql: String,
-        typeReference: TypeReference<R>,
-        values: List<Any?> = emptyList(),
-        block: SelectCallback<R> = {}
-    ): R?
-
-    /**
-     * Select with [Map] of parameters
-     */
-    @Throws(DataNotFoundException::class)
-    fun <R : Any> execute(
-        sql: String,
-        typeReference: TypeReference<R>,
-        values: Map<String, Any?>,
-        block: SelectCallback<R> = {}
-    ): R?
-
-    /**
-     * Select with multiple [Pair] of parameters
-     */
-    @Throws(DataNotFoundException::class)
-    fun <R : Any> execute(
-        sql: String,
-        typeReference: TypeReference<R>,
-        vararg values: Pair<String, Any?>,
-        block: SelectCallback<R> = {}
-    ): R? = execute(sql, typeReference, values.toMap(), block)
-
-    fun <R : Any?> exec(sql: String, value: R): QueryResult = exec(sql, listOf(value))
-    fun exec(sql: String, values: List<Any?>): QueryResult
-    fun exec(sql: String, values: Map<String, Any?>): QueryResult
-    fun exec(sql: String, vararg values: Pair<String, Any?>): QueryResult = exec(sql, values.toMap())
-
-    /**
-     * Warning: this method not use prepared statement
-     */
-    fun <R : Any?> sendQuery(sql: String, value: R): QueryResult = sendQuery(sql, listOf(value))
-    /**
-     * Warning: this method not use prepared statement
-     */
-    fun sendQuery(sql: String, values: List<Any?>): QueryResult
-    /**
-     * Warning: this method not use prepared statement
-     */
-    fun sendQuery(sql: String, values: Map<String, Any?>): QueryResult
-    /**
-     * Warning: this method not use prepared statement
-     */
-    fun sendQuery(sql: String, vararg values: Pair<String, Any?>): QueryResult = sendQuery(sql, values.toMap())
-}

src/main/kotlin/fr/postgresjson/connexion/ExecutableReified.kt

@@ -1,37 +1,106 @@
 package fr.postgresjson.connexion
 
 import com.fasterxml.jackson.core.type.TypeReference
-import kotlin.jvm.Throws
+import fr.postgresjson.entity.EntityI
+
+/* Update */
 
 /**
- * Select with unnamed parameters
+ * Update [EntityI] with one entity as argument
  */
-@Throws(DataNotFoundException::class)
-inline fun <reified R : Any> ExecutableRaw.execute(
+inline fun <reified R : EntityI> Executable.update(
+    sql: String,
+    value: R,
+    noinline block: SelectOneCallback<R> = {}
+): R? =
+    update(sql, object : TypeReference<R>() {}, value, block)
+
+/* Select One */
+
+/**
+ * Select One [EntityI] with [List] of parameters
+ */
+inline fun <reified R : EntityI> Executable.selectOne(
+    sql: String,
+    values: List<Any?> = emptyList(),
+    noinline block: SelectOneCallback<R> = {}
+): R? =
+    selectOne(sql, object : TypeReference<R>() {}, values, block)
+
+/**
+ * Select One [EntityI] with [Map] of parameters
+ */
+inline fun <reified R : EntityI> Executable.selectOne(
+    sql: String,
+    values: Map<String, Any?>,
+    noinline block: SelectOneCallback<R> = {}
+): R? =
+    selectOne(sql, object : TypeReference<R>() {}, values, block)
+
+/**
+ * Select One [EntityI] with multiple [Pair] of parameters
+ */
+inline fun <reified R : EntityI> Executable.selectOne(
+    sql: String,
+    vararg values: Pair<String, Any?>,
+    noinline block: SelectOneCallback<R> = {}
+): R? =
+    selectOne(sql, object : TypeReference<R>() {}, values = values, block)
+
+/* Select Multiples */
+
+/**
+ * Select Multiple [EntityI] with [List] of parameters
+ */
+inline fun <reified R : EntityI> Executable.select(
     sql: String,
     values: List<Any?> = emptyList(),
     noinline block: SelectCallback<R> = {}
-): R? =
-    execute(sql, object : TypeReference<R>() {}, values, block)
+): List<R> =
+    select(sql, object : TypeReference<List<R>>() {}, values, block)
 
 /**
- * Select with named parameters
+ * Select Multiple [EntityI] with [Map] of parameters
  */
-@Throws(DataNotFoundException::class)
-inline fun <reified R : Any> ExecutableRaw.execute(
+inline fun <reified R : EntityI> Executable.select(
     sql: String,
     values: Map<String, Any?>,
     noinline block: SelectCallback<R> = {}
-): R? =
-    execute(sql, object : TypeReference<R>() {}, values, block)
+): List<R> =
+    select(sql, object : TypeReference<List<R>>() {}, values, block)
 
 /**
- * Select with named parameters
+ * Select Multiple [EntityI] with multiple [Pair] of parameters
  */
-@Throws(DataNotFoundException::class)
-inline fun <reified R : Any> ExecutableRaw.execute(
+inline fun <reified R : EntityI> Executable.select(
     sql: String,
     vararg values: Pair<String, Any?>,
     noinline block: SelectCallback<R> = {}
-): R? =
-    execute(sql, object : TypeReference<R>() {}, values = values, block)
+): List<R> =
+    select(sql, object : TypeReference<List<R>>() {}, values = values, block)
+
+/* Select Paginated */
+
+/**
+ * Select Paginated [EntityI] with [Map] of parameters
+ */
+inline fun <reified R : EntityI> Executable.select(
+    sql: String,
+    page: Int,
+    limit: Int,
+    values: Map<String, Any?> = emptyMap(),
+    noinline block: SelectPaginatedCallback<R> = {}
+): Paginated<R> =
+    select(sql, page, limit, object : TypeReference<List<R>>() {}, values, block)
+
+/**
+ * Select Paginated [EntityI] with multiple [Pair] of parameters
+ */
+inline fun <reified R : EntityI> Executable.select(
+    sql: String,
+    page: Int,
+    limit: Int,
+    vararg values: Pair<String, Any?>,
+    noinline block: SelectPaginatedCallback<R> = {}
+): Paginated<R> =
+    select(sql, page, limit, object : TypeReference<List<R>>() {}, values = values, block)

src/main/kotlin/fr/postgresjson/connexion/Function.kt

@@ -3,6 +3,7 @@ package fr.postgresjson.connexion
 import com.fasterxml.jackson.core.type.TypeReference
 import com.github.jasync.sql.db.QueryResult
 import fr.postgresjson.definition.Function
+import fr.postgresjson.entity.EntityI
 
 class Function(val definition: Function, override val connection: Connection) : EmbedExecutable {
     override fun toString(): String {
@@ -11,42 +12,79 @@ class Function(val definition: Function, override val connection: Connection) :
 
     override val name: String = definition.name
 
+    /* Select One */
+
     /**
-     * Select with [List] of parameters
+     * Select One [EntityI] with [List] of parameters
      */
-    override fun <R : Any> execute(
+    override fun <R : EntityI> selectOne(
         typeReference: TypeReference<R>,
         values: List<Any?>,
-        block: SelectCallback<R>
+        block: (QueryResult, R?) -> Unit
     ): R? =
-        connection.execute(compileSql(values), typeReference, values, block)
+        connection.selectOne(compileSql(values), typeReference, values, block)
 
     /**
-     * Select with named parameters
+     * Select One [EntityI] with named parameters
      */
-    override fun <R : Any> execute(
+    override fun <R : EntityI> selectOne(
         typeReference: TypeReference<R>,
         values: Map<String, Any?>,
-        block: SelectCallback<R>
+        block: (QueryResult, R?) -> Unit
     ): R? =
-        connection.execute(compileSql(values), typeReference, values, block)
+        connection.selectOne(compileSql(values), typeReference, values, block)
+
+    /* Select Multiples */
 
     /**
-     * Execute function without treatments
+     * Select multiple [EntityI] with [List] of parameters
      */
+    override fun <R : EntityI> select(
+        typeReference: TypeReference<List<R>>,
+        values: List<Any?>,
+        block: (QueryResult, List<R>) -> Unit
+    ): List<R> =
+        connection.select(compileSql(values), typeReference, values, block)
+
+    /**
+     * Select multiple [EntityI] with named parameters
+     */
+    override fun <R : EntityI> select(
+        typeReference: TypeReference<List<R>>,
+        values: Map<String, Any?>,
+        block: (QueryResult, List<R>) -> Unit
+    ): List<R> =
+        connection.select(compileSql(values), typeReference, values, block)
+
+    /* Select Paginated */
+
+    /**
+     * Select Multiple [EntityI] with pagination
+     */
+    override fun <R : EntityI> select(
+        page: Int,
+        limit: Int,
+        typeReference: TypeReference<List<R>>,
+        values: Map<String, Any?>,
+        block: (QueryResult, Paginated<R>) -> Unit
+    ): Paginated<R> {
+        val offset = (page - 1) * limit
+        val newValues = values
+            .plus("offset" to offset)
+            .plus("limit" to limit)
+
+        return connection.select(compileSql(newValues), page, limit, typeReference, values, block)
+    }
+
+    /* Execute function without treatments */
+
     override fun exec(values: List<Any?>): QueryResult = connection.exec(compileSql(values), values)
 
-    /**
-     * Execute function without treatments
-     */
     override fun exec(values: Map<String, Any?>): QueryResult = connection.exec(compileSql(values), values)
 
-    private fun <A : Any?> compileParameters(value: A): String = compileParameters(listOf(value))
+    private fun <R : EntityI> compileArgs(value: R): String = compileArgs(listOf(value))
 
-    /**
-     * Add cast to all parameters
-     */
-    private fun compileParameters(values: List<Any?>): String {
+    private fun compileArgs(values: List<Any?>): String {
         val placeholders = values
             .filterIndexed { index, value ->
                 definition.parameters[index].default === null || value != null
@@ -58,11 +96,8 @@ class Function(val definition: Function, override val connection: Connection) :
         return placeholders.joinToString(separator = ", ")
     }
 
-    /**
-     * Cast and add named parameters
-     */
-    private fun compileParameters(values: Map<String, Any?>): String {
-        val parameters = definition.getParametersIndexedByName()
+    private fun compileArgs(values: Map<String, Any?>): String {
+        val parameters = definition.parametersIndexedByName
         val placeholders = values
             .filter { entry ->
                 val parameter = parameters[entry.key] ?: parameters["_" + entry.key] ?: error("Parameter ${entry.key} of function ${definition.name} not exist")
@@ -76,16 +111,7 @@ class Function(val definition: Function, override val connection: Connection) :
         return placeholders.joinToString(separator = ", ")
     }
 
-    /**
-     * Create SQL to call the function
-     */
-    private fun <A : Any?> compileSql(value: A): String = "SELECT * FROM ${definition.name} (${compileParameters(value)})"
-    /**
-     * Create SQL to call the function
-     */
-    private fun compileSql(values: List<Any?>): String = "SELECT * FROM ${definition.name} (${compileParameters(values)})"
-    /**
-     * Create SQL to call the function
-     */
-    private fun compileSql(values: Map<String, Any?>): String = "SELECT * FROM ${definition.name} (${compileParameters(values)})"
+    private fun <R : EntityI> compileSql(value: R): String = "SELECT * FROM ${definition.name} (${compileArgs(value)})"
+    private fun compileSql(values: List<Any?>): String = "SELECT * FROM ${definition.name} (${compileArgs(values)})"
+    private fun compileSql(values: Map<String, Any?>): String = "SELECT * FROM ${definition.name} (${compileArgs(values)})"
 }

src/main/kotlin/fr/postgresjson/connexion/Paginated.kt

@@ -0,0 +1,25 @@
+package fr.postgresjson.connexion
+
+import fr.postgresjson.entity.EntityI
+import kotlin.math.ceil
+
+data class Paginated<T : EntityI>(
+    val result: List<T>,
+    val offset: Int,
+    val limit: Int,
+    val total: Int
+) {
+    val currentPage: Int = (offset / limit) + 1
+    val count: Int = result.size
+    val totalPages: Int = (total.toDouble() / limit.toDouble()).ceil()
+
+    init {
+        if (offset < 0) error("offset must be greater or equal than 0")
+        if (limit < 1) error("limit must be greater or equal than 1")
+        if (total < 0) error("total must be greater or equal than 0")
+    }
+
+    fun isLastPage(): Boolean = currentPage >= totalPages
+
+    private fun Double.ceil(): Int = ceil(this).toInt()
+}

src/main/kotlin/fr/postgresjson/connexion/Query.kt

@@ -2,40 +2,75 @@ package fr.postgresjson.connexion
 
 import com.fasterxml.jackson.core.type.TypeReference
 import com.github.jasync.sql.db.QueryResult
+import fr.postgresjson.entity.EntityI
 
 class Query(override val name: String, private val sql: String, override val connection: Connection) : EmbedExecutable {
     override fun toString(): String {
         return sql
     }
 
+    /* Select One */
+
     /**
-     * Select with unnamed of parameters
+     * Select One [EntityI] with [List] of parameters
      */
-    override fun <R : Any> execute(
+    override fun <R : EntityI> selectOne(
         typeReference: TypeReference<R>,
         values: List<Any?>,
-        block: SelectCallback<R>
+        block: SelectOneCallback<R>
     ): R? =
-        connection.execute(sql, typeReference, values, block)
+        connection.selectOne(sql, typeReference, values, block)
 
     /**
-     * Select with named parameters
+     * Select One [EntityI] with named parameters
      */
-    override fun <R : Any> execute(
+    override fun <R : EntityI> selectOne(
         typeReference: TypeReference<R>,
         values: Map<String, Any?>,
-        block: SelectCallback<R>
+        block: SelectOneCallback<R>
     ): R? =
-        connection.execute(sql, typeReference, values, block)
+        connection.selectOne(sql, typeReference, values, block)
+
+    /* Select Multiples */
 
     /**
-     * Execute function without treatments
+     * Select multiple [EntityI] with [List] of parameters
      */
+    override fun <R : EntityI> select(
+        typeReference: TypeReference<List<R>>,
+        values: List<Any?>,
+        block: SelectCallback<R>
+    ): List<R> =
+        connection.select(sql, typeReference, values, block)
+
+    /**
+     * Select multiple [EntityI] with [Map] of parameters
+     */
+    override fun <R : EntityI> select(
+        typeReference: TypeReference<List<R>>,
+        values: Map<String, Any?>,
+        block: SelectCallback<R>
+    ): List<R> =
+        connection.select(sql, typeReference, values, block)
+
+    /* Select Paginated */
+
+    /**
+     * Select Multiple [EntityI] with pagination
+     */
+    override fun <R : EntityI> select(
+        page: Int,
+        limit: Int,
+        typeReference: TypeReference<List<R>>,
+        values: Map<String, Any?>,
+        block: (QueryResult, Paginated<R>) -> Unit
+    ): Paginated<R> =
+        connection.select(sql, page, limit, typeReference, values, block)
+
+    /* Execute function without treatments */
+
     override fun exec(values: List<Any?>): QueryResult = connection.exec(sql, values)
 
-    /**
-     * Execute function without treatments
-     */
     override fun exec(values: Map<String, Any?>): QueryResult = connection.exec(sql, values)
 
     /**
@@ -47,7 +82,6 @@ class Query(override val name: String, private val sql: String, override val con
      * Warning: this method not use prepared statement
      */
     fun sendQuery(values: Map<String, Any?>): QueryResult = connection.sendQuery(sql, values)
-
     /**
      * Warning: this method not use prepared statement
      */

src/main/kotlin/fr/postgresjson/connexion/QueryConverter.kt

@@ -4,24 +4,12 @@ import fr.postgresjson.utils.searchSqlFiles
 import java.net.URI
 import fr.postgresjson.definition.Query as QueryDefinition
 
-/**
- * Convert [QueryDefinition], to runnable [Query]
- */
 fun QueryDefinition.toRunnable(connection: Connection): Query = Query(name, script, connection)
 
-/**
- * Convert Sequence of [QueryDefinition], to runnable Sequence of [Query]
- */
 fun Sequence<QueryDefinition>.toRunnable(connection: Connection): Sequence<Query> = map { it.toRunnable(connection) }
 
-/**
- * Convert Sequence of [Query], to [Map] of [Query] with name as key
- */
 fun Sequence<Query>.toMutableMap(): MutableMap<String, Query> = map { it.name to it }.toMap().toMutableMap()
 
-/**
- * Create a [Map] of [Query] from a [URI] pointing to the queries folder
- */
 internal fun URI.toQuery(connection: Connection): MutableMap<String, Query> = searchSqlFiles()
     .filterIsInstance(QueryDefinition::class.java)
     .toRunnable(connection)

src/main/kotlin/fr/postgresjson/connexion/Requester.kt

@@ -1,6 +1,5 @@
 package fr.postgresjson.connexion
 
-import fr.postgresjson.definition.parse.parseFunction
 import fr.postgresjson.utils.searchSqlFiles
 import java.net.URI
 import fr.postgresjson.definition.Function as DefinitionFunction
@@ -49,7 +48,7 @@ class Requester(
     }
 
     fun addFunction(sql: String) {
-        parseFunction(sql)
+        DefinitionFunction(sql)
             .run { toRunnable(connection) }
             .run { functions[name] = this }
     }
@@ -64,6 +63,10 @@ class Requester(
 
     fun getQuery(path: String): Query = queries[path] ?: throw NoQueryDefined(path)
 
+    fun <A> inTransaction(block: Requester.() -> A?): A? = connection.inTransaction {
+        this@Requester.block()
+    }
+
     class NoFunctionDefined(name: String) : Exception("No function defined for $name")
     class NoQueryDefined(path: String) : Exception("No query defined in $path")
 }

src/main/kotlin/fr/postgresjson/connexion/SqlSerializable.kt

@@ -1,4 +0,0 @@
-package fr.postgresjson.connexion
-
-@Target(AnnotationTarget.CLASS)
-annotation class SqlSerializable

src/main/kotlin/fr/postgresjson/definition/Function.kt

@@ -1,29 +1,75 @@
 package fr.postgresjson.definition
 
-import fr.postgresjson.definition.Parameter.Direction.IN
+import fr.postgresjson.utils.Algorithm.MD5
+import fr.postgresjson.utils.hash
 import java.nio.file.Path
 
 class Function(
-    override val name: String,
-    override val parameters: List<Parameter>,
-    val returns: Returns,
     override val script: String,
-    override val source: Path? = null,
+    override val source: Path? = null
 ) : Resource, ParametersInterface {
+    val returns: String
+    override val name: String
+    override val parameters: List<Parameter>
 
-    fun getDefinition(): String = parameters
-        .filter { it.direction == IN }
-        .joinToString(", ") { it.type.toString() }
-        .let { "$name ($it)" }
+    init {
+        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 *[^ \n]+)?"""
+                .toRegex(setOf(RegexOption.IGNORE_CASE, RegexOption.MULTILINE))
 
-    fun getParametersIndexedByName(): Map<String, Parameter> = parameters
-        .withIndex()
-        .associate { (key, param) -> Pair(param.name ?: "${key + 1}", param) }
+        val paramsRegex =
+            """\s*(?<param>((?<direction>IN|OUT|INOUT|VARIADIC)?\s+)?("?(?<name>[^\s,")]+)"?\s+)?(?<type>[^\s,)]+)(\s+(?<default>default\s|=)\s*[^\s,)]+)?)\s*(,|$)"""
+                .toRegex(setOf(RegexOption.IGNORE_CASE, RegexOption.MULTILINE))
 
-    operator fun get(name: String): Parameter? = parameters.firstOrNull { it.name == name }
+        val queryMatch = functionRegex.find(script)
+        if (queryMatch !== null) {
+            val functionName = queryMatch.groups["name"]?.value?.trim() ?: error("Function name not found")
+            val functionParameters = queryMatch.groups["params"]?.value?.trim()
+            this.returns = queryMatch.groups["return"]?.value?.trim() ?: ""
+
+            /* Create parameters definition */
+            val parameters = if (functionParameters !== null) {
+                val matchesParams = paramsRegex.findAll(functionParameters)
+                matchesParams.map { paramsMatch ->
+                    Parameter(
+                        paramsMatch.groups["name"]!!.value.trim(),
+                        paramsMatch.groups["type"]!!.value.trim(),
+                        paramsMatch.groups["direction"]?.value?.trim(),
+                        paramsMatch.groups["default"]?.value?.trim()
+                    )
+                }.toList()
+            } else {
+                listOf()
+            }
+            this.name = functionName
+            this.parameters = parameters
+        } else {
+            throw FunctionNotFound()
+        }
+    }
+
+    class FunctionNotFound(cause: Throwable? = null) : Resource.ParseException("Function not found in script", cause)
+
+    val definition: String
+        get() {
+            return parameters
+                .filter { it.direction == Parameter.Direction.IN }
+                .joinToString(", ") { "${it.name} ${it.type}" }
+                .let { "$name ($it)" }
+        }
+
+    val definitionHash: String
+        get() {
+            return definition.hash(MD5)
+        }
+
+    val parametersIndexedByName: Map<String, Parameter>
+        get() {
+            return parameters.associateBy { it.name }
+        }
 
     infix fun `has same definition`(other: Function): Boolean {
-        return other.getDefinition() == this.getDefinition()
+        return other.definition == this.definition
     }
 
     infix fun `is different from`(other: Function): Boolean {

src/main/kotlin/fr/postgresjson/definition/Parameter.kt

@@ -2,63 +2,32 @@ package fr.postgresjson.definition
 
 import java.util.Locale
 
-class ParameterType(
-    val name: String,
-    val precision: Int? = null,
-    val scale: Int? = null,
-    val array: String? = null,
-) {
-    val isArray: Boolean
-        get() = array != null
+interface ParameterI {
+    val name: String
+    val type: String
+    val direction: Parameter.Direction
+    val default: String
+}
 
-    override fun toString(): String {
-        val type = if (precision == null && scale == null) {
-            name
-        } else if (scale == null) {
-            """$name($precision)"""
+class Parameter(val name: String, val type: String, direction: Direction? = Direction.IN, val default: Any? = null) {
+    val direction: Direction
+
+    init {
+        if (direction === null) {
+            this.direction = Direction.IN
         } else {
-            """$name($precision, $scale)"""
+            this.direction = direction
         }
-
-        return type+array
     }
-}
 
-interface ParameterSimpleI {
-    val name: String?
-    val type: ParameterType
-}
-
-class Parameter(
-    override val name: String?,
-    override val type: ParameterType,
-    val direction: Direction = Direction.IN,
-    val default: String? = null,
-) : ParameterSimpleI {
-    constructor(name: String?, type: ParameterType, direction: String = "IN", default: String? = null) : this(
+    constructor(name: String, type: String, direction: String? = "IN", default: Any? = null) : this(
         name = name,
         type = type,
-        direction = direction.let { Direction.valueOf(direction.uppercase(Locale.getDefault())) },
+        direction = direction?.let { Direction.valueOf(direction.uppercase(Locale.getDefault())) },
         default = default
     )
 
     enum class Direction { IN, OUT, INOUT }
-
-    override fun toString(): String {
-        return buildString {
-            append(direction.name.lowercase())
-            if (name?.isNotBlank() == true) {
-                append(" ")
-                append(name)
-            }
-            append(" ")
-            append(type.toString())
-            if (default?.isNotBlank() == true) {
-                append(" ")
-                append(default)
-            }
-        }
-    }
 }
 
 interface ParametersInterface {

src/main/kotlin/fr/postgresjson/definition/Resource.kt

@@ -1,6 +1,5 @@
 package fr.postgresjson.definition
 
-import fr.postgresjson.definition.parse.parseFunction
 import java.io.File
 import java.net.URL
 import java.nio.file.Path
@@ -24,7 +23,7 @@ sealed interface Resource {
                 Migration(resource, path)
             } catch (e: ParseException) {
                 try {
-                    parseFunction(resource, path)
+                    Function(resource, path)
                 } catch (e: ParseException) {
                     try {
                         Query(resource, path)

src/main/kotlin/fr/postgresjson/definition/Returns.kt

@@ -1,45 +0,0 @@
-package fr.postgresjson.definition
-
-sealed class Returns(
-    val definition: String,
-    val isSetOf: Boolean,
-) {
-    class Primitive(
-        definition: String,
-        isSetOf: Boolean,
-    ) : Returns(definition, isSetOf) {
-        val name = definition
-            .trim('"')
-    }
-
-    class PrimitiveList(
-        definition: String,
-        isSetOf: Boolean,
-    ) : Returns(definition, isSetOf) {
-        val name = definition
-            .drop(2)
-            .trim('"')
-    }
-
-    class Table(
-        definition: String,
-        isSetOf: Boolean,
-        val parameters: List<ParameterTable>,
-    ) : Returns(definition, isSetOf) {
-        class ParameterTable(
-            override val name: String,
-            override val type: ParameterType,
-        ) : ParameterSimpleI
-    }
-
-    class Any(
-        isSetOf: Boolean,
-    ) : Returns("any", isSetOf)
-
-    class Unknown(
-        definition: String,
-        isSetOf: Boolean,
-    ) : Returns(definition, isSetOf)
-
-    class Void : Returns("void", false)
-}

src/main/kotlin/fr/postgresjson/definition/parse/ParsingFunction.kt

@@ -1,217 +0,0 @@
-package fr.postgresjson.definition.parse
-
-import fr.postgresjson.definition.Function
-import fr.postgresjson.definition.Parameter
-import fr.postgresjson.definition.Parameter.Direction
-import fr.postgresjson.definition.Parameter.Direction.IN
-import fr.postgresjson.definition.Parameter.Direction.INOUT
-import fr.postgresjson.definition.Parameter.Direction.OUT
-import fr.postgresjson.definition.ParameterType
-import fr.postgresjson.definition.Resource.ParseException
-import fr.postgresjson.definition.Returns
-import fr.postgresjson.definition.Returns.Primitive
-import fr.postgresjson.definition.Returns.Unknown
-import fr.postgresjson.definition.Returns.Void
-import java.nio.file.Path
-import kotlin.text.RegexOption.IGNORE_CASE
-
-internal fun parseFunction(script: String, source: Path? = null): Function {
-    val name: String
-    val parameters: List<Parameter>
-    val returns: Returns
-    ScriptPart(script)
-        .getFunctionOrProcedure().trimSpace().nextScriptPart
-        .getFunctionName().apply { name = value }.nextScriptPart
-        .getParameters().apply { parameters = value }.nextScriptPart
-        .getReturns().apply { returns = value }
-
-    return Function(name, parameters, returns, script, source)
-}
-
-@Throws(FunctionNameMalformed::class)
-internal fun ScriptPart.getFunctionName(): NextScript<String> {
-    try {
-        return getNextScript { status.isNotEscaped() && afterBeginBy("(", " ", "\n") }
-            .changeValue(String::unescapeOrLowercase)
-    } catch (e: ParseException) {
-        throw FunctionNameMalformed(this, e)
-    }
-}
-
-internal class FunctionNameMalformed(val script: ScriptPart, cause: Throwable? = null) :
-    ParseException("Function name is malformed", cause)
-
-@Throws(FunctionNotFound::class)
-internal fun ScriptPart.getFunctionOrProcedure(): NextScript<String> {
-    val result = """create\s+(?:or\s+replace\s+)?(procedure|function)\s+"""
-        .toRegex()
-        .find(restOfScript)
-        ?: throw FunctionNotFound(this)
-
-    val rest = result.range.last
-        .let { cursor -> restOfScript.drop(cursor + 1) }
-
-    return NextScript(
-        result.groups[1]!!.value,
-        rest
-    )
-}
-
-internal class FunctionNotFound(val script: ScriptPart) :
-    ParseException("Function not found in script")
-
-internal fun ScriptPart.getParameters(): NextScript<List<Parameter>> {
-    val allParametersScript = this.getNextScript {
-        currentChar == ')' && status.isNotEscaped()
-    }
-    val parameterList: List<Parameter> = allParametersScript
-        .valueAsScriptPart()
-        .removeParentheses()
-        .split(",")
-        .map { it.toParameter() }
-
-    return NextScript(parameterList, allParametersScript.restOfScript)
-}
-
-private fun ScriptPart.toParameter(): Parameter {
-    var script: ScriptPart = this.trimSpace()
-    return Parameter(
-        direction = script.getParameterMode().apply { script = nextScriptPart }.value,
-        name = script.getParameterName().trimSpace().apply { script = nextScriptPart }.value.trim(),
-        type = script.getParameterType().trimSpace().apply { script = nextScriptPart }.value,
-        default = script.getParameterDefault().trimSpace().apply { script = nextScriptPart }.value,
-    )
-}
-
-private fun ScriptPart.getParameterMode(): NextScript<Direction> {
-    return when {
-        restOfScript.startsWith("inout ", true) -> NextScript(INOUT, restOfScript.drop("inout ".length))
-        restOfScript.startsWith("in ", true) -> NextScript(IN, restOfScript.drop("in ".length))
-        restOfScript.startsWith("out ", true) -> NextScript(OUT, restOfScript.drop("out ".length))
-        else -> NextScript(IN, restOfScript)
-    }
-}
-
-@Throws(ParameterNameMalformed::class)
-private fun ScriptPart.getParameterName(): NextScript<String> {
-    try {
-        return getNextScript { afterBeginBy(" ", "\n") && status.isNotEscaped() }
-            .changeValue(String::unescapeOrLowercase)
-    } catch (e: ParseException) {
-        throw ParameterNameMalformed(this, e)
-    }
-}
-
-private class ParameterNameMalformed(val script: ScriptPart, cause: Throwable) :
-    ParseException("Parameter name is malformed", cause)
-
-@Throws(ParameterTypeMalformed::class)
-private fun ScriptPart.getParameterType(): NextScript<ParameterType> {
-    val fullType = try {
-        val endTextList = arrayOf(" default ", "=")
-        getNextScript { afterBeginBy(texts = endTextList) }
-    } catch (e: ParseError) {
-        throw ParameterTypeMalformed(this, e)
-    }
-
-    var rest: ScriptPart = fullType.valueAsScriptPart()
-
-    val name = rest
-        .getNextScript { afterBeginBy("(", "[") }
-        .apply { rest = nextScriptPart }
-    rest = rest.trimStart(' ', '\n', '\t', ',', '(')
-    val precision = rest
-        .getNextInteger()
-        .apply { rest = nextScriptPart }
-    rest = rest.trimStart(' ', '\n', '\t', ',')
-    val scale = rest
-        .getNextInteger()
-        .apply { rest = nextScriptPart }
-    rest = rest.trimStart(' ', '\n', '\t', ')')
-
-    val arrayDef = rest.restOfScript.trim().takeIf(String::isNotBlank)
-
-    return NextScript(
-        ParameterType(
-            name = name.value.trim().trim('[', ']'),
-            precision = precision.value,
-            scale = scale.value,
-            array = arrayDef
-        ),
-        fullType.nextScriptPart.restOfScript
-    )
-}
-
-internal class ParameterTypeMalformed(val script: ScriptPart, cause: Throwable) :
-    ParseException("Parameter type is malformed", cause)
-
-@Throws(ParameterDefaultMalformed::class)
-private fun ScriptPart.getParameterDefault(): NextScript<String?> {
-    return if (this.isEmpty() || this.restOfScript == ")") {
-        NextScript(null, "")
-    } else {
-        """^(\s*=\s*|\s+default\s+)(.+)\s*$"""
-            .toRegex(IGNORE_CASE)
-            .find(restOfScript)
-            .let { it ?: throw ParameterDefaultMalformed(this) }
-            .let { it.groups[2]!!.value }
-            .let { NextScript(it.trim(), "") }
-    }
-}
-
-private class ParameterDefaultMalformed(val script: ScriptPart) :
-    ParseException("Parameter default is malformed")
-
-/**
- * TODO Finalize this
- */
-internal fun ScriptPart.getReturns(): NextScript<Returns> {
-    val rest = this.trimSpace()
-    if (!rest.restOfScript.startsWith("returns")) {
-        return NextScript(Void(), "")
-    }
-    var returns = ScriptPart(rest.restOfScript.drop("returns".length))
-        .getNextScript { this.afterBeginBy(Regex("\\s+language\\s+", IGNORE_CASE), Regex("\\s+as\\s+", IGNORE_CASE)) }
-        .trimSpace()
-        .value
-        .trimStart()
-
-    val isSetOf = returns.startsWith("SETOF", ignoreCase = true)
-
-    if (isSetOf) {
-        returns = returns.drop("SETOF".length).trimStart()
-    }
-
-    val returnsClass = if (returns.isBlank()) {
-        Void()
-    } else if (primitiveList.contains(ScriptPart(returns).getParameterType().value.name)) {
-        Primitive(returns, isSetOf)
-    } else {
-        Unknown(returns, isSetOf)
-    }
-
-    return NextScript(returnsClass, "")
-}
-
-private val primitiveList = listOf(
-    "text",
-    "varchar",
-    "character varying",
-    "character",
-    "char",
-    "int",
-    "smallint",
-    "integer",
-    "bigint",
-    "decimal",
-    "real",
-    "double precision",
-    "float",
-    "numeric",
-    "boolean",
-    "json",
-    "jsonb",
-)
-
-class ParseError(message: String? = null, cause: Throwable? = null) :
-    ParseException(message ?: "Parsing fail", cause)

src/main/kotlin/fr/postgresjson/definition/parse/ParsingHelper.kt

@@ -1,203 +0,0 @@
-package fr.postgresjson.definition.parse
-
-import kotlin.contracts.ExperimentalContracts
-import kotlin.contracts.InvocationKind.EXACTLY_ONCE
-import kotlin.contracts.contract
-
-@JvmInline
-internal value class ScriptPart(val restOfScript: String) {
-    fun copy(block: (String) -> String): ScriptPart {
-        return ScriptPart(block(restOfScript))
-    }
-
-    fun isEmpty() = restOfScript.isEmpty()
-}
-
-internal class NextScript<T>(val value: T, val restOfScript: String) {
-    val nextScriptPart: ScriptPart = ScriptPart(restOfScript)
-    fun isLast() = restOfScript == ""
-    fun isEmptyValue() = value == "" || value == null
-}
-
-internal fun ScriptPart.removeParentheses(): ScriptPart {
-    return if (restOfScript.take(1) == "(" && restOfScript.takeLast(1) == ")") {
-        this.copy {
-            it.drop(1).dropLast(1)
-        }
-    } else {
-        this
-    }
-}
-
-/**
- * Get next part of script.
- * You can define a list of characters that end the part of script. Like `(` or space.
- */
-@Throws(ParseError::class)
-internal fun ScriptPart.getNextScript(isEnd: Context.() -> Boolean = { false }): NextScript<String> {
-    val status = Status()
-
-    for ((index, c) in restOfScript.withIndex()) {
-        val prevChar = restOfScript.getOrNull(index - 1)
-        val nextChar = restOfScript.getOrNull(index + 1)
-        val nestedChars = listOf(prevChar, nextChar)
-
-        if (c == '"' && nestedChars.none { c == it }) {
-            status.doubleQuoted = !status.doubleQuoted
-        } else if (c == '\'' && nestedChars.none { c == it }) {
-            status.simpleQuoted = !status.simpleQuoted
-        }
-
-        if (status.isNotQuoted()) {
-            when (c) {
-                '(' -> status.parentheses++
-                ')' -> status.parentheses--
-                '[' -> status.brackets++
-                ']' -> status.brackets--
-                '{' -> status.braces++
-                '}' -> status.braces--
-            }
-        }
-
-        if (isEnd(Context(index, c, status.copy(), restOfScript))) {
-            return NextScript(
-                restOfScript.take(index + 1),
-                restOfScript.drop(index + 1),
-            )
-        }
-    }
-
-    if (status.isNotEscaped()) {
-        return NextScript(
-            restOfScript.trim(),
-            "",
-        )
-    }
-
-    throw ParseError()
-}
-
-internal fun ScriptPart.unescapeOrLowercase(): ScriptPart = restOfScript
-    .run(String::unescapeOrLowercase)
-    .let(::ScriptPart)
-
-internal fun String.unescapeOrLowercase(): String {
-    val first = take(1)
-    val last = takeLast(1)
-    return if (first == last && first == "'") {
-        drop(1).dropLast(1).replace("$first$first", first).lowercase()
-    } else if (first == last && first == "\"") {
-        drop(1).dropLast(1).replace("$first$first", first)
-    } else {
-        this.lowercase()
-    }
-}
-
-internal fun <T> NextScript<T>.trimSpace(): NextScript<T> {
-    val spaces = charArrayOf(' ', '\n', '\t')
-    return trim(chars = spaces)
-}
-
-internal fun ScriptPart.trimSpace(): ScriptPart {
-    for ((n, char) in restOfScript.withIndex()) {
-        if (char !in listOf(' ', '\n', '\t')) {
-            return ScriptPart(
-                restOfScript.drop(n)
-            )
-        }
-    }
-    return ScriptPart(restOfScript)
-}
-
-internal fun <T> NextScript<T>.trim(vararg chars: Char): NextScript<T> {
-    return NextScript(value, restOfScript.apply { dropWhile { it in chars } })
-}
-
-internal fun ScriptPart.trimStart(vararg chars: Char): ScriptPart {
-    return this.change { dropWhile { it in chars } }
-}
-
-internal fun ScriptPart.trimEnd(vararg chars: Char): ScriptPart {
-    return this.change { dropLastWhile { it in chars } }
-}
-
-internal fun ScriptPart.split(delimiter: String): List<ScriptPart> {
-    val parts: MutableList<ScriptPart> = mutableListOf()
-    var rest: ScriptPart = this
-    do {
-        rest = rest.trimSpace()
-            .getNextScript { status.isNotEscaped() && currentChar.toString() == delimiter }
-            .trimSpace()
-            .also { parts.add(it.valueAsScriptPart().trimSpace().trimEnd(',')) }
-            .nextScriptPart
-    } while (!rest.isEmpty())
-
-    return parts
-}
-
-/**
- * Return the value as ScriptPart
- */
-internal fun NextScript<String>.valueAsScriptPart(): ScriptPart = ScriptPart(value)
-
-@OptIn(ExperimentalContracts::class)
-internal inline fun ScriptPart.change(block: String.() -> String): ScriptPart {
-    contract {
-        callsInPlace(block, EXACTLY_ONCE)
-    }
-    return ScriptPart(restOfScript.run(block))
-}
-
-@OptIn(ExperimentalContracts::class)
-internal inline fun <T> NextScript<T>.changeValue(block: (T) -> T): NextScript<T> {
-    contract {
-        callsInPlace(block, EXACTLY_ONCE)
-    }
-    return NextScript(value.run(block), nextScriptPart.restOfScript)
-}
-
-internal fun <T> NextScript<T>.changeScript(block: (String) -> String): NextScript<T> {
-    return NextScript(value, block(restOfScript))
-}
-
-internal fun <T> NextScript<T>.dropOneOf(vararg endTextList: String): NextScript<T> {
-    return changeScript { script ->
-        endTextList
-            .filter { script.startsWith(it) }
-            .let { script.drop(it.size) }
-    }
-}
-
-internal fun ScriptPart.getNextInteger(): NextScript<Int?> {
-    val digits = restOfScript.takeWhile { it.isDigit() }
-    val restOfScript = restOfScript.trimStart { it.isDigit() }
-    return NextScript(digits.toIntOrNull(), restOfScript).trimSpace()
-}
-
-internal data class Status(
-    var doubleQuoted: Boolean = false, // "
-    var simpleQuoted: Boolean = false, // '
-    var parentheses: Int = 0, // ()
-    var brackets: Int = 0, // []
-    var braces: Int = 0, // {}
-) {
-    fun isQuoted(): Boolean = doubleQuoted || simpleQuoted
-    fun isNotQuoted(): Boolean = !isQuoted()
-    fun isNotEscaped(): Boolean = isNotQuoted() && parentheses == 0 && brackets == 0 && braces == 0
-}
-
-internal data class Context(
-    val index: Int,
-    val currentChar: Char,
-    val status: Status,
-    val script: String,
-) {
-    fun afterBeginBy(vararg texts: String): Boolean = texts.any {
-        script.drop(index + 1).take(it.length).lowercase() == it.lowercase()
-    }
-    fun afterBeginBy(vararg texts: Regex): Boolean = texts.any {
-        it.matchAt(script, index + 1) != null
-    }
-
-    val nextChar: Char? get() = script.substring(index + 1).getOrNull(0)
-}

src/main/kotlin/fr/postgresjson/entity/EntitiesInterfaces.kt

@@ -0,0 +1,126 @@
+package fr.postgresjson.entity
+
+import org.joda.time.DateTime
+import java.util.UUID
+
+interface EntityRefI<T> : EntityI {
+    val id: T
+}
+
+interface UuidEntityI : EntityRefI<UUID> {
+    override val id: UUID
+}
+
+abstract class Entity<T>(override val id: T) : EntityRefI<T>
+open class UuidEntity(id: UUID? = null) : UuidEntityI, Entity<UUID>(id ?: UUID.randomUUID())
+
+/* Version */
+interface EntityVersioning<ID, NUMBER> {
+    val versionNumber: NUMBER
+    val versionId: ID
+}
+
+class UuidEntityVersioning(
+    override val versionNumber: Int,
+    versionId: UUID? = null
+) : EntityVersioning<UUID, Int> {
+    override val versionId: UUID = versionId ?: UUID.randomUUID()
+}
+
+/* Dates */
+interface EntityCreatedAt {
+    val createdAt: DateTime
+}
+interface EntityUpdatedAt {
+    val updatedAt: DateTime
+}
+
+interface EntityDeletedAt {
+    val deletedAt: DateTime?
+    fun isDeleted(): Boolean {
+        return deletedAt?.let {
+            it < DateTime.now()
+        } ?: false
+    }
+}
+
+class EntityCreatedAtImp(
+    override val createdAt: DateTime = DateTime.now()
+) : EntityCreatedAt
+
+class EntityUpdatedAtImp(
+    override val updatedAt: DateTime = DateTime.now()
+) : EntityUpdatedAt
+
+class EntityDeletedAtImp(
+    override val deletedAt: DateTime? = null
+) : EntityDeletedAt
+
+/* Author */
+interface EntityCreatedBy<T : EntityI> {
+    val createdBy: T
+}
+interface EntityUpdatedBy<T : EntityI> {
+    val updatedBy: T
+}
+
+interface EntityDeletedBy<T : EntityI> {
+    val deletedBy: T?
+}
+
+class EntityCreatedByImp<UserT : EntityI>(
+    override val createdBy: UserT
+) : EntityCreatedBy<UserT>
+
+class EntityUpdatedByImp<UserT : EntityI>(
+    override val updatedBy: UserT
+) : EntityUpdatedBy<UserT>
+
+class EntityDeletedByImp<UserT : EntityI>(
+    override val deletedBy: UserT?
+) : EntityDeletedBy<UserT>
+
+/* Mixed */
+class EntityCreatedImp<UserT : EntityI>(
+    override val createdAt: DateTime = DateTime.now(),
+    createdBy: UserT
+) : EntityCreatedBy<UserT> by EntityCreatedByImp(createdBy),
+    EntityCreatedAt by EntityCreatedAtImp()
+
+class EntityUpdatedImp<UserT : EntityI>(
+    updatedAt: DateTime = DateTime.now(),
+    override val updatedBy: UserT
+) : EntityUpdatedBy<UserT>,
+    EntityUpdatedAt by EntityUpdatedAtImp(updatedAt)
+
+/* Published */
+interface Published<UserT : EntityI> {
+    val publishedAt: DateTime?
+    val publishedBy: UserT?
+}
+
+class EntityPublishedImp<UserT : EntityI>(
+    override val publishedBy: UserT?
+) : Published<UserT> {
+    override val publishedAt: DateTime? = null
+}
+
+/* Implementation */
+abstract class EntityImp<T, UserT : EntityI>(
+    updatedBy: UserT,
+    updatedAt: DateTime = DateTime.now()
+) : UuidEntity(),
+    EntityCreatedAt by EntityCreatedAtImp(updatedAt),
+    EntityUpdatedAt by EntityUpdatedAtImp(updatedAt),
+    EntityDeletedAt by EntityDeletedAtImp(),
+    EntityCreatedBy<UserT> by EntityCreatedByImp(updatedBy),
+    EntityUpdatedBy<UserT> by EntityUpdatedByImp(updatedBy),
+    EntityDeletedBy<UserT> by EntityDeletedByImp(updatedBy)
+
+abstract class UuidEntityExtended<T, UserT : EntityI>(
+    updatedBy: UserT,
+    publishedBy: UserT?
+) :
+    EntityImp<T, UserT>(updatedBy),
+    EntityVersioning<UUID, Int> by UuidEntityVersioning(0),
+    Published<UserT> by EntityPublishedImp(publishedBy)

src/main/kotlin/fr/postgresjson/entity/Entity.kt

@@ -0,0 +1,5 @@
+package fr.postgresjson.entity
+
+interface Serializable
+interface EntityI : Serializable
+interface Parameter : Serializable

src/main/kotlin/fr/postgresjson/functionGenerator/FunctionGenerator.kt

@@ -1,145 +0,0 @@
-package fr.postgresjson.functionGenerator
-
-import fr.postgresjson.definition.Function
-import fr.postgresjson.definition.Parameter
-import fr.postgresjson.definition.Parameter.Direction.IN
-import fr.postgresjson.definition.Parameter.Direction.INOUT
-import fr.postgresjson.definition.Parameter.Direction.OUT
-import fr.postgresjson.definition.Returns
-import fr.postgresjson.utils.searchSqlFiles
-import fr.postgresjson.utils.toCamelCase
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-import java.io.File
-import java.net.URI
-
-class FunctionGenerator(private val functionsDirectories: List<URI>) {
-    constructor(functionsDirectories: URI) : this(listOf(functionsDirectories))
-
-    private val logger: Logger = LoggerFactory.getLogger("sqlFilesSearch")
-
-    private fun List<Parameter>.toKotlinArgs(): String {
-        return filter { it.direction == IN || it.direction == INOUT }
-            .mapIndexed { index, parameter -> index to parameter }
-            .joinToString(", ") { (idx, param) ->
-                val base = """${param.kotlinName ?: "arg$idx"}: ${param.kotlinType}"""
-                val default = if (param.default == null) {
-                    ""
-                } else {
-                    when (param.kotlinType) {
-                        "String" -> """ = "${param.default.trim('\'')}""""
-                        "Int" -> """ = ${param.default}"""
-                        "Boolean" -> """ = ${param.default.lowercase()}"""
-                        else -> ""
-                    }
-                }
-
-                base + default
-            }
-    }
-
-    private fun List<Parameter>.toMapOf(): String {
-        return filter { it.direction == IN || it.direction == INOUT }
-            .joinToString(", ", prefix = "mapOf(", postfix = ")") { """"${it.kotlinName}" to ${it.kotlinName}""" }
-    }
-
-    private val Parameter.kotlinType: String
-        get() {
-            return when (type.name.lowercase()) {
-                "text" -> "String"
-                "varchar" -> "String"
-                "character varying" -> "String"
-                "character" -> "String"
-                "char" -> "String"
-                "int" -> "Int"
-                "smallint" -> "Int"
-                "integer" -> "Int"
-                "bigint" -> "Int"
-                "decimal" -> "Float"
-                "real" -> "Float"
-                "double precision" -> "Float"
-                "float" -> "Float"
-                "numeric" -> "Number"
-                "boolean" -> "Boolean"
-                "json" -> "S"
-                "jsonb" -> "S"
-                "any" -> "Any"
-                "anyelement" -> "Any"
-                "anyarray" -> "List<*>"
-                else -> "String"
-            }
-        }
-
-    private val Parameter.kotlinName: String?
-        get() {
-            return name?.toCamelCase()?.trimStart('_')
-        }
-
-    private val Function.kotlinName: String
-        get() {
-            return name.toCamelCase().trimStart('_')
-        }
-
-    private val functions: List<Function>
-        get() = functionsDirectories
-            .flatMap { it.searchSqlFiles() }
-            .filterIsInstance<Function>()
-
-    fun generate(outputDirectory: URI) {
-        File(outputDirectory.path).apply {
-            logger.debug("Create Directory: $absolutePath")
-            mkdirs()
-        }
-
-        functions
-            .map { function ->
-                File("${outputDirectory.path}${function.kotlinName}.kt").apply {
-                    writeText(generate(function))
-                }
-            }
-    }
-
-    fun generate(functionName: String): String {
-        return functions
-            .first { it.name == functionName }
-            .let { generate(it) }
-    }
-
-    fun generate(function: Function): String = function.run {
-        val args = parameters.toKotlinArgs()
-
-        val hasInputArgs: Boolean = parameters.filter { it.direction != OUT }.any { it.kotlinType == "S" }
-        val hasReturn: Boolean = parameters.any { it.direction != IN } || (returns !is Returns.Void)
-
-        val generics = mutableListOf<String>()
-        if (hasReturn) generics.add("reified E: Any")
-        if (hasInputArgs) generics.add("S: Any?")
-
-        val functionDecl = if (generics.isNotEmpty()) "inline fun <${generics.joinToString(", ")}>" else "fun"
-
-        return if (hasReturn) {
-            """
-            |package fr.postgresjson.functionGenerator.generated
-            |
-            |import com.fasterxml.jackson.core.type.TypeReference
-            |import fr.postgresjson.connexion.Requester
-            |
-            |$functionDecl Requester.$kotlinName($args): E? {
-            |    return getFunction("$name")
-            |        .execute<E>(object : TypeReference<E>() {}, ${parameters.toMapOf()})
-            |}
-        """.trimMargin()
-        } else {
-            """
-            |package fr.postgresjson.functionGenerator.generated
-            |
-            |import fr.postgresjson.connexion.Requester
-            |
-            |$functionDecl Requester.$kotlinName($args): Unit {
-            |    getFunction("$name")
-            |        .exec(${parameters.toMapOf()})
-            |}
-        """.trimMargin()
-        }
-    }
-}

src/main/kotlin/fr/postgresjson/migration/Function.kt

@@ -2,8 +2,7 @@ package fr.postgresjson.migration
 
 import com.github.jasync.sql.db.postgresql.exceptions.GenericDatabaseException
 import fr.postgresjson.connexion.Connection
-import fr.postgresjson.connexion.execute
-import fr.postgresjson.definition.parse.parseFunction
+import fr.postgresjson.connexion.selectOne
 import fr.postgresjson.migration.Migration.Action
 import fr.postgresjson.migration.Migration.Status
 import java.util.Date
@@ -31,8 +30,8 @@ data class Function(
         connection: Connection,
         executedAt: Date? = null
     ) : this(
-        parseFunction(up),
-        parseFunction(down),
+        DefinitionFunction(up),
+        DefinitionFunction(down),
         connection,
         executedAt
     )
@@ -44,18 +43,18 @@ data class Function(
             } catch (e: CompletionException) {
                 val cause = e.cause
                 if (cause is GenericDatabaseException && cause.errorMessage.fields['C'] == "42P13") {
-                    connection.sendQuery("drop function ${down.getDefinition()}")
+                    connection.sendQuery("drop function ${down.definition}")
                     connection.sendQuery(up.script)
                 }
             }
 
             this::class.java.classLoader
                 .getResource("sql/migration/insertFunction.sql")!!.readText()
-                .let { connection.execute<MigrationEntity>(it, listOf(up.name, up.getDefinition(), up.script, down.script)) }
-                ?.let { migration: MigrationEntity ->
-                    executedAt = migration.executedAt
+                .let { connection.selectOne<MigrationEntity>(it, listOf(up.name, up.definition, up.script, down.script)) }
+                ?.let { function ->
+                    executedAt = function.executedAt
                     doExecute = Action.OK
-                } ?: error("No migration executed")
+                }
 
             Status.OK
         } catch (e: Throwable) {
@@ -78,6 +77,16 @@ data class Function(
         }
     }
 
+    override fun test(): Status {
+        connection.inTransaction {
+            up()
+            down()
+            sendQuery("ROLLBACK")
+        }
+
+        return Status.OK
+    }
+
     fun copy(): Function = this
         .copy(up = up, down = down, connection = connection, executedAt = executedAt)
         .also { it.doExecute = this.doExecute }

src/main/kotlin/fr/postgresjson/migration/MigrationScript.kt

@@ -1,9 +1,9 @@
 package fr.postgresjson.migration
 
 import fr.postgresjson.connexion.Connection
-import fr.postgresjson.connexion.execute
+import fr.postgresjson.connexion.selectOne
+import fr.postgresjson.entity.Entity
 import fr.postgresjson.migration.Migration.Action
-import fr.postgresjson.migration.Migration.Status
 import java.util.Date
 
 data class MigrationScript(
@@ -12,34 +12,40 @@ data class MigrationScript(
     val down: String,
     private val connection: Connection,
     override var executedAt: Date? = null
-) : Migration {
+) : Migration, Entity<String?>(name) {
     override var doExecute: Action? = null
 
-    override fun up(): Status {
-        return try {
-            connection.sendQuery(up)
+    override fun up(): Migration.Status {
+        connection.sendQuery(up)
 
-            this::class.java.classLoader.getResource("sql/migration/insertHistory.sql")!!.readText().let { sqlScript ->
-                connection.execute<MigrationEntity>(sqlScript, listOf(name, up, down))?.let { query ->
-                    executedAt = query.executedAt
-                    doExecute = Action.OK
-                } ?: error("No migration executed")
+        this::class.java.classLoader.getResource("sql/migration/insertHistory.sql")!!.readText().let {
+            connection.selectOne<MigrationEntity>(it, listOf(name, up, down))?.let { query ->
+                executedAt = query.executedAt
+                doExecute = Action.OK
             }
-
-            Status.OK
-        } catch (e: Throwable) {
-            Status.UP_FAIL
         }
+
+        return Migration.Status.OK
     }
 
-    override fun down(): Status {
+    override fun down(): Migration.Status {
         connection.sendQuery(down)
 
         this::class.java.classLoader.getResource("sql/migration/deleteHistory.sql")!!.readText().let {
             connection.exec(it, listOf(name))
         }
 
-        return Status.OK
+        return Migration.Status.OK
+    }
+
+    override fun test(): Migration.Status {
+        connection.inTransaction {
+            up()
+            down()
+            sendQuery("ROLLBACK")
+        }
+
+        return Migration.Status.OK
     }
 
     fun copy(): MigrationScript {

src/main/kotlin/fr/postgresjson/migration/Migrations.kt

@@ -2,7 +2,7 @@ package fr.postgresjson.migration
 
 import com.fasterxml.jackson.core.type.TypeReference
 import fr.postgresjson.connexion.Connection
-import fr.postgresjson.definition.parse.parseFunction
+import fr.postgresjson.entity.Entity
 import fr.postgresjson.migration.Migration.Action
 import fr.postgresjson.migration.Migration.Status
 import fr.postgresjson.utils.LoggerDelegate
@@ -20,19 +20,20 @@ class MigrationEntity(
     val up: String,
     val down: String,
     val version: Int
-)
+) : Entity<String?>(filename)
 
 interface Migration {
     var executedAt: Date?
     var doExecute: Action?
     fun up(): Status
     fun down(): Status
+    fun test(): Status
 
     enum class Status(val i: Int) { OK(2), UP_FAIL(0), DOWN_FAIL(1) }
     enum class Action { OK, UP, DOWN }
 }
 
-class MigrationExecutor private constructor(
+class Migrations private constructor(
     private val connection: Connection,
     private val migrationsScripts: MutableMap<String, MigrationScript> = mutableMapOf(),
     private val functions: MutableMap<String, Function> = mutableMapOf()
@@ -52,8 +53,8 @@ class MigrationExecutor private constructor(
         migrationsScripts.clear()
         functions.clear()
 
-        addMigrationFromDB()
-        addMigrationFromDirectory(directories)
+        getMigrationFromDB()
+        getMigrationFromDirectory(directories)
 
         migrationsScripts.forEach { (_, query) ->
             if (query.doExecute === null) {
@@ -73,17 +74,17 @@ class MigrationExecutor private constructor(
     /**
      * Get all migration from DB
      */
-    private fun addMigrationFromDB() {
+    private fun getMigrationFromDB() {
         this::class.java.classLoader.getResource("sql/migration/findAllFunction.sql")!!.readText().let {
-            connection.execute(it, object : TypeReference<List<MigrationEntity>>() {})
-                ?.map { function ->
+            connection.select(it, object : TypeReference<List<MigrationEntity>>() {})
+                .map { function ->
                     functions[function.filename] = Function(function.up, function.down, connection, function.executedAt)
                 }
         }
 
         this::class.java.classLoader.getResource("sql/migration/findAllHistory.sql")!!.readText().let {
-            connection.execute(it, object : TypeReference<List<MigrationEntity>>() {})
-                ?.map { query ->
+            connection.select(it, object : TypeReference<List<MigrationEntity>>() {})
+                .map { query ->
                     migrationsScripts[query.filename] = MigrationScript(query.filename, query.up, query.down, connection, query.executedAt)
                 }
         }
@@ -92,16 +93,16 @@ class MigrationExecutor private constructor(
     /**
      * Get all migration from multiples Directories
      */
-    private fun addMigrationFromDirectory(directories: List<URI>) {
-        directories.forEach {
-            addMigrationFromDirectory(it)
+    private fun getMigrationFromDirectory(directory: List<URI>) {
+        directory.forEach {
+            getMigrationFromDirectory(it)
         }
     }
 
     /**
      * Get all migration from Directory
      */
-    private fun addMigrationFromDirectory(directory: URI) {
+    private fun getMigrationFromDirectory(directory: URI) {
         val downs: MutableMap<String, DefinitionMigration> = mutableMapOf()
 
         directory.searchSqlFiles().apply {
@@ -131,31 +132,31 @@ class MigrationExecutor private constructor(
     internal class DownMigrationNotDefined(path: String, cause: FileNotFoundException? = null) :
         Throwable("The file $path was not found", cause)
 
-    fun addFunction(newDefinition: DefinitionFunction, callback: (Function) -> Unit = {}): MigrationExecutor {
-        val currentFunction = functions[newDefinition.name]
+    fun addFunction(newDefinition: DefinitionFunction, callback: (Function) -> Unit = {}): Migrations {
+        val currentFunction = functions[newDefinition.definitionHash]
         if (currentFunction === null || currentFunction `is different from` newDefinition) {
-            val oldDefinition = functions[newDefinition.name]?.up ?: newDefinition
-            functions[newDefinition.name] = Function(newDefinition, oldDefinition, connection).apply {
+            val oldDefinition = functions[newDefinition.definitionHash]?.up ?: newDefinition
+            functions[newDefinition.definitionHash] = Function(newDefinition, oldDefinition, connection).apply {
                 doExecute = Action.UP
             }
         } else {
-            functions[newDefinition.name]?.doExecute = Action.OK
+            functions[newDefinition.definitionHash]?.doExecute = Action.OK
         }
 
-        callback(functions[newDefinition.name]!!)
+        callback(functions[newDefinition.definitionHash]!!)
 
         return this
     }
 
-    fun addFunction(sql: String): MigrationExecutor {
-        addFunction(parseFunction(sql))
+    fun addFunction(sql: String): Migrations {
+        addFunction(DefinitionFunction(sql))
         return this
     }
 
-    fun addMigrationScript(up: DefinitionMigration, down: DefinitionMigration, callback: (MigrationScript) -> Unit = {}): MigrationExecutor =
+    fun addMigrationScript(up: DefinitionMigration, down: DefinitionMigration, callback: (MigrationScript) -> Unit = {}): Migrations =
         addMigrationScript(up.name, up.script, down.script, callback)
 
-    fun addMigrationScript(name: String, up: String, down: String, callback: (MigrationScript) -> Unit = {}): MigrationExecutor {
+    fun addMigrationScript(name: String, up: String, down: String, callback: (MigrationScript) -> Unit = {}): Migrations {
         if (migrationsScripts[name] === null) {
             migrationsScripts[name] = MigrationScript(name, up, down, connection).apply {
                 doExecute = Action.UP
@@ -214,7 +215,7 @@ class MigrationExecutor private constructor(
         return list.toMap()
     }
 
-    internal fun down(force: Boolean = false): Map<String, Status> {
+    fun down(force: Boolean = false): Map<String, Status> {
         val list: MutableMap<String, Status> = mutableMapOf()
         migrationsScripts.forEach {
             it.value.let { query ->
@@ -296,7 +297,7 @@ class MigrationExecutor private constructor(
         return list.toMap()
     }
 
-    private fun copy(): MigrationExecutor {
+    private fun copy(): Migrations {
         val queriesCopy = migrationsScripts.map {
             it.key to it.value.copy()
         }.toMap().toMutableMap()
@@ -305,6 +306,10 @@ class MigrationExecutor private constructor(
             it.key to it.value.copy()
         }.toMap().toMutableMap()
 
-        return MigrationExecutor(connection, queriesCopy, functionsCopy)
+        return Migrations(connection, queriesCopy, functionsCopy)
+    }
+
+    fun status(): Map<String, Int> {
+        TODO("not implemented")
     }
 }

src/main/kotlin/fr/postgresjson/serializer/Serializer.kt

@@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.module.SimpleModule
 import com.fasterxml.jackson.datatype.joda.JodaModule
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
-import com.github.jasync.sql.db.QueryResult
+import fr.postgresjson.entity.Serializable
 
 class Serializer(val mapper: ObjectMapper = jacksonObjectMapper()) {
     init {
@@ -28,21 +28,24 @@ class Serializer(val mapper: ObjectMapper = jacksonObjectMapper()) {
     }
 
     fun <E> deserialize(json: String, valueTypeRef: TypeReference<E>): E {
-        return mapper.readValue(json, valueTypeRef)
+        return this.mapper.readValue(json, valueTypeRef)
     }
 
     inline fun <reified E> deserialize(json: String): E? {
         return this.mapper.readValue(json)
     }
-}
 
-inline fun <reified E : Any?> QueryResult.deserialize(): E? {
-    val value = this.rows.firstOrNull()?.getString(0)
-    return if (value == null) {
-        null
-    } else {
-        Serializer().deserialize<E>(value)
+    fun <E> deserializeList(json: String, valueTypeRef: TypeReference<E>): E {
+        return mapper.readValue(json, valueTypeRef)
+    }
+
+    inline fun <reified E> deserializeList(json: String): E {
+        return deserializeList(json, object : TypeReference<E>() {})
     }
 }
 
-inline fun <reified T : Any> T.toTypeReference(): TypeReference<T> = object : TypeReference<T>() {}
+fun Serializable.serialize(pretty: Boolean = false) = Serializer().serialize(this, pretty)
+fun List<Serializable>.serialize(pretty: Boolean = false) = Serializer().serialize(this, pretty)
+inline fun <reified E : Serializable> String.deserialize() = Serializer().deserialize<E>(this)
+
+inline fun <reified T : Serializable> T.toTypeReference(): TypeReference<T> = object : TypeReference<T>() {}

src/main/kotlin/fr/postgresjson/utils/caseChange.kt

@@ -1,7 +0,0 @@
-package fr.postgresjson.utils
-
-fun String.toCamelCase(): String {
-    return "_[a-zA-Z]".toRegex().replace(this) {
-        it.value.replace("_", "").uppercase()
-    }
-}

src/main/kotlin/fr/postgresjson/utils/md5.kt

@@ -0,0 +1,12 @@
+package fr.postgresjson.utils
+
+import java.math.BigInteger
+import java.security.MessageDigest
+
+internal enum class Algorithm(name: String) {
+    MD5("MD5")
+}
+internal fun String.hash(algorithm: Algorithm): String {
+    val md = MessageDigest.getInstance(algorithm.name)
+    return BigInteger(1, md.digest(toByteArray())).toString(16).padStart(32, '0')
+}

src/main/kotlin/fr/postgresjson/utils/searchSqlFiles.kt

@@ -14,7 +14,7 @@ import kotlin.streams.asSequence
 
 fun URL.searchSqlFiles() = this.toURI().searchSqlFiles()
 
-fun URI.searchSqlFiles(): Sequence<Resource> = sequence {
+fun URI.searchSqlFiles() = sequence {
     val logger: Logger = LoggerFactory.getLogger("sqlFilesSearch")
     val uri: URI = this@searchSqlFiles
     logger.debug("""SQL files found in "${uri.toString().substringAfter('!')}" :""")

src/test/kotlin/fr/postgresjson/ConnectionTest.kt

@@ -1,208 +1,117 @@
 package fr.postgresjson
 
 import com.fasterxml.jackson.core.type.TypeReference
-import fr.postgresjson.connexion.DataNotFoundException
-import fr.postgresjson.connexion.SqlSerializable
-import fr.postgresjson.connexion.execute
+import fr.postgresjson.connexion.Connection.QueryError
+import fr.postgresjson.connexion.Paginated
+import fr.postgresjson.connexion.select
+import fr.postgresjson.connexion.selectOne
+import fr.postgresjson.entity.Parameter
+import fr.postgresjson.entity.UuidEntity
 import fr.postgresjson.serializer.deserialize
 import fr.postgresjson.serializer.toTypeReference
-import io.kotest.core.spec.style.StringSpec
-import io.kotest.matchers.nulls.shouldBeNull
-import io.kotest.matchers.nulls.shouldNotBeNull
-import org.amshove.kluent.`should be equal to`
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.assertThrows
 import java.util.UUID
-import kotlin.reflect.full.hasAnnotation
+import kotlin.test.assertContains
 import kotlin.test.assertEquals
-import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
+import kotlin.test.assertNull
 import kotlin.test.assertTrue
 
-class ConnectionTest : StringSpec({
-    val connection = TestConnection()
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class ConnectionTest : TestAbstract() {
+    private class ObjTest(val name: String, id: UUID = UUID.fromString("2c0243ed-ff4d-4b9f-a52b-e38c71b0ed00")) : UuidEntity(id)
+    private class ObjTest2(val title: String, var test: ObjTest?) : UuidEntity()
+    private class ObjTest3(val first: String, var second: String, var third: Int) : UuidEntity()
+    private class ObjTestWithParameterObject(var first: ParameterObject, var second: ParameterObject) : UuidEntity()
+    private class ParameterObject(var third: String) : Parameter
 
-    @SqlSerializable
-    class ObjTest(val name: String, val id: UUID = UUID.fromString("2c0243ed-ff4d-4b9f-a52b-e38c71b0ed00"))
-
-    @SqlSerializable
-    class ObjTest2(val id: UUID, val title: String, var test: ObjTest?)
-
-    @SqlSerializable
-    class ObjTest3(val id: UUID, val first: String, var second: String, var third: Int)
-
-    @SqlSerializable
-    class ParameterObject(var third: String)
-
-    @SqlSerializable
-    class ObjTestWithParameterObject(val id: UUID, var first: ParameterObject, var second: ParameterObject)
-    class ObjTest4
-
-    "serializable" {
-        assertTrue(ObjTest("plop")::class.hasAnnotation<SqlSerializable>())
-        assertFalse(ObjTest4()::class.hasAnnotation<SqlSerializable>())
-    }
-
-    "getObject" {
-        val obj: ObjTest? = connection.rollbackAfter {
-            sendQuery(
-                """
-                create table test(
-                    id UUID primary key,
-                    name text
-                );
-                INSERT INTO test (id, name) VALUES ('1e5f5d41-6d14-4007-897b-0ed2616bec96', 'one');
-                INSERT INTO test (id, name) VALUES ('26fa76cf-7688-4a1d-b611-e3060b38bf58', 'two');
-                """.trimIndent()
-            )
-
-            execute("select to_json(a) from test a limit 1")
-        }
-
-        assertNotNull(obj)
+    @Test
+    fun getObject() {
+        val obj: ObjTest? = connection.selectOne("select to_json(a) from test a limit 1")
+        assertTrue(obj is ObjTest)
         assertEquals(UUID.fromString("1e5f5d41-6d14-4007-897b-0ed2616bec96"), obj.id)
     }
 
-    "getExistingObject" {
-        val objs: List<ObjTest2>? = connection.rollbackAfter {
-            sendQuery(
-                """
-                create table test(
-                    id uuid primary key,
-                    name text
-                );
-                create table test2(
-                    id uuid primary key,
-                    title text,
-                    test_id uuid
-                );
-                INSERT INTO test VALUES ('1e5f5d41-6d14-4007-897b-0ed2616bec96', 'one');
-                INSERT INTO test2 VALUES ('a0214677-7332-4eec-8e9b-af0658ea72a6', 'two', '1e5f5d41-6d14-4007-897b-0ed2616bec96');
-                INSERT INTO test2 VALUES ('8545577e-2785-421f-bb7e-1ec3faa1d79a', 'three', null);
-                """.trimIndent()
-            )
-
-            execute<List<ObjTest2>>(
-                """
-                select json_agg(j)
-                from (
-                    select
-                        t.id, 
-                        t.title,
-                        t2 as test
-                    from test2 t
-                    join test t2 ON t.test_id = t2.id
-                ) j;
-                """.trimIndent()
-            )
-        }
-
-        objs.shouldNotBeNull()
-        objs.size `should be equal to` 1
-        objs.first().id `should be equal to` UUID.fromString("a0214677-7332-4eec-8e9b-af0658ea72a6")
-        objs.first().title `should be equal to` "two"
-        objs.first().test!!.id `should be equal to` UUID.fromString("1e5f5d41-6d14-4007-897b-0ed2616bec96")
-        objs.first().test!!.name `should be equal to` "one"
-    }
-
-    "test call request with args" {
-        val result: ObjTest? = connection.execute(
-            "select json_build_object('id', '2c0243ed-ff4d-4b9f-a52b-e38c71b0ed00', 'name', ?::text)",
-            listOf("myName")
+    @Test
+    fun getExistingObject() {
+        val objs: List<ObjTest2> = connection.select(
+            """
+            select
+                json_agg(j)
+                FROM (
+                SELECT
+                    t.id, t.title,
+                    t2 as test
+                from test2 t
+                JOIN test t2 ON t.test_id = t2.id
+            ) j;
+            """.trimIndent()
         )
-        result.shouldNotBeNull()
-        result.name `should be equal to` "myName"
+        assertNotNull(objs)
+        assertEquals(objs.size, 2)
+        assertEquals(objs[0].id, UUID.fromString("1e5f5d41-6d14-4007-897b-0ed2616bec96"))
+        assertEquals(objs[0].test!!.id, UUID.fromString("1e5f5d41-6d14-4007-897b-0ed2616bec96"))
     }
 
-    "test call request without args" {
-        val result: ObjTest? = connection.execute(
-            "select json_build_object('id', '2c0243ed-ff4d-4b9f-a52b-e38c71b0ed00', 'name', 'myName')",
-            object : TypeReference<ObjTest>() {}
-        ) {
-            assertEquals("myName", this.deserialize<ObjTest>()?.name)
+    @Test
+    fun `test call request with args`() {
+        val result: ObjTest? = connection.selectOne("select json_build_object('id', '2c0243ed-ff4d-4b9f-a52b-e38c71b0ed00', 'name', ?::text)", listOf("myName"))
+        assertNotNull(result)
+        assertEquals("myName", result.name)
+    }
+
+    @Test
+    fun `test call request without args`() {
+        val result: ObjTest? = connection.selectOne("select json_build_object('id', '2c0243ed-ff4d-4b9f-a52b-e38c71b0ed00', 'name', 'myName')", object : TypeReference<ObjTest>() {}) {
+            assertEquals("myName", this.rows[0].getString(0)?.deserialize<ObjTest>()?.name)
         }
-        result.shouldNotBeNull()
-        result.name `should be equal to` "myName"
+        assertNotNull(result)
+        assertEquals("myName", result.name)
     }
 
-    "test call request return null" {
-        val result: ObjTest? = connection.execute("select null;", object : TypeReference<ObjTest>() {})
-        result.shouldBeNull()
+    @Test
+    fun `test call request return null`() {
+        val result: ObjTest? = connection.selectOne("select null;", object : TypeReference<ObjTest>() {})
+        assertNull(result)
     }
 
-    "test call request return nothing" {
-        val e = connection.rollbackAfter {
-            sendQuery(
-                """
-                create table test(
-                    id UUID primary key,
-                    name text
-                );
-                """.trimIndent()
-            )
-
-            assertThrows<DataNotFoundException> {
-                execute("select * from test where false;", object : TypeReference<ObjTest>() {})
-            }
-        }
-
-        e.shouldNotBeNull()
-        e.message `should be equal to` "No data return for the query"
-        e.queryExecuted `should be equal to` "select * from test where false;"
+    @Test
+    fun `test call request return nothing`() {
+        val result: ObjTest? = connection.selectOne("select * from test where false;", object : TypeReference<ObjTest>() {})
+        assertNull(result)
     }
 
-    "callRequestWithArgsEntity" {
+    @Test
+    fun callRequestWithArgsEntity() {
         val o = ObjTest("myName", id = UUID.fromString("2c0243ed-ff4d-4b9f-a52b-e38c71b0ed00"))
-        val obj: ObjTest? = connection.execute(
-            "select json_build_object('id', id, 'name', name) FROM json_to_record(?::json) as o(id uuid, name text);",
-            listOf(o)
-        )
-        obj.shouldNotBeNull()
-        obj.id `should be equal to` UUID.fromString("2c0243ed-ff4d-4b9f-a52b-e38c71b0ed00")
-        obj.name `should be equal to` "myName"
+        val obj: ObjTest? = connection.selectOne("select json_build_object('id', id, 'name', name) FROM json_to_record(?::json) as o(id uuid, name text);", listOf(o))
+        assertNotNull(obj)
+        assertEquals(UUID.fromString("2c0243ed-ff4d-4b9f-a52b-e38c71b0ed00"), obj.id)
+        assertEquals("myName", obj.name)
     }
 
-    "test update Entity" {
+    @Test
+    fun `test update Entity`() {
         val obj = ObjTest("before", id = UUID.fromString("1e5f5d41-6d14-4007-897b-0ed2616bec96"))
-        val objUpdated: ObjTest? = connection.execute(
-            "select ?::jsonb || jsonb_build_object('name', 'after');",
-            obj.toTypeReference(), listOf(obj)
-        )
-        objUpdated.shouldNotBeNull()
-        objUpdated.id `should be equal to` UUID.fromString("1e5f5d41-6d14-4007-897b-0ed2616bec96")
-        objUpdated.name `should be equal to` "after"
-    }
-
-    "test update Entity with vararg" {
-        val obj = ObjTest("before", id = UUID.fromString("1e5f5d41-6d14-4007-897b-0ed2616bec96"))
-        val objUpdated: ObjTest? = connection.execute(
-            "select :obj::jsonb || jsonb_build_object('name', 'after');",
-            obj.toTypeReference(),
-            "obj" to obj
-        )
-        assertNotNull(objUpdated)
+        val objUpdated: ObjTest? = connection.update("select ?::jsonb || jsonb_build_object('name', 'after');", obj.toTypeReference(), obj)
+        assertTrue(objUpdated is ObjTest)
         assertEquals(UUID.fromString("1e5f5d41-6d14-4007-897b-0ed2616bec96"), objUpdated.id)
         assertEquals("after", objUpdated.name)
     }
 
-    "callExec" {
+    @Test
+    fun callExec() {
         val o = ObjTest("myName")
-        val result = connection.exec(
-            "select json_build_object('id', '2c0243ed-ff4d-4b9f-a52b-e38c71b0ed00', 'name', ?::json->>'name')",
-            listOf(o)
-        )
+        val result = connection.exec("select json_build_object('id', '2c0243ed-ff4d-4b9f-a52b-e38c71b0ed00', 'name', ?::json->>'name')", listOf(o))
         assertEquals(1, result.rowsAffected)
     }
 
-    "select one with named parameters" {
-        val result: ObjTest3? = connection.execute(
-            """
-            SELECT json_build_object(
-                'id', 'bf0e5605-3a8f-4db9-8b98-c8e0691dd576', 
-                'first', :first::text, 
-                'second', :second::text, 
-                'third', :third::int
-            )
-            """.trimIndent(),
+    @Test
+    fun `select one with named parameters`() {
+        val result: ObjTest3? = connection.selectOne(
+            "SELECT json_build_object('first', :first::text, 'second', :second::text, 'third', :third::int)",
             mapOf(
                 "first" to "ff",
                 "second" to "sec",
@@ -215,42 +124,27 @@ class ConnectionTest : StringSpec({
         assertEquals(123, result.third)
     }
 
-    "select one with named parameters object" {
-        val result: ObjTestWithParameterObject? = connection.execute(
-            """
-            SELECT json_build_object(
-                'id', 'bf0e5605-3a8f-4db9-8b98-c8e0691dd576', 
-                'first', :first::json, 
-                'second', :second::json
-            )
-            """.trimIndent(),
+    @Test
+    fun `select one with named parameters object`() {
+        val result: ObjTestWithParameterObject? = connection.selectOne(
+            "SELECT json_build_object('first', :first::json, 'second', :second::json)",
             mapOf(
                 "first" to ParameterObject("one"),
                 "second" to ParameterObject("two")
             )
         )
         assertNotNull(result)
-        assertEquals("bf0e5605-3a8f-4db9-8b98-c8e0691dd576", result.id.toString())
         assertEquals("one", result.first.third)
         assertEquals("two", result.second.third)
     }
 
-    "select with named parameters" {
-        val result: List<ObjTest3>? = connection.execute(
+    @Test
+    fun `select with named parameters`() {
+        val result: List<ObjTest3> = connection.select(
             """
             SELECT json_build_array(
-                json_build_object(
-                    'id', 'bf0e5605-3a8f-4db9-8b98-c8e0691dd576', 
-                    'first', :first::text, 
-                    'second', :second::text, 
-                    'third', :third::int
-                ),
-                json_build_object(
-                    'id', 'ce9ae3c9-dc0e-4561-a168-811b996d913e', 
-                    'first', :first::text, 
-                    'second', :second::text, 
-                    'third', :third::int
-                )
+                json_build_object('first', :first::text, 'second', :second::text, 'third', :third::int),
+                json_build_object('first', :first::text, 'second', :second::text, 'third', :third::int)
             )
             """.trimIndent(),
             mapOf(
@@ -259,51 +153,190 @@ class ConnectionTest : StringSpec({
                 "second" to "sec"
             )
         )
-        assertNotNull(result)
-        assertEquals("bf0e5605-3a8f-4db9-8b98-c8e0691dd576", result[0].id.toString())
         assertEquals("ff", result[0].first)
         assertEquals("sec", result[0].second)
         assertEquals(123, result[0].third)
     }
 
-    "select with named parameters as vararg of Pair" {
-        val result: List<ObjTest3>? = connection.execute(
+    @Test
+    fun `select with named parameters as vararg of Pair`() {
+        val result: List<ObjTest3> = connection.select(
             """
             SELECT json_build_array(
-                json_build_object('id', 'bf0e5605-3a8f-4db9-8b98-c8e0691dd576', 'first', :first::text, 'second', :second::text, 'third', :third::int),
-                json_build_object('id', '0c9d55d2-f69a-4750-a278-fac821774276', 'first', :first::text, 'second', :second::text, 'third', :third::int)
+                json_build_object('first', :first::text, 'second', :second::text, 'third', :third::int),
+                json_build_object('first', :first::text, 'second', :second::text, 'third', :third::int)
             )
             """.trimIndent(),
             "first" to "ff",
             "third" to 123,
             "second" to "sec"
         )
-        assertNotNull(result)
-        assertEquals("bf0e5605-3a8f-4db9-8b98-c8e0691dd576", result[0].id.toString())
         assertEquals("ff", result[0].first)
         assertEquals("sec", result[0].second)
         assertEquals(123, result[0].third)
     }
 
-    "execute with extra parameters" {
+    @Test
+    fun `select paginated`() {
+        val result: Paginated<ObjTest> = connection.select(
+            """
+            SELECT json_build_array(
+                json_build_object('id', '417aaa7e-7bc6-49b7-9fe8-6c8433b3f430', 'name', :name::text),
+                json_build_object('id', 'abd46e7a-e749-4ce4-8361-e7b64da89da6', 'name', :name::text || '-2')
+            ), 10 as total
+            LIMIT :limit OFFSET :offset
+            """.trimIndent(),
+            1,
+            2,
+            mapOf("name" to "ff")
+
+        )
+        assertNotNull(result)
+        assertEquals("ff", result.result[0].name)
+        assertEquals("ff-2", result.result[1].name)
+        assertEquals(10, result.total)
+        assertEquals(0, result.offset)
+    }
+
+    @Test
+    fun `test select paginated without result`() {
+        val result: Paginated<ObjTest> = connection.select(
+            """
+            SELECT null, 
+            10 as total
+            LIMIT :limit 
+            OFFSET :offset
+            """.trimIndent(),
+            1,
+            2,
+            object : TypeReference<List<ObjTest>>() {}
+        )
+        assertNotNull(result)
+        assertTrue(result.result.isEmpty())
+        assertEquals(0, result.result.size)
+        assertEquals(10, result.total)
+        assertEquals(0, result.offset)
+    }
+
+    @Test
+    fun `test select paginated`() {
+        val result: Paginated<ObjTest> = connection.select(
+            """
+            SELECT json_build_array(
+                jsonb_build_object(
+                    'name', :name::text,
+                    'id', 'e9f9a0f0-237c-47cf-98c5-be353f2f2ce3'
+                )
+            ), 
+            10 as total
+            LIMIT :limit 
+            OFFSET :offset
+            """.trimIndent(),
+            1,
+            2,
+            object : TypeReference<List<ObjTest>>() {},
+            mapOf(
+                "name" to "myName"
+            )
+        )
+        assertNotNull(result)
+        assertEquals("myName", result.result[0].name)
+        assertEquals(1, result.result.size)
+        assertEquals(10, result.total)
+        assertEquals(0, result.offset)
+    }
+
+    @Test
+    fun `test select paginated with no result`() {
+        assertThrows<QueryError> {
+            connection.select(
+                """
+                SELECT :name as name,
+                10 as total
+                LIMIT :limit 
+                OFFSET :offset
+                """.trimIndent(),
+                100,
+                10,
+                object : TypeReference<List<ObjTest>>() {},
+                mapOf(
+                    "name" to "myName"
+                )
+            )
+        }.run {
+            assertNotNull(message)
+            assertContains(message!!, "The query has no return")
+        }
+    }
+
+    @Test
+    fun `test select paginated with total was not integer`() {
+        assertThrows<QueryError> {
+            connection.select(
+                """
+                SELECT :name as name,
+                'plop' as total
+                LIMIT :limit 
+                OFFSET :offset
+                """.trimIndent(),
+                1,
+                10,
+                object : TypeReference<List<ObjTest>>() {},
+                mapOf(
+                    "name" to "myName"
+                )
+            )
+        }.run {
+            assertNotNull(message)
+            assertContains(message!!, """Column "total" must be an integer""")
+        }
+    }
+
+    @Test
+    fun `test select paginated without total`() {
+        val exception = assertThrows<QueryError> {
+            val result: Paginated<ObjTest> = connection.select(
+                """
+            SELECT null
+            LIMIT :limit 
+            OFFSET :offset
+                """.trimIndent(),
+                1,
+                2,
+                object : TypeReference<List<ObjTest>>() {}
+            )
+        }
+
+        assertEquals(
+            """
+            The query not return the "total" column
+            
+              > :offset = 0, :limit = 2
+              > SELECT null
+              > LIMIT :limit 
+              > OFFSET :offset
+              > -----
+              > ?column?
+              > null
+            """.trimIndent(),
+            exception.message
+        )
+    }
+
+    @Test
+    fun `selectOne with extra parameters`() {
         val params: Map<String, Any?> = mapOf(
             "first" to "ff",
             "third" to 123,
             "second" to "sec"
         )
-        val result: ObjTest3? = connection.execute(
+        val result: ObjTest3? = connection.selectOne(
             """
-            SELECT json_build_object(
-                'id', 'bf0e5605-3a8f-4db9-8b98-c8e0691dd576', 
-                'first', :first::text, 
-                'second', :second::text, 
-                'third', :third::int
-            ), 'plop'::text as other
+            SELECT json_build_object('first', :first::text, 'second', :second::text, 'third', :third::int), 'plop'::text as other
             """.trimIndent(),
             params
         ) {
             assertNotNull(it)
-            assertEquals("bf0e5605-3a8f-4db9-8b98-c8e0691dd576", it.id.toString())
             assertEquals("ff", it.first)
             assertEquals("plop", rows[0].getString("other"))
         }
@@ -313,30 +346,27 @@ class ConnectionTest : StringSpec({
         assertEquals(123, result.third)
     }
 
-    "test exec without parameters" {
+    @Test
+    fun `test exec without parameters`() {
         connection.exec("select 42, 'hello';").run {
             assertEquals(42, rows[0].getInt(0))
             assertEquals("hello", rows[0].getString(1))
         }
     }
 
-    "test exec with one object as parameter" {
+    @Test
+    fun `test exec with one object as parameter`() {
         val obj = ObjTest("myName", UUID.fromString("c606e216-53b3-43c8-a900-e727cb4a017c"))
         connection.exec("select ?::jsonb->>'name'", obj).run {
             assertEquals("myName", rows[0].getString(0))
         }
     }
 
-    "select one in transaction" {
+    @Test
+    fun `select one in transaction`() {
         connection.inTransaction {
-            execute<ObjTestWithParameterObject>(
-                """
-                SELECT json_build_object(
-                    'id', 'bf0e5605-3a8f-4db9-8b98-c8e0691dd576', 
-                    'first', :first::json, 
-                    'second', :second::json
-                    )
-                """.trimIndent(),
+            selectOne<ObjTestWithParameterObject>(
+                "SELECT json_build_object('first', :first::json, 'second', :second::json)",
                 mapOf(
                     "first" to ParameterObject("one"),
                     "second" to ParameterObject("two")
@@ -348,4 +378,4 @@ class ConnectionTest : StringSpec({
             }
         }
     }
-})
+}

src/test/kotlin/fr/postgresjson/EntityTest.kt

@@ -0,0 +1,34 @@
+package fr.postgresjson
+
+import fr.postgresjson.entity.Entity
+import fr.postgresjson.entity.EntityCreatedAt
+import fr.postgresjson.entity.EntityCreatedBy
+import fr.postgresjson.entity.EntityI
+import fr.postgresjson.entity.EntityUpdatedAt
+import fr.postgresjson.entity.EntityUpdatedBy
+import fr.postgresjson.entity.Published
+import fr.postgresjson.entity.UuidEntityExtended
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import java.util.UUID
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class EntityTest() {
+    private class User(id: UUID = UUID.randomUUID()) : Entity<UUID>(id)
+    private class ObjTest(val name: String) : UuidEntityExtended<Int?, User>(User(), User())
+
+    @Test
+    fun getObject() {
+        val obj = ObjTest("plop")
+        assertTrue(obj is ObjTest)
+        assertTrue(obj is UuidEntityExtended<Int?, User>)
+        assertTrue(obj is EntityI)
+        assertTrue(obj is Entity<UUID>)
+        assertTrue(obj is Published<User>)
+        assertTrue(obj is EntityCreatedBy<User>)
+        assertTrue(obj is EntityUpdatedBy<User>)
+        assertTrue(obj is EntityCreatedAt)
+        assertTrue(obj is EntityUpdatedAt)
+    }
+}

src/test/kotlin/fr/postgresjson/MigrationTest.kt

@@ -1,9 +1,9 @@
 package fr.postgresjson
 
 import fr.postgresjson.connexion.Requester
-import fr.postgresjson.connexion.execute
+import fr.postgresjson.connexion.selectOne
 import fr.postgresjson.migration.Migration
-import fr.postgresjson.migration.MigrationExecutor
+import fr.postgresjson.migration.Migrations
 import org.amshove.kluent.invoking
 import org.amshove.kluent.`should be equal to`
 import org.amshove.kluent.`should contain`
@@ -12,15 +12,13 @@ import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import java.util.UUID
-import kotlin.test.assertEquals
-import kotlin.test.assertNotNull
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class MigrationTest : TestAbstract() {
     @Test
     fun `run up query`() {
         val resources = this::class.java.getResource("/sql/migrations")!!.toURI()
-        val m = MigrationExecutor(connection, resources)
+        val m = Migrations(connection, resources)
         m.up().apply {
             this `should contain` Pair("1", Migration.Status.OK)
             size `should be equal to` 1
@@ -33,14 +31,14 @@ class MigrationTest : TestAbstract() {
     fun `migration up Query should throw error if no down`() {
         val resources = this::class.java.getResource("/sql/migration_without_down")!!.toURI()
         invoking {
-            MigrationExecutor(resources, connection)
-        } shouldThrow MigrationExecutor.DownMigrationNotDefined::class
+            Migrations(resources, connection)
+        } shouldThrow Migrations.DownMigrationNotDefined::class
     }
 
     @Test
     fun `run forced down query`() {
         val resources = this::class.java.getResource("/sql/migrations")!!.toURI()
-        val m = MigrationExecutor(resources, connection)
+        val m = Migrations(resources, connection)
         repeat(3) {
             m.down(true).apply {
                 this `should contain` Pair("1", Migration.Status.OK)
@@ -52,10 +50,10 @@ class MigrationTest : TestAbstract() {
     @Test
     fun `run dry migrations`() {
         val resources = this::class.java.getResource("/sql/real_migrations")!!.toURI()
-        MigrationExecutor(resources, connection).apply {
+        Migrations(resources, connection).apply {
             runDry().size `should be equal to` 2
         }
-        MigrationExecutor(resources, connection).apply {
+        Migrations(resources, connection).apply {
             runDry().size `should be equal to` 2
         }
     }
@@ -63,7 +61,7 @@ class MigrationTest : TestAbstract() {
     @Test
     fun `run dry migrations launch twice`() {
         val resources = this::class.java.getResource("/sql/real_migrations")!!.toURI()
-        MigrationExecutor(resources, connection).apply {
+        Migrations(resources, connection).apply {
             runDry().size `should be equal to` 2
             runDry().size `should be equal to` 2
         }
@@ -72,7 +70,7 @@ class MigrationTest : TestAbstract() {
     @Test
     fun `run migrations`() {
         val resources = this::class.java.getResource("/sql/real_migrations")!!.toURI()
-        MigrationExecutor(resources, connection).apply {
+        Migrations(resources, connection).apply {
             run().apply {
                 size `should be equal to` 1
             }
@@ -83,12 +81,12 @@ class MigrationTest : TestAbstract() {
     fun `run migrations force down`() {
         val resources = this::class.java.getResource("/sql/real_migrations")!!.toURI()
         val resourcesFunctions = this::class.java.getResource("/sql/function/Test")!!.toURI()
-        MigrationExecutor(listOf(resources, resourcesFunctions), connection).apply {
+        Migrations(listOf(resources, resourcesFunctions), connection).apply {
             up().apply {
                 size `should be equal to` 6
             }
         }
-        MigrationExecutor(listOf(resources, resourcesFunctions), connection).apply {
+        Migrations(listOf(resources, resourcesFunctions), connection).apply {
             forceAllDown().apply {
                 size `should be equal to` 6
             }
@@ -98,35 +96,34 @@ class MigrationTest : TestAbstract() {
     @Test
     fun `run functions migrations`() {
         val resources = this::class.java.getResource("/sql/function/Test")!!.toURI()
-        MigrationExecutor(resources, connection).apply {
+        Migrations(resources, connection).apply {
             run().size `should be equal to` 5
         }
 
         val objTest: RequesterTest.ObjTest? = Requester(connection, functionsDirectory = resources)
             .getFunction("test_function")
-            .execute(listOf("test", "plip"))
+            .selectOne(listOf("test", "plip"))
 
-        assertNotNull(objTest)
-        assertEquals(objTest.id, UUID.fromString("457daad5-4f1b-4eb7-80ec-6882adb8cc7d"))
-        assertEquals(objTest.name, "test")
+        Assertions.assertEquals(objTest!!.id, UUID.fromString("457daad5-4f1b-4eb7-80ec-6882adb8cc7d"))
+        Assertions.assertEquals(objTest.name, "test")
     }
 
     @Test
     fun `run functions migrations and drop if exist`() {
         val resources = this::class.java.getResource("/sql/function/Test1")!!.toURI()
-        MigrationExecutor(resources, connection).apply {
+        Migrations(resources, connection).apply {
             run().size `should be equal to` 1
         }
 
         val objTest: RequesterTest.ObjTest? = Requester(connection, functionsDirectory = resources)
             .getFunction("test_function_duplicate")
-            .execute(listOf("test"))
+            .selectOne(listOf("test"))
 
         Assertions.assertEquals(objTest!!.id, UUID.fromString("457daad5-4f1b-4eb7-80ec-6882adb8cc7d"))
         Assertions.assertEquals(objTest.name, "test")
 
         val resources2 = this::class.java.getResource("/sql/function/Test2")!!.toURI()
-        MigrationExecutor(resources2, connection).apply {
+        Migrations(resources2, connection).apply {
             run().size `should be equal to` 1
         }
     }

src/test/kotlin/fr/postgresjson/RequesterTest.kt

@@ -2,11 +2,14 @@ package fr.postgresjson
 
 import com.fasterxml.jackson.core.type.TypeReference
 import fr.postgresjson.connexion.Connection.QueryError
+import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.connexion.Requester.NoFunctionDefined
 import fr.postgresjson.connexion.Requester.NoQueryDefined
-import fr.postgresjson.connexion.SqlSerializable
-import fr.postgresjson.connexion.execute
+import fr.postgresjson.connexion.select
+import fr.postgresjson.connexion.selectOne
+import fr.postgresjson.connexion.update
+import fr.postgresjson.entity.UuidEntity
 import fr.postgresjson.serializer.deserialize
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Test
@@ -15,8 +18,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 
 class RequesterTest : TestAbstract() {
-    @SqlSerializable
-    class ObjTest(val name: String, val id: UUID = UUID.fromString("5623d902-3067-42f3-bfd9-095dbb12c29f"))
+    class ObjTest(val name: String, id: UUID = UUID.fromString("5623d902-3067-42f3-bfd9-095dbb12c29f")) : UuidEntity(id)
 
     @Test
     fun `requester constructor empty`() {
@@ -97,7 +99,7 @@ class RequesterTest : TestAbstract() {
         val objTest: ObjTest? = Requester(connection)
             .apply { addQuery(resources) }
             .getQuery("selectOne")
-            .execute()
+            .selectOne()
 
         assertNotNull(objTest)
         assertEquals(objTest.id, UUID.fromString("829b1a29-5db8-47f9-9562-961c561ac528"))
@@ -136,7 +138,7 @@ class RequesterTest : TestAbstract() {
         val resources = this::class.java.getResource("/sql/function/Test")?.toURI()
         val objTest: ObjTest? = Requester(connection, functionsDirectory = resources)
             .getFunction("test_function")
-            .execute(listOf("test", "plip"))
+            .selectOne(listOf("test", "plip"))
 
         assertNotNull(objTest)
         assertEquals(objTest.id, UUID.fromString("457daad5-4f1b-4eb7-80ec-6882adb8cc7d"))
@@ -160,7 +162,7 @@ class RequesterTest : TestAbstract() {
             .getQuery("selectOneWithParameters")
             .exec(listOf("myName"))
 
-        assertEquals("myName", result.deserialize<ObjTest>()?.name)
+        assertEquals("myName", result.rows[0].getString(0)?.deserialize<ObjTest>()?.name)
     }
 
     @Test
@@ -276,30 +278,30 @@ class RequesterTest : TestAbstract() {
     fun `call exec on function with pair as arguments`() {
         val resources = this::class.java.getResource("/sql/function/Test")?.toURI()
         val result = Requester(connection, functionsDirectory = resources)
-            .getFunction("test_function_void")
+            .getFunction("function_void")
             .exec("name" to "test")
 
         assertEquals(1, result.rowsAffected)
     }
 
     @Test
-    fun `call execute on function`() {
+    fun `call selectOne on function`() {
         val resources = this::class.java.getResource("/sql/function/Test")?.toURI()
         val obj: ObjTest? = Requester(connection, functionsDirectory = resources)
             .getFunction("test_function")
-            .execute(mapOf("name" to "myName"))
+            .selectOne(mapOf("name" to "myName"))
 
         assertNotNull(obj)
         assertEquals("myName", obj.name)
     }
 
     @Test
-    fun `call execute on function with object and named argument`() {
+    fun `call selectOne on function with object and named argument`() {
         val resources = this::class.java.getResource("/sql/function/Test")?.toURI()
         val obj2 = ObjTest("original")
         val obj: ObjTest? = Requester(connection, functionsDirectory = resources)
             .getFunction("test_function_object")
-            .execute("resource" to obj2)
+            .selectOne("resource" to obj2)
 
         assertNotNull(obj)
         assertEquals("changedName", obj.name)
@@ -307,12 +309,12 @@ class RequesterTest : TestAbstract() {
     }
 
     @Test
-    fun `call execute on function with object`() {
+    fun `call selectOne on function with object`() {
         val resources = this::class.java.getResource("/sql/function/Test")?.toURI()
         val obj2 = ObjTest("original")
         val obj: ObjTest? = Requester(connection, functionsDirectory = resources)
             .getFunction("test_function_object")
-            .execute(listOf(obj2))
+            .update(obj2)
 
         assertNotNull(obj)
         assertEquals("changedName", obj.name)
@@ -320,22 +322,22 @@ class RequesterTest : TestAbstract() {
     }
 
     @Test
-    fun `call execute on function with object and no arguments`() {
+    fun `call selectOne on function with object and no arguments`() {
         val resources = this::class.java.getResource("/sql/function/Test")?.toURI()
         val obj: ObjTest? = Requester(connection, functionsDirectory = resources)
             .getFunction("test_function")
-            .execute()
+            .selectOne()
 
         assertNotNull(obj)
         assertEquals("plop", obj.name)
     }
 
     @Test
-    fun `call execute on query`() {
+    fun `call selectOne on query`() {
         val resources = this::class.java.getResource("/sql/query")?.toURI()
         val obj: ObjTest? = Requester(connection, queriesDirectory = resources)
             .getQuery("selectOneWithParameters")
-            .execute(mapOf("name" to "myName"))
+            .selectOne(mapOf("name" to "myName"))
 
         assertNotNull(obj)
         assertEquals("myName", obj.name)
@@ -344,11 +346,10 @@ class RequesterTest : TestAbstract() {
     @Test
     fun `call select (multiple) on function with named argument`() {
         val resources = this::class.java.getResource("/sql/function/Test")?.toURI()
-        val obj: List<ObjTest>? = Requester(connection, functionsDirectory = resources)
+        val obj: List<ObjTest> = Requester(connection, functionsDirectory = resources)
             .getFunction("test_function_multiple")
-            .execute(mapOf("name" to "myName"))
+            .select(mapOf("name" to "myName"))
 
-        assertNotNull(obj)
         assertNotNull(obj[0])
         assertEquals("myName", obj[0].name)
         assertEquals("myName", obj[0].name)
@@ -357,11 +358,10 @@ class RequesterTest : TestAbstract() {
     @Test
     fun `call select (multiple) on function with ordered arguments`() {
         val resources = this::class.java.getResource("/sql/function/Test")?.toURI()
-        val obj: List<ObjTest>? = Requester(connection, functionsDirectory = resources)
+        val obj: List<ObjTest> = Requester(connection, functionsDirectory = resources)
             .getFunction("test_function_multiple")
-            .execute(listOf("myName"))
+            .select(listOf("myName"))
 
-        assertNotNull(obj)
         assertEquals("myName", obj[0].name)
     }
 
@@ -370,13 +370,13 @@ class RequesterTest : TestAbstract() {
         val resources = this::class.java.getResource("/sql/query")?.toURI()
         Requester(connection, queriesDirectory = resources)
             .getQuery("selectMultiple").apply {
-                execute<List<ObjTest>>(mapOf("name" to "ff")).let { result ->
+                select<ObjTest>(mapOf("name" to "ff")).let { result ->
                     assertNotNull(result)
                     assertEquals("ff", result[0].name)
                     assertEquals("ff-2", result[1].name)
                 }
             }.apply {
-                execute(object : TypeReference<List<ObjTest>>() {}, mapOf("name" to "ff")).let { result ->
+                select(object : TypeReference<List<ObjTest>>() {}, mapOf("name" to "ff")).let { result ->
                     assertNotNull(result)
                     assertEquals("ff", result[0].name)
                     assertEquals("ff-2", result[1].name)
@@ -389,13 +389,13 @@ class RequesterTest : TestAbstract() {
         val resources = this::class.java.getResource("/sql/query")?.toURI()
         Requester(connection, queriesDirectory = resources)
             .getQuery("selectMultiple").apply {
-                execute<List<ObjTest>>("name" to "ff").let { result ->
+                select<ObjTest>("name" to "ff").let { result ->
                     assertNotNull(result)
                     assertEquals("ff", result[0].name)
                     assertEquals("ff-2", result[1].name)
                 }
             }.apply {
-                execute(object : TypeReference<List<ObjTest>>() {}, "name" to "ff").let { result ->
+                select(object : TypeReference<List<ObjTest>>() {}, "name" to "ff").let { result ->
                     assertNotNull(result)
                     assertEquals("ff", result[0].name)
                     assertEquals("ff-2", result[1].name)
@@ -408,13 +408,13 @@ class RequesterTest : TestAbstract() {
         val resources = this::class.java.getResource("/sql/query")?.toURI()
         Requester(connection, queriesDirectory = resources)
             .getQuery("selectMultipleOrderedArgs").apply {
-                execute<List<ObjTest>>(listOf("ff", "aa")).let { result ->
+                select<ObjTest>(listOf("ff", "aa")).let { result ->
                     assertNotNull(result)
                     assertEquals("ff", result[0].name)
                     assertEquals("aa-2", result[1].name)
                 }
             }.apply {
-                execute(object : TypeReference<List<ObjTest>>() {}, listOf("ff", "aa")).let { result ->
+                select(object : TypeReference<List<ObjTest>>() {}, listOf("ff", "aa")).let { result ->
                     assertNotNull(result)
                     assertEquals("ff", result[0].name)
                     assertEquals("aa-2", result[1].name)
@@ -423,11 +423,71 @@ class RequesterTest : TestAbstract() {
     }
 
     @Test
-    fun `call execute on query with extra parameter`() {
+    fun `call select paginated on query`() {
+        val resources = this::class.java.getResource("/sql/query")?.toURI()
+        val result: Paginated<ObjTest> = Requester(connection, queriesDirectory = resources)
+            .getQuery("selectPaginated")
+            .select(1, 2, mapOf("name" to "ff"))
+        assertNotNull(result)
+        assertEquals("ff", result.result[0].name)
+        assertEquals("ff-2", result.result[1].name)
+        assertEquals(10, result.total)
+        assertEquals(0, result.offset)
+    }
+
+    @Test
+    fun `call select paginated on function`() {
+        val resources = this::class.java.getResource("/sql/function")?.toURI()
+        Requester(connection, functionsDirectory = resources)
+            .getFunction("test_function_paginated").apply {
+                select<ObjTest>(1, 2, mapOf("name" to "ff")).run {
+                    assertNotNull(result)
+                    assertEquals("ff", result[0].name)
+                    assertEquals("ff-2", result[1].name)
+                    assertEquals(10, total)
+                    assertEquals(0, offset)
+                }
+            }.apply {
+                select(1, 2, object : TypeReference<List<ObjTest>>() {}, mapOf("name" to "ff")).run {
+                    assertNotNull(result)
+                    assertEquals("ff", result[0].name)
+                    assertEquals("ff-2", result[1].name)
+                    assertEquals(10, total)
+                    assertEquals(0, offset)
+                }
+            }
+    }
+
+    @Test
+    fun `call select paginated on function with vararg`() {
+        val resources = this::class.java.getResource("/sql/function")?.toURI()
+        Requester(connection, functionsDirectory = resources)
+            .getFunction("test_function_paginated")
+            .select<ObjTest>(1, 2, "name" to "ff").run {
+                assertNotNull(result)
+                assertEquals("ff", result[0].name)
+                assertEquals("ff-2", result[1].name)
+                assertEquals(10, total)
+                assertEquals(0, offset)
+            }
+
+        Requester(connection, functionsDirectory = resources)
+            .getFunction("test_function_paginated")
+            .select(1, 2, object : TypeReference<List<ObjTest>>() {}, "name" to "ff").run {
+                assertNotNull(result)
+                assertEquals("ff", result[0].name)
+                assertEquals("ff-2", result[1].name)
+                assertEquals(10, total)
+                assertEquals(0, offset)
+            }
+    }
+
+    @Test
+    fun `call selectOne on query with extra parameter`() {
         val resources = this::class.java.getResource("/sql/query")?.toURI()
         Requester(connection, queriesDirectory = resources)
             .getQuery("selectOneWithParameters").apply {
-                execute<ObjTest>(mapOf("name" to "myName")) {
+                selectOne<ObjTest>(mapOf("name" to "myName")) {
                     assertNotNull(it)
                     assertEquals("myName", it.name)
                     assertEquals("plop", rows[0].getString("other"))
@@ -435,7 +495,7 @@ class RequesterTest : TestAbstract() {
                     assertEquals("selectOneWithParameters", name)
                 }
             }.apply {
-                execute(typeReference = object : TypeReference<ObjTest>() {}, values = mapOf("name" to "myName")) {
+                selectOne(typeReference = object : TypeReference<ObjTest>() {}, values = mapOf("name" to "myName")) {
                     assertNotNull(it)
                     assertEquals("myName", it.name)
                     assertEquals("plop", rows[0].getString("other"))

src/test/kotlin/fr/postgresjson/SerializerTest.kt

@@ -1,6 +1,8 @@
 package fr.postgresjson
 
+import fr.postgresjson.entity.UuidEntity
 import fr.postgresjson.serializer.Serializer
+import fr.postgresjson.serializer.serialize
 import org.joda.time.DateTime
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
@@ -11,8 +13,8 @@ import java.util.UUID
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class SerializerTest {
-    private class ObjTest(var val1: String, var val2: Int, val id: UUID = UUID.fromString("1e5f5d41-6d14-4007-897b-0ed2616bec96"))
-    private class ObjTestDate(var val1: DateTime, val id: UUID = UUID.fromString("829b1a29-5db8-47f9-9562-961c561ac528"))
+    private class ObjTest(var val1: String, var val2: Int, id: UUID = UUID.fromString("1e5f5d41-6d14-4007-897b-0ed2616bec96")) : UuidEntity(id)
+    private class ObjTestDate(var val1: DateTime, id: UUID = UUID.fromString("829b1a29-5db8-47f9-9562-961c561ac528")) : UuidEntity(id)
 
     private val serializer = Serializer()
 
@@ -31,10 +33,16 @@ internal class SerializerTest {
         assertTrue(json.contains(""""val1":"plop","val2":123"""))
     }
 
+    @Test
+    fun serialize2() {
+        val json = obj.serialize()
+        assertTrue(json.contains(""""val1":"plop","val2":123"""))
+    }
+
     @Test
     fun serializeList() {
         val list = listOf(ObjTest("one", 1), ObjTest("two", 2))
-        val json = serializer.serialize(list)
+        val json = list.serialize()
         assertTrue(json.contains(""""val1":"one","val2":1"""))
         assertTrue(json.contains(""""val1":"two","val2":2"""))
     }
@@ -42,7 +50,7 @@ internal class SerializerTest {
     @Test
     fun serializeDate() {
         val objDate = ObjTestDate(DateTime.parse("2019-07-30T14:08:51.420108+04:00"))
-        val json = serializer.serialize(objDate)
+        val json = objDate.serialize()
         assertTrue(json.contains(""""val1":"2019-07-30T10:08:51.420Z""""), json)
     }
 

src/test/kotlin/fr/postgresjson/SqlFixtureListener.kt

@@ -1,26 +0,0 @@
-package fr.postgresjson
-
-import fr.postgresjson.connexion.Connection
-import io.kotest.core.listeners.AfterSpecListener
-import io.kotest.core.listeners.BeforeSpecListener
-import io.kotest.core.spec.Spec
-import java.io.File
-
-open class SqlFixtureListener : BeforeSpecListener, AfterSpecListener {
-    private val connection = Connection(database = "json_test", username = "test", password = "test", port = 35555)
-
-    override suspend fun beforeSpec(spec: Spec) {
-        val initSQL = File(this::class.java.getResource("/fixtures/init.sql")!!.toURI())
-        connection
-            .connect()
-            .sendQuery(initSQL.readText())
-            .join()
-    }
-
-    override suspend fun afterSpec(spec: Spec) {
-        val downSQL = File(this::class.java.getResource("/fixtures/down.sql")!!.toURI())
-        connection
-            .apply { connect().sendQuery(downSQL.readText()).join() }
-            .disconnect()
-    }
-}

src/test/kotlin/fr/postgresjson/TestAbstract.kt

@@ -8,8 +8,8 @@ import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
 import java.io.File
 
 @TestInstance(PER_CLASS)
-open class TestAbstract {
-    protected val connection = Connection(database = "json_test", username = "test", password = "test", port = 35555)
+abstract class TestAbstract {
+    protected val connection = Connection(database = "json_test", username = "test", password = "test", port = 5555)
 
     @BeforeEach
     fun beforeAll() {

src/test/kotlin/fr/postgresjson/TestConnection.kt

@@ -1,16 +0,0 @@
-package fr.postgresjson
-
-import fr.postgresjson.connexion.Connection
-
-fun TestConnection(): Connection =
-    Connection(database = "json_test", username = "test", password = "test", port = 35555)
-
-fun <A> Connection.rollbackAfter(block: Connection.() -> A?) = connect().run {
-    sendQuery("BEGIN")
-    try {
-        block().apply { sendQuery("ROLLBACK") }
-    } catch (e: Throwable) {
-        sendQuery("ROLLBACK")
-        throw e
-    }
-}

src/test/kotlin/fr/postgresjson/definition/FunctionTest.kt

@@ -1,648 +0,0 @@
-package fr.postgresjson.definition
-
-import fr.postgresjson.definition.Parameter.Direction.IN
-import fr.postgresjson.definition.Parameter.Direction.INOUT
-import fr.postgresjson.definition.Parameter.Direction.OUT
-import fr.postgresjson.definition.Returns.Primitive
-import fr.postgresjson.definition.parse.parseFunction
-import io.kotest.core.spec.style.FreeSpec
-import io.kotest.matchers.collections.shouldHaveSize
-import io.kotest.matchers.shouldBe
-import org.amshove.kluent.shouldBeInstanceOf
-
-class FunctionTest : FreeSpec({
-    "Function name" - {
-        "all in lower" {
-            parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function myfun() returns text language plpgsql as
-                $$ begin; end$$;
-                """.trimIndent()
-            ).apply {
-                name shouldBe "myfun"
-            }
-        }
-
-        "first letter caps without quoted" {
-            parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function Myfun() returns text language plpgsql as
-                $$ begin; end$$;
-                """.trimIndent()
-            ).apply {
-                name shouldBe "myfun"
-            }
-        }
-
-        "with numbers" {
-            parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function myfun001() returns text language plpgsql as
-                $$ begin; end$$;
-                """.trimIndent()
-            ).apply {
-                name shouldBe "myfun001"
-            }
-        }
-
-        "escaped name with space" {
-            parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function "My fun"() returns text language plpgsql as
-                $$ begin; end$$;
-                """.trimIndent()
-            ).apply {
-                name shouldBe "My fun"
-            }
-        }
-
-        "quoted name with double quote in name" {
-            parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function "My""fun" () returns text language plpgsql as
-                $$ begin; end$$;
-                """.trimIndent()
-            ).apply {
-                name shouldBe "My\"fun"
-            }
-        }
-
-        "name with new line before and after" {
-            parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function 
-                myfun
-                () 
-                returns text language plpgsql as
-                $$ begin; end$$;
-                """.trimIndent()
-            ).apply {
-                name shouldBe "myfun"
-            }
-        }
-    }
-
-    "Parameters" - {
-        "One parameter text" - {
-            val param = parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function myfun(one text) returns text language plpgsql as
-                $$ begin end;$$;
-                """.trimIndent()
-            ).parameters
-
-            "should have one parameter" {
-                param shouldHaveSize 1
-            }
-
-            "should have first parameter name" {
-                param[0].name shouldBe "one"
-            }
-
-            "should have first parameter type name" {
-                param[0].type.name shouldBe "text"
-            }
-        }
-
-        "Two parameters" - {
-            val param = parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function myfun(one text, two int) returns text language plpgsql as
-                $$ begin end;$$;
-                """.trimIndent()
-            ).parameters
-
-            "should have 2 parameters" {
-                param shouldHaveSize 2
-            }
-
-            "should have names" {
-                param[0].name shouldBe "one"
-                param[1].name shouldBe "two"
-            }
-
-            "should have first parameter type name" {
-                param[0].type.name shouldBe "text"
-                param[1].type.name shouldBe "int"
-            }
-        }
-
-        "Escaped parameters name" - {
-            val param = parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function myfun("one""or two" text, "#@€" int) returns text language plpgsql as
-                $$ begin end;$$;
-                """.trimIndent()
-            ).parameters
-
-            "should have 2 parameters" {
-                param shouldHaveSize 2
-            }
-
-            "should have names" {
-                param[0].name shouldBe "one\"or two"
-                param[1].name shouldBe "#@€"
-            }
-        }
-        "Parameters with Caps" - {
-            val param = parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function myfun("One" text, Two text) returns text language plpgsql as
-                $$ begin end;$$;
-                """.trimIndent()
-            ).parameters
-
-            "should have first parameter name" {
-                param[0].name shouldBe "One"
-                param[1].name shouldBe "two"
-            }
-        }
-
-        "Parameters with type `character varying(255)`" - {
-            val param = parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function myfun(one character varying(255)) returns text language plpgsql as
-                $$ begin end;$$;
-                """.trimIndent()
-            ).parameters
-
-            "should have 1 parameters" {
-                param shouldHaveSize 1
-            }
-
-            "should have name" {
-                param[0].name shouldBe "one"
-            }
-
-            "should have type name" {
-                param[0].type.name shouldBe "character varying"
-            }
-
-            "should have type precision" {
-                param[0].type.precision shouldBe 255
-                param[0].type.scale shouldBe null
-            }
-        }
-
-        "Parameters with type `numeric(16, 8)`" - {
-            val param = parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function myfun(one numeric(16, 8)) returns text language plpgsql as
-                $$ begin end;$$;
-                """.trimIndent()
-            ).parameters
-
-            "should have 1 parameters" {
-                param shouldHaveSize 1
-            }
-
-            "should have name" {
-                param[0].name shouldBe "one"
-            }
-
-            "should have type name" {
-                param[0].type.name shouldBe "numeric"
-            }
-
-            "should have type precision" {
-                param[0].type.precision shouldBe 16
-            }
-
-            "should have type scale" {
-                param[0].type.scale shouldBe 8
-            }
-        }
-
-        "Parameters with default text" - {
-            val param = parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function myfun(one text default 'example') returns text language plpgsql as
-                $$ begin end;$$;
-                """.trimIndent()
-            ).parameters
-
-            "should have 1 parameters" {
-                param shouldHaveSize 1
-            }
-
-            "should have name" {
-                param[0].name shouldBe "one"
-            }
-
-            "should have type name" {
-                param[0].type.name shouldBe "text"
-            }
-
-            "should have default text" {
-                param[0].default shouldBe "'example'"
-            }
-        }
-
-        "Parameters with default int" - {
-            val param = parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function myfun(one int DEFAULT 123456 ) returns text language plpgsql as
-                $$ begin end;$$;
-                """.trimIndent()
-            ).parameters
-
-            "should have 1 parameters" {
-                param shouldHaveSize 1
-            }
-
-            "should have name" {
-                param[0].name shouldBe "one"
-            }
-
-            "should have type name" {
-                param[0].type.name shouldBe "int"
-            }
-
-            "should have default text" {
-                param[0].default shouldBe "123456"
-            }
-        }
-
-        "Parameters with multiple default and equal" - {
-            val param = parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function myfun(one int DEFAULT 123456 , two text default 'hello', three text = '654') returns text language plpgsql as
-                $$ begin end;$$;
-                """.trimIndent()
-            ).parameters
-
-            "should have 3 parameters" {
-                param shouldHaveSize 3
-            }
-
-            "should have name" {
-                param[0].name shouldBe "one"
-                param[1].name shouldBe "two"
-                param[2].name shouldBe "three"
-            }
-
-            "should have type name" {
-                param[0].type.name shouldBe "int"
-                param[1].type.name shouldBe "text"
-                param[2].type.name shouldBe "text"
-            }
-
-            "should have default text" {
-                param[0].default shouldBe "123456"
-                param[1].default shouldBe "'hello'"
-                param[2].default shouldBe "'654'"
-            }
-        }
-
-        "parameters with IN OUT INOUT" - {
-            val param = parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function myfun(in one text, inout two text, out three text, four text) language plpgsql as
-                $$ begin end;$$;
-                """.trimIndent()
-            ).parameters
-
-            "should have 4 parameters" {
-                param shouldHaveSize 4
-            }
-
-            "should have parameter name" {
-                param[0].name shouldBe "one"
-                param[1].name shouldBe "two"
-                param[2].name shouldBe "three"
-                param[3].name shouldBe "four"
-            }
-
-            "should have parameter type name" {
-                param[0].type.name shouldBe "text"
-                param[1].type.name shouldBe "text"
-                param[2].type.name shouldBe "text"
-            }
-
-            "should have parameter direction" {
-                param[0].direction shouldBe IN
-                param[1].direction shouldBe INOUT
-                param[2].direction shouldBe OUT
-                param[3].direction shouldBe IN
-            }
-        }
-
-        "Parameters with type array of numeric" - {
-            val param = parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function myfun(one numeric(10, 2)[]) language plpgsql as
-                $$ begin end;$$;
-                """.trimIndent()
-            ).parameters
-
-            "should have 1 parameters" {
-                param shouldHaveSize 1
-            }
-
-            "should have parameter name" {
-                param[0].name shouldBe "one"
-            }
-
-            "should have parameter type is array" {
-                param[0].type.isArray shouldBe true
-            }
-
-            "should have parameter type name" {
-                param[0].type.name shouldBe "numeric"
-            }
-
-            "should have parameter type precision" {
-                param[0].type.precision shouldBe 10
-            }
-
-            "should have parameter type scale" {
-                param[0].type.scale shouldBe 2
-            }
-        }
-
-        "Parameters with type array of text" - {
-            val param = parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function myfun(one text[], two int[], three text) language plpgsql as
-                $$ begin end;$$;
-                """.trimIndent()
-            ).parameters
-
-            "should have 2 parameters" {
-                param shouldHaveSize 3
-            }
-
-            "should have parameter name" {
-                param[0].name shouldBe "one"
-                param[1].name shouldBe "two"
-                param[2].name shouldBe "three"
-            }
-
-            "should have parameter type is array" {
-                param[0].type.isArray shouldBe true
-                param[1].type.isArray shouldBe true
-                param[2].type.isArray shouldBe false
-            }
-
-            "should have parameter type name" {
-                param[0].type.name shouldBe "text"
-                param[1].type.name shouldBe "int"
-                param[2].type.name shouldBe "text"
-            }
-
-            "should have parameter direction" {
-                param[0].direction shouldBe IN
-                param[1].direction shouldBe IN
-                param[2].direction shouldBe IN
-            }
-        }
-
-        "Parameters with type array multidimensional of text" - {
-            val param = parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function myfun(one text[][]) language plpgsql as
-                $$ begin end;$$;
-                """.trimIndent()
-            ).parameters
-
-            "should have parameter type is array" {
-                param[0].type.isArray shouldBe true
-            }
-
-            "should have parameter type name" {
-                param[0].type.name shouldBe "text"
-            }
-        }
-
-        "Parameters with type fixed size array" - {
-            val param = parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function myfun(one text[45], two text[1][]) language plpgsql as
-                $$ begin end;$$;
-                """.trimIndent()
-            ).parameters
-
-            "should have parameter type is array" {
-                param[0].type.isArray shouldBe true
-                param[1].type.isArray shouldBe true
-            }
-
-            "should have parameter type name" {
-                param[0].type.name shouldBe "text"
-                param[1].type.name shouldBe "text"
-            }
-
-            "should return the type with array" {
-                param[0].type.toString() shouldBe "text[45]"
-                param[1].type.toString() shouldBe "text[1][]"
-            }
-
-            "should return the type name" {
-                param[0].toString() shouldBe "in one text[45]"
-                param[1].toString() shouldBe "in two text[1][]"
-            }
-        }
-    }
-
-    "Function Returns" - {
-        "should return the type text" {
-            val returns = parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function myfun() returns text language plpgsql as 
-                $$ begin; end$$;
-                """.trimIndent()
-            ).returns
-
-            returns shouldBeInstanceOf Primitive::class
-            returns.definition shouldBe "text"
-            returns.isSetOf shouldBe false
-        }
-
-        "should return the type character varying" {
-            val returns = parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function myfun() returns character varying language plpgsql as 
-                $$ begin; end$$;
-                """.trimIndent()
-            ).returns
-
-            returns shouldBeInstanceOf Primitive::class
-            returns.definition shouldBe "character varying"
-            returns.isSetOf shouldBe false
-        }
-
-        "should return the type character varying(255)" {
-            val returns = parseFunction(
-                // language=PostgreSQL
-                """
-                create or replace function myfun() returns character varying(255) language plpgsql as 
-                $$ begin; end$$;
-                """.trimIndent()
-            ).returns
-
-            returns shouldBeInstanceOf Primitive::class
-            returns.definition shouldBe "character varying(255)"
-            returns.isSetOf shouldBe false
-        }
-    }
-
-//    "function returns" - {
-//        "should return the type text if function return text" {
-//            Function(
-//                // language=PostgreSQL
-//                """
-//                create or replace function test001() returns text language plpgsql as
-//                $$ begin; end$$;
-//                """.trimIndent()
-//            ).returns shouldBe "text"
-//        }
-//
-//        "return null if function return void" {
-//            Function(
-//                // language=PostgreSQL
-//                """
-//                create or replace function test001() returns void language plpgsql as
-//                $$ begin; end$$;
-//                """.trimIndent()
-//            ).returns shouldBe null
-//        }
-//    }
-//
-//    "Parameters" - {
-//        "One parameter text" - {
-//            val param = Function(
-//                // language=PostgreSQL
-//                """
-//                create or replace function myfun(
-//                    one text
-//                ) returns text language plpgsql as
-//                $$ begin end;$$;
-//                """.trimIndent()
-//            ).parameters
-//
-//            "Function must have one parameter" {
-//                param shouldHaveSize 1
-//            }
-//
-//            "The parameter must be in lower case" {
-//                param.getOrNull(0)?.name shouldBe "one"
-//            }
-//        }
-//    }
-//
-//    "parameters" - {
-//        val param = Function(
-//            // language=PostgreSQL
-//            """
-//            create or replace function myfun(
-//                one text,
-//                "Two" INTEGER default 5,
-//                "Three ""and"" half" character varying = 'Yes',
-//                Three_and_more character varying(255) default 'Hello',
-//                dot point default '(1, 2)'::point,
-//                num NUMERIC(10, 3) default 123.654,
-//                arr01 text[] default '{hello, world, "and others", and\ more, "with \", ], [ , ) and as $$ in text"}'::text[],
-//                arr02 "point"[] default array['(1, 2)'::point, '(7, 12)'::point]::point[],
-//                arr03 text[] default array[
-//                    'text01',
-//                    'text02"([,#-',
-//                    null
-//                    ],
-//                last "text" default 'Hi'
-//            ) returns text language plpgsql as
-//            $$ begin end;$$;
-//            """.trimIndent()
-//        ).parameters
-//
-//        "count must be correct" {
-//            param shouldHaveSize 10
-//        }
-//
-//        "name" - {
-//            "in lower case" {
-//                param.getOrNull(0)?.name shouldBe "one"
-//            }
-//            "in camel case with double quote" {
-//                param.getOrNull(1)?.name shouldBe "Two"
-//            }
-//            "with spaces and double quote" {
-//                param.getOrNull(2)?.name shouldBe "Three \"and\" half"
-//            }
-//            "in snake_case" {
-//                param.getOrNull(3)?.name shouldBe "three_and_more"
-//            }
-//            "with numbers" {
-//                param.getOrNull(5)?.name shouldBe "arr01"
-//            }
-//        }
-//
-//        "type" - {
-//            "text in lower case" {
-//                param.getOrNull(0)?.type shouldBe "text"
-//            }
-//            "integer in UPPER case" {
-//                param.getOrNull(1)?.type shouldBe "integer"
-//            }
-//            "character varying in two word" {
-//                param.getOrNull(2)?.type shouldBe "character varying"
-//            }
-//            "character varying with max size" - {
-//                "dont return the scale type in name" {
-//                    param.getOrNull(3)?.type shouldBe "character varying"
-//                }
-//                "return the correct size" {
-//                    param.getOrNull(3)?.type?.precision shouldBe 255
-//                }
-//            }
-//            "numeric with precision and scale" - {
-//                "dont return the precision and scale type in name" {
-//                    param.getOrNull(5)?.type shouldBe "numeric"
-//                }
-//                "return the correct precision" {
-//                    param.getOrNull(5)?.type?.precision shouldBe 10
-//                }
-//                "return the correct scale" {
-//                    param.getOrNull(5)?.type?.scale shouldBe 3
-//                }
-//            }
-//            "array of text" {
-//                param.getOrNull(7)?.type shouldBe "text[]"
-//            }
-//        }
-//        "default" - {
-//            "with array of composite type Point" - {
-//                """must return "arr02" at name""" {
-//                    param.getOrNull(7)?.name shouldBe "arr02"
-//                }
-//                """must return "point[]" at type""" {
-//                    param.getOrNull(7)?.type shouldBe "point[]"
-//                }
-//                """must return "array[(1, 2)::point, (7, 12)::point]::point[]" at default""" {
-//                    param.getOrNull(7)?.default shouldBe "array[(1, 2)::point, (7, 12)::point]::point[]"
-//                }
-//            }
-//        }
-//    }
-})

src/test/kotlin/fr/postgresjson/functionGenerator/FunctionGeneratorTest.kt

@@ -1,97 +0,0 @@
-package fr.postgresjson.functionGenerator
-
-import fr.postgresjson.definition.parse.parseFunction
-import io.kotest.core.Tag
-import io.kotest.core.annotation.Ignored
-import io.kotest.core.spec.style.StringSpec
-import org.amshove.kluent.`should be equal to`
-
-@Ignored
-class FunctionGeneratorTest : StringSpec({
-    tags(Tag("Generator"))
-    val functionDirectory = this::class.java.getResource("/sql/function/Test")!!.toURI()
-    val generator = FunctionGenerator(functionDirectory)
-
-    "generate function with input object and output object" {
-        val functionSql = """
-            |create or replace function test_function_object (inout resource json)
-            |language plpgsql
-            |as
-            |$$
-            |begin
-            |    resource = json_build_object('id', '1e5f5d41-6d14-4007-897b-0ed2616bec96', 'name', 'changedName');
-            |end;
-            |$$
-        """.trimMargin()
-
-        val expectedGenerated = """
-            |package fr.postgresjson.functionGenerator.generated
-            |
-            |import com.fasterxml.jackson.core.type.TypeReference
-            |import fr.postgresjson.connexion.Requester
-            |
-            |inline fun <reified E: Any, S: Any?> Requester.testFunctionObject(resource: S): E? {
-            |    return getFunction("test_function_object")
-            |        .execute<E>(object : TypeReference<E>() {}, mapOf("resource" to resource))
-            |}
-        """.trimMargin()
-
-        generator.generate(parseFunction(functionSql)) `should be equal to` expectedGenerated
-    }
-
-    "generate function with return void" {
-        val functionSql = """
-            |create or replace function test_function_void (name text default 'plop') returns void
-            |language plpgsql
-            |as
-            |$$
-            |begin
-            |    perform 1;
-            |end;
-            |$$;
-        """.trimMargin()
-
-        val expectedGenerated = """
-            |package fr.postgresjson.functionGenerator.generated
-            |
-            |import fr.postgresjson.connexion.Requester
-            |
-            |fun Requester.testFunctionVoid(name: String = "plop"): Unit {
-            |    getFunction("test_function_void")
-            |        .exec(mapOf("name" to name))
-            |}
-        """.trimMargin()
-
-        generator.generate(parseFunction(functionSql)) `should be equal to` expectedGenerated
-    }
-
-    "generate function with multiple args and defaults" {
-        val functionSql = """
-            |create or replace function test_function_multiple (name text default 'plop', in hi text default 'hello', out result json)
-            |language plpgsql
-            |as
-            |$$
-            |begin
-            |    result = json_build_array(
-            |        json_build_object('id', '457daad5-4f1b-4eb7-80ec-6882adb8cc7d', 'name', name),
-            |        json_build_object('id', '8d20abb0-7f77-4b6c-9991-44acd3c88faa', 'name', hi)
-            |    );
-            |end;
-            |$$
-        """.trimMargin()
-
-        val expectedGenerated = """
-            |package fr.postgresjson.functionGenerator.generated
-            |
-            |import com.fasterxml.jackson.core.type.TypeReference
-            |import fr.postgresjson.connexion.Requester
-            |
-            |inline fun <reified E: Any> Requester.testFunctionMultiple(name: String = "plop", hi: String = "hello"): E? {
-            |    return getFunction("test_function_multiple")
-            |        .execute<E>(object : TypeReference<E>() {}, mapOf("name" to name, "hi" to hi))
-            |}
-        """.trimMargin()
-
-        generator.generate(parseFunction(functionSql)) `should be equal to` expectedGenerated
-    }
-})

src/test/resources/fixtures/init.sql

@@ -74,7 +74,7 @@ BEGIN
 END;
 $$;
 
-CREATE OR REPLACE FUNCTION test_function_void (name text default 'plop') returns void
+CREATE OR REPLACE FUNCTION function_void (name text default 'plop') returns void
     LANGUAGE plpgsql
 AS
 $$

src/test/resources/sql/function/Test/function_test.sql

@@ -0,0 +1,8 @@
+CREATE OR REPLACE FUNCTION test_function (name text default 'plop', IN hi text default 'hello', out result json)
+LANGUAGE plpgsql
+AS
+$$
+BEGIN
+    result = json_build_object('id', '457daad5-4f1b-4eb7-80ec-6882adb8cc7d', 'name', name);
+END;
+$$

src/test/resources/sql/function/Test/function_test_object.sql

@@ -1,8 +1,8 @@
-create or replace function test_function_object(inout resource json)
-    language plpgsql
-as
+CREATE OR REPLACE FUNCTION test_function_object (inout resource json)
+LANGUAGE plpgsql
+AS
 $$
-begin
+BEGIN
     resource = json_build_object('id', '1e5f5d41-6d14-4007-897b-0ed2616bec96', 'name', 'changedName');
-end;
+END;
 $$

src/test/resources/sql/function/Test/function_void.sql

@@ -0,0 +1,8 @@
+CREATE OR REPLACE FUNCTION function_void (name text default 'plop') returns void
+LANGUAGE plpgsql
+AS
+$$
+BEGIN
+    PERFORM 1;
+END;
+$$;

src/test/resources/sql/function/Test/test_function.sql

@@ -1,8 +0,0 @@
-create or replace function test_function(name text default 'plop', in hi text default 'hello', out result json)
-    language plpgsql
-as
-$$
-begin
-    result = json_build_object('id', '457daad5-4f1b-4eb7-80ec-6882adb8cc7d', 'name', name);
-end;
-$$

src/test/resources/sql/function/Test/test_function_multiparam.sql

@@ -1,34 +0,0 @@
-create or replace function test_function_multiparam(
-    name varchar(45) default 'plop',
-    numeric(4, 5),
-    num float(5),
-    num2 timestamp without time zone default '2002-01-01T00:00:00'::timestamp,
-    num3 int,
-    num4 integer,
-    num5 smallint,
-    num6 bigint,
-    num7 decimal,
-    num8 decimal(4, 6),
-    num9 real,
-    num10 double precision,
-    num11 smallserial,
-    num12 serial,
-    num13 bigserial,
-    num14 serial,
-    num15 money,
-    num16 character varying(789),
-    num16b character varying(789) default 'abc',
-    num16c character varying default 'abc',
-    num17 character(56),
-    num18 char(2),
-    num19 any,
-    num20 anyelement,
-    num21 anyarray
-)
-    language plpgsql
-as
-$$
-begin
-    perform 1;
-end;
-$$;

src/test/resources/sql/function/Test/test_function_multiple.sql

@@ -1,11 +1,11 @@
-create or replace function test_function_multiple(name text default 'plop', in hi text default 'hello', out result json)
-    language plpgsql
-as
+CREATE OR REPLACE FUNCTION test_function_multiple (name text default 'plop', IN hi text default 'hello', out result json)
+LANGUAGE plpgsql
+AS
 $$
-begin
+BEGIN
     result = json_build_array(
-            json_build_object('id', '457daad5-4f1b-4eb7-80ec-6882adb8cc7d', 'name', name),
-            json_build_object('id', '8d20abb0-7f77-4b6c-9991-44acd3c88faa', 'name', hi)
-        );
-end;
+        json_build_object('id', '457daad5-4f1b-4eb7-80ec-6882adb8cc7d', 'name', name),
+        json_build_object('id', '8d20abb0-7f77-4b6c-9991-44acd3c88faa', 'name', hi)
+    );
+END;
 $$

src/test/resources/sql/function/Test/test_function_paginated.sql

@@ -0,0 +1,14 @@
+CREATE OR REPLACE FUNCTION test_function_paginated (name text default 'plop', IN "limit" int default 10, IN "offset" int default 0, out result json, out total int)
+LANGUAGE plpgsql
+AS
+$$
+BEGIN
+    SELECT json_build_array(
+        json_build_object('id', '457daad5-4f1b-4eb7-80ec-6882adb8cc7d', 'name', name::text),
+        json_build_object('id', '8d20abb0-7f77-4b6c-9991-44acd3c88faa', 'name', name::text || '-2')
+    ),
+    10
+    INTO result, total
+    LIMIT "limit" OFFSET "offset";
+END;
+$$

src/test/resources/sql/function/Test/test_function_void.sql

@@ -1,8 +0,0 @@
-create or replace function test_function_void(name text default 'plop') returns void
-    language plpgsql
-as
-$$
-begin
-    perform 1;
-end;
-$$;