From d7877e57bc2c74142b1975c1f2661623c8062506 Mon Sep 17 00:00:00 2001
From: Andrew Golovashevich <landgrafhomyak@gmail.com>
Date: Tue, 18 Feb 2025 14:26:42 +0300
Subject: [PATCH] Fixes pack 1

---
 .../db/serdha0/api/misc/DatabaseType.kt               |  2 +-
 .../db/serdha0/api/misc/FiltersScope.kt               |  4 ++--
 .../landgrafhomyak/db/serdha0/api/misc/QueryParam.kt  |  1 +
 .../ru/landgrafhomyak/db/serdha0/api/misc/Reducer.kt  |  6 +++---
 .../db/serdha0/api/queries/DeleteQuery.kt             |  8 ++++----
 .../db/serdha0/api/queries/InsertQuery.kt             |  4 ++--
 .../db/serdha0/api/queries/SelectQuery.kt             |  4 +++-
 .../db/serdha0/api/queries/UpdateQuery.kt             | 11 ++++++-----
 .../ru/landgrafhomyak/db/serdha0/api/table/Table.kt   |  2 --
 .../db/serdha0/api/table/TableConstructor.kt          |  5 +++--
 .../db/serdha0/api/table/TableUpgrade.kt              |  1 +
 11 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/DatabaseType.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/DatabaseType.kt
index e67b160..82aa610 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/DatabaseType.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/DatabaseType.kt
@@ -59,7 +59,7 @@ public interface DatabaseType<@Suppress("unused") RT> {
 	public interface Provider {
 		@Suppress("INAPPLICABLE_JVM_NAME", "FunctionName")
 		@JvmName("ROW_ID")
-		public fun <TableUserExtension : Any> ROW_ID(table: Table<TableUserExtension, *>): DatabaseType<RowId<TableUserExtension>>
+		public fun <TableUserExtension : Any> ROW_ID(table: Table<TableUserExtension, *>): DatabaseType.ROW_ID<TableUserExtension>
 
 		@Suppress("INAPPLICABLE_JVM_NAME", "PropertyName")
 		@get:JvmName("BOOLEAN")
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/FiltersScope.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/FiltersScope.kt
index bdbc71d..5bacd2d 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/FiltersScope.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/FiltersScope.kt
@@ -13,8 +13,8 @@ public interface FiltersScope<oqUE : Any> {
 		GREATER_OR_EQUALS,
 	}
 
-	public fun <RT : Any, DT : DatabaseType<RT>> compareWithParam(column: IntermediateColumn<RT, DT, oqUE>, operator: ComparisonType, param: QueryParam<RT, DT, oqUE>)
-	public fun <RT : Any, DT : DatabaseType<RT>> compareWithConstant(column: IntermediateColumn<RT, DT, oqUE>, operator: ComparisonType, constant: RT)
+	public fun <RT, DT : DatabaseType<RT>> compareWithParam(column: IntermediateColumn<RT, DT, oqUE>, operator: ComparisonType, param: QueryParam<RT, DT, oqUE>)
+	public fun <RT, DT : DatabaseType<RT>> compareWithConstant(column: IntermediateColumn<RT, DT, oqUE>, operator: ComparisonType, constant: RT)
 	public fun ifTrue(column: IntermediateColumn<Boolean, DatabaseType.BOOLEAN, oqUE>)
 	public fun ifFalse(column: IntermediateColumn<Boolean, DatabaseType.BOOLEAN, oqUE>)
 }
\ No newline at end of file
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/QueryParam.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/QueryParam.kt
index 6ba77e5..d1c59c3 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/QueryParam.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/QueryParam.kt
@@ -3,4 +3,5 @@ package ru.landgrafhomyak.db.serdha0.api.misc
 public interface QueryParam<RT, DT : DatabaseType<RT>, OwnerQueryUserExtension : Any> {
 	public val name: String
 	public val userWrapper: OwnerQueryUserExtension
+	public val type: DT
 }
\ No newline at end of file
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/Reducer.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/Reducer.kt
index 97cb68a..449b0e7 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/Reducer.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/Reducer.kt
@@ -10,12 +10,12 @@ public interface Reducer<rUE : Any> {
 	public interface OutputColumn<RT, DT : DatabaseType<RT>, rUE : Any> : Column<RT, DT, rUE>, QueryParam<RT, DT, rUE>
 
 
-	public fun interface Linker<rUE : Any, qUE : Any, oUE : Any> {
-		public fun link(linker: Scope<rUE, qUE>): oUE
+	public fun interface Linker<_rUE : Any, qUE : Any, oUE : Any> {
+		public fun link(rUE: _rUE, linker: Scope<_rUE, qUE>): oUE
 
 		public interface Scope<_rUE : Any, qUE : Any> {
 			public val rUE: _rUE
-			public fun <RT, DT : DatabaseType<RT>> link(red: BidirectionalColumn<RT, DT, _rUE>, src: IntermediateColumn<RT, DT, _rUE>): IntermediateColumn<RT, DT, qUE>
+			public fun <RT, DT : DatabaseType<RT>> link(red: BidirectionalColumn<RT, DT, _rUE>, src: IntermediateColumn<RT, DT, qUE>): IntermediateColumn<RT, DT, qUE>
 			public fun <RT, DT : DatabaseType<RT>> linkAndInitialize(red: BidirectionalColumn<RT, DT, _rUE>, src: IntermediateColumn<RT, DT, qUE>, initial: RT): IntermediateColumn<RT, DT, qUE>
 			public fun <RT, DT : DatabaseType<RT>> linkAndInitialize(red: BidirectionalColumn<RT, DT, _rUE>, src: IntermediateColumn<RT, DT, qUE>, initial: QueryParam<RT, DT, qUE>): IntermediateColumn<RT, DT, qUE>
 			public fun <RT, DT : DatabaseType<RT>> link(red: OutputColumn<RT, DT, _rUE>): IntermediateColumn<RT, DT, qUE>
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/DeleteQuery.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/DeleteQuery.kt
index 2e8ac74..3eeae43 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/DeleteQuery.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/DeleteQuery.kt
@@ -22,9 +22,9 @@ public interface DeleteQuery<out qUE : Any> : _Query<qUE> {
 				public val tt: Table<ttUE, *>
 
 				public val types: DatabaseType.Provider
-				public fun <RT, DT : DatabaseType<RT>> param(name: String, type: DT): QueryParam<RT, DT, qUE>
+				public fun <RT, DT : DatabaseType<RT>> queryParam(name: String, type: DT): QueryParam<RT, DT, qUE>
 
-				public var rowToRemove: QueryParam<*, DatabaseType.ROW_ID<ttUE>, qUE>
+				public val rowToRemove: QueryParam<*, DatabaseType.ROW_ID<ttUE>, qUE>
 
 				public fun <RT, DT : DatabaseType<RT>> returnRemovedValue(name: String, column: Column<RT, DT, ttUE>): Column<RT, DT, qUE>
 				public fun <RT, DT : DatabaseType<RT>> returnParam(name: String, column: QueryParam<RT, DT, ttUE>): Column<RT, DT, qUE>
@@ -51,10 +51,10 @@ public interface DeleteQuery<out qUE : Any> : _Query<qUE> {
 				public val src: _Selectable<sUE>
 
 				public val types: DatabaseType.Provider
-				public fun <RT, DT : DatabaseType<RT>> param(name: String, type: DT): QueryParam<RT, DT, qUE>
+				public fun <RT, DT : DatabaseType<RT>> queryParam(name: String, type: DT): QueryParam<RT, DT, qUE>
 
 				public val selectorParams: InputRow.WithRedirect<sUE, qUE>
-				public var selectorColumn: Column<*, DatabaseType.ROW_ID<ttUE>, sUE>
+				public val selectorColumn: Column<*, DatabaseType.ROW_ID<ttUE>, sUE>
 
 				public fun <RT, DT : DatabaseType<RT>> returnFromSubquery(name: String, column: Column<RT, DT, sUE>): Column<RT, DT, qUE>
 				public fun <RT, DT : DatabaseType<RT>> returnRemovedValue(name: String, column: Column<RT, DT, ttUE>): Column<RT, DT, qUE>
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/InsertQuery.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/InsertQuery.kt
index a0a6320..f515cf2 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/InsertQuery.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/InsertQuery.kt
@@ -73,12 +73,12 @@ public interface InsertQuery<out qUE : Any> : _Query<qUE> {
 
 				public fun <RT, DT : DatabaseType<RT>> insertConstant(dst: Column<RT, DT, ttUE>, src: RT)
 				public fun <RT, DT : DatabaseType<RT>> insertParam(dst: Column<RT, DT, ttUE>, src: QueryParam<RT, DT, qUE>)
-				public fun <RT, DT : DatabaseType<RT>> insertFromSubquery(dst: Column<RT, DT, ttUE>, src: Column<RT, DT, ttUE>)
+				public fun <RT, DT : DatabaseType<RT>> insertFromSubquery(dst: Column<RT, DT, ttUE>, src: Column<RT, DT, sUE>)
 
 				public fun onConflictReturnOnly(u: UniqueIndex<ttUE>)
 
 				public fun <RT, DT : DatabaseType<RT>> returnFromSubquery(name: String, column: Column<RT, DT, sUE>): Column<RT, DT, qUE>
-				public fun <RT, DT : DatabaseType<RT>> returnNewValue(name: String, column: Column<RT, DT, ttUE>): Column<RT, DT, qUE>
+				public fun <RT, DT : DatabaseType<RT>> returnInsertedValue(name: String, column: Column<RT, DT, ttUE>): Column<RT, DT, qUE>
 				public fun <RT, DT : DatabaseType<RT>> returnParam(name: String, param: QueryParam<RT, DT, ttUE>): Column<RT, DT, qUE>
 			}
 		}
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/SelectQuery.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/SelectQuery.kt
index 2b3c03d..49c7e01 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/SelectQuery.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/SelectQuery.kt
@@ -20,11 +20,13 @@ public interface SelectQuery<out qUE : Any> : _Query<qUE> {
 		public val join: Join
 	) {
 		public enum class LeftNull {
+			NULL_NOT_EXPECTED,
 			AS_ID, SKIP, JOIN_TO_NULL
 		}
 
 		public enum class Join {
-			LEFT_TO_FIRST_RIGHT, LEFT_FOR_EACH_RIGHT, LEFT_FOR_EACH_RIGHT_OR_NULL,
+			LEFT_TO_FIRST_RIGHT, LEFT_FOR_EACH_RIGHT, LEFT_FOR_EACH_RIGHT_OR_TO_NULL,
+			EACH_LEFT_TO_EACH_RIGHT
 		}
 	}
 
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/UpdateQuery.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/UpdateQuery.kt
index 5270af2..04d1b5c 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/UpdateQuery.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/UpdateQuery.kt
@@ -6,6 +6,7 @@ import ru.landgrafhomyak.db.serdha0.api.misc.DatabaseType
 import ru.landgrafhomyak.db.serdha0.api.misc.QueryParam
 import ru.landgrafhomyak.db.serdha0.api.misc._Selectable
 import ru.landgrafhomyak.db.serdha0.api.runtime.InputRow
+import ru.landgrafhomyak.db.serdha0.api.table.RowId
 
 public interface UpdateQuery<out qUE : Any> : _Query<qUE> {
 	public interface SingleRow<out qUE : Any> : UpdateQuery<qUE>, _Query.Params2Table<qUE> {
@@ -20,9 +21,9 @@ public interface UpdateQuery<out qUE : Any> : _Query<qUE> {
 				public val tt: Table<ttUE, *>
 
 				public val types: DatabaseType.Provider
-				public fun <RT, DT : DatabaseType<RT>> param(name: String, type: DT): QueryParam<RT, DT, qUE>
+				public fun <RT, DT : DatabaseType<RT>> queryParam(name: String, type: DT): QueryParam<RT, DT, qUE>
 
-				public var rowToUpdate: QueryParam<*, DatabaseType.ROW_ID<ttUE>, qUE>
+				public val rowToUpdate: QueryParam<*, DatabaseType.ROW_ID<ttUE>, qUE>
 
 				public fun <RT, DT : DatabaseType<RT>> updateColumnWithOldValue(dst: Column<RT, DT, ttUE>, src: Column<RT, DT, ttUE>)
 				public fun <RT, DT : DatabaseType<RT>> updateColumnWithParam(dst: Column<RT, DT, ttUE>, src: QueryParam<RT, DT, qUE>)
@@ -53,10 +54,10 @@ public interface UpdateQuery<out qUE : Any> : _Query<qUE> {
 				public val src: _Selectable<sUE>
 
 				public val types: DatabaseType.Provider
-				public fun <RT, DT : DatabaseType<RT>> param(name: String, type: DT): QueryParam<RT, DT, qUE>
+				public fun <RT, DT : DatabaseType<RT>> queryParam(name: String, type: DT): QueryParam<RT, DT, qUE>
 
 				public val selectorParams: InputRow.WithRedirect<sUE, qUE>
-				public var selectorColumn: Column<*, DatabaseType.ROW_ID<ttUE>, sUE>
+				public val selectorColumn: Column<RowId<ttUE>, DatabaseType.ROW_ID<ttUE>, sUE>
 
 				public fun <RT, DT : DatabaseType<RT>> updateColumnWithSubquery(dst: Column<RT, DT, ttUE>, src: Column<RT, DT, sUE>)
 				public fun <RT, DT : DatabaseType<RT>> updateColumnWithOldValue(dst: Column<RT, DT, ttUE>, src: Column<RT, DT, ttUE>)
@@ -88,7 +89,7 @@ public interface UpdateQuery<out qUE : Any> : _Query<qUE> {
 				public val types: DatabaseType.Provider
 				public fun <RT, DT : DatabaseType<RT>> inputColumn(name: String, type: DT): QueryParam<RT, DT, qUE>
 
-				public var rowToUpdate: QueryParam<*, DatabaseType.ROW_ID<ttUE>, qUE>
+				public val rowToUpdate: QueryParam<*, DatabaseType.ROW_ID<ttUE>, qUE>
 
 				public fun <RT, DT : DatabaseType<RT>> updateColumnWithOldValue(dst: Column<RT, DT, ttUE>, src: Column<RT, DT, ttUE>)
 				public fun <RT, DT : DatabaseType<RT>> updateColumnWithParam(dst: Column<RT, DT, ttUE>, src: QueryParam<RT, DT, qUE>)
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/Table.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/Table.kt
index e75c1bb..d375c50 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/Table.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/Table.kt
@@ -16,6 +16,4 @@ public interface Table<out UE : Any, pUE : Any> : _Selectable<UE> {
 	public val temporaryType: TemporaryType?
 
 	public val namespacesFromModuleRoot: List<String>
-
-	public val isMutable: Boolean
 }
\ No newline at end of file
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/TableConstructor.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/TableConstructor.kt
index 82f92a0..49798da 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/TableConstructor.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/TableConstructor.kt
@@ -18,10 +18,11 @@ public interface TableConstructor<tUE : Any> {
 
 		public fun uniqueIndex(name: String, distinctNulls: Boolean, vararg columns: Column<*, *, tUE>): UniqueIndex<tUE>
 		public fun checkConstraint(name: String, constructor: RowExpression.Constructor<tUE, *, Boolean>, recheckExistingRows: Boolean = false): CheckConstraint<tUE>
-		public fun <RT : Any> defaultValue(c: Column<RT, *, tUE>, creator: RowExpression.Constructor<tUE, *, RT>): ColumnDefaultValue<tUE, RT>
+		public fun <RT : Any, DT : DatabaseType<RT>> defaultValue(c: Column<RT, DT, tUE>, value: RT): ColumnDefaultValue<tUE, RT>
+		public fun <RT : Any, DT : DatabaseType<RT>> defaultValue(c: Column<RT, DT, tUE>, creator: RowExpression.Constructor<tUE, *, RT>): ColumnDefaultValue<tUE, RT>
 
 		@Suppress("PropertyName")
-		public val rowId_column: Column<RowId<tUE>, DatabaseType<RowId<tUE>>, tUE>
+		public val rowId_column: Column<RowId<tUE>, DatabaseType.ROW_ID<tUE>, tUE>
 
 		@Suppress("PropertyName")
 		public val rowId_uniqueConstraint: UniqueIndex<tUE>
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/TableUpgrade.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/TableUpgrade.kt
index 88d1c88..c9a0e87 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/TableUpgrade.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/TableUpgrade.kt
@@ -27,6 +27,7 @@ public interface TableUpgrade<tnUE : Any, toUE : Any> {
 
 		public fun <RT, DT : DatabaseType<RT>> keepDefaultValue(c: Column<RT, DT, tnUE>, d: ColumnDefaultValue<toUE, RT>): ColumnDefaultValue<tnUE, RT>
 		public fun <RT, DT : DatabaseType<RT>> changeDefaultValue(c: Column<RT, DT, tnUE>, d: ColumnDefaultValue<toUE, RT>): ColumnDefaultValue<tnUE, RT>
+		public fun <RT, DT : DatabaseType<RT>> changeDefaultValue(c: Column<RT, DT, tnUE>, d: RT): ColumnDefaultValue<tnUE, RT>
 		public fun deleteDefaultValue(i: ColumnDefaultValue<toUE, *>)
 
 		public fun <ttUE : Any, RT, DT : DatabaseType<RT>> keepForeignRowReference(