diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f9c4cf8d..d101e124 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ assertk = "0.28.1" cucumber = "7.23.0" coroutines = "1.10.2" -exposed = "1.0.0-rc-4" +exposed = "1.0.0" dependencyManagement = "1.1.4" flyway = "11.19.0" h2Database = "2.4.240" diff --git a/persistence/src/main/kotlin/com/github/jactor/rises/persistence/address/Addresses.kt b/persistence/src/main/kotlin/com/github/jactor/rises/persistence/address/Addresses.kt index 1ca0cfca..2940e1b1 100644 --- a/persistence/src/main/kotlin/com/github/jactor/rises/persistence/address/Addresses.kt +++ b/persistence/src/main/kotlin/com/github/jactor/rises/persistence/address/Addresses.kt @@ -4,11 +4,12 @@ import com.github.jactor.rises.persistence.UUIDv7 import org.jetbrains.exposed.v1.core.Column import org.jetbrains.exposed.v1.core.dao.id.EntityID import org.jetbrains.exposed.v1.core.dao.id.IdTable +import org.jetbrains.exposed.v1.core.java.javaUUID import org.jetbrains.exposed.v1.javatime.datetime import java.util.UUID object Addresses : IdTable(name = "T_ADDRESS") { - override val id: Column> = uuid("ID") + override val id: Column> = javaUUID("ID") .clientDefault { UUIDv7.generate() } .entityId() diff --git a/persistence/src/main/kotlin/com/github/jactor/rises/persistence/blog/BlogEntries.kt b/persistence/src/main/kotlin/com/github/jactor/rises/persistence/blog/BlogEntries.kt index 79087720..58826a2f 100644 --- a/persistence/src/main/kotlin/com/github/jactor/rises/persistence/blog/BlogEntries.kt +++ b/persistence/src/main/kotlin/com/github/jactor/rises/persistence/blog/BlogEntries.kt @@ -4,15 +4,16 @@ import com.github.jactor.rises.persistence.UUIDv7 import org.jetbrains.exposed.v1.core.Column import org.jetbrains.exposed.v1.core.dao.id.EntityID import org.jetbrains.exposed.v1.core.dao.id.IdTable +import org.jetbrains.exposed.v1.core.java.javaUUID import org.jetbrains.exposed.v1.javatime.datetime import java.util.UUID object BlogEntries : IdTable(name = "T_BLOG_ENTRY") { - override val id: Column> = uuid("ID") + override val id: Column> = javaUUID("ID") .clientDefault { UUIDv7.generate() } .entityId() - val blogId = uuid("BLOG_ID").references(Blogs.id) + val blogId = javaUUID("BLOG_ID").references(Blogs.id) val createdBy = text("CREATED_BY") val modifiedBy = text("UPDATED_BY") val timeOfCreation = datetime("CREATION_TIME") diff --git a/persistence/src/main/kotlin/com/github/jactor/rises/persistence/blog/Blogs.kt b/persistence/src/main/kotlin/com/github/jactor/rises/persistence/blog/Blogs.kt index 0e003590..34405b13 100644 --- a/persistence/src/main/kotlin/com/github/jactor/rises/persistence/blog/Blogs.kt +++ b/persistence/src/main/kotlin/com/github/jactor/rises/persistence/blog/Blogs.kt @@ -5,12 +5,13 @@ import com.github.jactor.rises.persistence.user.Users import org.jetbrains.exposed.v1.core.Column import org.jetbrains.exposed.v1.core.dao.id.EntityID import org.jetbrains.exposed.v1.core.dao.id.IdTable +import org.jetbrains.exposed.v1.core.java.javaUUID import org.jetbrains.exposed.v1.javatime.date import org.jetbrains.exposed.v1.javatime.datetime import java.util.UUID object Blogs : IdTable(name = "T_BLOG") { - override val id: Column> = uuid("ID") + override val id: Column> = javaUUID("ID") .clientDefault { UUIDv7.generate() } .entityId() @@ -21,5 +22,5 @@ object Blogs : IdTable(name = "T_BLOG") { val created = date("CREATED") val title = text("TITLE") - val userId = uuid("USER_ID").references(Users.id) + val userId = javaUUID("USER_ID").references(Users.id) } diff --git a/persistence/src/main/kotlin/com/github/jactor/rises/persistence/guestbook/GuestBookEntries.kt b/persistence/src/main/kotlin/com/github/jactor/rises/persistence/guestbook/GuestBookEntries.kt index 5754a5d6..31cff6b6 100644 --- a/persistence/src/main/kotlin/com/github/jactor/rises/persistence/guestbook/GuestBookEntries.kt +++ b/persistence/src/main/kotlin/com/github/jactor/rises/persistence/guestbook/GuestBookEntries.kt @@ -4,18 +4,19 @@ import com.github.jactor.rises.persistence.UUIDv7 import org.jetbrains.exposed.v1.core.Column import org.jetbrains.exposed.v1.core.dao.id.EntityID import org.jetbrains.exposed.v1.core.dao.id.IdTable +import org.jetbrains.exposed.v1.core.java.javaUUID import org.jetbrains.exposed.v1.javatime.datetime import java.util.UUID object GuestBookEntries : IdTable(name = "T_GUEST_BOOK_ENTRY") { - override val id: Column> = uuid("ID") + override val id: Column> = javaUUID("ID") .clientDefault { UUIDv7.generate() } .entityId() val createdBy = text("CREATED_BY") val guestName = text("GUEST_NAME") val entry = text("ENTRY") - val guestBookId = uuid("GUEST_BOOK_ID").references(GuestBooks.id) + val guestBookId = javaUUID("GUEST_BOOK_ID").references(GuestBooks.id) val modifiedBy = text("UPDATED_BY") val timeOfCreation = datetime("CREATION_TIME") val timeOfModification = datetime("UPDATED_TIME") diff --git a/persistence/src/main/kotlin/com/github/jactor/rises/persistence/guestbook/GuestBooks.kt b/persistence/src/main/kotlin/com/github/jactor/rises/persistence/guestbook/GuestBooks.kt index 1bf858ee..5a987eeb 100644 --- a/persistence/src/main/kotlin/com/github/jactor/rises/persistence/guestbook/GuestBooks.kt +++ b/persistence/src/main/kotlin/com/github/jactor/rises/persistence/guestbook/GuestBooks.kt @@ -5,11 +5,12 @@ import com.github.jactor.rises.persistence.user.Users import org.jetbrains.exposed.v1.core.Column import org.jetbrains.exposed.v1.core.dao.id.EntityID import org.jetbrains.exposed.v1.core.dao.id.IdTable +import org.jetbrains.exposed.v1.core.java.javaUUID import org.jetbrains.exposed.v1.javatime.datetime import java.util.UUID object GuestBooks : IdTable(name = "T_GUEST_BOOK") { - override val id: Column> = uuid("ID") + override val id: Column> = javaUUID("ID") .clientDefault { UUIDv7.generate() } .entityId() @@ -18,5 +19,5 @@ object GuestBooks : IdTable(name = "T_GUEST_BOOK") { val timeOfCreation = datetime("CREATION_TIME") val timeOfModification = datetime("UPDATED_TIME") val title = text("TITLE") - val userId = uuid("USER_ID").references(Users.id) + val userId = javaUUID("USER_ID").references(Users.id) } diff --git a/persistence/src/main/kotlin/com/github/jactor/rises/persistence/person/People.kt b/persistence/src/main/kotlin/com/github/jactor/rises/persistence/person/People.kt index 288882a8..af264697 100644 --- a/persistence/src/main/kotlin/com/github/jactor/rises/persistence/person/People.kt +++ b/persistence/src/main/kotlin/com/github/jactor/rises/persistence/person/People.kt @@ -5,11 +5,12 @@ import com.github.jactor.rises.persistence.address.Addresses import org.jetbrains.exposed.v1.core.Column import org.jetbrains.exposed.v1.core.dao.id.EntityID import org.jetbrains.exposed.v1.core.dao.id.IdTable +import org.jetbrains.exposed.v1.core.java.javaUUID import org.jetbrains.exposed.v1.javatime.datetime import java.util.UUID object People : IdTable(name = "T_PERSON") { - override val id: Column> = uuid("ID") + override val id: Column> = javaUUID("ID") .clientDefault { UUIDv7.generate() } .entityId() @@ -22,5 +23,5 @@ object People : IdTable(name = "T_PERSON") { val firstName = text("FIRST_NAME").nullable() val surname = text("SURNAME") val locale = text("LOCALE").nullable() - val addressId = uuid("ADDRESS_ID").references(Addresses.id) + val addressId = javaUUID("ADDRESS_ID").references(Addresses.id) } diff --git a/persistence/src/main/kotlin/com/github/jactor/rises/persistence/user/Users.kt b/persistence/src/main/kotlin/com/github/jactor/rises/persistence/user/Users.kt index 6c9d48ba..01c8b5d9 100644 --- a/persistence/src/main/kotlin/com/github/jactor/rises/persistence/user/Users.kt +++ b/persistence/src/main/kotlin/com/github/jactor/rises/persistence/user/Users.kt @@ -5,11 +5,12 @@ import com.github.jactor.rises.persistence.person.People import org.jetbrains.exposed.v1.core.Column import org.jetbrains.exposed.v1.core.dao.id.EntityID import org.jetbrains.exposed.v1.core.dao.id.IdTable +import org.jetbrains.exposed.v1.core.java.javaUUID import org.jetbrains.exposed.v1.javatime.datetime import java.util.UUID object Users : IdTable(name = "T_USER") { - override val id: Column> = uuid("ID") + override val id: Column> = javaUUID("ID") .clientDefault { UUIDv7.generate() } .entityId() @@ -20,7 +21,7 @@ object Users : IdTable(name = "T_USER") { val emailAddress = text("EMAIL").nullable() val username = text("USER_NAME") - val personId = uuid("PERSON_ID").references(People.id) + val personId = javaUUID("PERSON_ID").references(People.id) val userType = text("USER_TYPE") val inactiveSince = datetime("INACTIVE_SINCE").nullable() }