From 783e6f102981bedbaf6c3dcc27949eebf46f5505 Mon Sep 17 00:00:00 2001
From: Andrew Golovashevich <landgrafhomyak@gmail.com>
Date: Sat, 1 Feb 2025 05:23:43 +0300
Subject: [PATCH] Renaming property 'userExtension' -> 'uExt' and changing
 'sUExt' -> 'src' in recursive queries

---
 .../ru/landgrafhomyak/db/serdha0/api/misc/Mapper.kt    |  2 +-
 .../ru/landgrafhomyak/db/serdha0/api/misc/Reducer.kt   |  2 +-
 .../landgrafhomyak/db/serdha0/api/misc/_Selectable.kt  |  4 +++-
 .../db/serdha0/api/queries/DeleteQuery.kt              |  2 +-
 .../db/serdha0/api/queries/InsertQuery.kt              |  2 +-
 .../db/serdha0/api/queries/SelectQuery.kt              | 10 +++++-----
 .../db/serdha0/api/queries/UpdateQuery.kt              |  2 +-
 .../ru/landgrafhomyak/db/serdha0/api/queries/_Query.kt |  4 ++--
 .../ru/landgrafhomyak/db/serdha0/api/table/Table.kt    |  2 +-
 9 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/Mapper.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/Mapper.kt
index cb5ba83..271d230 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/Mapper.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/Mapper.kt
@@ -4,7 +4,7 @@ import ru.landgrafhomyak.db.serdha0.api.runtime.InputRow
 import ru.landgrafhomyak.db.serdha0.api.runtime.OutputRow
 
 public interface Mapper<mUE : Any> {
-	public val userExtension: mUE
+	public val uExt: mUE
 
 	public interface InputColumn<RT, DT : DatabaseType<RT>, mUE : Any> : Column<RT, DT, mUE>
 	public interface OutputColumn<RT, DT : DatabaseType<RT>, mUE : Any> : QueryParam<RT, DT, mUE>
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 0753724..97cb68a 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
@@ -4,7 +4,7 @@ import ru.landgrafhomyak.db.serdha0.api.runtime.InputRow
 import ru.landgrafhomyak.db.serdha0.api.runtime.OutputRow
 
 public interface Reducer<rUE : Any> {
-	public val userExtension: rUE
+	public val uExt: rUE
 
 	public interface BidirectionalColumn<RT, DT : DatabaseType<RT>, rUE : Any> : Column<RT, DT, rUE>, QueryParam<RT, DT, rUE>
 	public interface OutputColumn<RT, DT : DatabaseType<RT>, rUE : Any> : Column<RT, DT, rUE>, QueryParam<RT, DT, rUE>
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/_Selectable.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/_Selectable.kt
index dd442d7..ffb363a 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/_Selectable.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/_Selectable.kt
@@ -1,4 +1,6 @@
 package ru.landgrafhomyak.db.serdha0.api.misc
 
 @Suppress("ClassName")
-public interface _Selectable<@Suppress("unused") QueryUserExtension : Any>
\ No newline at end of file
+public interface _Selectable<UE : Any> {
+	public val uExt: UE
+}
\ No newline at end of file
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 36ae791..15e042e 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
@@ -48,7 +48,7 @@ public interface DeleteQuery<qUE : Any> : _Query<qUE> {
 
 			public interface Scope<qUE : Any, ttUE : Any, sUE : Any> {
 				public val tt: Table<ttUE, *>
-				public val sUExt: sUE
+				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>
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 d5eecb2..359ef00 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
@@ -64,7 +64,7 @@ public interface InsertQuery<qUE : Any> : _Query<qUE> {
 
 			public interface Scope<qUE : Any, ttUE : Any, sUE : Any> : _CommonInsertCreatorScope<qUE, ttUE> {
 				public val tt: Table<ttUE, *>
-				public val sUExt: sUE
+				public val src: _Selectable<sUE>
 
 				public fun <RT, DT : DatabaseType<RT>> queryParam(name: String, type: DT): QueryParam<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 c929205..b254a6a 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
@@ -61,7 +61,7 @@ public interface SelectQuery<qUE : Any> : _Query<qUE> {
 			public fun createSelect(context: Scope<qUE, tUE>): qUE
 
 			public interface Scope<qUE : Any, tUE : Any> : _CommonSelectCreatorScope<qUE> {
-				public val sUExt: tUE
+				public val src: _Selectable<tUE>
 				public val subqueryParams: InputRow.WithRedirect<tUE, qUE>
 
 				public fun <RT, DT : DatabaseType<RT>> selectColumnFromSubquery(param: Column<RT, DT, tUE>): IntermediateColumn<RT, DT, qUE>
@@ -83,8 +83,8 @@ public interface SelectQuery<qUE : Any> : _Query<qUE> {
 			public fun createSelectWithJoin(context: Scope<qUE, lsqUE, rsqUE>): qUE
 
 			public interface Scope<qUE : Any, lsqUE : Any, rsqUE : Any> : _CommonSelectCreatorScope<qUE> {
-				public val lsqUExt: lsqUE
-				public val rsqUExt: rsqUE
+				public val lsq: _Selectable<lsqUE>
+				public val rsq: _Selectable<rsqUE>
 
 				public val leftSubqueryParams: InputRow.WithRedirect<lsqUE, qUE>
 				public val rightSubqueryParams: InputRow.WithRedirect<rsqUE, qUE>
@@ -106,7 +106,7 @@ public interface SelectQuery<qUE : Any> : _Query<qUE> {
 			public fun createSelectWithReduce(context: Scope<qUE, tUE>): qUE
 
 			public interface Scope<qUE : Any, tUE : Any> : _CommonSelectCreatorScope<qUE> {
-				public val sUExt: tUE
+				public val src: _Selectable<tUE>
 				public val sourceParams: InputRow.WithRedirect<tUE, qUE>
 
 				public fun <RT, DT : DatabaseType<RT>> selectColumnFromSubquery(param: Column<RT, DT, tUE>): IntermediateColumn<RT, DT, qUE>
@@ -132,7 +132,7 @@ public interface SelectQuery<qUE : Any> : _Query<qUE> {
 			public fun createSelectWithFold(context: Scope<qUE, tUE>): qUE
 
 			public interface Scope<qUE : Any, tUE : Any> : _CommonSelectCreatorScope<qUE> {
-				public val sUExt: tUE
+				public val src: _Selectable<tUE>
 				public val sourceParams: InputRow.WithRedirect<tUE, qUE>
 
 				public fun <RT, DT : DatabaseType<RT>> selectColumnFromSubquery(param: Column<RT, DT, tUE>): IntermediateColumn<RT, DT, qUE>
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 78665ca..b894eab 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
@@ -50,7 +50,7 @@ public interface UpdateQuery<qUE : Any> : _Query<qUE> {
 
 			public interface Scope<qUE : Any, ttUE : Any, sUE : Any> {
 				public val tt: Table<ttUE, *>
-				public val sUExt: sUE
+				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>
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/_Query.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/_Query.kt
index 16c2c93..ac698ae 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/_Query.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/_Query.kt
@@ -4,8 +4,8 @@ import ru.landgrafhomyak.db.serdha0.api.misc._Selectable
 
 
 @Suppress("ClassName")
-public interface _Query<QueryUserExtension : Any> {
-	public val userExtension: QueryUserExtension
+public interface _Query<qUE : Any> {
+	public val uExt: qUE
 
 	public interface Table2Void<QueryUserExtension : Any> : _Query<QueryUserExtension>
 	public interface Params2Void<QueryUserExtension : Any> : _Query<QueryUserExtension>
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 7f506da..36ec1fb 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
@@ -4,7 +4,7 @@ import ru.landgrafhomyak.db.serdha0.api.misc._Selectable
 import ru.landgrafhomyak.db.serdha0.api.module.Module
 
 public interface Table<UserExtension : Any, PreviousUserExtension : Any> : _Selectable<UserExtension> {
-	public val userExtension: UserExtension
+	public override val uExt: UserExtension
 	public val name: String
 	public val module: Module<*>