Combine quill-core-portable & quill-sql-portable into quill-engine (#…

…2360)
zio · Dec 30, 2021 · 52011e6 · 52011e6
1 parent d0c43aa
commit 52011e6
Show file tree

Hide file tree

Showing 104 changed files with 13 additions and 37 deletions.
diff --git a/build.sbt b/build.sbt
@@ -34,14 +34,12 @@ val CodegenTag = Tags.Tag("CodegenTag")
 (Global / concurrentRestrictions) += Tags.limit(ScalaJSTags.Link, 1)
 
 lazy val jsModules = Seq[sbt.ClasspathDep[sbt.ProjectReference]](
-  `quill-core-portable-js`, `quill-core-js`,
-  `quill-sql-portable-js`, `quill-sql-js`
+  `quill-engine-js`, `quill-core-js`, `quill-sql-js`
 )
 
 lazy val baseModules = Seq[sbt.ClasspathDep[sbt.ProjectReference]](
-  `quill-core-portable-jvm`,
+  `quill-engine-jvm`,
   `quill-core-jvm`,
-  `quill-sql-portable-jvm`,
   `quill-sql-jvm`, `quill-monix`, `quill-zio`
 )
 
@@ -200,7 +198,7 @@ def pprintVersion(v: String) = {
   if(v.startsWith("2.11")) "0.5.4" else "0.5.9"
 }
 
-lazy val `quill-core-portable` =
+lazy val `quill-engine` =
   crossProject(JVMPlatform, JSPlatform).crossType(ultraPure)
     .settings(commonSettings: _*)
     .settings(mimaSettings: _*)
@@ -210,7 +208,8 @@ lazy val `quill-core-portable` =
         "com.typesafe.scala-logging" %% "scala-logging" % "3.9.4",
         "org.scala-lang"             %  "scala-reflect" % scalaVersion.value,
         "com.twitter"                %% "chill"         % "0.10.0",
-        "io.suzaku"                  %% "boopickle"     % "1.3.1"
+        "io.suzaku"                  %% "boopickle"     % "1.3.1",
+        "com.github.vertical-blank"  %% "scala-sql-formatter" % "1.0.0"
       ),
       coverageExcludedPackages := "<empty>;.*AstPrinter;.*Using;io.getquill.Model;io.getquill.ScalarTag;io.getquill.QuotationTag"
     )
@@ -220,15 +219,16 @@ lazy val `quill-core-portable` =
         "org.scala-js" %%% "scalajs-java-time" % "0.2.5",
         "com.lihaoyi" %%% "pprint" % "0.5.4",
         "org.scala-js" %%% "scalajs-java-time" % "0.2.5",
-        "io.suzaku" %%% "boopickle" % "1.3.1"
+        "io.suzaku" %%% "boopickle" % "1.3.1",
+        "com.github.vertical-blank" %%% "scala-sql-formatter" % "1.0.0"
       ),
       coverageExcludedPackages := ".*",
       // 2.12 Build seems to take forever without this option
       Test / fastOptJS / scalaJSOptimizerOptions ~= { _.withDisableOptimizer(true) }
     ).enablePlugins(MimaPlugin)
 
-lazy val `quill-core-portable-jvm` = `quill-core-portable`.jvm
-lazy val `quill-core-portable-js` = `quill-core-portable`.js
+lazy val `quill-engine-jvm` = `quill-engine`.jvm
+lazy val `quill-engine-js` = `quill-engine`.js
 
 lazy val `quill-core` =
   crossProject(JVMPlatform, JSPlatform).crossType(superPure)
@@ -254,36 +254,12 @@ lazy val `quill-core` =
       // 2.12 Build seems to take forever without this option
       Test / fastOptJS / scalaJSOptimizerOptions ~= { _.withDisableOptimizer(true) }
     )
-    .dependsOn(`quill-core-portable` % "compile->compile")
+    .dependsOn(`quill-engine` % "compile->compile")
     .enablePlugins(MimaPlugin)
 
 // dependsOn in these clauses technically not needed however, intellij does not work properly without them
-lazy val `quill-core-jvm` = `quill-core`.jvm.dependsOn(`quill-core-portable-jvm` % "compile->compile")
-lazy val `quill-core-js` = `quill-core`.js.dependsOn(`quill-core-portable-js` % "compile->compile")
-
-lazy val `quill-sql-portable` =
-  crossProject(JVMPlatform, JSPlatform).crossType(ultraPure)
-    .settings(commonSettings: _*)
-    .settings(mimaSettings: _*)
-    .settings(libraryDependencies ++= Seq(
-      "com.github.vertical-blank"  %% "scala-sql-formatter" % "1.0.0"
-    ))
-    .jsSettings(
-      libraryDependencies ++= Seq(
-        "com.github.vertical-blank" %%% "scala-sql-formatter" % "1.0.0"
-      ),
-      scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule) },
-      coverageExcludedPackages := ".*",
-      // 2.12 Build seems to take forever without this option
-      Test / fastOptJS / scalaJSOptimizerOptions ~= { _.withDisableOptimizer(true) }
-      //jsEnv := NodeJSEnv(args = Seq("--max_old_space_size=1024")).value
-    )
-    .dependsOn(`quill-core-portable` % "compile->compile")
-    .enablePlugins(MimaPlugin)
-
-lazy val `quill-sql-portable-jvm` = `quill-sql-portable`.jvm
-lazy val `quill-sql-portable-js` = `quill-sql-portable`.js
-
+lazy val `quill-core-jvm` = `quill-core`.jvm.dependsOn(`quill-engine-jvm` % "compile->compile")
+lazy val `quill-core-js` = `quill-core`.js.dependsOn(`quill-engine-js` % "compile->compile")
 
 lazy val `quill-sql` =
   crossProject(JVMPlatform, JSPlatform).crossType(ultraPure)
@@ -302,7 +278,7 @@ lazy val `quill-sql` =
       Test / fastOptJS / scalaJSOptimizerOptions ~= { _.withDisableOptimizer(true) }
     )
     .dependsOn(
-      `quill-sql-portable` % "compile->compile",
+      `quill-engine` % "compile->compile",
       `quill-core` % "compile->compile;test->test"
     )
     .enablePlugins(MimaPlugin)

diff --git a/...c/main/scala/io/getquill/AstPrinter.scala → ...c/main/scala/io/getquill/AstPrinter.scala b/...c/main/scala/io/getquill/AstPrinter.scala → ...c/main/scala/io/getquill/AstPrinter.scala
diff --git a/...src/main/scala/io/getquill/Embedded.scala → ...src/main/scala/io/getquill/Embedded.scala b/...src/main/scala/io/getquill/Embedded.scala → ...src/main/scala/io/getquill/Embedded.scala
diff --git a/...rc/main/scala/io/getquill/H2Dialect.scala → ...rc/main/scala/io/getquill/H2Dialect.scala b/...rc/main/scala/io/getquill/H2Dialect.scala → ...rc/main/scala/io/getquill/H2Dialect.scala
diff --git a/...in/scala/io/getquill/MappedEncoding.scala → ...in/scala/io/getquill/MappedEncoding.scala b/...in/scala/io/getquill/MappedEncoding.scala → ...in/scala/io/getquill/MappedEncoding.scala
diff --git a/.../main/scala/io/getquill/MirrorIdiom.scala → .../main/scala/io/getquill/MirrorIdiom.scala b/.../main/scala/io/getquill/MirrorIdiom.scala → .../main/scala/io/getquill/MirrorIdiom.scala
diff --git a/.../scala/io/getquill/MirrorSqlDialect.scala → .../scala/io/getquill/MirrorSqlDialect.scala b/.../scala/io/getquill/MirrorSqlDialect.scala → .../scala/io/getquill/MirrorSqlDialect.scala
diff --git a/...le/src/main/scala/io/getquill/Model.scala → ...ne/src/main/scala/io/getquill/Model.scala b/...le/src/main/scala/io/getquill/Model.scala → ...ne/src/main/scala/io/getquill/Model.scala
diff --git a/...main/scala/io/getquill/MySQLDialect.scala → ...main/scala/io/getquill/MySQLDialect.scala b/...main/scala/io/getquill/MySQLDialect.scala → ...main/scala/io/getquill/MySQLDialect.scala
diff --git a/...in/scala/io/getquill/NamingStrategy.scala → ...in/scala/io/getquill/NamingStrategy.scala b/...in/scala/io/getquill/NamingStrategy.scala → ...in/scala/io/getquill/NamingStrategy.scala
diff --git a/...ain/scala/io/getquill/OracleDialect.scala → ...ain/scala/io/getquill/OracleDialect.scala b/...ain/scala/io/getquill/OracleDialect.scala → ...ain/scala/io/getquill/OracleDialect.scala
diff --git a/...src/main/scala/io/getquill/OrdModel.scala → ...src/main/scala/io/getquill/OrdModel.scala b/...src/main/scala/io/getquill/OrdModel.scala → ...src/main/scala/io/getquill/OrdModel.scala
diff --git a/...n/scala/io/getquill/PostgresDialect.scala → ...n/scala/io/getquill/PostgresDialect.scala b/...n/scala/io/getquill/PostgresDialect.scala → ...n/scala/io/getquill/PostgresDialect.scala
diff --git a/...main/scala/io/getquill/QueryProbing.scala → ...main/scala/io/getquill/QueryProbing.scala b/...main/scala/io/getquill/QueryProbing.scala → ...main/scala/io/getquill/QueryProbing.scala
diff --git a/...main/scala/io/getquill/ReturnAction.scala → ...main/scala/io/getquill/ReturnAction.scala b/...main/scala/io/getquill/ReturnAction.scala → ...main/scala/io/getquill/ReturnAction.scala
diff --git a/.../scala/io/getquill/SQLServerDialect.scala → .../scala/io/getquill/SQLServerDialect.scala b/.../scala/io/getquill/SQLServerDialect.scala → .../scala/io/getquill/SQLServerDialect.scala
diff --git a/...ain/scala/io/getquill/SqliteDialect.scala → ...ain/scala/io/getquill/SqliteDialect.scala b/...ain/scala/io/getquill/SqliteDialect.scala → ...ain/scala/io/getquill/SqliteDialect.scala
diff --git a/.../src/main/scala/io/getquill/ast/Ast.scala → .../src/main/scala/io/getquill/ast/Ast.scala b/.../src/main/scala/io/getquill/ast/Ast.scala → .../src/main/scala/io/getquill/ast/Ast.scala
diff --git a/...c/main/scala/io/getquill/ast/AstOps.scala → ...c/main/scala/io/getquill/ast/AstOps.scala b/...c/main/scala/io/getquill/ast/AstOps.scala → ...c/main/scala/io/getquill/ast/AstOps.scala
diff --git a/...in/scala/io/getquill/ast/CollectAst.scala → ...in/scala/io/getquill/ast/CollectAst.scala b/...in/scala/io/getquill/ast/CollectAst.scala → ...in/scala/io/getquill/ast/CollectAst.scala
diff --git a/...main/scala/io/getquill/ast/JoinType.scala → ...main/scala/io/getquill/ast/JoinType.scala b/...main/scala/io/getquill/ast/JoinType.scala → ...main/scala/io/getquill/ast/JoinType.scala
diff --git a/...main/scala/io/getquill/ast/Operator.scala → ...main/scala/io/getquill/ast/Operator.scala b/...main/scala/io/getquill/ast/Operator.scala → ...main/scala/io/getquill/ast/Operator.scala
diff --git a/...io/getquill/ast/StatefulTransformer.scala → ...io/getquill/ast/StatefulTransformer.scala b/...io/getquill/ast/StatefulTransformer.scala → ...io/getquill/ast/StatefulTransformer.scala
diff --git a/...ll/ast/StatefulTransformerWithStack.scala → ...ll/ast/StatefulTransformerWithStack.scala b/...ll/ast/StatefulTransformerWithStack.scala → ...ll/ast/StatefulTransformerWithStack.scala
diff --git a/...o/getquill/ast/StatelessTransformer.scala → ...o/getquill/ast/StatelessTransformer.scala b/...o/getquill/ast/StatelessTransformer.scala → ...o/getquill/ast/StatelessTransformer.scala
diff --git a/...ain/scala/io/getquill/ast/Transform.scala → ...ain/scala/io/getquill/ast/Transform.scala b/...ain/scala/io/getquill/ast/Transform.scala → ...ain/scala/io/getquill/ast/Transform.scala
diff --git a/...la/io/getquill/context/ProtoContext.scala → ...la/io/getquill/context/ProtoContext.scala b/...la/io/getquill/context/ProtoContext.scala → ...la/io/getquill/context/ProtoContext.scala
diff --git a/...quill/context/ReturnFieldCapability.scala → ...quill/context/ReturnFieldCapability.scala b/...quill/context/ReturnFieldCapability.scala → ...quill/context/ReturnFieldCapability.scala
diff --git a/...cala/io/getquill/context/RowContext.scala → ...cala/io/getquill/context/RowContext.scala b/...cala/io/getquill/context/RowContext.scala → ...cala/io/getquill/context/RowContext.scala
diff --git a/...tquill/context/mirror/MirrorSession.scala → ...tquill/context/mirror/MirrorSession.scala b/...tquill/context/mirror/MirrorSession.scala → ...tquill/context/mirror/MirrorSession.scala
diff --git a/...cala/io/getquill/context/mirror/Row.scala → ...cala/io/getquill/context/mirror/Row.scala b/...cala/io/getquill/context/mirror/Row.scala → ...cala/io/getquill/context/mirror/Row.scala
diff --git a/...main/scala/io/getquill/dsl/InfixDsl.scala → ...main/scala/io/getquill/dsl/InfixDsl.scala b/...main/scala/io/getquill/dsl/InfixDsl.scala → ...main/scala/io/getquill/dsl/InfixDsl.scala
diff --git a/...c/main/scala/io/getquill/dsl/OrdDsl.scala → ...c/main/scala/io/getquill/dsl/OrdDsl.scala b/...c/main/scala/io/getquill/dsl/OrdDsl.scala → ...c/main/scala/io/getquill/dsl/OrdDsl.scala
diff --git a/...cala/io/getquill/dsl/UnlimitedTuple.scala → ...cala/io/getquill/dsl/UnlimitedTuple.scala b/...cala/io/getquill/dsl/UnlimitedTuple.scala → ...cala/io/getquill/dsl/UnlimitedTuple.scala
diff --git a/.../main/scala/io/getquill/idiom/Idiom.scala → .../main/scala/io/getquill/idiom/Idiom.scala b/.../main/scala/io/getquill/idiom/Idiom.scala → .../main/scala/io/getquill/idiom/Idiom.scala
diff --git a/...la/io/getquill/idiom/ReifyStatement.scala → ...la/io/getquill/idiom/ReifyStatement.scala b/...la/io/getquill/idiom/ReifyStatement.scala → ...la/io/getquill/idiom/ReifyStatement.scala
diff --git a/...n/scala/io/getquill/idiom/Statement.scala → ...n/scala/io/getquill/idiom/Statement.scala b/...n/scala/io/getquill/idiom/Statement.scala → ...n/scala/io/getquill/idiom/Statement.scala
diff --git a/...etquill/idiom/StatementInterpolator.scala → ...etquill/idiom/StatementInterpolator.scala b/...etquill/idiom/StatementInterpolator.scala → ...etquill/idiom/StatementInterpolator.scala
diff --git a/...ala/io/getquill/norm/AdHocReduction.scala → ...ala/io/getquill/norm/AdHocReduction.scala b/...ala/io/getquill/norm/AdHocReduction.scala → ...ala/io/getquill/norm/AdHocReduction.scala
diff --git a/...ain/scala/io/getquill/norm/ApplyMap.scala → ...ain/scala/io/getquill/norm/ApplyMap.scala b/...ain/scala/io/getquill/norm/ApplyMap.scala → ...ain/scala/io/getquill/norm/ApplyMap.scala
diff --git a/...ala/io/getquill/norm/AttachToEntity.scala → ...ala/io/getquill/norm/AttachToEntity.scala b/...ala/io/getquill/norm/AttachToEntity.scala → ...ala/io/getquill/norm/AttachToEntity.scala
diff --git a/...cala/io/getquill/norm/BetaReduction.scala → ...cala/io/getquill/norm/BetaReduction.scala b/...cala/io/getquill/norm/BetaReduction.scala → ...cala/io/getquill/norm/BetaReduction.scala
diff --git a/...a/io/getquill/norm/DialectBehaviors.scala → ...a/io/getquill/norm/DialectBehaviors.scala b/...a/io/getquill/norm/DialectBehaviors.scala → ...a/io/getquill/norm/DialectBehaviors.scala
diff --git a/...la/io/getquill/norm/ExpandReturning.scala → ...la/io/getquill/norm/ExpandReturning.scala b/...la/io/getquill/norm/ExpandReturning.scala → ...la/io/getquill/norm/ExpandReturning.scala
diff --git a/...etquill/norm/FlattenOptionOperation.scala → ...etquill/norm/FlattenOptionOperation.scala b/...etquill/norm/FlattenOptionOperation.scala → ...etquill/norm/FlattenOptionOperation.scala
diff --git a/...getquill/norm/NestImpureMappedInfix.scala → ...getquill/norm/NestImpureMappedInfix.scala b/...getquill/norm/NestImpureMappedInfix.scala → ...getquill/norm/NestImpureMappedInfix.scala
diff --git a/...in/scala/io/getquill/norm/Normalize.scala → ...in/scala/io/getquill/norm/Normalize.scala b/...in/scala/io/getquill/norm/Normalize.scala → ...in/scala/io/getquill/norm/Normalize.scala
diff --git a/...a/io/getquill/norm/NormalizeCaching.scala → ...a/io/getquill/norm/NormalizeCaching.scala b/...a/io/getquill/norm/NormalizeCaching.scala → ...a/io/getquill/norm/NormalizeCaching.scala
diff --git a/...uill/norm/NormalizeNestedStructures.scala → ...uill/norm/NormalizeNestedStructures.scala b/...uill/norm/NormalizeNestedStructures.scala → ...uill/norm/NormalizeNestedStructures.scala
diff --git a/...io/getquill/norm/NormalizeReturning.scala → ...io/getquill/norm/NormalizeReturning.scala b/...io/getquill/norm/NormalizeReturning.scala → ...io/getquill/norm/NormalizeReturning.scala
diff --git a/...getquill/norm/NormalizeStringConcat.scala → ...getquill/norm/NormalizeStringConcat.scala b/...getquill/norm/NormalizeStringConcat.scala → ...getquill/norm/NormalizeStringConcat.scala
diff --git a/...n/scala/io/getquill/norm/OrderTerms.scala → ...n/scala/io/getquill/norm/OrderTerms.scala b/...n/scala/io/getquill/norm/OrderTerms.scala → ...n/scala/io/getquill/norm/OrderTerms.scala
diff --git a/...a/io/getquill/norm/RenameProperties.scala → ...a/io/getquill/norm/RenameProperties.scala b/...a/io/getquill/norm/RenameProperties.scala → ...a/io/getquill/norm/RenameProperties.scala
diff --git a/...a/io/getquill/norm/RepropagateQuats.scala → ...a/io/getquill/norm/RepropagateQuats.scala b/...a/io/getquill/norm/RepropagateQuats.scala → ...a/io/getquill/norm/RepropagateQuats.scala
diff --git a/.../io/getquill/norm/SheathLeafClauses.scala → .../io/getquill/norm/SheathLeafClauses.scala b/.../io/getquill/norm/SheathLeafClauses.scala → .../io/getquill/norm/SheathLeafClauses.scala
diff --git a/...io/getquill/norm/SimplifyNullChecks.scala → ...io/getquill/norm/SimplifyNullChecks.scala b/...io/getquill/norm/SimplifyNullChecks.scala → ...io/getquill/norm/SimplifyNullChecks.scala
diff --git a/...cala/io/getquill/norm/StablizeLifts.scala → ...cala/io/getquill/norm/StablizeLifts.scala b/...cala/io/getquill/norm/StablizeLifts.scala → ...cala/io/getquill/norm/StablizeLifts.scala
diff --git a/.../io/getquill/norm/SymbolicReduction.scala → .../io/getquill/norm/SymbolicReduction.scala b/.../io/getquill/norm/SymbolicReduction.scala → .../io/getquill/norm/SymbolicReduction.scala
diff --git a/...ill/norm/capture/AvoidAliasConflict.scala → ...ill/norm/capture/AvoidAliasConflict.scala b/...ill/norm/capture/AvoidAliasConflict.scala → ...ill/norm/capture/AvoidAliasConflict.scala
diff --git a/.../getquill/norm/capture/AvoidCapture.scala → .../getquill/norm/capture/AvoidCapture.scala b/.../getquill/norm/capture/AvoidCapture.scala → .../getquill/norm/capture/AvoidCapture.scala
diff --git a/...la/io/getquill/norm/capture/Dealias.scala → ...la/io/getquill/norm/capture/Dealias.scala b/...la/io/getquill/norm/capture/Dealias.scala → ...la/io/getquill/norm/capture/Dealias.scala
diff --git a/...rm/capture/DemarcateExternalAliases.scala → ...rm/capture/DemarcateExternalAliases.scala b/...rm/capture/DemarcateExternalAliases.scala → ...rm/capture/DemarcateExternalAliases.scala
diff --git a/...etquill/norm/capture/TemporaryIdent.scala → ...etquill/norm/capture/TemporaryIdent.scala b/...etquill/norm/capture/TemporaryIdent.scala → ...etquill/norm/capture/TemporaryIdent.scala
diff --git a/.../io/getquill/quat/BooQuatSerializer.scala → .../io/getquill/quat/BooQuatSerializer.scala b/.../io/getquill/quat/BooQuatSerializer.scala → .../io/getquill/quat/BooQuatSerializer.scala
diff --git a/...io/getquill/quat/KryoQuatSerializer.scala → ...io/getquill/quat/KryoQuatSerializer.scala b/...io/getquill/quat/KryoQuatSerializer.scala → ...io/getquill/quat/KryoQuatSerializer.scala
diff --git a/...rc/main/scala/io/getquill/quat/Quat.scala → ...rc/main/scala/io/getquill/quat/Quat.scala b/...rc/main/scala/io/getquill/quat/Quat.scala → ...rc/main/scala/io/getquill/quat/Quat.scala
diff --git a/.../io/getquill/quat/QuatNestingHelper.scala → .../io/getquill/quat/QuatNestingHelper.scala b/.../io/getquill/quat/QuatNestingHelper.scala → .../io/getquill/quat/QuatNestingHelper.scala
diff --git a/...main/scala/io/getquill/quat/QuatOps.scala → ...main/scala/io/getquill/quat/QuatOps.scala b/...main/scala/io/getquill/quat/QuatOps.scala → ...main/scala/io/getquill/quat/QuatOps.scala
diff --git a/...io/getquill/quotation/FreeVariables.scala → ...io/getquill/quotation/FreeVariables.scala b/...io/getquill/quotation/FreeVariables.scala → ...io/getquill/quotation/FreeVariables.scala
diff --git a/...tquill/quotation/NonQuotedException.scala → ...tquill/quotation/NonQuotedException.scala b/...tquill/quotation/NonQuotedException.scala → ...tquill/quotation/NonQuotedException.scala
diff --git a/...io/getquill/quotation/QuatException.scala → ...io/getquill/quotation/QuatException.scala b/...io/getquill/quotation/QuatException.scala → ...io/getquill/quotation/QuatException.scala
diff --git a/...main/scala/io/getquill/sql/SqlQuery.scala → ...main/scala/io/getquill/sql/SqlQuery.scala b/...main/scala/io/getquill/sql/SqlQuery.scala → ...main/scala/io/getquill/sql/SqlQuery.scala
diff --git a/...ill/sql/idiom/BooleanLiteralSupport.scala → ...ill/sql/idiom/BooleanLiteralSupport.scala b/...ill/sql/idiom/BooleanLiteralSupport.scala → ...ill/sql/idiom/BooleanLiteralSupport.scala
diff --git a/...io/getquill/sql/idiom/ConcatSupport.scala → ...io/getquill/sql/idiom/ConcatSupport.scala b/...io/getquill/sql/idiom/ConcatSupport.scala → ...io/getquill/sql/idiom/ConcatSupport.scala
diff --git a/...etquill/sql/idiom/OnConflictSupport.scala → ...etquill/sql/idiom/OnConflictSupport.scala b/...etquill/sql/idiom/OnConflictSupport.scala → ...etquill/sql/idiom/OnConflictSupport.scala
diff --git a/...l/sql/idiom/PositionalBindVariables.scala → ...l/sql/idiom/PositionalBindVariables.scala b/...l/sql/idiom/PositionalBindVariables.scala → ...l/sql/idiom/PositionalBindVariables.scala
diff --git a/...sql/idiom/QuestionMarkBindVariables.scala → ...sql/idiom/QuestionMarkBindVariables.scala b/...sql/idiom/QuestionMarkBindVariables.scala → ...sql/idiom/QuestionMarkBindVariables.scala
diff --git a/...cala/io/getquill/sql/idiom/SqlIdiom.scala → ...cala/io/getquill/sql/idiom/SqlIdiom.scala b/...cala/io/getquill/sql/idiom/SqlIdiom.scala → ...cala/io/getquill/sql/idiom/SqlIdiom.scala
diff --git a/...o/getquill/sql/idiom/VerifySqlQuery.scala → ...o/getquill/sql/idiom/VerifySqlQuery.scala b/...o/getquill/sql/idiom/VerifySqlQuery.scala → ...o/getquill/sql/idiom/VerifySqlQuery.scala
diff --git a/...ill/sql/norm/AddDropToNestedOrderBy.scala → ...ill/sql/norm/AddDropToNestedOrderBy.scala b/...ill/sql/norm/AddDropToNestedOrderBy.scala → ...ill/sql/norm/AddDropToNestedOrderBy.scala
diff --git a/...io/getquill/sql/norm/ExpandDistinct.scala → ...io/getquill/sql/norm/ExpandDistinct.scala b/...io/getquill/sql/norm/ExpandDistinct.scala → ...io/getquill/sql/norm/ExpandDistinct.scala
diff --git a/...ala/io/getquill/sql/norm/ExpandJoin.scala → ...ala/io/getquill/sql/norm/ExpandJoin.scala b/...ala/io/getquill/sql/norm/ExpandJoin.scala → ...ala/io/getquill/sql/norm/ExpandJoin.scala
diff --git a/...getquill/sql/norm/ExpandMappedInfix.scala → ...getquill/sql/norm/ExpandMappedInfix.scala b/...getquill/sql/norm/ExpandMappedInfix.scala → ...getquill/sql/norm/ExpandMappedInfix.scala
diff --git a/...tquill/sql/norm/ExpandNestedQueries.scala → ...tquill/sql/norm/ExpandNestedQueries.scala b/...tquill/sql/norm/ExpandNestedQueries.scala → ...tquill/sql/norm/ExpandNestedQueries.scala
diff --git a/.../sql/norm/FlattenGroupByAggregation.scala → .../sql/norm/FlattenGroupByAggregation.scala b/.../sql/norm/FlattenGroupByAggregation.scala → .../sql/norm/FlattenGroupByAggregation.scala
diff --git a/.../getquill/sql/norm/RemoveExtraAlias.scala → .../getquill/sql/norm/RemoveExtraAlias.scala b/.../getquill/sql/norm/RemoveExtraAlias.scala → .../getquill/sql/norm/RemoveExtraAlias.scala
diff --git a/...tquill/sql/norm/RemoveUnusedSelects.scala → ...tquill/sql/norm/RemoveUnusedSelects.scala b/...tquill/sql/norm/RemoveUnusedSelects.scala → ...tquill/sql/norm/RemoveUnusedSelects.scala
diff --git a/...l/sql/norm/SelectPropertyProtractor.scala → ...l/sql/norm/SelectPropertyProtractor.scala b/...l/sql/norm/SelectPropertyProtractor.scala → ...l/sql/norm/SelectPropertyProtractor.scala
diff --git a/...a/io/getquill/sql/norm/SqlNormalize.scala → ...a/io/getquill/sql/norm/SqlNormalize.scala b/...a/io/getquill/sql/norm/SqlNormalize.scala → ...a/io/getquill/sql/norm/SqlNormalize.scala
diff --git a/.../sql/norm/StatelessQueryTransformer.scala → .../sql/norm/StatelessQueryTransformer.scala b/.../sql/norm/StatelessQueryTransformer.scala → .../sql/norm/StatelessQueryTransformer.scala
diff --git a/...getquill/sql/norm/VendorizeBooleans.scala → ...getquill/sql/norm/VendorizeBooleans.scala b/...getquill/sql/norm/VendorizeBooleans.scala → ...getquill/sql/norm/VendorizeBooleans.scala
diff --git a/...o/getquill/sql/norm/nested/Elements.scala → ...o/getquill/sql/norm/nested/Elements.scala b/...o/getquill/sql/norm/nested/Elements.scala → ...o/getquill/sql/norm/nested/Elements.scala
diff --git a/.../norm/nested/FindUnexpressedInfixes.scala → .../norm/nested/FindUnexpressedInfixes.scala b/.../norm/nested/FindUnexpressedInfixes.scala → .../norm/nested/FindUnexpressedInfixes.scala
diff --git a/...c/main/scala/io/getquill/util/Cache.scala → ...c/main/scala/io/getquill/util/Cache.scala b/...c/main/scala/io/getquill/util/Cache.scala → ...c/main/scala/io/getquill/util/Cache.scala
diff --git a/...n/scala/io/getquill/util/CollectTry.scala → ...n/scala/io/getquill/util/CollectTry.scala b/...n/scala/io/getquill/util/CollectTry.scala → ...n/scala/io/getquill/util/CollectTry.scala
diff --git a/...cala/io/getquill/util/ContextLogger.scala → ...cala/io/getquill/util/ContextLogger.scala b/...cala/io/getquill/util/ContextLogger.scala → ...cala/io/getquill/util/ContextLogger.scala
diff --git a/...n/scala/io/getquill/util/IndentUtil.scala → ...n/scala/io/getquill/util/IndentUtil.scala b/...n/scala/io/getquill/util/IndentUtil.scala → ...n/scala/io/getquill/util/IndentUtil.scala
diff --git a/...n/scala/io/getquill/util/Interleave.scala → ...n/scala/io/getquill/util/Interleave.scala b/...n/scala/io/getquill/util/Interleave.scala → ...n/scala/io/getquill/util/Interleave.scala
diff --git a/...scala/io/getquill/util/Interpolator.scala → ...scala/io/getquill/util/Interpolator.scala b/...scala/io/getquill/util/Interpolator.scala → ...scala/io/getquill/util/Interpolator.scala
diff --git a/...n/scala/io/getquill/util/LoadConfig.scala → ...n/scala/io/getquill/util/LoadConfig.scala b/...n/scala/io/getquill/util/LoadConfig.scala → ...n/scala/io/getquill/util/LoadConfig.scala
diff --git a/...n/scala/io/getquill/util/LoadObject.scala → ...n/scala/io/getquill/util/LoadObject.scala b/...n/scala/io/getquill/util/LoadObject.scala → ...n/scala/io/getquill/util/LoadObject.scala
diff --git a/...ain/scala/io/getquill/util/Messages.scala → ...ain/scala/io/getquill/util/Messages.scala b/...ain/scala/io/getquill/util/Messages.scala → ...ain/scala/io/getquill/util/Messages.scala
diff --git a/...rc/main/scala/io/getquill/util/Show.scala → ...rc/main/scala/io/getquill/util/Show.scala b/...rc/main/scala/io/getquill/util/Show.scala → ...rc/main/scala/io/getquill/util/Show.scala
diff --git a/...c/main/scala/io/getquill/util/Using.scala → ...c/main/scala/io/getquill/util/Using.scala b/...c/main/scala/io/getquill/util/Using.scala → ...c/main/scala/io/getquill/util/Using.scala