From c02dc87ad2e4d6fd76ac8abd3a0d3465478552b6 Mon Sep 17 00:00:00 2001 From: Andrew Golovashevich Date: Sat, 4 Jan 2025 20:02:00 +0300 Subject: [PATCH] [history/serdha] Table creating scopes and lazy column deleting --- .../api/v0/ddl/module/CreateModuleScope.kt | 68 ++++++++++--------- .../serdha/api/v0/ddl/table/Column.kt | 8 ++- .../api/v0/ddl/table/CreateTableScope.kt | 38 +++++++++++ .../serdha/api/v0/ddl/table/TableCreator.kt | 35 ---------- 4 files changed, 79 insertions(+), 70 deletions(-) create mode 100644 src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/CreateTableScope.kt delete mode 100644 src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/TableCreator.kt diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/module/CreateModuleScope.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/module/CreateModuleScope.kt index f1fa1ca..c3b578c 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/module/CreateModuleScope.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/module/CreateModuleScope.kt @@ -1,11 +1,13 @@ package ru.landgrafhomyak.serdha.api.v0.ddl.module import ru.landgrafhomyak.serdha.api.v0.ddl.table.Table -import ru.landgrafhomyak.serdha.api.v0.dml.Delete -import ru.landgrafhomyak.serdha.api.v0.dml.Insert -import ru.landgrafhomyak.serdha.api.v0.dml.InsertCreator -import ru.landgrafhomyak.serdha.api.v0.dml.Select -import ru.landgrafhomyak.serdha.api.v0.dml.Update +import ru.landgrafhomyak.serdha.api.v0.dml.CopyQuery +import ru.landgrafhomyak.serdha.api.v0.dml.CreateCopyQueryScope +import ru.landgrafhomyak.serdha.api.v0.dml.CreateInsertQueryScope +import ru.landgrafhomyak.serdha.api.v0.dml.DeleteQuery +import ru.landgrafhomyak.serdha.api.v0.dml.InsertQuery +import ru.landgrafhomyak.serdha.api.v0.dml.SelectQuery +import ru.landgrafhomyak.serdha.api.v0.dml.UpdateQuery import ru.landgrafhomyak.serdha.api.v0.runtime.SynchronizedDatabase import ru.landgrafhomyak.serdha.api.v0.runtime.Transaction @@ -40,7 +42,7 @@ public interface CreateModuleScope { * @see CreateModuleScope.createTransactionScopeTemporaryTable * @see UpgradeModuleScope.TableUpgrade */ - public fun createTable(creator: ru.landgrafhomyak.serdha.api.v0.ddl.table.TableCreator): TableUserExtension + public fun createTable(creator: ru.landgrafhomyak.serdha.api.v0.ddl.table.CreateTableScope): TableUserExtension } /** @@ -101,7 +103,7 @@ public interface CreateModuleScope { * * @see CreateModuleScope.createSelectQuery */ - public fun createSelect(creator: ru.landgrafhomyak.serdha.api.v0.dml.SelectCreator): QueryUserWrapper + public fun createSelect(creator: ru.landgrafhomyak.serdha.api.v0.dml.CreateSelectQueryScope): QueryUserWrapper } /** @@ -115,7 +117,7 @@ public interface CreateModuleScope { * * @see CreateModuleScope.createTemporarySelectQuery */ - public fun createSelectQuery(initializer: SelectQueryCreator): Select + public fun createSelectQuery(initializer: SelectQueryCreator): SelectQuery /** * Creates 'SELECT' query accessible only while the module is [creating][ModuleTemplate.ModuleCreator] or [updating][ModuleTemplate.ModuleUpgrade]. @@ -129,7 +131,7 @@ public interface CreateModuleScope { * * @see CreateModuleScope.createSelectQuery */ - public fun createTemporarySelectQuery(initializer: SelectQueryCreator): Select + public fun createTemporarySelectQuery(initializer: SelectQueryCreator): SelectQuery /** * Functional interface for creating 'INSERT ... VALUES' query. @@ -139,9 +141,9 @@ public interface CreateModuleScope { * @param TableUserExtension User's type with descriptors related to table to which values will be inserted. * @param QueryUserWrapper User's type with descriptors related to query. * - * @see CreateModuleScope.createInsertParamsQuery + * @see CreateModuleScope.createInsertQuery */ - public interface InsertParamsQueryCreator { + public interface InsertQueryCreator { /** * Scope method that uses [creator] to create a query. * @@ -149,9 +151,9 @@ public interface CreateModuleScope { * @param creator Object with descriptor providers and factories. * @return User's object with query-related descriptors for future access. * - * @see CreateModuleScope.createInsertParamsQuery + * @see CreateModuleScope.createInsertQuery */ - public fun createInsert(table: Table, creator: InsertCreator.InsertParams): QueryUserWrapper + public fun createInsert(table: Table, creator: CreateInsertQueryScope): QueryUserWrapper } /** @@ -164,13 +166,13 @@ public interface CreateModuleScope { * @param initializer Query-related descriptors initializer. * @return Query descriptor. * - * @see CreateModuleScope.createTemporaryInsertParamsQuery + * @see CreateModuleScope.createTemporaryInsertQuery */ - public fun createInsertParamsQuery(table: Table, initializer: InsertParamsQueryCreator): Insert.InsertParams + public fun createInsertQuery(table: Table, initializer: InsertQueryCreator): InsertQuery /** * Creates 'INSERT ... VALUES' query accessible only while the module is [creating][ModuleTemplate.ModuleCreator] or [updating][ModuleTemplate.ModuleUpgrade]. - * Using this function instead of [CreateModuleScope.createInsertParamsQuery] may help the driver to optimize caches and runtime indexes. + * Using this function instead of [CreateModuleScope.createInsertQuery] may help the driver to optimize caches and runtime indexes. * * On [module upgrading][ModuleTemplate.CreateModuleTemplatesScope.upgradeTemplate] must be recreated if needed. * @@ -179,9 +181,9 @@ public interface CreateModuleScope { * @param initializer Query-related descriptors initializer. * @return Query descriptor. * - * @see CreateModuleScope.createInsertParamsQuery + * @see CreateModuleScope.createInsertQuery */ - public fun createTemporaryInsertParamsQuery(table: Table, initializer: InsertParamsQueryCreator): Insert.InsertParams + public fun createTemporaryInsertQuery(table: Table, initializer: InsertQueryCreator): InsertQuery /** * Functional interface for creating 'INSERT ... FROM' query. @@ -191,9 +193,9 @@ public interface CreateModuleScope { * @param TableUserExtension User's type with descriptors related to table to which values will be inserted. * @param QueryUserWrapper User's type with descriptors related to query. * - * @see CreateModuleScope.createInsertFromQueryQuery + * @see CreateModuleScope.createCopyQuery */ - public interface InsertFromQueryQueryCreator { + public interface CopyQueryCreator { /** * Scope method that uses [creator] to create a query. * @@ -201,9 +203,9 @@ public interface CreateModuleScope { * @param creator Object with descriptor providers and factories. * @return User's object with query-related descriptors for future access. * - * @see CreateModuleScope.createInsertFromQueryQuery + * @see CreateModuleScope.createCopyQuery */ - public fun createInsert(table: Table, creator: InsertCreator.InsertFromQuery): QueryUserWrapper + public fun createCopy(table: Table, creator: CreateCopyQueryScope): QueryUserWrapper } /** @@ -215,13 +217,13 @@ public interface CreateModuleScope { * @param initializer Query-related descriptors initializer. * @return Query descriptor. * - * @see CreateModuleScope.createTemporaryInsertFromQueryQuery + * @see CreateModuleScope.createTemporaryCopyQuery */ - public fun createInsertFromQueryQuery(table: Table, initializer: InsertFromQueryQueryCreator): Insert.InsertFromQuery + public fun createCopyQuery(table: Table, initializer: CopyQueryCreator): CopyQuery /** * Creates 'INSERT ... FROM' query accessible only while the module is [creating][ModuleTemplate.ModuleCreator] or [updating][ModuleTemplate.ModuleUpgrade]. - * Using this function instead of [CreateModuleScope.createInsertFromQueryQuery] may help the driver to optimize caches and runtime indexes. + * Using this function instead of [CreateModuleScope.createCopyQuery] may help the driver to optimize caches and runtime indexes. * * On [module upgrading][ModuleTemplate.CreateModuleTemplatesScope.upgradeTemplate] must be recreated if needed. * @@ -229,9 +231,9 @@ public interface CreateModuleScope { * @param initializer Query-related descriptors initializer. * @return Query descriptor. * - * @see CreateModuleScope.createInsertFromQueryQuery + * @see CreateModuleScope.createCopyQuery */ - public fun createTemporaryInsertFromQueryQuery(table: Table, initializer: InsertFromQueryQueryCreator): Insert.InsertFromQuery + public fun createTemporaryCopyQuery(table: Table, initializer: CopyQueryCreator): CopyQuery /** * Functional interface for creating 'UPDATE' query. @@ -253,7 +255,7 @@ public interface CreateModuleScope { * * @see CreateModuleScope.createUpdateQuery */ - public fun createUpdate(table: Table, creator: ru.landgrafhomyak.serdha.api.v0.dml.UpdateCreator): QueryUserWrapper + public fun createUpdate(table: Table, creator: ru.landgrafhomyak.serdha.api.v0.dml.CreateUpdateQueryScope): QueryUserWrapper } /** @@ -267,7 +269,7 @@ public interface CreateModuleScope { * * @see CreateModuleScope.createTemporaryUpdateQuery */ - public fun createUpdateQuery(table: Table, initializer: UpdateQueryCreator): Update + public fun createUpdateQuery(table: Table, initializer: UpdateQueryCreator): UpdateQuery /** * Creates 'UPDATE' query accessible only while the module is [creating][ModuleTemplate.ModuleCreator] or [updating][ModuleTemplate.ModuleUpgrade]. @@ -281,7 +283,7 @@ public interface CreateModuleScope { * * @see CreateModuleScope.createUpdateQuery */ - public fun createTemporaryUpdateQuery(table: Table, initializer: UpdateQueryCreator): Update + public fun createTemporaryUpdateQuery(table: Table, initializer: UpdateQueryCreator): UpdateQuery /** * Functional interface for creating 'DELETE' query. @@ -303,7 +305,7 @@ public interface CreateModuleScope { * * @see CreateModuleScope.createDeleteQuery */ - public fun createDelete(table: Table, creator: ru.landgrafhomyak.serdha.api.v0.dml.DeleteCreator): QueryUserWrapper + public fun createDelete(table: Table, creator: ru.landgrafhomyak.serdha.api.v0.dml.CreateDeleteQueryScope): QueryUserWrapper } /** @@ -317,7 +319,7 @@ public interface CreateModuleScope { * * @see CreateModuleScope.createTemporaryDeleteQuery */ - public fun createDeleteQuery(table: Table, initializer: DeleteQueryCreator): Delete + public fun createDeleteQuery(table: Table, initializer: DeleteQueryCreator): DeleteQuery /** * Creates 'DELETE' query accessible only while the module is [creating][ModuleTemplate.ModuleCreator] or [updating][ModuleTemplate.ModuleUpgrade]. @@ -331,7 +333,7 @@ public interface CreateModuleScope { * * @see CreateModuleScope.createDeleteQuery */ - public fun createTemporaryDeleteQuery(table: Table, initializer: DeleteQueryCreator): Delete + public fun createTemporaryDeleteQuery(table: Table, initializer: DeleteQueryCreator): DeleteQuery /** * Replaces [specified namespace][rootNs] with schema provided by [template]. diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/Column.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/Column.kt index 808ff8b..049271a 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/Column.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/Column.kt @@ -1,9 +1,13 @@ package ru.landgrafhomyak.serdha.api.v0.ddl.table -public interface Column, TableUserExtension : Any> { +import kotlin.jvm.JvmName +import ru.landgrafhomyak.serdha.api.v0.ddl.types.DatabaseType +import ru.landgrafhomyak.serdha.api.v0.dml.SelectedTable + +public interface Column, TableUserExtension : Any> { public val name: String - public val type: DatabaseType + public val type: DT public val table: Table } \ No newline at end of file diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/CreateTableScope.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/CreateTableScope.kt new file mode 100644 index 0000000..3dc898b --- /dev/null +++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/CreateTableScope.kt @@ -0,0 +1,38 @@ +package ru.landgrafhomyak.serdha.api.v0.ddl.table + +import ru.landgrafhomyak.serdha.api.v0.Expression +import ru.landgrafhomyak.serdha.api.v0.ddl.types.DatabaseType +import ru.landgrafhomyak.serdha.api.v0.ddl.types.DatabaseTypesProvider +import ru.landgrafhomyak.serdha.api.v0.ddl.types.RowId + +public interface CreateTableScope { + public val expressionBuilder: Expression.Builder + + public val types: DatabaseTypesProvider + + public fun > column(name: String, type: DT): Column + + public fun index(name: String, vararg columns: Column<*, *, TableUserExtension>): Index + + public fun uniqueIndex(name: String, distinctNulls: Boolean, vararg columns: Column<*, *, TableUserExtension>): UniqueIndex + public fun checkConstraint(name: String, constraint: Expression): CheckConstraint + public fun > defaultValue(c: Column, expr: Expression): DefaultConstraint + + @Suppress("PropertyName") + public val rowId_column: Column, DatabaseType>, TableUserExtension> + + @Suppress("PropertyName") + public val rowId_uniqueConstraint: UniqueIndex + + public fun selfRowReference( + onDelete: ForeignRowReference.OnDeleteAction, + toColumn: Column, DatabaseType.ROW_ID, TargetTableUserWrapper>, + ): ForeignRowReference + + public fun foreignRowReference( + fromColumn: Column, DatabaseType.ROW_ID, TableUserExtension>, + toTable: Table, + toColumn: Column, DatabaseType.ROW_ID, TargetTableUserWrapper>, + onDelete: ForeignRowReference.OnDeleteAction, + ): ForeignRowReference +} \ No newline at end of file diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/TableCreator.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/TableCreator.kt deleted file mode 100644 index b52f120..0000000 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/TableCreator.kt +++ /dev/null @@ -1,35 +0,0 @@ -package ru.landgrafhomyak.serdha.api.v0.ddl.table - -import ru.landgrafhomyak.serdha.api.v0.Expression - -public interface TableCreator { - public val expressionBuilder: Expression.Builder - - public val types: ColumnType.Builder - - public fun > column(name: String, type: DatabaseType): Column - - public fun index(name: String, vararg columns: Column<*, *, TableUserExtension>): Index - - public fun uniqueIndex(name: String, distinctNulls: Boolean, vararg columns: Column<*, *, TableUserExtension>): UniqueIndex - public fun checkConstraint(name: String, constraint: Expression): CheckConstraint - public fun > defaultValue(c: Column, expr: Expression): DefaultConstraint - - @Suppress("PropertyName") - public val rowId_column: Column, ColumnType>, TableUserExtension> - - @Suppress("PropertyName") - public val rowId_uniqueConstraint: UniqueIndex - - public fun selfRowReference( - onDelete: ForeignRowReference.OnDeleteAction, - toColumn: Column, ColumnType.ROW_ID, TargetTableUserWrapper>, - ): ForeignRowReference - - public fun foreignRowReference( - fromColumn: Column, ColumnType.ROW_ID, TableUserExtension>, - toTable: Table, - toColumn: Column, ColumnType.ROW_ID, TargetTableUserWrapper>, - onDelete: ForeignRowReference.OnDeleteAction, - ): ForeignRowReference -} \ No newline at end of file