From ed5d63cc2839b9623560f857a4b016d6a0a4da55 Mon Sep 17 00:00:00 2001
From: Andrew Golovashevich <landgrafhomyak@gmail.com>
Date: Sun, 29 Dec 2024 16:56:47 +0300
Subject: [PATCH] Nullable expressions unwrapper

---
 .../serdha/api/v0/Expression.kt               | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/Expression.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/Expression.kt
index ce1bd7a..a73949f 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/Expression.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/Expression.kt
@@ -7,20 +7,13 @@ import kotlinx.datetime.LocalTime
 import ru.landgrafhomyak.serdha.api.v0.ddl.ColumnType
 
 public interface Expression<RuntimeType, DatabaseType : ColumnType<RuntimeType>, OwnerBuilderUserExtension : Any> {
-
-
 	public interface Builder<OwnerBuilderUserExtension : Any> {
-		@Target(AnnotationTarget.FUNCTION)
-		@Retention(AnnotationRetention.BINARY)
-		@RequiresOptIn
-		public annotation class DynamicTyping
-
-		public fun <RuntimeType, DatabaseType : ColumnType<RuntimeType>> equals(
+		public fun <DatabaseType : ColumnType<*>> equals(
 			left: Expression<*, DatabaseType, OwnerBuilderUserExtension>,
 			right: Expression<*, DatabaseType, OwnerBuilderUserExtension>,
 		): Expression<Boolean, ColumnType.BOOLEAN, OwnerBuilderUserExtension>
 
-		public fun <RuntimeType, DatabaseType : ColumnType<RuntimeType>> notEquals(
+		public fun <DatabaseType : ColumnType<*>> notEquals(
 			left: Expression<*, DatabaseType, OwnerBuilderUserExtension>,
 			right: Expression<*, DatabaseType, OwnerBuilderUserExtension>,
 		): Expression<Boolean, ColumnType.BOOLEAN, OwnerBuilderUserExtension> =
@@ -442,7 +435,24 @@ public interface Expression<RuntimeType, DatabaseType : ColumnType<RuntimeType>,
 		public fun constantOf(v: LocalTime): Expression<LocalTime, ColumnType.LOCAL_TIME, OwnerBuilderUserExtension>
 		public fun constantOf(v: LocalDateTime): Expression<LocalDateTime, ColumnType.LOCAL_DATETIME, OwnerBuilderUserExtension>
 		public fun constantOf(v: Instant): Expression<Instant, ColumnType.INSTANT, OwnerBuilderUserExtension>
+
 		@OptIn(ExperimentalUnsignedTypes::class)
 		public fun constantOf(v: ByteArray): Expression<UByteArray, ColumnType.BYTE_ARRAY, OwnerBuilderUserExtension>
+
+		public fun <ArgRuntimeType : Any, ArgDatabaseType : ColumnType<ArgRuntimeType>, RetRuntimeType, RetDatabaseType : ColumnType<RetRuntimeType>> ifNull(
+			nullable: Expression<ArgRuntimeType?, ColumnType.Nullable<ArgRuntimeType, ArgDatabaseType>, OwnerBuilderUserExtension>,
+			onValue: (Expression<ArgRuntimeType, ArgDatabaseType, OwnerBuilderUserExtension>) -> Expression<RetRuntimeType, RetDatabaseType, OwnerBuilderUserExtension>,
+			onNull: () -> Expression<RetRuntimeType, RetDatabaseType, OwnerBuilderUserExtension>
+		): Expression<RetRuntimeType, RetDatabaseType, OwnerBuilderUserExtension>
+
+		public fun <ArgRuntimeType : Any, ArgDatabaseType : ColumnType<ArgRuntimeType>> notNullAnd(
+			nullable: Expression<ArgRuntimeType?, ColumnType.Nullable<ArgRuntimeType, ArgDatabaseType>, OwnerBuilderUserExtension>,
+			onValue: (Expression<ArgRuntimeType, ArgDatabaseType, OwnerBuilderUserExtension>) -> Expression<Boolean, ColumnType.BOOLEAN, OwnerBuilderUserExtension>,
+		): Expression<Boolean, ColumnType.BOOLEAN, OwnerBuilderUserExtension>
+
+		public fun <ArgRuntimeType : Any, ArgDatabaseType : ColumnType<ArgRuntimeType>> nullOr(
+			nullable: Expression<ArgRuntimeType?, ColumnType.Nullable<ArgRuntimeType, ArgDatabaseType>, OwnerBuilderUserExtension>,
+			onValue: (Expression<ArgRuntimeType, ArgDatabaseType, OwnerBuilderUserExtension>) -> Expression<Boolean, ColumnType.BOOLEAN, OwnerBuilderUserExtension>,
+		): Expression<Boolean, ColumnType.BOOLEAN, OwnerBuilderUserExtension>
 	}
 }
\ No newline at end of file