Add postgres json operator support and move postgres specific feature…

…s into postgres module (#7)
MineKing9534 · Oct 22, 2024 · 0b47ecf · 0b47ecf
1 parent 026c925
commit 0b47ecf
Show file tree

Hide file tree

Showing 49 changed files with 84 additions and 63 deletions.
diff --git a/core/src/main/kotlin/de/mineking/database/Conditions.kt b/core/src/main/kotlin/de/mineking/database/Conditions.kt
@@ -81,8 +81,6 @@ infix fun Node.isEqualTo(other: Node) = Where(this + " = " + other)
 infix fun Node.isNotEqualTo(other: Node) = Where(this + " != " + other)
 
 infix fun Node.isLike(other: String) = Where(this + " like '" + other + "'")
-infix fun Node.matches(other: String) = Where(this + " ~ '" + other + "'")
-infix fun Node.contains(other: Node) = Where(other + " = any(" + this + ")")
 
 fun Node.isIn(nodes: Array<Node>) = Where(this + " in (" + nodes.join() + ")")
 fun Node.isIn(nodes: Collection<Node>) = isIn(nodes.toTypedArray())

diff --git a/core/src/main/kotlin/de/mineking/database/Nodes.kt b/core/src/main/kotlin/de/mineking/database/Nodes.kt
@@ -1,6 +1,7 @@
 package de.mineking.database
 
 import org.jdbi.v3.core.argument.Argument
+import javax.swing.text.html.StyleSheet.BoxPainter
 import kotlin.reflect.KType
 import kotlin.reflect.full.isSubtypeOf
 import kotlin.reflect.jvm.jvmErasure
@@ -26,7 +27,6 @@ fun length(node: Node) = "len"(node)
 fun lowerCase(node: Node) = "lower"(node)
 fun upperCase(node: Node) = "upper"(node)
 
-fun arrayLength(node: Node) = "array_length"(node)
 fun abs(node: Node) = "abs"(node)
 
 operator fun Node.get(index: Node) = this + "[" + index + "]"
@@ -38,23 +38,23 @@ fun property(name: String): PropertyNode = object : PropertyNode {
 	override fun columnContext(table: TableStructure<*>): ColumnInfo = parseColumnSpecification(name, table)
 }
 
-fun <T> value(value: T, type: KType): ValueNode = object : ValueNode {
+fun <T> value(value: T, type: KType, static: Boolean = false): ValueNode = object : ValueNode {
 	override fun format(table: TableStructure<*>): String = ":${ hashCode() }"
 
 	override fun values(table: TableStructure<*>, column: ColumnData<*, *>?): Map<String, Argument> {
 		@Suppress("UNCHECKED_CAST")
-		val manager = column?.takeIf { it.type.isSubtypeOf(type) }?.mapper as TypeMapper<T, *>? ?: table.manager.getTypeMapper<T, Any>(type, column?.getRootColumn()?.property) ?: throw IllegalArgumentException("Cannot find suitable TypeMapper for $type")
+		val manager = column?.takeIf { !static && it.type.isSubtypeOf(type) }?.mapper as TypeMapper<T, *>? ?: table.manager.getTypeMapper<T, Any>(type, column?.getRootColumn()?.property?.takeIf { !static }) ?: throw IllegalArgumentException("Cannot find suitable TypeMapper for $type")
 		return mapOf(hashCode().toString() to manager.write(column, table, type, value))
 	}
 }
 
+inline fun <reified T> value(value: T, static: Boolean = false) = value(value, typeOf<T>(), static)
+
 fun nullValue() = object : ValueNode {
 	override fun format(table: TableStructure<*>): String = "null"
 	override fun values(table: TableStructure<*>, column: ColumnData<*, *>?): Map<String, Argument> = emptyMap()
 }
 
-inline fun <reified T> value(value: T) = value(value, typeOf<T>())
-
 fun unsafeNode(string: String, values: Map<String, Argument> = emptyMap()) = object : Node {
 	override fun format(table: TableStructure<*>): String = string
 	override fun values(table: TableStructure<*>, column: ColumnData<*, *>?): Map<String, Argument> = values

diff --git a/discord/src/test/kotlin/tests/discord/Discord.kt b/discord/src/test/kotlin/tests/discord/Discord.kt
@@ -1,8 +1,8 @@
 package tests.discord
 
 import de.mineking.database.*
-import de.mineking.database.vendors.PostgresConnection
-import de.mineking.database.vendors.PostgresMappers
+import de.mineking.database.vendors.postgres.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresMappers
 import net.dv8tion.jda.api.entities.*
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel
 import net.dv8tion.jda.api.entities.emoji.CustomEmoji

diff --git a/discord/src/test/kotlin/tests/discord/Snowflake.kt b/discord/src/test/kotlin/tests/discord/Snowflake.kt
@@ -1,8 +1,8 @@
 package tests.discord
 
 import de.mineking.database.*
-import de.mineking.database.vendors.PostgresConnection
-import de.mineking.database.vendors.PostgresMappers
+import de.mineking.database.vendors.postgres.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresMappers
 import net.dv8tion.jda.api.entities.Guild
 import net.dv8tion.jda.api.entities.ISnowflake
 import org.junit.jupiter.api.Assertions.assertEquals

diff --git a/minecraft/src/test/kotlin/tests/minecraft/Location.kt b/minecraft/src/test/kotlin/tests/minecraft/Location.kt
@@ -1,8 +1,8 @@
 package tests.minecraft
 
 import de.mineking.database.*
-import de.mineking.database.vendors.PostgresConnection
-import de.mineking.database.vendors.PostgresMappers
+import de.mineking.database.vendors.postgres.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresMappers
 import org.bukkit.Location
 import org.bukkit.World
 import org.junit.jupiter.api.Assertions.assertEquals

diff --git a/minecraft/src/test/kotlin/tests/minecraft/Player.kt b/minecraft/src/test/kotlin/tests/minecraft/Player.kt
@@ -1,8 +1,8 @@
 package tests.minecraft
 
 import de.mineking.database.*
-import de.mineking.database.vendors.PostgresConnection
-import de.mineking.database.vendors.PostgresMappers
+import de.mineking.database.vendors.postgres.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresMappers
 import org.bukkit.OfflinePlayer
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test

diff --git a/postgres/src/main/kotlin/de/mineking/database/vendors/postgres/Conditions.kt b/postgres/src/main/kotlin/de/mineking/database/vendors/postgres/Conditions.kt
@@ -0,0 +1,11 @@
+package de.mineking.database.vendors.postgres
+
+import de.mineking.database.*
+import kotlin.reflect.typeOf
+
+fun arrayLength(node: Node) = "array_length"(node)
+
+infix fun Node.matches(other: String) = Where(this + " ~ '" + other + "'")
+infix fun Node.contains(other: Node) = Where(other + " = any(" + this + ")")
+
+fun Node.json(vararg path: String) = this + " #>> " + value(path, typeOf<Array<String>>(), static = true)
diff --git a/...ng/database/vendors/PostgresConnection.kt → ...se/vendors/postgres/PostgresConnection.kt b/...ng/database/vendors/PostgresConnection.kt → ...se/vendors/postgres/PostgresConnection.kt
@@ -1,4 +1,4 @@
-package de.mineking.database.vendors
+package de.mineking.database.vendors.postgres
 
 import de.mineking.database.DatabaseConnection
 import de.mineking.database.NamingStrategy

diff --git a/...ineking/database/vendors/PostgresTable.kt → ...atabase/vendors/postgres/PostgresTable.kt b/...ineking/database/vendors/PostgresTable.kt → ...atabase/vendors/postgres/PostgresTable.kt
@@ -1,7 +1,7 @@
-package de.mineking.database.vendors
+package de.mineking.database.vendors.postgres
 
 import de.mineking.database.*
-import de.mineking.database.vendors.PostgresConnection.Companion.logger
+import de.mineking.database.vendors.postgres.PostgresConnection.Companion.logger
 import org.jdbi.v3.core.kotlin.useHandleUnchecked
 import org.jdbi.v3.core.result.ResultIterable
 import org.jdbi.v3.core.statement.UnableToExecuteStatementException

diff --git a/...ineking/database/vendors/PostgresTypes.kt → ...atabase/vendors/postgres/PostgresTypes.kt b/...ineking/database/vendors/PostgresTypes.kt → ...atabase/vendors/postgres/PostgresTypes.kt
@@ -1,4 +1,4 @@
-package de.mineking.database.vendors
+package de.mineking.database.vendors.postgres
 
 import com.google.gson.GsonBuilder
 import com.google.gson.ToNumberStrategy
@@ -40,7 +40,8 @@ object PostgresMappers {
 	val STRING = typeMapper<String?>(PostgresType.TEXT, ResultSet::getString)
 	val ENUM = object : TypeMapper<Enum<*>?, String?> {
 		override fun accepts(manager: DatabaseConnection, property: KProperty<*>?, type: KType): Boolean = type.jvmErasure.java.isEnum
-		override fun getType(column: ColumnData<*, *>?, table: TableStructure<*>, type: KType): DataType = PostgresType.TEXT
+		override fun getType(column: ColumnData<*, *>?, table: TableStructure<*>, type: KType): DataType =
+            PostgresType.TEXT
 
 		override fun format(column: ColumnData<*, *>?, table: TableStructure<*>, type: KType, value: Enum<*>?): String? = value?.name
 

diff --git a/postgres/src/test/kotlin/tests/postgres/general/Delete.kt b/postgres/src/test/kotlin/tests/postgres/general/Delete.kt
@@ -3,7 +3,7 @@ package tests.postgres.general
 import de.mineking.database.isBetween
 import de.mineking.database.property
 import de.mineking.database.value
-import de.mineking.database.vendors.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresConnection
 import org.junit.jupiter.api.Test
 import setup.ConsoleSqlLogger
 import setup.UserDao

diff --git a/postgres/src/test/kotlin/tests/postgres/general/Insert.kt b/postgres/src/test/kotlin/tests/postgres/general/Insert.kt
@@ -1,6 +1,6 @@
 package tests.postgres.general
 
-import de.mineking.database.vendors.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresConnection
 import org.junit.jupiter.api.Test
 import setup.ConsoleSqlLogger
 import setup.UserDao

diff --git a/postgres/src/test/kotlin/tests/postgres/general/Select.kt b/postgres/src/test/kotlin/tests/postgres/general/Select.kt
@@ -1,7 +1,7 @@
 package tests.postgres.general
 
 import de.mineking.database.*
-import de.mineking.database.vendors.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresConnection
 import org.junit.jupiter.api.Test
 import setup.ConsoleSqlLogger
 import setup.UserDao

diff --git a/postgres/src/test/kotlin/tests/postgres/general/Transaction.kt b/postgres/src/test/kotlin/tests/postgres/general/Transaction.kt
@@ -1,6 +1,6 @@
 package tests.postgres.general
 
-import de.mineking.database.vendors.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresConnection
 import org.junit.jupiter.api.Test
 import setup.ConsoleSqlLogger
 import setup.UserDao

diff --git a/postgres/src/test/kotlin/tests/postgres/general/Update.kt b/postgres/src/test/kotlin/tests/postgres/general/Update.kt
@@ -4,7 +4,7 @@ import de.mineking.database.isEqualTo
 import de.mineking.database.property
 import de.mineking.database.select
 import de.mineking.database.value
-import de.mineking.database.vendors.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresConnection
 import org.junit.jupiter.api.Test
 import setup.ConsoleSqlLogger
 import setup.UserDao

diff --git a/postgres/src/test/kotlin/tests/postgres/general/Upsert.kt b/postgres/src/test/kotlin/tests/postgres/general/Upsert.kt
@@ -1,7 +1,7 @@
 package tests.postgres.general
 
 import de.mineking.database.*
-import de.mineking.database.vendors.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresConnection
 import org.junit.jupiter.api.Test
 import setup.ConsoleSqlLogger
 import setup.recreate

diff --git a/postgres/src/test/kotlin/tests/postgres/reference/DeletedReference.kt b/postgres/src/test/kotlin/tests/postgres/reference/DeletedReference.kt
@@ -4,7 +4,7 @@ import de.mineking.database.AutoIncrement
 import de.mineking.database.Column
 import de.mineking.database.Key
 import de.mineking.database.Reference
-import de.mineking.database.vendors.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresConnection
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import setup.ConsoleSqlLogger

diff --git a/postgres/src/test/kotlin/tests/postgres/reference/Reference.kt b/postgres/src/test/kotlin/tests/postgres/reference/Reference.kt
@@ -1,7 +1,7 @@
 package tests.postgres.reference
 
 import de.mineking.database.*
-import de.mineking.database.vendors.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresConnection
 import org.junit.jupiter.api.Test
 import setup.ConsoleSqlLogger
 import setup.recreate

diff --git a/postgres/src/test/kotlin/tests/postgres/reference/ReferenceArray.kt b/postgres/src/test/kotlin/tests/postgres/reference/ReferenceArray.kt
@@ -1,7 +1,8 @@
 package tests.postgres.reference
 
 import de.mineking.database.*
-import de.mineking.database.vendors.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresConnection
+import de.mineking.database.vendors.postgres.contains
 import org.junit.jupiter.api.Test
 import setup.ConsoleSqlLogger
 import setup.recreate

diff --git a/postgres/src/test/kotlin/tests/postgres/specific/Array.kt b/postgres/src/test/kotlin/tests/postgres/specific/Array.kt
@@ -1,7 +1,8 @@
 package tests.postgres.specific
 
 import de.mineking.database.*
-import de.mineking.database.vendors.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresConnection
+import de.mineking.database.vendors.postgres.contains
 import org.junit.jupiter.api.Assertions.assertArrayEquals
 import org.junit.jupiter.api.Test
 import setup.ConsoleSqlLogger

diff --git a/postgres/src/test/kotlin/tests/postgres/specific/Date.kt b/postgres/src/test/kotlin/tests/postgres/specific/Date.kt
@@ -1,7 +1,7 @@
 package tests.postgres.specific
 
 import de.mineking.database.*
-import de.mineking.database.vendors.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresConnection
 import org.junit.jupiter.api.Test
 import setup.ConsoleSqlLogger
 import setup.recreate

diff --git a/postgres/src/test/kotlin/tests/postgres/specific/Enum.kt b/postgres/src/test/kotlin/tests/postgres/specific/Enum.kt
@@ -1,7 +1,7 @@
 package tests.postgres.specific
 
 import de.mineking.database.*
-import de.mineking.database.vendors.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresConnection
 import org.junit.jupiter.api.Test
 import setup.ConsoleSqlLogger
 import setup.recreate

diff --git a/postgres/src/test/kotlin/tests/postgres/specific/Json.kt b/postgres/src/test/kotlin/tests/postgres/specific/Json.kt
@@ -1,7 +1,8 @@
 package tests.postgres.specific
 
 import de.mineking.database.*
-import de.mineking.database.vendors.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresConnection
+import de.mineking.database.vendors.postgres.json
 import org.junit.jupiter.api.Test
 import setup.ConsoleSqlLogger
 import setup.recreate
@@ -37,4 +38,9 @@ class JsonTest {
 	fun selectSingle() {
 		assertEquals(linkedMapOf("a" to "b", "b" to "a"), table.select<LinkedHashMap<String, String>>(property("map1")).first())
 	}
+
+	@Test
+	fun selectChild() {
+		assertEquals("b", table.select<String>(property("map1").json("a")).first())
+	}
 }
diff --git a/postgres/src/test/kotlin/tests/postgres/specific/Null.kt b/postgres/src/test/kotlin/tests/postgres/specific/Null.kt
@@ -1,7 +1,7 @@
 package tests.postgres.specific
 
 import de.mineking.database.*
-import de.mineking.database.vendors.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresConnection
 import org.junit.jupiter.api.Test
 import setup.ConsoleSqlLogger
 import setup.recreate

diff --git a/postgres/src/test/kotlin/tests/postgres/specific/Numeric.kt b/postgres/src/test/kotlin/tests/postgres/specific/Numeric.kt
@@ -3,7 +3,7 @@ package tests.postgres.specific
 import de.mineking.database.AutoIncrement
 import de.mineking.database.Column
 import de.mineking.database.Key
-import de.mineking.database.vendors.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresConnection
 import org.junit.jupiter.api.Test
 import setup.ConsoleSqlLogger
 import setup.recreate

diff --git a/postgres/src/test/kotlin/tests/postgres/table/CustomTable.kt b/postgres/src/test/kotlin/tests/postgres/table/CustomTable.kt
@@ -4,7 +4,7 @@ import de.mineking.database.Table
 import de.mineking.database.isEqualTo
 import de.mineking.database.property
 import de.mineking.database.value
-import de.mineking.database.vendors.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresConnection
 import setup.ConsoleSqlLogger
 import setup.UserDao
 import setup.recreate

diff --git a/postgres/src/test/kotlin/tests/postgres/table/DataObject.kt b/postgres/src/test/kotlin/tests/postgres/table/DataObject.kt
@@ -1,7 +1,7 @@
 package tests.postgres.table
 
 import de.mineking.database.*
-import de.mineking.database.vendors.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresConnection
 import setup.ConsoleSqlLogger
 import setup.recreate
 import kotlin.test.Test

diff --git a/postgres/src/test/kotlin/tests/postgres/table/Unique.kt b/postgres/src/test/kotlin/tests/postgres/table/Unique.kt
@@ -4,7 +4,7 @@ import de.mineking.database.AutoIncrement
 import de.mineking.database.Column
 import de.mineking.database.Key
 import de.mineking.database.Unique
-import de.mineking.database.vendors.PostgresConnection
+import de.mineking.database.vendors.postgres.PostgresConnection
 import org.junit.jupiter.api.Test
 import setup.ConsoleSqlLogger
 import setup.recreate

diff --git a/...king/database/vendors/SQLiteConnection.kt → ...tabase/vendors/sqlite/SQLiteConnection.kt b/...king/database/vendors/SQLiteConnection.kt → ...tabase/vendors/sqlite/SQLiteConnection.kt
@@ -1,4 +1,4 @@
-package de.mineking.database.vendors
+package de.mineking.database.vendors.sqlite
 
 import de.mineking.database.*
 import mu.KotlinLogging

diff --git a/.../mineking/database/vendors/SQLiteTable.kt → ...ng/database/vendors/sqlite/SQLiteTable.kt b/.../mineking/database/vendors/SQLiteTable.kt → ...ng/database/vendors/sqlite/SQLiteTable.kt
@@ -1,7 +1,7 @@
-package de.mineking.database.vendors
+package de.mineking.database.vendors.sqlite
 
 import de.mineking.database.*
-import de.mineking.database.vendors.SQLiteConnection.Companion.logger
+import de.mineking.database.vendors.sqlite.SQLiteConnection.Companion.logger
 import org.jdbi.v3.core.kotlin.useHandleUnchecked
 import org.jdbi.v3.core.result.ResultIterable
 import org.jdbi.v3.core.statement.UnableToExecuteStatementException

diff --git a/.../mineking/database/vendors/SQLiteTypes.kt → ...ng/database/vendors/sqlite/SQLiteTypes.kt b/.../mineking/database/vendors/SQLiteTypes.kt → ...ng/database/vendors/sqlite/SQLiteTypes.kt
@@ -1,4 +1,4 @@
-package de.mineking.database.vendors
+package de.mineking.database.vendors.sqlite
 
 import com.google.gson.GsonBuilder
 import com.google.gson.ToNumberStrategy
@@ -36,7 +36,8 @@ object SQLiteMappers {
 	val ENUM = object : TypeMapper<Enum<*>?, String?> {
 		override fun accepts(manager: DatabaseConnection, property: KProperty<*>?, type: KType): Boolean = type.jvmErasure.java.isEnum
 
-		override fun getType(column: ColumnData<*, *>?, table: TableStructure<*>, type: KType): DataType = SQLiteType.TEXT
+		override fun getType(column: ColumnData<*, *>?, table: TableStructure<*>, type: KType): DataType =
+            SQLiteType.TEXT
 
 		override fun format(column: ColumnData<*, *>?, table: TableStructure<*>, type: KType, value: Enum<*>?): String? = value?.name
 
@@ -55,7 +56,8 @@ object SQLiteMappers {
 			.create()
 
 		override fun accepts(manager: DatabaseConnection, property: KProperty<*>?, type: KType): Boolean = property?.hasDatabaseAnnotation<Json>() == true
-		override fun getType(column: ColumnData<*, *>?, table: TableStructure<*>, type: KType): DataType = SQLiteType.TEXT
+		override fun getType(column: ColumnData<*, *>?, table: TableStructure<*>, type: KType): DataType =
+            SQLiteType.TEXT
 
 		override fun format(column: ColumnData<*, *>?, table: TableStructure<*>, type: KType, value: Any?): String? = value?.let { gson.toJson(value) }
 		override fun createArgument(column: ColumnData<*, *>?, table: TableStructure<*>, type: KType, value: String?): Argument = object : Argument {
@@ -85,7 +87,8 @@ object SQLiteMappers {
 		fun Collection<*>.createArray(component: KType) = (this as java.util.Collection<*>).toArray { java.lang.reflect.Array.newInstance(component.jvmErasure.java, it) as Array<*> }
 
 		override fun accepts(manager: DatabaseConnection, property: KProperty<*>?, type: KType): Boolean = type.isArray()
-		override fun getType(column: ColumnData<*, *>?, table: TableStructure<*>, type: KType): DataType = SQLiteType.BLOB
+		override fun getType(column: ColumnData<*, *>?, table: TableStructure<*>, type: KType): DataType =
+            SQLiteType.BLOB
 
 		override fun <O: Any> initialize(column: DirectColumnData<O, *>, type: KType) {
 			val component = type.component()

diff --git a/sqlite/src/test/kotlin/tests/sqlite/general/Delete.kt b/sqlite/src/test/kotlin/tests/sqlite/general/Delete.kt
@@ -3,7 +3,7 @@ package tests.sqlite.general
 import de.mineking.database.isBetween
 import de.mineking.database.property
 import de.mineking.database.value
-import de.mineking.database.vendors.SQLiteConnection
+import de.mineking.database.vendors.sqlite.SQLiteConnection
 import org.junit.jupiter.api.Test
 import setup.ConsoleSqlLogger
 import setup.UserDao

diff --git a/sqlite/src/test/kotlin/tests/sqlite/general/Insert.kt b/sqlite/src/test/kotlin/tests/sqlite/general/Insert.kt
@@ -1,6 +1,6 @@
 package tests.sqlite.general
 
-import de.mineking.database.vendors.SQLiteConnection
+import de.mineking.database.vendors.sqlite.SQLiteConnection
 import org.junit.jupiter.api.Test
 import setup.ConsoleSqlLogger
 import setup.UserDao

diff --git a/sqlite/src/test/kotlin/tests/sqlite/general/Select.kt b/sqlite/src/test/kotlin/tests/sqlite/general/Select.kt
@@ -1,7 +1,7 @@
 package tests.sqlite.general
 
 import de.mineking.database.*
-import de.mineking.database.vendors.SQLiteConnection
+import de.mineking.database.vendors.sqlite.SQLiteConnection
 import org.junit.jupiter.api.Test
 import setup.ConsoleSqlLogger
 import setup.UserDao