-
Notifications
You must be signed in to change notification settings - Fork 694
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: EXPOSED-316 Add support for UIntIdTable and UIntEntity (#2026)
- Loading branch information
Showing
5 changed files
with
163 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/UIntEntity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package org.jetbrains.exposed.dao | ||
|
|
||
| import org.jetbrains.exposed.dao.id.EntityID | ||
| import org.jetbrains.exposed.dao.id.IdTable | ||
|
|
||
| /** Base class for an [Entity] instance identified by an [id] comprised of a wrapped `UInt` value. */ | ||
| abstract class UIntEntity(id: EntityID<UInt>) : Entity<UInt>(id) | ||
|
|
||
| /** | ||
| * Base class representing the [EntityClass] that manages [UIntEntity] instances and | ||
| * maintains their relation to the provided [table]. | ||
| * | ||
| * @param [table] The [IdTable] object that stores rows mapped to entities of this class. | ||
| * @param [entityType] The expected [UIntEntity] type. This can be left `null` if it is the class of type | ||
| * argument [E] provided to this [UIntEntityClass] instance. If this `UIntEntityClass` is defined as a companion | ||
| * object of a custom `UIntEntity` class, the parameter will be set to this immediately enclosing class by default. | ||
| * @sample org.jetbrains.exposed.sql.tests.shared.DDLTests.testDropTableFlushesCache | ||
| * @param [entityCtor] The function invoked to instantiate an [UIntEntity] using a provided [EntityID] value. | ||
| * If a reference to a specific constructor or a custom function is not passed as an argument, reflection will | ||
| * be used to determine the primary constructor of the associated entity class on first access. If this `UIntEntityClass` | ||
| * is defined as a companion object of a custom `UIntEntity` class, the constructor will be set to that of the | ||
| * immediately enclosing class by default. | ||
| * @sample org.jetbrains.exposed.sql.tests.shared.entities.EntityTests.testExplicitEntityConstructor | ||
| */ | ||
| abstract class UIntEntityClass<out E : UIntEntity>( | ||
| table: IdTable<UInt>, | ||
| entityType: Class<E>? = null, | ||
| entityCtor: ((EntityID<UInt>) -> E)? = null | ||
| ) : EntityClass<UInt, E>(table, entityType, entityCtor) |
105 changes: 105 additions & 0 deletions
105
.../src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/entities/UIntIdTableEntityTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| package org.jetbrains.exposed.sql.tests.shared.entities | ||
|
|
||
| import org.jetbrains.exposed.dao.UIntEntity | ||
| import org.jetbrains.exposed.dao.UIntEntityClass | ||
| import org.jetbrains.exposed.dao.id.EntityID | ||
| import org.jetbrains.exposed.dao.id.UIntIdTable | ||
| import org.jetbrains.exposed.sql.exists | ||
| import org.jetbrains.exposed.sql.tests.DatabaseTestsBase | ||
| import org.jetbrains.exposed.sql.tests.shared.assertEquals | ||
| import org.junit.Test | ||
|
|
||
| class UIntIdTableEntityTest : DatabaseTestsBase() { | ||
|
|
||
| @Test | ||
| fun `create tables`() { | ||
| withTables(UIntIdTables.Cities, UIntIdTables.People) { | ||
| assertEquals(true, UIntIdTables.Cities.exists()) | ||
| assertEquals(true, UIntIdTables.People.exists()) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun `create records`() { | ||
| withTables(UIntIdTables.Cities, UIntIdTables.People) { | ||
| val mumbai = UIntIdTables.City.new { name = "Mumbai" } | ||
| val pune = UIntIdTables.City.new { name = "Pune" } | ||
| UIntIdTables.Person.new { | ||
| name = "David D'souza" | ||
| city = mumbai | ||
| } | ||
| UIntIdTables.Person.new { | ||
| name = "Tushar Mumbaikar" | ||
| city = mumbai | ||
| } | ||
| UIntIdTables.Person.new { | ||
| name = "Tanu Arora" | ||
| city = pune | ||
| } | ||
|
|
||
| val allCities = UIntIdTables.City.all().map { it.name } | ||
| assertEquals(true, allCities.contains<String>("Mumbai")) | ||
| assertEquals(true, allCities.contains<String>("Pune")) | ||
| assertEquals(false, allCities.contains<String>("Chennai")) | ||
|
|
||
| val allPeople = UIntIdTables.Person.all().map { Pair(it.name, it.city.name) } | ||
| assertEquals(true, allPeople.contains(Pair("David D'souza", "Mumbai"))) | ||
| assertEquals(false, allPeople.contains(Pair("David D'souza", "Pune"))) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun `update and delete records`() { | ||
| withTables(UIntIdTables.Cities, UIntIdTables.People) { | ||
| val mumbai = UIntIdTables.City.new { name = "Mumbai" } | ||
| val pune = UIntIdTables.City.new { name = "Pune" } | ||
| UIntIdTables.Person.new { | ||
| name = "David D'souza" | ||
| city = mumbai | ||
| } | ||
| UIntIdTables.Person.new { | ||
| name = "Tushar Mumbaikar" | ||
| city = mumbai | ||
| } | ||
| val tanu = UIntIdTables.Person.new { | ||
| name = "Tanu Arora" | ||
| city = pune | ||
| } | ||
|
|
||
| tanu.delete() | ||
| pune.delete() | ||
|
|
||
| val allCities = UIntIdTables.City.all().map { it.name } | ||
| assertEquals(true, allCities.contains<String>("Mumbai")) | ||
| assertEquals(false, allCities.contains<String>("Pune")) | ||
|
|
||
| val allPeople = UIntIdTables.Person.all().map { Pair(it.name, it.city.name) } | ||
| assertEquals(true, allPeople.contains(Pair("David D'souza", "Mumbai"))) | ||
| assertEquals(false, allPeople.contains(Pair("Tanu Arora", "Pune"))) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| object UIntIdTables { | ||
| object Cities : UIntIdTable() { | ||
| val name = varchar("name", 50) | ||
| } | ||
|
|
||
| class City(id: EntityID<UInt>) : UIntEntity(id) { | ||
| companion object : UIntEntityClass<City>(Cities) | ||
|
|
||
| var name by Cities.name | ||
| } | ||
|
|
||
| object People : UIntIdTable() { | ||
| val name = varchar("name", 80) | ||
| val cityId = reference("city_id", Cities) | ||
| } | ||
|
|
||
| class Person(id: EntityID<UInt>) : UIntEntity(id) { | ||
| companion object : UIntEntityClass<Person>(People) | ||
|
|
||
| var name by People.name | ||
| var city by City referencedOn People.cityId | ||
| } | ||
| } |