#118: moving database -> demo_database folder, and moving examples

AbsaOSS · Apr 24, 2024 · 1650f30 · 1650f30
1 parent f25f70f
commit 1650f30
Show file tree

Hide file tree

Showing 26 changed files with 7 additions and 43 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -51,7 +51,6 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}/core/target/scala-${{ matrix.scalaShort }}/jacoco/report/jacoco.xml
-            ${{ github.workspace }}/examples/target/scala-${{ matrix.scalaShort }}/jacoco/report/jacoco.xml
             ${{ github.workspace }}/slick/target/scala-${{ matrix.scalaShort }}/jacoco/report/jacoco.xml
             ${{ github.workspace }}/doobie/target/scala-${{ matrix.scalaShort }}/jacoco/report/jacoco.xml
           key: ${{ runner.os }}-${{ matrix.scalaShort }}-${{ hashFiles('**/jacoco.xml') }}
@@ -79,7 +78,6 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}/core/target/scala-${{ matrix.scalaShort }}/jacoco/report/jacoco.xml
-            ${{ github.workspace }}/examples/target/scala-${{ matrix.scalaShort }}/jacoco/report/jacoco.xml
             ${{ github.workspace }}/slick/target/scala-${{ matrix.scalaShort }}/jacoco/report/jacoco.xml
             ${{ github.workspace }}/doobie/target/scala-${{ matrix.scalaShort }}/jacoco/report/jacoco.xml
           key: ${{ runner.os }}-${{ matrix.scalaShort }}-${{ hashFiles('**/jacoco.xml') }}
@@ -95,7 +93,6 @@ jobs:
             ${{ github.workspace }}/core/target/scala-${{ matrix.scalaShort }}/jacoco/report/jacoco.xml,
             ${{ github.workspace }}/slick/target/scala-${{ matrix.scalaShort }}/jacoco/report/jacoco.xml,
             ${{ github.workspace }}/doobie/target/scala-${{ matrix.scalaShort }}/jacoco/report/jacoco.xml
-          # examples don't need code coverage - at least not now
           token: ${{ secrets.GITHUB_TOKEN }}
           min-coverage-overall: ${{ matrix.overall }}
           min-coverage-changed-files: ${{ matrix.changed }}

diff --git a/build.sbt b/build.sbt
@@ -57,7 +57,7 @@ flywaySqlMigrationSuffixes := FlywayConfiguration.flywaySqlMigrationSuffixes
 libraryDependencies ++= flywayDependencies
 
 lazy val parent = (project in file("."))
-  .aggregate(faDbCore, faDBSlick, faDBDoobie, faDBExamples)
+  .aggregate(faDbCore, faDBSlick, faDBDoobie)
   .settings(
     name := "root",
     libraryDependencies ++= rootDependencies(scalaVersion.value),
@@ -110,18 +110,4 @@ lazy val faDBDoobie = (project in file("doobie"))
     jacocoExcludes := commonJacocoExcludes
   )
 
-lazy val faDBExamples = (project in file("examples"))
-  .configs(IntegrationTest)
-  .settings(
-    name := "examples",
-    libraryDependencies ++= examplesDependencies(scalaVersion.value),
-    Test / parallelExecution := false,
-    (Compile / compile) := ((Compile / compile) dependsOn printScalaVersion).value, // printScalaVersion is run with compile
-    publish / skip := true
-  ).dependsOn(faDbCore, faDBSlick)
-  .settings(
-    jacocoReportSettings := commonJacocoReportSettings.withTitle(s"fa-db:examples Jacoco Report - scala:${scalaVersion.value}"),
-    jacocoExcludes := commonJacocoExcludes
-  )
-
 sonatypeProfileName := "za.co.absa"
diff --git a/database/README.md → demo_database/README.md b/database/README.md → demo_database/README.md
diff --git a/database/src/main/postgres/00_databases.ddl → ...tabase/src/main/postgres/00_databases.ddl b/database/src/main/postgres/00_databases.ddl → ...tabase/src/main/postgres/00_databases.ddl
diff --git a/...in/postgres/V1.1.1__01_add_extensions.ddl → ...in/postgres/V1.1.1__01_add_extensions.ddl b/...in/postgres/V1.1.1__01_add_extensions.ddl → ...in/postgres/V1.1.1__01_add_extensions.ddl
diff --git a/...tion/V1.2.10__get_all_date_time_types.sql → ...tion/V1.2.10__get_all_date_time_types.sql b/...tion/V1.2.10__get_all_date_time_types.sql → ...tion/V1.2.10__get_all_date_time_types.sql
diff --git a/...tegration/V1.2.11__insert_dates_times.sql → ...tegration/V1.2.11__insert_dates_times.sql b/...tegration/V1.2.11__insert_dates_times.sql → ...tegration/V1.2.11__insert_dates_times.sql
diff --git a/...tegration/V1.2.12__insert_other_types.sql → ...tegration/V1.2.12__insert_other_types.sql b/...tegration/V1.2.12__insert_other_types.sql → ...tegration/V1.2.12__insert_other_types.sql
diff --git a/...integration/V1.2.13__read_other_types.sql → ...integration/V1.2.13__read_other_types.sql b/...integration/V1.2.13__read_other_types.sql → ...integration/V1.2.13__read_other_types.sql
diff --git a/...es/integration/V1.2.14__test_function.sql → ...es/integration/V1.2.14__test_function.sql b/...es/integration/V1.2.14__test_function.sql → ...es/integration/V1.2.14__test_function.sql
diff --git a/...c/main/postgres/integration/V1.2.1___.ddl → ...c/main/postgres/integration/V1.2.1___.ddl b/...c/main/postgres/integration/V1.2.1___.ddl → ...c/main/postgres/integration/V1.2.1___.ddl
diff --git a/...n/postgres/integration/V1.2.2__actors.ddl → ...n/postgres/integration/V1.2.2__actors.ddl b/...n/postgres/integration/V1.2.2__actors.ddl → ...n/postgres/integration/V1.2.2__actors.ddl
diff --git a/...s/integration/V1.2.3__date_time_types.ddl → ...s/integration/V1.2.3__date_time_types.ddl b/...s/integration/V1.2.3__date_time_types.ddl → ...s/integration/V1.2.3__date_time_types.ddl
diff --git a/...tgres/integration/V1.2.4__other_types.ddl → ...tgres/integration/V1.2.4__other_types.ddl b/...tgres/integration/V1.2.4__other_types.ddl → ...tgres/integration/V1.2.4__other_types.ddl
diff --git a/...gres/integration/V1.2.5__create_actor.sql → ...gres/integration/V1.2.5__create_actor.sql b/...gres/integration/V1.2.5__create_actor.sql → ...gres/integration/V1.2.5__create_actor.sql
diff --git a/...stgres/integration/V1.2.6__get_actors.sql → ...stgres/integration/V1.2.6__get_actors.sql b/...stgres/integration/V1.2.6__get_actors.sql → ...stgres/integration/V1.2.6__get_actors.sql
diff --git a/...ration/V1.2.7__get_actors_by_lastname.sql → ...ration/V1.2.7__get_actors_by_lastname.sql b/...ration/V1.2.7__get_actors_by_lastname.sql → ...ration/V1.2.7__get_actors_by_lastname.sql
diff --git a/...s/integration/V1.2.8__get_actor_by_id.sql → ...s/integration/V1.2.8__get_actor_by_id.sql b/...s/integration/V1.2.8__get_actor_by_id.sql → ...s/integration/V1.2.8__get_actor_by_id.sql
diff --git a/...integration/V1.2.99__insert_test_data.sql → ...integration/V1.2.99__insert_test_data.sql b/...integration/V1.2.99__insert_test_data.sql → ...integration/V1.2.99__insert_test_data.sql
diff --git a/.../integration/V1.2.9__error_if_not_one.sql → .../integration/V1.2.9__error_if_not_one.sql b/.../integration/V1.2.9__error_if_not_one.sql → .../integration/V1.2.9__error_if_not_one.sql
diff --git a/examples/src/main/resources/application.conf b/examples/src/main/resources/application.conf
diff --git a/examples/src/test/resources/application.conf b/examples/src/test/resources/application.conf
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -51,10 +51,6 @@ object Dependencies {
     )
   }
 
-  def examplesDependencies(scalaVersion: String): Seq[ModuleID] = {
-    slickDependencies(scalaVersion)
-  }
-
   def flywayDependencies: Seq[ModuleID] = {
     val postgresql = "org.postgresql" % "postgresql" % "42.6.0"
 

diff --git a/project/FlywayConfiguration.scala b/project/FlywayConfiguration.scala
@@ -22,7 +22,7 @@ object FlywayConfiguration {
   val flywayUrl = s"jdbc:postgresql://$host:$port/$database"
   val flywayUser = "postgres"
   val flywayPassword = "postgres"
-  val flywayLocations: Seq[String] = Seq("filesystem:database/src/main/postgres")
+  val flywayLocations: Seq[String] = Seq("filesystem:demo_database/src/main/postgres")
   val flywaySqlMigrationSuffixes: Seq[String] = Seq(".sql",".ddl")
 
 }
diff --git a/...db/examples/enceladus/DatasetSchema.scala → ...za/co/absa/fadb/slick/DatasetSchema.scala b/...db/examples/enceladus/DatasetSchema.scala → ...za/co/absa/fadb/slick/DatasetSchema.scala
@@ -14,20 +14,18 @@
  * limitations under the License.
  */
 
-package za.co.absa.fadb.examples.enceladus
+package za.co.absa.fadb.slick
 
 import cats.MonadError
 import slick.jdbc.PostgresProfile.api._
 import slick.jdbc.{GetResult, SQLActionBuilder}
 import za.co.absa.fadb.DBSchema
-import za.co.absa.fadb.examples.enceladus.DatasetSchema._
 import za.co.absa.fadb.naming.implementations.SnakeCaseNaming.Implicits.namingConvention
+import za.co.absa.fadb.slick.DatasetSchema._
 import za.co.absa.fadb.slick.SlickFunction.{SlickMultipleResultFunction, SlickSingleResultFunctionWithStatus}
-import za.co.absa.fadb.slick.SlickPgEngine
 import za.co.absa.fadb.status.handling.implementations.UserDefinedStatusHandling
 
 import java.sql.Timestamp
-import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
 
 /* The Schema doesn't need the dBEngine directly, but it seems cleaner this way to hand it over to schema's functions */

diff --git a/...amples/enceladus/DatasetSchemaSuite.scala → .../absa/fadb/slick/DatasetSchemaSuite.scala b/...amples/enceladus/DatasetSchemaSuite.scala → .../absa/fadb/slick/DatasetSchemaSuite.scala
@@ -14,18 +14,17 @@
  * limitations under the License.
  */
 
-package za.co.absa.fadb.examples.enceladus
+package za.co.absa.fadb.slick
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
-import za.co.absa.fadb.examples.enceladus.DatasetSchema._
 import slick.jdbc.PostgresProfile.api._
 import za.co.absa.fadb.exceptions.StatusException
-import za.co.absa.fadb.slick.SlickPgEngine
+import za.co.absa.fadb.slick.DatasetSchema._
 
 import scala.concurrent.Await
-import scala.concurrent.duration.Duration
 import scala.concurrent.ExecutionContext.Implicits.global
+import scala.concurrent.duration.Duration
 
 class DatasetSchemaSuite extends AnyWordSpec with Matchers {
   private val db = Database.forConfig("menasdb")