diff --git a/build.gradle.kts b/build.gradle.kts index 82838a6..edbc62b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,7 @@ buildscript { } } -group = "ru.landgrafhomyak.serdha" +group = "ru.landgrafhomyak.db.serdha" version = "0.0" repositories { diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/LowLevelApi.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/LowLevelApi.kt similarity index 81% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/LowLevelApi.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/LowLevelApi.kt index 268c693..224bea3 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/LowLevelApi.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/LowLevelApi.kt @@ -1,4 +1,4 @@ -package ru.landgrafhomyak.serdha.api.v0 +package ru.landgrafhomyak.db.serdha0.api @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY) @Retention(AnnotationRetention.BINARY) diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/BuiltinExpressionsProvider.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/BuiltinExpressionsProvider.kt similarity index 62% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/BuiltinExpressionsProvider.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/BuiltinExpressionsProvider.kt index 991c7ab..d26b862 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/BuiltinExpressionsProvider.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/BuiltinExpressionsProvider.kt @@ -1,4 +1,4 @@ -package ru.landgrafhomyak.serdha.api.v0.misc +package ru.landgrafhomyak.db.serdha0.api.misc public interface BuiltinExpressionsProvider { } \ No newline at end of file diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/Column.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/Column.kt similarity index 91% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/Column.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/Column.kt index 72f3669..3fff0ae 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/Column.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/Column.kt @@ -1,7 +1,7 @@ -package ru.landgrafhomyak.serdha.api.v0.misc +package ru.landgrafhomyak.db.serdha0.api.misc import kotlin.jvm.JvmName -import ru.landgrafhomyak.serdha.api.v0.table.Table +import ru.landgrafhomyak.db.serdha0.api.table.Table /** * Descriptor of data column (of table or query). Used for schema manipulations and [access in queries builder][SelectedTable.selectColumn]. diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/DatabaseType.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/DatabaseType.kt similarity index 85% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/DatabaseType.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/DatabaseType.kt index b746d7f..d2d28cf 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/DatabaseType.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/DatabaseType.kt @@ -1,9 +1,9 @@ -package ru.landgrafhomyak.serdha.api.v0.misc +package ru.landgrafhomyak.db.serdha0.api.misc import kotlin.jvm.JvmField import kotlin.jvm.JvmName -import ru.landgrafhomyak.serdha.api.v0.table.RowId -import ru.landgrafhomyak.serdha.api.v0.table.Table +import ru.landgrafhomyak.db.serdha0.api.table.RowId +import ru.landgrafhomyak.db.serdha0.api.table.Table /** * Descriptor of a database type. @@ -63,17 +63,17 @@ public interface DatabaseType<@Suppress("unused") RuntimeType> { @Suppress("INAPPLICABLE_JVM_NAME", "PropertyName") @get:JvmName("BOOLEAN") - public val BOOLEAN: DatabaseType.BOOLEAN + public val BOOLEAN: BOOLEAN @Suppress("INAPPLICABLE_JVM_NAME", "PropertyName") @get:JvmName("BINARY_DATA") - public val BINARY_DATA: DatabaseType.BINARY_DATA + public val BINARY_DATA: BINARY_DATA @Suppress("INAPPLICABLE_JVM_NAME") @JvmName("BINARY_DATA") - public fun BINARY_DATA(size: UInt, isFixedSize: Boolean): DatabaseType.BINARY_DATA + public fun BINARY_DATA(size: UInt, isFixedSize: Boolean): BINARY_DATA - public fun > nullableOf(notNull: DT): DatabaseType.Nullable + public fun > nullableOf(notNull: DT): Nullable } } diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/Expression.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/Expression.kt similarity index 92% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/Expression.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/Expression.kt index d7748b2..14c0ba5 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/Expression.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/Expression.kt @@ -1,7 +1,7 @@ -package ru.landgrafhomyak.serdha.api.v0.misc +package ru.landgrafhomyak.db.serdha0.api.misc -import ru.landgrafhomyak.serdha.api.v0.runtime.InputRow -import ru.landgrafhomyak.serdha.api.v0.runtime.OutputRow +import ru.landgrafhomyak.db.serdha0.api.runtime.InputRow +import ru.landgrafhomyak.db.serdha0.api.runtime.OutputRow public interface Expression { public val userExtension: ExpressionUserExtension diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/FiltersScope.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/FiltersScope.kt similarity index 95% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/FiltersScope.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/FiltersScope.kt index 673e2e9..bdbc71d 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/FiltersScope.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/FiltersScope.kt @@ -1,4 +1,4 @@ -package ru.landgrafhomyak.serdha.api.v0.misc +package ru.landgrafhomyak.db.serdha0.api.misc public interface FiltersScope { public fun > filterNotNull(nullable: IntermediateColumn, oqUE>): IntermediateColumn diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/IntermediateColumn.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/IntermediateColumn.kt similarity index 68% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/IntermediateColumn.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/IntermediateColumn.kt index 522ea83..ad568d7 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/IntermediateColumn.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/IntermediateColumn.kt @@ -1,4 +1,4 @@ -package ru.landgrafhomyak.serdha.api.v0.misc +package ru.landgrafhomyak.db.serdha0.api.misc public interface IntermediateColumn, OwnerBuilderUserExtension : Any> { diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/QueryParam.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/QueryParam.kt similarity index 78% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/QueryParam.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/QueryParam.kt index 9063259..6ba77e5 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/QueryParam.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/QueryParam.kt @@ -1,4 +1,4 @@ -package ru.landgrafhomyak.serdha.api.v0.misc +package ru.landgrafhomyak.db.serdha0.api.misc public interface QueryParam, OwnerQueryUserExtension : Any> { public val name: String diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/_Selectable.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/_Selectable.kt similarity index 68% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/_Selectable.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/_Selectable.kt index b35d507..dd442d7 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/misc/_Selectable.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/misc/_Selectable.kt @@ -1,4 +1,4 @@ -package ru.landgrafhomyak.serdha.api.v0.misc +package ru.landgrafhomyak.db.serdha0.api.misc @Suppress("ClassName") public interface _Selectable<@Suppress("unused") QueryUserExtension : Any> \ No newline at end of file diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/module/CreateModuleScope.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/module/CreateModuleScope.kt similarity index 92% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/module/CreateModuleScope.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/module/CreateModuleScope.kt index 86e4e68..6c67991 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/module/CreateModuleScope.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/module/CreateModuleScope.kt @@ -1,10 +1,10 @@ -package ru.landgrafhomyak.serdha.api.v0.module +package ru.landgrafhomyak.db.serdha0.api.module -import ru.landgrafhomyak.serdha.api.v0.table.Table -import ru.landgrafhomyak.serdha.api.v0.queries.QueryCreator -import ru.landgrafhomyak.serdha.api.v0.runtime.SynchronizedDatabase -import ru.landgrafhomyak.serdha.api.v0.runtime.Transaction -import ru.landgrafhomyak.serdha.api.v0.table.CreateTableScope +import ru.landgrafhomyak.db.serdha0.api.table.Table +import ru.landgrafhomyak.db.serdha0.api.queries.QueryCreator +import ru.landgrafhomyak.db.serdha0.api.runtime.SynchronizedDatabase +import ru.landgrafhomyak.db.serdha0.api.runtime.Transaction +import ru.landgrafhomyak.db.serdha0.api.table.CreateTableScope /** * Scope methods for creating new [module template][ModuleTemplate]. diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/module/Module.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/module/Module.kt similarity index 87% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/module/Module.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/module/Module.kt index 4d69f38..bb5cbde 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/module/Module.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/module/Module.kt @@ -1,7 +1,7 @@ -package ru.landgrafhomyak.serdha.api.v0.module +package ru.landgrafhomyak.db.serdha0.api.module import kotlin.jvm.JvmName -import ru.landgrafhomyak.serdha.api.v0.runtime.SynchronizedDatabase +import ru.landgrafhomyak.db.serdha0.api.runtime.SynchronizedDatabase /** * Descriptor of synchronized module. Used for schema manipulations. diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/module/ModuleTemplate.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/module/ModuleTemplate.kt similarity index 92% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/module/ModuleTemplate.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/module/ModuleTemplate.kt index 029b86c..23741d7 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/module/ModuleTemplate.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/module/ModuleTemplate.kt @@ -1,6 +1,6 @@ -package ru.landgrafhomyak.serdha.api.v0.module +package ru.landgrafhomyak.db.serdha0.api.module -import ru.landgrafhomyak.serdha.api.v0.runtime.Transaction +import ru.landgrafhomyak.db.serdha0.api.runtime.Transaction public interface ModuleTemplate<@Suppress("unused") ModuleUserExtension : Any> { public interface Provider { diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/module/Namespace.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/module/Namespace.kt similarity index 78% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/module/Namespace.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/module/Namespace.kt index 32cf96f..40f935f 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/module/Namespace.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/module/Namespace.kt @@ -1,4 +1,4 @@ -package ru.landgrafhomyak.serdha.api.v0.module +package ru.landgrafhomyak.db.serdha0.api.module public interface Namespace { @Suppress("SpellCheckingInspection") diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/module/UpgradeModuleScope.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/module/UpgradeModuleScope.kt similarity index 97% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/module/UpgradeModuleScope.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/module/UpgradeModuleScope.kt index c49b3a5..4092fb7 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/module/UpgradeModuleScope.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/module/UpgradeModuleScope.kt @@ -1,7 +1,7 @@ -package ru.landgrafhomyak.serdha.api.v0.module +package ru.landgrafhomyak.db.serdha0.api.module -import ru.landgrafhomyak.serdha.api.v0.table.Table -import ru.landgrafhomyak.serdha.api.v0.table.UpdateTableScope +import ru.landgrafhomyak.db.serdha0.api.table.Table +import ru.landgrafhomyak.db.serdha0.api.table.UpdateTableScope /** * Scope methods for upgrading [module template][ModuleTemplate]. diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/queries/DeleteQuery.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/DeleteQuery.kt similarity index 86% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/queries/DeleteQuery.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/DeleteQuery.kt index ced0249..0204803 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/queries/DeleteQuery.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/DeleteQuery.kt @@ -1,12 +1,12 @@ -package ru.landgrafhomyak.serdha.api.v0.queries +package ru.landgrafhomyak.db.serdha0.api.queries -import ru.landgrafhomyak.serdha.api.v0.misc.Column -import ru.landgrafhomyak.serdha.api.v0.misc.DatabaseType -import ru.landgrafhomyak.serdha.api.v0.misc.QueryParam -import ru.landgrafhomyak.serdha.api.v0.misc._Selectable -import ru.landgrafhomyak.serdha.api.v0.runtime.InputRow -import ru.landgrafhomyak.serdha.api.v0.table.RowId -import ru.landgrafhomyak.serdha.api.v0.table.Table +import ru.landgrafhomyak.db.serdha0.api.misc.Column +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 +import ru.landgrafhomyak.db.serdha0.api.table.Table public interface DeleteQuery : _Query { public interface SingleRow : DeleteQuery, _Query.Params2Table { diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/queries/InsertQuery.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/InsertQuery.kt similarity index 89% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/queries/InsertQuery.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/InsertQuery.kt index 5775dfc..498b1f5 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/queries/InsertQuery.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/InsertQuery.kt @@ -1,12 +1,12 @@ -package ru.landgrafhomyak.serdha.api.v0.queries +package ru.landgrafhomyak.db.serdha0.api.queries -import ru.landgrafhomyak.serdha.api.v0.misc.Column -import ru.landgrafhomyak.serdha.api.v0.table.Table -import ru.landgrafhomyak.serdha.api.v0.misc.DatabaseType -import ru.landgrafhomyak.serdha.api.v0.misc.QueryParam -import ru.landgrafhomyak.serdha.api.v0.misc._Selectable -import ru.landgrafhomyak.serdha.api.v0.runtime.InputRow -import ru.landgrafhomyak.serdha.api.v0.table.UniqueIndex +import ru.landgrafhomyak.db.serdha0.api.misc.Column +import ru.landgrafhomyak.db.serdha0.api.table.Table +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.UniqueIndex public interface InsertQuery : _Query { @Suppress("ClassName") diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/queries/QueryCreator.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/QueryCreator.kt similarity index 92% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/queries/QueryCreator.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/QueryCreator.kt index c3e8454..d8d5929 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/queries/QueryCreator.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/QueryCreator.kt @@ -1,7 +1,7 @@ -package ru.landgrafhomyak.serdha.api.v0.queries +package ru.landgrafhomyak.db.serdha0.api.queries -import ru.landgrafhomyak.serdha.api.v0.misc._Selectable -import ru.landgrafhomyak.serdha.api.v0.table.Table +import ru.landgrafhomyak.db.serdha0.api.misc._Selectable +import ru.landgrafhomyak.db.serdha0.api.table.Table public interface QueryCreator { public fun createQuery(internalQueries: Scope, outQueries: Scope): qUE diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/queries/SelectQuery.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/SelectQuery.kt similarity index 84% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/queries/SelectQuery.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/SelectQuery.kt index 7588886..e38e624 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/queries/SelectQuery.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/SelectQuery.kt @@ -1,14 +1,14 @@ -package ru.landgrafhomyak.serdha.api.v0.queries +package ru.landgrafhomyak.db.serdha0.api.queries -import ru.landgrafhomyak.serdha.api.v0.misc.BuiltinExpressionsProvider -import ru.landgrafhomyak.serdha.api.v0.misc.Column -import ru.landgrafhomyak.serdha.api.v0.misc.IntermediateColumn -import ru.landgrafhomyak.serdha.api.v0.misc.DatabaseType -import ru.landgrafhomyak.serdha.api.v0.misc.Expression -import ru.landgrafhomyak.serdha.api.v0.misc.FiltersScope -import ru.landgrafhomyak.serdha.api.v0.misc.QueryParam -import ru.landgrafhomyak.serdha.api.v0.misc._Selectable -import ru.landgrafhomyak.serdha.api.v0.runtime.InputRow +import ru.landgrafhomyak.db.serdha0.api.misc.BuiltinExpressionsProvider +import ru.landgrafhomyak.db.serdha0.api.misc.Column +import ru.landgrafhomyak.db.serdha0.api.misc.IntermediateColumn +import ru.landgrafhomyak.db.serdha0.api.misc.DatabaseType +import ru.landgrafhomyak.db.serdha0.api.misc.Expression +import ru.landgrafhomyak.db.serdha0.api.misc.FiltersScope +import ru.landgrafhomyak.db.serdha0.api.misc.QueryParam +import ru.landgrafhomyak.db.serdha0.api.misc._Selectable +import ru.landgrafhomyak.db.serdha0.api.runtime.InputRow public interface SelectQuery : _Query { public enum class Order { diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/queries/UpdateQuery.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/UpdateQuery.kt similarity index 91% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/queries/UpdateQuery.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/UpdateQuery.kt index 0041aa2..0ccbb85 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/queries/UpdateQuery.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/UpdateQuery.kt @@ -1,11 +1,11 @@ -package ru.landgrafhomyak.serdha.api.v0.queries +package ru.landgrafhomyak.db.serdha0.api.queries -import ru.landgrafhomyak.serdha.api.v0.misc.Column -import ru.landgrafhomyak.serdha.api.v0.table.Table -import ru.landgrafhomyak.serdha.api.v0.misc.DatabaseType -import ru.landgrafhomyak.serdha.api.v0.misc.QueryParam -import ru.landgrafhomyak.serdha.api.v0.misc._Selectable -import ru.landgrafhomyak.serdha.api.v0.runtime.InputRow +import ru.landgrafhomyak.db.serdha0.api.misc.Column +import ru.landgrafhomyak.db.serdha0.api.table.Table +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 public interface UpdateQuery : _Query { public interface SingleRow : UpdateQuery, _Query.Params2Table { diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/queries/_Query.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/_Query.kt similarity index 83% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/queries/_Query.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/_Query.kt index c5d3302..bd650ab 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/queries/_Query.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/queries/_Query.kt @@ -1,6 +1,6 @@ -package ru.landgrafhomyak.serdha.api.v0.queries +package ru.landgrafhomyak.db.serdha0.api.queries -import ru.landgrafhomyak.serdha.api.v0.misc._Selectable +import ru.landgrafhomyak.db.serdha0.api.misc._Selectable @Suppress("ClassName") diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/InputRow.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/runtime/InputRow.kt similarity index 90% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/InputRow.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/runtime/InputRow.kt index 540864a..32b4fba 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/InputRow.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/runtime/InputRow.kt @@ -1,8 +1,8 @@ -package ru.landgrafhomyak.serdha.api.v0.runtime +package ru.landgrafhomyak.db.serdha0.api.runtime -import ru.landgrafhomyak.serdha.api.v0.LowLevelApi -import ru.landgrafhomyak.serdha.api.v0.misc.DatabaseType -import ru.landgrafhomyak.serdha.api.v0.misc.QueryParam +import ru.landgrafhomyak.db.serdha0.api.LowLevelApi +import ru.landgrafhomyak.db.serdha0.api.misc.DatabaseType +import ru.landgrafhomyak.db.serdha0.api.misc.QueryParam public interface InputRow { public operator fun set(c: QueryParam, value: RuntimeType) diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/OutputRow.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/runtime/OutputRow.kt similarity index 90% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/OutputRow.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/runtime/OutputRow.kt index c912678..62d2c62 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/OutputRow.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/runtime/OutputRow.kt @@ -1,7 +1,7 @@ -package ru.landgrafhomyak.serdha.api.v0.runtime +package ru.landgrafhomyak.db.serdha0.api.runtime -import ru.landgrafhomyak.serdha.api.v0.LowLevelApi -import ru.landgrafhomyak.serdha.api.v0.misc.Column +import ru.landgrafhomyak.db.serdha0.api.LowLevelApi +import ru.landgrafhomyak.db.serdha0.api.misc.Column public interface OutputRow { public operator fun get(c: Column): RuntimeType diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/SynchronizedDatabase.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/runtime/SynchronizedDatabase.kt similarity index 84% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/SynchronizedDatabase.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/runtime/SynchronizedDatabase.kt index 7677b9d..19cfd59 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/SynchronizedDatabase.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/runtime/SynchronizedDatabase.kt @@ -1,10 +1,10 @@ -package ru.landgrafhomyak.serdha.api.v0.runtime +package ru.landgrafhomyak.db.serdha0.api.runtime -import ru.landgrafhomyak.serdha.api.v0.LowLevelApi -import ru.landgrafhomyak.serdha.api.v0.module.Module -import ru.landgrafhomyak.serdha.api.v0.table.RowId -import ru.landgrafhomyak.serdha.api.v0.table.Table -import ru.landgrafhomyak.serdha.api.v0.queries._Query +import ru.landgrafhomyak.db.serdha0.api.LowLevelApi +import ru.landgrafhomyak.db.serdha0.api.module.Module +import ru.landgrafhomyak.db.serdha0.api.table.RowId +import ru.landgrafhomyak.db.serdha0.api.table.Table +import ru.landgrafhomyak.db.serdha0.api.queries._Query public interface SynchronizedDatabase : Module { @Suppress("FunctionName") diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/Transaction.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/runtime/Transaction.kt similarity index 87% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/Transaction.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/runtime/Transaction.kt index 85b2c99..4d443a7 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/Transaction.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/runtime/Transaction.kt @@ -1,7 +1,7 @@ -package ru.landgrafhomyak.serdha.api.v0.runtime +package ru.landgrafhomyak.db.serdha0.api.runtime -import ru.landgrafhomyak.serdha.api.v0.LowLevelApi -import ru.landgrafhomyak.serdha.api.v0.queries._Query +import ru.landgrafhomyak.db.serdha0.api.LowLevelApi +import ru.landgrafhomyak.db.serdha0.api.queries._Query public interface Transaction { @Suppress("FunctionName") diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/UnsynchronizedDatabase.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/runtime/UnsynchronizedDatabase.kt similarity index 75% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/UnsynchronizedDatabase.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/runtime/UnsynchronizedDatabase.kt index 8b1d1e6..4452325 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/UnsynchronizedDatabase.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/runtime/UnsynchronizedDatabase.kt @@ -1,6 +1,6 @@ -package ru.landgrafhomyak.serdha.api.v0.runtime +package ru.landgrafhomyak.db.serdha0.api.runtime -import ru.landgrafhomyak.serdha.api.v0.module.ModuleTemplate +import ru.landgrafhomyak.db.serdha0.api.module.ModuleTemplate @Suppress("SpellCheckingInspection") public interface UnsynchronizedDatabase { diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/CheckConstraint.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/CheckConstraint.kt similarity index 81% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/CheckConstraint.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/CheckConstraint.kt index bceb8f1..c91f66c 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/CheckConstraint.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/CheckConstraint.kt @@ -1,11 +1,11 @@ -package ru.landgrafhomyak.serdha.api.v0.table +package ru.landgrafhomyak.db.serdha0.api.table import kotlin.jvm.JvmName -import ru.landgrafhomyak.serdha.api.v0.misc.BuiltinExpressionsProvider -import ru.landgrafhomyak.serdha.api.v0.misc.Column -import ru.landgrafhomyak.serdha.api.v0.misc.IntermediateColumn -import ru.landgrafhomyak.serdha.api.v0.misc.DatabaseType -import ru.landgrafhomyak.serdha.api.v0.misc.Expression +import ru.landgrafhomyak.db.serdha0.api.misc.BuiltinExpressionsProvider +import ru.landgrafhomyak.db.serdha0.api.misc.Column +import ru.landgrafhomyak.db.serdha0.api.misc.IntermediateColumn +import ru.landgrafhomyak.db.serdha0.api.misc.DatabaseType +import ru.landgrafhomyak.db.serdha0.api.misc.Expression public interface CheckConstraint { @Suppress("INAPPLICABLE_JVM_NAME") diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/CreateTableScope.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/CreateTableScope.kt similarity index 92% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/CreateTableScope.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/CreateTableScope.kt index 0186cd8..9e417a2 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/CreateTableScope.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/CreateTableScope.kt @@ -1,7 +1,7 @@ -package ru.landgrafhomyak.serdha.api.v0.table +package ru.landgrafhomyak.db.serdha0.api.table -import ru.landgrafhomyak.serdha.api.v0.misc.Column -import ru.landgrafhomyak.serdha.api.v0.misc.DatabaseType +import ru.landgrafhomyak.db.serdha0.api.misc.Column +import ru.landgrafhomyak.db.serdha0.api.misc.DatabaseType public interface CreateTableScope { public val types: DatabaseType.Provider diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/DefaultConstraint.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/DefaultConstraint.kt similarity index 81% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/DefaultConstraint.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/DefaultConstraint.kt index 0f4750a..905f00e 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/DefaultConstraint.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/DefaultConstraint.kt @@ -1,11 +1,11 @@ -package ru.landgrafhomyak.serdha.api.v0.table +package ru.landgrafhomyak.db.serdha0.api.table import kotlin.jvm.JvmName -import ru.landgrafhomyak.serdha.api.v0.misc.BuiltinExpressionsProvider -import ru.landgrafhomyak.serdha.api.v0.misc.Column -import ru.landgrafhomyak.serdha.api.v0.misc.IntermediateColumn -import ru.landgrafhomyak.serdha.api.v0.misc.DatabaseType -import ru.landgrafhomyak.serdha.api.v0.misc.Expression +import ru.landgrafhomyak.db.serdha0.api.misc.BuiltinExpressionsProvider +import ru.landgrafhomyak.db.serdha0.api.misc.Column +import ru.landgrafhomyak.db.serdha0.api.misc.IntermediateColumn +import ru.landgrafhomyak.db.serdha0.api.misc.DatabaseType +import ru.landgrafhomyak.db.serdha0.api.misc.Expression public interface DefaultConstraint { @Suppress("INAPPLICABLE_JVM_NAME") diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/ForeignRowReference.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/ForeignRowReference.kt similarity index 93% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/ForeignRowReference.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/ForeignRowReference.kt index 663be65..8489df1 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/ForeignRowReference.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/ForeignRowReference.kt @@ -1,8 +1,8 @@ -package ru.landgrafhomyak.serdha.api.v0.table +package ru.landgrafhomyak.db.serdha0.api.table import kotlin.jvm.JvmName -import ru.landgrafhomyak.serdha.api.v0.misc.Column -import ru.landgrafhomyak.serdha.api.v0.misc.DatabaseType +import ru.landgrafhomyak.db.serdha0.api.misc.Column +import ru.landgrafhomyak.db.serdha0.api.misc.DatabaseType /** * Descriptor of a reference to row in another table (== foreign key to `INTEGER PRIMARY KEY AUTOINCREMENT`). Used for schema manipulations. diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/Index.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/Index.kt similarity index 89% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/Index.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/Index.kt index ae8d11e..116878e 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/Index.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/Index.kt @@ -1,7 +1,7 @@ -package ru.landgrafhomyak.serdha.api.v0.table +package ru.landgrafhomyak.db.serdha0.api.table import kotlin.jvm.JvmName -import ru.landgrafhomyak.serdha.api.v0.misc.Column +import ru.landgrafhomyak.db.serdha0.api.misc.Column /** * Descriptor of index. Used for schema manipulations. diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/RowId.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/RowId.kt similarity index 61% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/RowId.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/RowId.kt index b9a20e8..b06249f 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/RowId.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/RowId.kt @@ -1,4 +1,4 @@ -package ru.landgrafhomyak.serdha.api.v0.table +package ru.landgrafhomyak.db.serdha0.api.table public interface RowId<@Suppress("unused") OwnerTableUserExtension: Any> \ No newline at end of file diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/Table.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/Table.kt similarity index 72% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/Table.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/Table.kt index b180161..7f506da 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/Table.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/Table.kt @@ -1,7 +1,7 @@ -package ru.landgrafhomyak.serdha.api.v0.table +package ru.landgrafhomyak.db.serdha0.api.table -import ru.landgrafhomyak.serdha.api.v0.misc._Selectable -import ru.landgrafhomyak.serdha.api.v0.module.Module +import ru.landgrafhomyak.db.serdha0.api.misc._Selectable +import ru.landgrafhomyak.db.serdha0.api.module.Module public interface Table : _Selectable { public val userExtension: UserExtension diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/UniqueIndex.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/UniqueIndex.kt similarity index 74% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/UniqueIndex.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/UniqueIndex.kt index 87c5460..2f58e41 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/UniqueIndex.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/UniqueIndex.kt @@ -1,4 +1,4 @@ -package ru.landgrafhomyak.serdha.api.v0.table +package ru.landgrafhomyak.db.serdha0.api.table public interface UniqueIndex : Index { public val areNullsDistinct: Boolean diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/UpdateTableScope.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/UpdateTableScope.kt similarity index 92% rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/UpdateTableScope.kt rename to src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/UpdateTableScope.kt index f77fa02..ee4ecda 100644 --- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/table/UpdateTableScope.kt +++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/serdha0/api/table/UpdateTableScope.kt @@ -1,9 +1,7 @@ -package ru.landgrafhomyak.serdha.api.v0.table +package ru.landgrafhomyak.db.serdha0.api.table -import ru.landgrafhomyak.serdha.api.v0.misc.BuiltinExpressionsProvider -import ru.landgrafhomyak.serdha.api.v0.misc.Column -import ru.landgrafhomyak.serdha.api.v0.misc.IntermediateColumn -import ru.landgrafhomyak.serdha.api.v0.misc.DatabaseType +import ru.landgrafhomyak.db.serdha0.api.misc.Column +import ru.landgrafhomyak.db.serdha0.api.misc.DatabaseType public interface UpdateTableScope : CreateTableScope {