Fix some packages

Katrix · May 26, 2024 · 1424821 · 1424821
1 parent f736fdf
commit 1424821
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 24 deletions.
diff --git a/common/src/main/scala/dataprism/platform/MapRes.scala b/common/src/main/scala/dataprism/platform/MapRes.scala
@@ -1,4 +1,4 @@
-package dataprism.platform.base
+package dataprism.platform
 
 import cats.Applicative
 import cats.syntax.all.*

diff --git a/common/src/main/scala/dataprism/platform/QueryPlatform.scala b/common/src/main/scala/dataprism/platform/QueryPlatform.scala
@@ -1,4 +1,4 @@
-package dataprism.platform.base
+package dataprism.platform
 
 import scala.annotation.targetName
 

diff --git a/common/src/main/scala/dataprism/platform/sql/SqlOperations.scala b/common/src/main/scala/dataprism/platform/sql/SqlOperations.scala
@@ -3,7 +3,7 @@ package dataprism.platform.sql
 import cats.data.{NonEmptyList, NonEmptySeq}
 import cats.syntax.all.*
 import cats.{Applicative, Functor, MonadThrow}
-import dataprism.platform.base.MapRes
+import dataprism.platform.MapRes
 import dataprism.sharedast.{SelectAst, SqlExpr}
 import dataprism.sql.*
 import perspective.*

diff --git a/common/src/main/scala/dataprism/platform/sql/SqlOperationsBase.scala b/common/src/main/scala/dataprism/platform/sql/SqlOperationsBase.scala
@@ -3,7 +3,8 @@ package dataprism.platform.sql
 import cats.MonadThrow
 import cats.data.{NonEmptyList, NonEmptySeq}
 import cats.syntax.all.*
-import dataprism.platform.base.MapRes
+import dataprism.platform.MapRes
+import dataprism.platform.sql.query.SqlQueriesBase
 import dataprism.sql.*
 import perspective.*
 

diff --git a/common/src/main/scala/dataprism/platform/sql/SqlQueryPlatform.scala b/common/src/main/scala/dataprism/platform/sql/SqlQueryPlatform.scala
@@ -1,5 +1,8 @@
 package dataprism.platform.sql
 
+import dataprism.platform.sql.query.{SqlQueries, SqlValueSources}
+import dataprism.platform.sql.value.{SqlDbValues, SqlSimpleMath}
+
 //noinspection SqlNoDataSourceInspection,ScalaUnusedSymbol
 trait SqlQueryPlatform
     extends SqlQueryPlatformBase,

diff --git a/common/src/main/scala/dataprism/platform/sql/SqlQueryPlatformBase.scala b/common/src/main/scala/dataprism/platform/sql/SqlQueryPlatformBase.scala
@@ -4,7 +4,7 @@ import scala.annotation.targetName
 import scala.util.NotGiven
 
 import cats.data.State
-import dataprism.platform.base.{MapRes, QueryPlatform}
+import dataprism.platform.{MapRes, QueryPlatform}
 import dataprism.sharedast.AstRenderer
 import dataprism.sql.*
 import perspective.*

diff --git a/common/src/main/scala/dataprism/platform/sql/query/SqlQueries.scala b/common/src/main/scala/dataprism/platform/sql/query/SqlQueries.scala
@@ -1,11 +1,11 @@
-package dataprism.platform.sql
+package dataprism.platform.sql.query
 
 import scala.annotation.targetName
-
 import cats.Applicative
 import cats.data.State
 import cats.syntax.all.*
-import dataprism.platform.base.MapRes
+import dataprism.platform.MapRes
+import dataprism.platform.sql.SqlQueryPlatform
 import dataprism.sharedast.{SelectAst, SqlExpr}
 import dataprism.sql.*
 import perspective.*

diff --git a/common/src/main/scala/dataprism/platform/sql/query/SqlQueriesBase.scala b/common/src/main/scala/dataprism/platform/sql/query/SqlQueriesBase.scala
@@ -1,9 +1,11 @@
-package dataprism.platform.sql
+package dataprism.platform.sql.query
 
 import cats.Applicative
 import cats.data.State
 import cats.syntax.all.*
-import dataprism.platform.base.MapRes
+import dataprism.platform.MapRes
+import dataprism.platform.sql.SqlQueryPlatformBase
+import dataprism.platform.sql.value.SqlDbValuesBase
 import dataprism.sharedast.{SelectAst, SqlExpr}
 import dataprism.sql.*
 import perspective.*

diff --git a/common/src/main/scala/dataprism/platform/sql/query/SqlValueSources.scala b/common/src/main/scala/dataprism/platform/sql/query/SqlValueSources.scala
@@ -1,7 +1,8 @@
-package dataprism.platform.sql
+package dataprism.platform.sql.query
 
 import cats.data.State
 import cats.syntax.all.*
+import dataprism.platform.sql.SqlQueryPlatform
 import dataprism.sharedast.{SelectAst, SqlExpr}
 import dataprism.sql.*
 import perspective.*

diff --git a/common/src/main/scala/dataprism/platform/sql/query/SqlValueSourcesBase.scala b/common/src/main/scala/dataprism/platform/sql/query/SqlValueSourcesBase.scala
@@ -1,9 +1,9 @@
-package dataprism.platform.sql
+package dataprism.platform.sql.query
 
 import scala.annotation.targetName
-
 import cats.data.State
 import cats.syntax.all.*
+import dataprism.platform.sql.SqlQueryPlatformBase
 import dataprism.sharedast.{SelectAst, SqlExpr}
 import dataprism.sql.*
 import perspective.*

diff --git a/common/src/main/scala/dataprism/platform/sql/value/SqlDbValues.scala b/common/src/main/scala/dataprism/platform/sql/value/SqlDbValues.scala
@@ -1,13 +1,12 @@
-package dataprism.platform.sql
+package dataprism.platform.sql.value
 
 import java.sql.{Date, Time, Timestamp}
-
 import scala.annotation.targetName
 import scala.util.NotGiven
-
 import cats.data.State
 import cats.syntax.all.*
-import dataprism.platform.base.MapRes
+import dataprism.platform.MapRes
+import dataprism.platform.sql.SqlQueryPlatform
 import dataprism.sharedast.SqlExpr
 import dataprism.sql.*
 import perspective.*

diff --git a/common/src/main/scala/dataprism/platform/sql/value/SqlDbValuesBase.scala b/common/src/main/scala/dataprism/platform/sql/value/SqlDbValuesBase.scala
@@ -1,9 +1,9 @@
-package dataprism.platform.sql
+package dataprism.platform.sql.value
 
 import scala.annotation.targetName
 import scala.util.NotGiven
-
-import dataprism.platform.base.MapRes
+import dataprism.platform.MapRes
+import dataprism.platform.sql.SqlQueryPlatformBase
 import dataprism.sharedast.{SelectAst, SqlExpr}
 import dataprism.sql.SqlStr
 import perspective.*

diff --git a/common/src/main/scala/dataprism/platform/sql/value/SqlSimpleMath.scala b/common/src/main/scala/dataprism/platform/sql/value/SqlSimpleMath.scala
@@ -1,4 +1,4 @@
-package dataprism.platform.sql
+package dataprism.platform.sql.value
 
 import dataprism.sharedast.SqlExpr
 

diff --git a/common/src/test/scala/dataprism/PlatformOperationSuite.scala b/common/src/test/scala/dataprism/PlatformOperationSuite.scala
@@ -4,7 +4,7 @@ import cats.data.NonEmptyList
 import cats.kernel.Eq
 import cats.syntax.all.*
 import cats.{MonadThrow, Monoid}
-import dataprism.platform.base.MapRes
+import dataprism.platform.MapRes
 import dataprism.platform.sql.SqlQueryPlatform
 import dataprism.sql.*
 import perspective.{DistributiveKC, Id}

diff --git a/jdbc/src/main/scala/dataprism/jdbc/testing.scala b/jdbc/src/main/scala/dataprism/jdbc/testing.scala
@@ -6,7 +6,7 @@ import scala.concurrent.Future
 import dataprism.KMacros
 import dataprism.jdbc.platform.PostgresJdbcPlatform
 import dataprism.jdbc.sql.{JdbcCodec, JdbcColumns, PostgresJdbcTypes, jdbcType}
-import dataprism.platform.base.MapRes
+import dataprism.platform.MapRes
 import dataprism.sql.*
 import perspective.*
 

diff --git a/skunk/src/main/scala/dataprism/skunk/platform/PostgresSkunkPlatform.scala b/skunk/src/main/scala/dataprism/skunk/platform/PostgresSkunkPlatform.scala
@@ -3,7 +3,7 @@ package dataprism.skunk.platform
 import scala.annotation.targetName
 
 import cats.data.State
-import dataprism.platform.base.MapRes
+import dataprism.platform.MapRes
 import dataprism.platform.sql.implementations.PostgresPlatform
 import dataprism.skunk.sql.{PostgresSkunkAstRenderer, SkunkAnsiTypes}
 import dataprism.sql.{AnsiTypes, NullabilityTypeChoice}