From fab47cb0ea49d025d71ac7aa69c0cb4b59c1a10d Mon Sep 17 00:00:00 2001
From: Andrew Golovashevich <landgrafhomyak@gmail.com>
Date: Mon, 30 Dec 2024 17:55:19 +0300
Subject: [PATCH] Minor improvements

---
 .../serdha/api/v0/ddl/ModuleCreator.kt        |  4 +--
 .../landgrafhomyak/serdha/api/v0/ddl/Table.kt | 13 +++++++-
 .../serdha/api/v0/ddl/TableUpdater.kt         | 32 ++++++++++++++++---
 .../serdha/api/v0/ddl/UniqueIndex.kt          |  6 ++--
 4 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/ModuleCreator.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/ModuleCreator.kt
index a217101..17cb361 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/ModuleCreator.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/ModuleCreator.kt
@@ -15,8 +15,8 @@ public interface ModuleCreator {
 	}
 
 	public fun <TableUserExtension : Any> createTable(namespace: Namespace, name: String, initializer: CreateTable<TableUserExtension>): Table<TableUserExtension, Nothing>
-	public fun <TableUserExtension : Any> createTempSessionWideTable(initializer: CreateTable<TableUserExtension>): Table<TableUserExtension, Nothing>
-	public fun <TableUserExtension : Any> createTempTransactionWideTable(initializer: CreateTable<TableUserExtension>): Table<TableUserExtension, Nothing>
+	public fun <TableUserExtension : Any> createSessionScopeTemporaryTable(initializer: CreateTable<TableUserExtension>): Table<TableUserExtension, Nothing>
+	public fun <TableUserExtension : Any> createTransactionScopeTemporaryTable(initializer: CreateTable<TableUserExtension>): Table<TableUserExtension, Nothing>
 
 	public interface UpdateTable<TableNewUserExtension : Any, TableOldUserExtension : Any> {
 		public fun updateTable(oldTable: Table<TableOldUserExtension, *>, updater: TableUpdater<TableNewUserExtension, TableOldUserExtension>): TableNewUserExtension
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/Table.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/Table.kt
index a74ecbb..9b7dbaa 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/Table.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/Table.kt
@@ -1,5 +1,16 @@
 package ru.landgrafhomyak.serdha.api.v0.ddl
 
-public interface Table<UserExtension : Any, PreviousUserExtension: Any> {
+public interface Table<UserExtension : Any, PreviousUserExtension : Any> {
 	public val userExtension: UserExtension
+	public val name: String
+	public val module: Module<*>
+
+	public enum class TemporaryType {
+		TRANSACTION_SCOPE,
+		CONNECTION_SCOPE
+	}
+
+	public val temporaryType: TemporaryType?
+
+	public val namespacesFromModuleRoot: List<String>
 }
\ No newline at end of file
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/TableUpdater.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/TableUpdater.kt
index 8644c23..edb67b0 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/TableUpdater.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/TableUpdater.kt
@@ -30,9 +30,31 @@ public interface TableUpdater<TableNewUserExtension : Any, TableOldUserExtension
 	public fun <RuntimeType, DatabaseType : ColumnType<RuntimeType>> changeDefaultValue(c: Column<RuntimeType, DatabaseType, TableNewUserExtension>, d: DefaultConstraint<*, *, TableOldUserExtension>): DefaultConstraint<RuntimeType, DatabaseType, TableNewUserExtension>
 	public fun deleteDefaultValue(i: DefaultConstraint<*, *, TableOldUserExtension>)
 
-	public fun <TargetTableOldUserWrapper : Any, TargetTableNewUserWrapper : Any> keepForeignKeyToUpdatedTable(i: ForeignKey<TableOldUserExtension, TargetTableOldUserWrapper>, updatedTable: Table<TargetTableNewUserWrapper, TargetTableOldUserWrapper>): ForeignKey<TableNewUserExtension, TargetTableNewUserWrapper>
-	public fun <TargetTableUserWrapper : Any> keepForeignKey(i: ForeignKey<TableOldUserExtension, TargetTableUserWrapper>): ForeignKey<TableNewUserExtension, TargetTableUserWrapper>
-	public fun <TargetTableOldUserWrapper : Any, TargetTableNewUserWrapper : Any> renameAndKeepForeignKeyToUpdatedTable(i: ForeignKey<TableOldUserExtension, TargetTableOldUserWrapper>, updatedTable: Table<TargetTableNewUserWrapper, TargetTableOldUserWrapper>): ForeignKey<TableNewUserExtension, TargetTableNewUserWrapper>
-	public fun <TargetTableUserWrapper : Any> renameAndKeepForeignKey(i: ForeignKey<TableOldUserExtension, TargetTableUserWrapper>): ForeignKey<TableNewUserExtension, TargetTableUserWrapper>
-	public fun deleteForeignKey(i: ForeignKey<TableOldUserExtension, *>)
+	public fun <TargetTableOldUserWrapper : Any, TargetTableNewUserWrapper : Any> keepForeignKeyToUpdatedTable(
+		fk: ForeignKey<TableOldUserExtension, TargetTableOldUserWrapper>,
+		updatedTable: Table<TargetTableNewUserWrapper, TargetTableOldUserWrapper>,
+		onUpdate: ForeignKey.OnUpdateAction? = null,
+		onDelete: ForeignKey.OnDeleteAction? = null
+	): ForeignKey<TableNewUserExtension, TargetTableNewUserWrapper>
+
+	public fun <TargetTableUserWrapper : Any> keepForeignKey(
+		fk: ForeignKey<TableOldUserExtension, TargetTableUserWrapper>,
+		onUpdate: ForeignKey.OnUpdateAction? = null,
+		onDelete: ForeignKey.OnDeleteAction? = null
+	): ForeignKey<TableNewUserExtension, TargetTableUserWrapper>
+
+	public fun <TargetTableOldUserWrapper : Any, TargetTableNewUserWrapper : Any> renameAndKeepForeignKeyToUpdatedTable(
+		fk: ForeignKey<TableOldUserExtension, TargetTableOldUserWrapper>,
+		updatedTable: Table<TargetTableNewUserWrapper, TargetTableOldUserWrapper>,
+		onUpdate: ForeignKey.OnUpdateAction? = null,
+		onDelete: ForeignKey.OnDeleteAction? = null
+	): ForeignKey<TableNewUserExtension, TargetTableNewUserWrapper>
+
+	public fun <TargetTableUserWrapper : Any> renameAndKeepForeignKey(
+		fk: ForeignKey<TableOldUserExtension, TargetTableUserWrapper>,
+		onUpdate: ForeignKey.OnUpdateAction? = null,
+		onDelete: ForeignKey.OnDeleteAction? = null
+	): ForeignKey<TableNewUserExtension, TargetTableUserWrapper>
+
+	public fun deleteForeignKey(fk: ForeignKey<TableOldUserExtension, *>)
 }
\ No newline at end of file
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/UniqueIndex.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/UniqueIndex.kt
index d01fe2f..8ee6c09 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/UniqueIndex.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/UniqueIndex.kt
@@ -1,7 +1,5 @@
 package ru.landgrafhomyak.serdha.api.v0.ddl
 
-public interface UniqueIndex<OwnerTableUserExtension : Any> {
-	public val name: String
-	public val table: Table<OwnerTableUserExtension, *>
-	public val columns: List<Column<*, *, OwnerTableUserExtension>>
+public interface UniqueIndex<OwnerTableUserExtension : Any> : Index<OwnerTableUserExtension> {
+	public val areNullsDistinct: Boolean
 }
\ No newline at end of file