Skip to content
This repository was archived by the owner on Apr 1, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<UUID>(name = "T_ADDRESS") {
override val id: Column<EntityID<UUID>> = uuid("ID")
override val id: Column<EntityID<UUID>> = javaUUID("ID")
.clientDefault { UUIDv7.generate() }
.entityId()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<UUID>(name = "T_BLOG_ENTRY") {
override val id: Column<EntityID<UUID>> = uuid("ID")
override val id: Column<EntityID<UUID>> = 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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<UUID>(name = "T_BLOG") {
override val id: Column<EntityID<UUID>> = uuid("ID")
override val id: Column<EntityID<UUID>> = javaUUID("ID")
.clientDefault { UUIDv7.generate() }
.entityId()

Expand All @@ -21,5 +22,5 @@ object Blogs : IdTable<UUID>(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)
}
Original file line number Diff line number Diff line change
Expand Up @@ -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<UUID>(name = "T_GUEST_BOOK_ENTRY") {
override val id: Column<EntityID<UUID>> = uuid("ID")
override val id: Column<EntityID<UUID>> = 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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<UUID>(name = "T_GUEST_BOOK") {
override val id: Column<EntityID<UUID>> = uuid("ID")
override val id: Column<EntityID<UUID>> = javaUUID("ID")
.clientDefault { UUIDv7.generate() }
.entityId()

Expand All @@ -18,5 +19,5 @@ object GuestBooks : IdTable<UUID>(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)
}
Original file line number Diff line number Diff line change
Expand Up @@ -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<UUID>(name = "T_PERSON") {
override val id: Column<EntityID<UUID>> = uuid("ID")
override val id: Column<EntityID<UUID>> = javaUUID("ID")
.clientDefault { UUIDv7.generate() }
.entityId()

Expand All @@ -22,5 +23,5 @@ object People : IdTable<UUID>(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)
}
Original file line number Diff line number Diff line change
Expand Up @@ -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<UUID>(name = "T_USER") {
override val id: Column<EntityID<UUID>> = uuid("ID")
override val id: Column<EntityID<UUID>> = javaUUID("ID")
.clientDefault { UUIDv7.generate() }
.entityId()

Expand All @@ -20,7 +21,7 @@ object Users : IdTable<UUID>(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()
}