From 2d7b2a575b1e7ba8ab0bc157a49e35f34ca5cc07 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Wed, 20 Nov 2024 03:09:05 +0800 Subject: [PATCH] Move all the code in the package `postgresql` into the "postgresql" module --- integrated/build.gradle.kts | 4 ++-- postgresql/build.gradle.kts | 2 ++ .../exposedvertxsqlclient/postgresql/DatabaseClient.kt | 0 .../postgresql/exposed/ExposedDatabases.kt | 0 .../postgresql/local/LocalConnectionConfig.kt | 0 .../postgresql/vertx/pgclient/PgClients.kt | 0 6 files changed, 4 insertions(+), 2 deletions(-) rename {core => postgresql}/src/main/kotlin/com/huanshankeji/exposedvertxsqlclient/postgresql/DatabaseClient.kt (100%) rename {core => postgresql}/src/main/kotlin/com/huanshankeji/exposedvertxsqlclient/postgresql/exposed/ExposedDatabases.kt (100%) rename {core => postgresql}/src/main/kotlin/com/huanshankeji/exposedvertxsqlclient/postgresql/local/LocalConnectionConfig.kt (100%) rename {core => postgresql}/src/main/kotlin/com/huanshankeji/exposedvertxsqlclient/postgresql/vertx/pgclient/PgClients.kt (100%) diff --git a/integrated/build.gradle.kts b/integrated/build.gradle.kts index 0c7ada2..9362b8b 100644 --- a/integrated/build.gradle.kts +++ b/integrated/build.gradle.kts @@ -9,8 +9,8 @@ dependencies { with(commonDependencies.vertx) { implementation(platformStackDepchain()) } // needed implementation(cpnProject(project, ":core")) - - // for the examples + implementation(cpnProject(project, ":postgresql")) + implementation(cpnProject(project, ":sql-dsl")) implementation("com.huanshankeji:exposed-adt-mapping:${DependencyVersions.exposedAdtMapping}") implementation(cpnProject(project, ":sql-dsl-with-mapper")) } diff --git a/postgresql/build.gradle.kts b/postgresql/build.gradle.kts index f23dd0d..0321367 100644 --- a/postgresql/build.gradle.kts +++ b/postgresql/build.gradle.kts @@ -10,4 +10,6 @@ dependencies { runtimeOnly(commonDependencies.postgreSql()) implementation(commonDependencies.vertx.moduleWithoutVersion("pg-client")) + implementation(commonDependencies.kotlinCommon.core()) // for `Untested` + implementation(commonDependencies.kotlinCommon.vertx()) // for `PgPoolOptions.setUpConventionally` } diff --git a/core/src/main/kotlin/com/huanshankeji/exposedvertxsqlclient/postgresql/DatabaseClient.kt b/postgresql/src/main/kotlin/com/huanshankeji/exposedvertxsqlclient/postgresql/DatabaseClient.kt similarity index 100% rename from core/src/main/kotlin/com/huanshankeji/exposedvertxsqlclient/postgresql/DatabaseClient.kt rename to postgresql/src/main/kotlin/com/huanshankeji/exposedvertxsqlclient/postgresql/DatabaseClient.kt diff --git a/core/src/main/kotlin/com/huanshankeji/exposedvertxsqlclient/postgresql/exposed/ExposedDatabases.kt b/postgresql/src/main/kotlin/com/huanshankeji/exposedvertxsqlclient/postgresql/exposed/ExposedDatabases.kt similarity index 100% rename from core/src/main/kotlin/com/huanshankeji/exposedvertxsqlclient/postgresql/exposed/ExposedDatabases.kt rename to postgresql/src/main/kotlin/com/huanshankeji/exposedvertxsqlclient/postgresql/exposed/ExposedDatabases.kt diff --git a/core/src/main/kotlin/com/huanshankeji/exposedvertxsqlclient/postgresql/local/LocalConnectionConfig.kt b/postgresql/src/main/kotlin/com/huanshankeji/exposedvertxsqlclient/postgresql/local/LocalConnectionConfig.kt similarity index 100% rename from core/src/main/kotlin/com/huanshankeji/exposedvertxsqlclient/postgresql/local/LocalConnectionConfig.kt rename to postgresql/src/main/kotlin/com/huanshankeji/exposedvertxsqlclient/postgresql/local/LocalConnectionConfig.kt diff --git a/core/src/main/kotlin/com/huanshankeji/exposedvertxsqlclient/postgresql/vertx/pgclient/PgClients.kt b/postgresql/src/main/kotlin/com/huanshankeji/exposedvertxsqlclient/postgresql/vertx/pgclient/PgClients.kt similarity index 100% rename from core/src/main/kotlin/com/huanshankeji/exposedvertxsqlclient/postgresql/vertx/pgclient/PgClients.kt rename to postgresql/src/main/kotlin/com/huanshankeji/exposedvertxsqlclient/postgresql/vertx/pgclient/PgClients.kt