Add Table#upsert

core/src/main/kotlin/de/mineking/database/DataObject.kt

@@ -6,6 +6,7 @@ interface DataObject<T: Any> {
 
 	fun insert() = getTable().insert(this as T)
 	fun update() = getTable().update(this as T)
+	fun upsert() = getTable().upsert(this as T)
 	fun delete() = getTable().delete(this as T)
 
 	fun <O: Any> selectReferring(table: Table<O>, reference: String, where: Where = Where.EMPTY): QueryResult<O> {

core/src/main/kotlin/de/mineking/database/Table.kt

@@ -51,6 +51,8 @@ interface Table<T: Any> {
 	fun update(column: String, value: Node, where: Where = Where.EMPTY): UpdateResult<Int>
 
 	fun insert(obj: T): UpdateResult<T>
+	fun upsert(obj: T): UpdateResult<T>
+
 	fun delete(where: Where = Where.EMPTY): Int
 	fun delete(obj: T) = delete(identifyObject(obj))
 }
@@ -64,8 +66,6 @@ abstract class TableImplementation<T: Any>(
 ) : Table<T>, InvocationHandler {
 	override val implementation: TableImplementation<T> = this
 
-	abstract fun createSelect(columns: String, where: Where, order: Order?, limit: Int?, offset: Int?): String
-
 	open fun parseResult(context: ReadContext): Boolean {
 		if (!context.proceed()) return false
 

postgres/src/main/kotlin/de/mineking/database/vendors/PostgresTable.kt

@@ -82,7 +82,7 @@ class PostgresTable<T: Any>(
 		""") + createJoinList(it.reference!!.structure.columns, prefix + it.name) }
 	}
 
-	override fun createSelect(columns: String, where: Where, order: Order?, limit: Int?, offset: Int?): String = """
+	private fun createSelect(columns: String, where: Where, order: Order?, limit: Int?, offset: Int?): String = """
 		select $columns
 		from ${ structure.name }
 		${ createJoinList(structure.columns.reversed()).joinToString(" ") }
@@ -229,8 +229,38 @@ class PostgresTable<T: Any>(
 
 		val sql = """
 			insert into ${ structure.name }
-			(${columns.joinToString { "\"${it.name}\"" }})
-			values(${columns.joinToString { ":${it.name}" }}) 
+			(${ columns.joinToString { "\"${ it.name }\"" } })
+			values(${ columns.joinToString { ":${ it.name }" } }) 
+			returning *
+		""".trim().replace("\\s+".toRegex(), " ")
+
+		return createResult {
+			structure.manager.driver.withHandleUnchecked { executeUpdate(it.createUpdate(sql), obj) }
+			if (obj is DataObject<*>) obj.afterRead()
+			obj
+		}
+	}
+
+	override fun upsert(obj: T): UpdateResult<T> {
+		if (obj is DataObject<*>) obj.beforeWrite()
+
+		val insertColumns = structure.getAllColumns().filter {
+			if (!it.getRootColumn().autogenerate) true
+			else {
+				val value = it.get(obj)
+				value != 0 && value != null
+			}
+		}
+
+		val updateColumns = structure.getAllColumns().filter { !it.getRootColumn().key }
+
+
+		val sql = """
+			insert into ${ structure.name }
+			(${ insertColumns.joinToString { "\"${ it.name }\"" } })
+			values(${ insertColumns.joinToString { ":${ it.name }" } }) 
+			on conflict (${ structure.getKeys().joinToString { "\"${ it.name }\"" } }) do update set
+			${ updateColumns.joinToString { "\"${ it.name }\" = :${ it.name }" } }
 			returning *
 		""".trim().replace("\\s+".toRegex(), " ")
 

postgres/src/test/kotlin/tests/postgres/general/Upsert.kt

@@ -0,0 +1,54 @@
+package tests.postgres.general
+
+import de.mineking.database.*
+import de.mineking.database.vendors.PostgresConnection
+import org.junit.jupiter.api.Test
+import setup.ConsoleSqlLogger
+import setup.recreate
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+data class UpsertDao(
+	@AutoGenerate @Key @Column val id1: Int = 0,
+	@AutoGenerate @Key @Column val id2: Int = 0,
+	@Column val name: String = "",
+	@Unique @Column val email: String = ""
+)
+
+class UpsertTest {
+	val connection = PostgresConnection("localhost:5432/test", user = "test", password = "test")
+	val table = connection.getTable(name = "upsert_test") { UpsertDao() }
+
+	val entries = listOf(
+		UpsertDao(name = "Tom", email = "[email protected]"),
+		UpsertDao(name = "Alex", email = "[email protected]"),
+		UpsertDao(name = "Bob", email = "[email protected]"),
+		UpsertDao(name = "Eve", email = "[email protected]"),
+		UpsertDao(name = "Max", email = "[email protected]")
+	)
+
+	init {
+		table.recreate()
+
+		entries.forEach { table.upsert(it) }
+
+		connection.driver.setSqlLogger(ConsoleSqlLogger)
+	}
+
+	@Test
+	fun checkInsert() {
+		assertEquals(5, table.selectRowCount())
+	}
+
+	@Test
+	fun update() {
+		assertTrue(table.upsert(entries[0].copy(name = "Test")).isSuccess())
+		assertEquals("Test", table.select<String>(property("name"), where = property("id1") isEqualTo value(1)).first())
+	}
+
+	@Test
+	fun notUpdated() {
+		assertTrue(table.upsert(entries[0].copy(email = "[email protected]")).isError())
+		assertEquals("[email protected]", table.select<String>(property("email"), where = property("id1") isEqualTo value(1)).first())
+	}
+}

sqlite/src/main/kotlin/de/mineking/database/vendors/SQLiteTable.kt

@@ -48,7 +48,7 @@ class SQLiteTable<T: Any>(
 		TODO("Not yet implemented")
 	}
 
-	override fun createSelect(columns: String, where: Where, order: Order?, limit: Int?, offset: Int?): String = """
+	private fun createSelect(columns: String, where: Where, order: Order?, limit: Int?, offset: Int?): String = """
 
 	""".trim().replace("\\s+".toRegex(), " ")
 
@@ -72,6 +72,10 @@ class SQLiteTable<T: Any>(
 		TODO("Not yet implemented")
 	}
 
+	override fun upsert(obj: T): UpdateResult<T> {
+		TODO("Not yet implemented")
+	}
+
 	override fun delete(where: Where): Int {
 		TODO("Not yet implemented")
 	}