From 73bad1448d997d3a7e4c85d51d3e1d8a61572dbb Mon Sep 17 00:00:00 2001 From: jilen Date: Wed, 23 Jul 2025 10:41:29 +0800 Subject: [PATCH] Move to subproject --- build.sbt | 34 ++++++++++++------- .../src}/main/scala/minisql/AstPrinter.scala | 0 .../src}/main/scala/minisql/Meta.scala | 0 .../main/scala/minisql/NamingStrategy.scala | 0 .../main/scala/minisql/ParamEncoder.scala | 0 .../src}/main/scala/minisql/Quoted.scala | 0 .../main/scala/minisql/ReturnAction.scala | 0 .../src}/main/scala/minisql/SqlInfix.scala | 0 .../src}/main/scala/minisql/ast/Ast.scala | 0 .../src}/main/scala/minisql/ast/AstOps.scala | 0 .../main/scala/minisql/ast/CollectAst.scala | 0 .../main/scala/minisql/ast/FromExprs.scala | 0 .../main/scala/minisql/ast/JoinType.scala | 0 .../main/scala/minisql/ast/Operator.scala | 0 .../minisql/ast/StatefulTransformer.scala | 0 .../minisql/ast/StatelessTransformer.scala | 0 .../main/scala/minisql/ast/Transform.scala | 0 .../main/scala/minisql/context/Context.scala | 0 .../scala/minisql/context/MirrorContext.scala | 0 .../context/ReturnFieldCapability.scala | 0 .../main/scala/minisql/context/mirror.scala | 0 .../minisql/context/sql/ConcatSupport.scala | 0 .../context/sql/MirrorSqlContext.scala | 0 .../context/sql/MirrorSqlDialect.scala | 0 .../context/sql/OnConflictSupport.scala | 0 .../context/sql/PositionalBindVariables.scala | 0 .../minisql/context/sql/PostgresDialect.scala | 0 .../sql/QuestionMarkBindVariables.scala | 0 .../minisql/context/sql/SqlContext.scala | 0 .../scala/minisql/context/sql/SqlIdiom.scala | 0 .../scala/minisql/context/sql/SqlQuery.scala | 0 .../minisql/context/sql/VerifySqlQuery.scala | 0 .../sql/norm/AddDropToNestedOrderBy.scala | 0 .../context/sql/norm/ExpandDistinct.scala | 0 .../minisql/context/sql/norm/ExpandJoin.scala | 0 .../context/sql/norm/ExpandMappedInfix.scala | 0 .../sql/norm/ExpandNestedQueries.scala | 0 .../sql/norm/FlattenGroupByAggregation.scala | 0 .../context/sql/norm/SqlNormalize.scala | 0 .../context/sql/norm/nested/Elements.scala | 0 .../sql/norm/nested/ExpandSelect.scala | 0 .../norm/nested/FindUnexpressedInfixes.scala | 0 .../src}/main/scala/minisql/idiom/Idiom.scala | 0 .../main/scala/minisql/idiom/LoadNaming.scala | 0 .../scala/minisql/idiom/MirrorIdiom.scala | 0 .../scala/minisql/idiom/ReifyStatement.scala | 0 .../main/scala/minisql/idiom/Statement.scala | 0 .../minisql/idiom/StatementInterpolator.scala | 0 .../scala/minisql/norm/AdHocReduction.scala | 0 .../main/scala/minisql/norm/ApplyMap.scala | 0 .../scala/minisql/norm/AttachToEntity.scala | 0 .../scala/minisql/norm/BetaReduction.scala | 0 .../scala/minisql/norm/ConcatBehavior.scala | 0 .../scala/minisql/norm/EqualityBehavior.scala | 0 .../scala/minisql/norm/ExpandReturning.scala | 0 .../minisql/norm/FlattenOptionOperation.scala | 0 .../scala/minisql/norm/FreeVariables.scala | 0 .../minisql/norm/NestImpureMappedInfix.scala | 0 .../main/scala/minisql/norm/Normalize.scala | 0 .../norm/NormalizeAggregationIdent.scala | 0 .../norm/NormalizeNestedStructures.scala | 0 .../minisql/norm/NormalizeReturning.scala | 0 .../main/scala/minisql/norm/OrderTerms.scala | 0 .../scala/minisql/norm/RenameProperties.scala | 0 .../scala/minisql/norm/Replacements.scala | 0 .../minisql/norm/SimplifyNullChecks.scala | 0 .../minisql/norm/SymbolicReduction.scala | 0 .../norm/capture/AvoidAliasConflict.scala | 0 .../minisql/norm/capture/AvoidCapture.scala | 0 .../scala/minisql/norm/capture/Dealias.scala | 0 .../capture/DemarcateExternalAliases.scala | 0 .../scala/minisql/parsing/BlockParsing.scala | 0 .../scala/minisql/parsing/BoxingParsing.scala | 0 .../scala/minisql/parsing/InfixParsing.scala | 0 .../scala/minisql/parsing/LiftParsing.scala | 0 .../minisql/parsing/OperationParsing.scala | 0 .../main/scala/minisql/parsing/Parser.scala | 0 .../main/scala/minisql/parsing/Parsing.scala | 0 .../minisql/parsing/PatMatchParsing.scala | 0 .../minisql/parsing/PropertyParsing.scala | 0 .../parsing/TraversableOperationParsing.scala | 0 .../scala/minisql/parsing/ValueParsing.scala | 0 .../main/scala/minisql/util/CollectTry.scala | 0 .../minisql/util/EnableReflectiveCalls.scala | 0 .../main/scala/minisql/util/IndentUtil.scala | 0 .../main/scala/minisql/util/Interleave.scala | 0 .../scala/minisql/util/Interpolator.scala | 0 .../main/scala/minisql/util/LoadObject.scala | 0 .../main/scala/minisql/util/Message.scala | 0 .../scala/minisql/util/QuotesHelper.scala | 0 .../src}/main/scala/minisql/util/Show.scala | 0 .../scala/minisql/ast/FromExprsSuite.scala | 0 .../context/sql/MirrorSqlContextSuite.scala | 0 .../scala/minisql/context/sql/context.scala | 0 .../scala/minisql/parsing/ParsingSuite.scala | 0 .../scala/minisql/parsing/QuerySuite.scala | 0 96 files changed, 21 insertions(+), 13 deletions(-) rename {src => core/src}/main/scala/minisql/AstPrinter.scala (100%) rename {src => core/src}/main/scala/minisql/Meta.scala (100%) rename {src => core/src}/main/scala/minisql/NamingStrategy.scala (100%) rename {src => core/src}/main/scala/minisql/ParamEncoder.scala (100%) rename {src => core/src}/main/scala/minisql/Quoted.scala (100%) rename {src => core/src}/main/scala/minisql/ReturnAction.scala (100%) rename {src => core/src}/main/scala/minisql/SqlInfix.scala (100%) rename {src => core/src}/main/scala/minisql/ast/Ast.scala (100%) rename {src => core/src}/main/scala/minisql/ast/AstOps.scala (100%) rename {src => core/src}/main/scala/minisql/ast/CollectAst.scala (100%) rename {src => core/src}/main/scala/minisql/ast/FromExprs.scala (100%) rename {src => core/src}/main/scala/minisql/ast/JoinType.scala (100%) rename {src => core/src}/main/scala/minisql/ast/Operator.scala (100%) rename {src => core/src}/main/scala/minisql/ast/StatefulTransformer.scala (100%) rename {src => core/src}/main/scala/minisql/ast/StatelessTransformer.scala (100%) rename {src => core/src}/main/scala/minisql/ast/Transform.scala (100%) rename {src => core/src}/main/scala/minisql/context/Context.scala (100%) rename {src => core/src}/main/scala/minisql/context/MirrorContext.scala (100%) rename {src => core/src}/main/scala/minisql/context/ReturnFieldCapability.scala (100%) rename {src => core/src}/main/scala/minisql/context/mirror.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/ConcatSupport.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/MirrorSqlContext.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/MirrorSqlDialect.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/OnConflictSupport.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/PositionalBindVariables.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/PostgresDialect.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/QuestionMarkBindVariables.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/SqlContext.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/SqlIdiom.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/SqlQuery.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/VerifySqlQuery.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/norm/AddDropToNestedOrderBy.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/norm/ExpandDistinct.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/norm/ExpandJoin.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/norm/ExpandMappedInfix.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/norm/ExpandNestedQueries.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/norm/FlattenGroupByAggregation.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/norm/SqlNormalize.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/norm/nested/Elements.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/norm/nested/ExpandSelect.scala (100%) rename {src => core/src}/main/scala/minisql/context/sql/norm/nested/FindUnexpressedInfixes.scala (100%) rename {src => core/src}/main/scala/minisql/idiom/Idiom.scala (100%) rename {src => core/src}/main/scala/minisql/idiom/LoadNaming.scala (100%) rename {src => core/src}/main/scala/minisql/idiom/MirrorIdiom.scala (100%) rename {src => core/src}/main/scala/minisql/idiom/ReifyStatement.scala (100%) rename {src => core/src}/main/scala/minisql/idiom/Statement.scala (100%) rename {src => core/src}/main/scala/minisql/idiom/StatementInterpolator.scala (100%) rename {src => core/src}/main/scala/minisql/norm/AdHocReduction.scala (100%) rename {src => core/src}/main/scala/minisql/norm/ApplyMap.scala (100%) rename {src => core/src}/main/scala/minisql/norm/AttachToEntity.scala (100%) rename {src => core/src}/main/scala/minisql/norm/BetaReduction.scala (100%) rename {src => core/src}/main/scala/minisql/norm/ConcatBehavior.scala (100%) rename {src => core/src}/main/scala/minisql/norm/EqualityBehavior.scala (100%) rename {src => core/src}/main/scala/minisql/norm/ExpandReturning.scala (100%) rename {src => core/src}/main/scala/minisql/norm/FlattenOptionOperation.scala (100%) rename {src => core/src}/main/scala/minisql/norm/FreeVariables.scala (100%) rename {src => core/src}/main/scala/minisql/norm/NestImpureMappedInfix.scala (100%) rename {src => core/src}/main/scala/minisql/norm/Normalize.scala (100%) rename {src => core/src}/main/scala/minisql/norm/NormalizeAggregationIdent.scala (100%) rename {src => core/src}/main/scala/minisql/norm/NormalizeNestedStructures.scala (100%) rename {src => core/src}/main/scala/minisql/norm/NormalizeReturning.scala (100%) rename {src => core/src}/main/scala/minisql/norm/OrderTerms.scala (100%) rename {src => core/src}/main/scala/minisql/norm/RenameProperties.scala (100%) rename {src => core/src}/main/scala/minisql/norm/Replacements.scala (100%) rename {src => core/src}/main/scala/minisql/norm/SimplifyNullChecks.scala (100%) rename {src => core/src}/main/scala/minisql/norm/SymbolicReduction.scala (100%) rename {src => core/src}/main/scala/minisql/norm/capture/AvoidAliasConflict.scala (100%) rename {src => core/src}/main/scala/minisql/norm/capture/AvoidCapture.scala (100%) rename {src => core/src}/main/scala/minisql/norm/capture/Dealias.scala (100%) rename {src => core/src}/main/scala/minisql/norm/capture/DemarcateExternalAliases.scala (100%) rename {src => core/src}/main/scala/minisql/parsing/BlockParsing.scala (100%) rename {src => core/src}/main/scala/minisql/parsing/BoxingParsing.scala (100%) rename {src => core/src}/main/scala/minisql/parsing/InfixParsing.scala (100%) rename {src => core/src}/main/scala/minisql/parsing/LiftParsing.scala (100%) rename {src => core/src}/main/scala/minisql/parsing/OperationParsing.scala (100%) rename {src => core/src}/main/scala/minisql/parsing/Parser.scala (100%) rename {src => core/src}/main/scala/minisql/parsing/Parsing.scala (100%) rename {src => core/src}/main/scala/minisql/parsing/PatMatchParsing.scala (100%) rename {src => core/src}/main/scala/minisql/parsing/PropertyParsing.scala (100%) rename {src => core/src}/main/scala/minisql/parsing/TraversableOperationParsing.scala (100%) rename {src => core/src}/main/scala/minisql/parsing/ValueParsing.scala (100%) rename {src => core/src}/main/scala/minisql/util/CollectTry.scala (100%) rename {src => core/src}/main/scala/minisql/util/EnableReflectiveCalls.scala (100%) rename {src => core/src}/main/scala/minisql/util/IndentUtil.scala (100%) rename {src => core/src}/main/scala/minisql/util/Interleave.scala (100%) rename {src => core/src}/main/scala/minisql/util/Interpolator.scala (100%) rename {src => core/src}/main/scala/minisql/util/LoadObject.scala (100%) rename {src => core/src}/main/scala/minisql/util/Message.scala (100%) rename {src => core/src}/main/scala/minisql/util/QuotesHelper.scala (100%) rename {src => core/src}/main/scala/minisql/util/Show.scala (100%) rename {src => core/src}/test/scala/minisql/ast/FromExprsSuite.scala (100%) rename {src => core/src}/test/scala/minisql/context/sql/MirrorSqlContextSuite.scala (100%) rename {src => core/src}/test/scala/minisql/context/sql/context.scala (100%) rename {src => core/src}/test/scala/minisql/parsing/ParsingSuite.scala (100%) rename {src => core/src}/test/scala/minisql/parsing/QuerySuite.scala (100%) diff --git a/build.sbt b/build.sbt index 509877e..6d1c303 100644 --- a/build.sbt +++ b/build.sbt @@ -1,15 +1,23 @@ -name := "minisql" +val prjScalaVersion = "3.7.1" -scalaVersion := "3.7.1" +lazy val root = (project in file(".")) + .aggregate(core) + .settings( + name := "minisql", + scalaVersion := prjScalaVersion + ) -libraryDependencies ++= Seq( - "org.scalameta" %% "munit" % "1.1.1" % Test -) - - -scalacOptions ++= Seq( - "-deprecation", - "-feature", - "-source:3.7-migration", - "-rewrite" -) +lazy val core = (project in file("core")) + .settings( + name := "minisql-core", + scalaVersion := prjScalaVersion, + libraryDependencies ++= Seq( + "org.scalameta" %% "munit" % "1.1.1" % Test + ), + scalacOptions ++= Seq( + "-deprecation", + "-feature", + "-source:3.7-migration", + "-rewrite" + ) + ) diff --git a/src/main/scala/minisql/AstPrinter.scala b/core/src/main/scala/minisql/AstPrinter.scala similarity index 100% rename from src/main/scala/minisql/AstPrinter.scala rename to core/src/main/scala/minisql/AstPrinter.scala diff --git a/src/main/scala/minisql/Meta.scala b/core/src/main/scala/minisql/Meta.scala similarity index 100% rename from src/main/scala/minisql/Meta.scala rename to core/src/main/scala/minisql/Meta.scala diff --git a/src/main/scala/minisql/NamingStrategy.scala b/core/src/main/scala/minisql/NamingStrategy.scala similarity index 100% rename from src/main/scala/minisql/NamingStrategy.scala rename to core/src/main/scala/minisql/NamingStrategy.scala diff --git a/src/main/scala/minisql/ParamEncoder.scala b/core/src/main/scala/minisql/ParamEncoder.scala similarity index 100% rename from src/main/scala/minisql/ParamEncoder.scala rename to core/src/main/scala/minisql/ParamEncoder.scala diff --git a/src/main/scala/minisql/Quoted.scala b/core/src/main/scala/minisql/Quoted.scala similarity index 100% rename from src/main/scala/minisql/Quoted.scala rename to core/src/main/scala/minisql/Quoted.scala diff --git a/src/main/scala/minisql/ReturnAction.scala b/core/src/main/scala/minisql/ReturnAction.scala similarity index 100% rename from src/main/scala/minisql/ReturnAction.scala rename to core/src/main/scala/minisql/ReturnAction.scala diff --git a/src/main/scala/minisql/SqlInfix.scala b/core/src/main/scala/minisql/SqlInfix.scala similarity index 100% rename from src/main/scala/minisql/SqlInfix.scala rename to core/src/main/scala/minisql/SqlInfix.scala diff --git a/src/main/scala/minisql/ast/Ast.scala b/core/src/main/scala/minisql/ast/Ast.scala similarity index 100% rename from src/main/scala/minisql/ast/Ast.scala rename to core/src/main/scala/minisql/ast/Ast.scala diff --git a/src/main/scala/minisql/ast/AstOps.scala b/core/src/main/scala/minisql/ast/AstOps.scala similarity index 100% rename from src/main/scala/minisql/ast/AstOps.scala rename to core/src/main/scala/minisql/ast/AstOps.scala diff --git a/src/main/scala/minisql/ast/CollectAst.scala b/core/src/main/scala/minisql/ast/CollectAst.scala similarity index 100% rename from src/main/scala/minisql/ast/CollectAst.scala rename to core/src/main/scala/minisql/ast/CollectAst.scala diff --git a/src/main/scala/minisql/ast/FromExprs.scala b/core/src/main/scala/minisql/ast/FromExprs.scala similarity index 100% rename from src/main/scala/minisql/ast/FromExprs.scala rename to core/src/main/scala/minisql/ast/FromExprs.scala diff --git a/src/main/scala/minisql/ast/JoinType.scala b/core/src/main/scala/minisql/ast/JoinType.scala similarity index 100% rename from src/main/scala/minisql/ast/JoinType.scala rename to core/src/main/scala/minisql/ast/JoinType.scala diff --git a/src/main/scala/minisql/ast/Operator.scala b/core/src/main/scala/minisql/ast/Operator.scala similarity index 100% rename from src/main/scala/minisql/ast/Operator.scala rename to core/src/main/scala/minisql/ast/Operator.scala diff --git a/src/main/scala/minisql/ast/StatefulTransformer.scala b/core/src/main/scala/minisql/ast/StatefulTransformer.scala similarity index 100% rename from src/main/scala/minisql/ast/StatefulTransformer.scala rename to core/src/main/scala/minisql/ast/StatefulTransformer.scala diff --git a/src/main/scala/minisql/ast/StatelessTransformer.scala b/core/src/main/scala/minisql/ast/StatelessTransformer.scala similarity index 100% rename from src/main/scala/minisql/ast/StatelessTransformer.scala rename to core/src/main/scala/minisql/ast/StatelessTransformer.scala diff --git a/src/main/scala/minisql/ast/Transform.scala b/core/src/main/scala/minisql/ast/Transform.scala similarity index 100% rename from src/main/scala/minisql/ast/Transform.scala rename to core/src/main/scala/minisql/ast/Transform.scala diff --git a/src/main/scala/minisql/context/Context.scala b/core/src/main/scala/minisql/context/Context.scala similarity index 100% rename from src/main/scala/minisql/context/Context.scala rename to core/src/main/scala/minisql/context/Context.scala diff --git a/src/main/scala/minisql/context/MirrorContext.scala b/core/src/main/scala/minisql/context/MirrorContext.scala similarity index 100% rename from src/main/scala/minisql/context/MirrorContext.scala rename to core/src/main/scala/minisql/context/MirrorContext.scala diff --git a/src/main/scala/minisql/context/ReturnFieldCapability.scala b/core/src/main/scala/minisql/context/ReturnFieldCapability.scala similarity index 100% rename from src/main/scala/minisql/context/ReturnFieldCapability.scala rename to core/src/main/scala/minisql/context/ReturnFieldCapability.scala diff --git a/src/main/scala/minisql/context/mirror.scala b/core/src/main/scala/minisql/context/mirror.scala similarity index 100% rename from src/main/scala/minisql/context/mirror.scala rename to core/src/main/scala/minisql/context/mirror.scala diff --git a/src/main/scala/minisql/context/sql/ConcatSupport.scala b/core/src/main/scala/minisql/context/sql/ConcatSupport.scala similarity index 100% rename from src/main/scala/minisql/context/sql/ConcatSupport.scala rename to core/src/main/scala/minisql/context/sql/ConcatSupport.scala diff --git a/src/main/scala/minisql/context/sql/MirrorSqlContext.scala b/core/src/main/scala/minisql/context/sql/MirrorSqlContext.scala similarity index 100% rename from src/main/scala/minisql/context/sql/MirrorSqlContext.scala rename to core/src/main/scala/minisql/context/sql/MirrorSqlContext.scala diff --git a/src/main/scala/minisql/context/sql/MirrorSqlDialect.scala b/core/src/main/scala/minisql/context/sql/MirrorSqlDialect.scala similarity index 100% rename from src/main/scala/minisql/context/sql/MirrorSqlDialect.scala rename to core/src/main/scala/minisql/context/sql/MirrorSqlDialect.scala diff --git a/src/main/scala/minisql/context/sql/OnConflictSupport.scala b/core/src/main/scala/minisql/context/sql/OnConflictSupport.scala similarity index 100% rename from src/main/scala/minisql/context/sql/OnConflictSupport.scala rename to core/src/main/scala/minisql/context/sql/OnConflictSupport.scala diff --git a/src/main/scala/minisql/context/sql/PositionalBindVariables.scala b/core/src/main/scala/minisql/context/sql/PositionalBindVariables.scala similarity index 100% rename from src/main/scala/minisql/context/sql/PositionalBindVariables.scala rename to core/src/main/scala/minisql/context/sql/PositionalBindVariables.scala diff --git a/src/main/scala/minisql/context/sql/PostgresDialect.scala b/core/src/main/scala/minisql/context/sql/PostgresDialect.scala similarity index 100% rename from src/main/scala/minisql/context/sql/PostgresDialect.scala rename to core/src/main/scala/minisql/context/sql/PostgresDialect.scala diff --git a/src/main/scala/minisql/context/sql/QuestionMarkBindVariables.scala b/core/src/main/scala/minisql/context/sql/QuestionMarkBindVariables.scala similarity index 100% rename from src/main/scala/minisql/context/sql/QuestionMarkBindVariables.scala rename to core/src/main/scala/minisql/context/sql/QuestionMarkBindVariables.scala diff --git a/src/main/scala/minisql/context/sql/SqlContext.scala b/core/src/main/scala/minisql/context/sql/SqlContext.scala similarity index 100% rename from src/main/scala/minisql/context/sql/SqlContext.scala rename to core/src/main/scala/minisql/context/sql/SqlContext.scala diff --git a/src/main/scala/minisql/context/sql/SqlIdiom.scala b/core/src/main/scala/minisql/context/sql/SqlIdiom.scala similarity index 100% rename from src/main/scala/minisql/context/sql/SqlIdiom.scala rename to core/src/main/scala/minisql/context/sql/SqlIdiom.scala diff --git a/src/main/scala/minisql/context/sql/SqlQuery.scala b/core/src/main/scala/minisql/context/sql/SqlQuery.scala similarity index 100% rename from src/main/scala/minisql/context/sql/SqlQuery.scala rename to core/src/main/scala/minisql/context/sql/SqlQuery.scala diff --git a/src/main/scala/minisql/context/sql/VerifySqlQuery.scala b/core/src/main/scala/minisql/context/sql/VerifySqlQuery.scala similarity index 100% rename from src/main/scala/minisql/context/sql/VerifySqlQuery.scala rename to core/src/main/scala/minisql/context/sql/VerifySqlQuery.scala diff --git a/src/main/scala/minisql/context/sql/norm/AddDropToNestedOrderBy.scala b/core/src/main/scala/minisql/context/sql/norm/AddDropToNestedOrderBy.scala similarity index 100% rename from src/main/scala/minisql/context/sql/norm/AddDropToNestedOrderBy.scala rename to core/src/main/scala/minisql/context/sql/norm/AddDropToNestedOrderBy.scala diff --git a/src/main/scala/minisql/context/sql/norm/ExpandDistinct.scala b/core/src/main/scala/minisql/context/sql/norm/ExpandDistinct.scala similarity index 100% rename from src/main/scala/minisql/context/sql/norm/ExpandDistinct.scala rename to core/src/main/scala/minisql/context/sql/norm/ExpandDistinct.scala diff --git a/src/main/scala/minisql/context/sql/norm/ExpandJoin.scala b/core/src/main/scala/minisql/context/sql/norm/ExpandJoin.scala similarity index 100% rename from src/main/scala/minisql/context/sql/norm/ExpandJoin.scala rename to core/src/main/scala/minisql/context/sql/norm/ExpandJoin.scala diff --git a/src/main/scala/minisql/context/sql/norm/ExpandMappedInfix.scala b/core/src/main/scala/minisql/context/sql/norm/ExpandMappedInfix.scala similarity index 100% rename from src/main/scala/minisql/context/sql/norm/ExpandMappedInfix.scala rename to core/src/main/scala/minisql/context/sql/norm/ExpandMappedInfix.scala diff --git a/src/main/scala/minisql/context/sql/norm/ExpandNestedQueries.scala b/core/src/main/scala/minisql/context/sql/norm/ExpandNestedQueries.scala similarity index 100% rename from src/main/scala/minisql/context/sql/norm/ExpandNestedQueries.scala rename to core/src/main/scala/minisql/context/sql/norm/ExpandNestedQueries.scala diff --git a/src/main/scala/minisql/context/sql/norm/FlattenGroupByAggregation.scala b/core/src/main/scala/minisql/context/sql/norm/FlattenGroupByAggregation.scala similarity index 100% rename from src/main/scala/minisql/context/sql/norm/FlattenGroupByAggregation.scala rename to core/src/main/scala/minisql/context/sql/norm/FlattenGroupByAggregation.scala diff --git a/src/main/scala/minisql/context/sql/norm/SqlNormalize.scala b/core/src/main/scala/minisql/context/sql/norm/SqlNormalize.scala similarity index 100% rename from src/main/scala/minisql/context/sql/norm/SqlNormalize.scala rename to core/src/main/scala/minisql/context/sql/norm/SqlNormalize.scala diff --git a/src/main/scala/minisql/context/sql/norm/nested/Elements.scala b/core/src/main/scala/minisql/context/sql/norm/nested/Elements.scala similarity index 100% rename from src/main/scala/minisql/context/sql/norm/nested/Elements.scala rename to core/src/main/scala/minisql/context/sql/norm/nested/Elements.scala diff --git a/src/main/scala/minisql/context/sql/norm/nested/ExpandSelect.scala b/core/src/main/scala/minisql/context/sql/norm/nested/ExpandSelect.scala similarity index 100% rename from src/main/scala/minisql/context/sql/norm/nested/ExpandSelect.scala rename to core/src/main/scala/minisql/context/sql/norm/nested/ExpandSelect.scala diff --git a/src/main/scala/minisql/context/sql/norm/nested/FindUnexpressedInfixes.scala b/core/src/main/scala/minisql/context/sql/norm/nested/FindUnexpressedInfixes.scala similarity index 100% rename from src/main/scala/minisql/context/sql/norm/nested/FindUnexpressedInfixes.scala rename to core/src/main/scala/minisql/context/sql/norm/nested/FindUnexpressedInfixes.scala diff --git a/src/main/scala/minisql/idiom/Idiom.scala b/core/src/main/scala/minisql/idiom/Idiom.scala similarity index 100% rename from src/main/scala/minisql/idiom/Idiom.scala rename to core/src/main/scala/minisql/idiom/Idiom.scala diff --git a/src/main/scala/minisql/idiom/LoadNaming.scala b/core/src/main/scala/minisql/idiom/LoadNaming.scala similarity index 100% rename from src/main/scala/minisql/idiom/LoadNaming.scala rename to core/src/main/scala/minisql/idiom/LoadNaming.scala diff --git a/src/main/scala/minisql/idiom/MirrorIdiom.scala b/core/src/main/scala/minisql/idiom/MirrorIdiom.scala similarity index 100% rename from src/main/scala/minisql/idiom/MirrorIdiom.scala rename to core/src/main/scala/minisql/idiom/MirrorIdiom.scala diff --git a/src/main/scala/minisql/idiom/ReifyStatement.scala b/core/src/main/scala/minisql/idiom/ReifyStatement.scala similarity index 100% rename from src/main/scala/minisql/idiom/ReifyStatement.scala rename to core/src/main/scala/minisql/idiom/ReifyStatement.scala diff --git a/src/main/scala/minisql/idiom/Statement.scala b/core/src/main/scala/minisql/idiom/Statement.scala similarity index 100% rename from src/main/scala/minisql/idiom/Statement.scala rename to core/src/main/scala/minisql/idiom/Statement.scala diff --git a/src/main/scala/minisql/idiom/StatementInterpolator.scala b/core/src/main/scala/minisql/idiom/StatementInterpolator.scala similarity index 100% rename from src/main/scala/minisql/idiom/StatementInterpolator.scala rename to core/src/main/scala/minisql/idiom/StatementInterpolator.scala diff --git a/src/main/scala/minisql/norm/AdHocReduction.scala b/core/src/main/scala/minisql/norm/AdHocReduction.scala similarity index 100% rename from src/main/scala/minisql/norm/AdHocReduction.scala rename to core/src/main/scala/minisql/norm/AdHocReduction.scala diff --git a/src/main/scala/minisql/norm/ApplyMap.scala b/core/src/main/scala/minisql/norm/ApplyMap.scala similarity index 100% rename from src/main/scala/minisql/norm/ApplyMap.scala rename to core/src/main/scala/minisql/norm/ApplyMap.scala diff --git a/src/main/scala/minisql/norm/AttachToEntity.scala b/core/src/main/scala/minisql/norm/AttachToEntity.scala similarity index 100% rename from src/main/scala/minisql/norm/AttachToEntity.scala rename to core/src/main/scala/minisql/norm/AttachToEntity.scala diff --git a/src/main/scala/minisql/norm/BetaReduction.scala b/core/src/main/scala/minisql/norm/BetaReduction.scala similarity index 100% rename from src/main/scala/minisql/norm/BetaReduction.scala rename to core/src/main/scala/minisql/norm/BetaReduction.scala diff --git a/src/main/scala/minisql/norm/ConcatBehavior.scala b/core/src/main/scala/minisql/norm/ConcatBehavior.scala similarity index 100% rename from src/main/scala/minisql/norm/ConcatBehavior.scala rename to core/src/main/scala/minisql/norm/ConcatBehavior.scala diff --git a/src/main/scala/minisql/norm/EqualityBehavior.scala b/core/src/main/scala/minisql/norm/EqualityBehavior.scala similarity index 100% rename from src/main/scala/minisql/norm/EqualityBehavior.scala rename to core/src/main/scala/minisql/norm/EqualityBehavior.scala diff --git a/src/main/scala/minisql/norm/ExpandReturning.scala b/core/src/main/scala/minisql/norm/ExpandReturning.scala similarity index 100% rename from src/main/scala/minisql/norm/ExpandReturning.scala rename to core/src/main/scala/minisql/norm/ExpandReturning.scala diff --git a/src/main/scala/minisql/norm/FlattenOptionOperation.scala b/core/src/main/scala/minisql/norm/FlattenOptionOperation.scala similarity index 100% rename from src/main/scala/minisql/norm/FlattenOptionOperation.scala rename to core/src/main/scala/minisql/norm/FlattenOptionOperation.scala diff --git a/src/main/scala/minisql/norm/FreeVariables.scala b/core/src/main/scala/minisql/norm/FreeVariables.scala similarity index 100% rename from src/main/scala/minisql/norm/FreeVariables.scala rename to core/src/main/scala/minisql/norm/FreeVariables.scala diff --git a/src/main/scala/minisql/norm/NestImpureMappedInfix.scala b/core/src/main/scala/minisql/norm/NestImpureMappedInfix.scala similarity index 100% rename from src/main/scala/minisql/norm/NestImpureMappedInfix.scala rename to core/src/main/scala/minisql/norm/NestImpureMappedInfix.scala diff --git a/src/main/scala/minisql/norm/Normalize.scala b/core/src/main/scala/minisql/norm/Normalize.scala similarity index 100% rename from src/main/scala/minisql/norm/Normalize.scala rename to core/src/main/scala/minisql/norm/Normalize.scala diff --git a/src/main/scala/minisql/norm/NormalizeAggregationIdent.scala b/core/src/main/scala/minisql/norm/NormalizeAggregationIdent.scala similarity index 100% rename from src/main/scala/minisql/norm/NormalizeAggregationIdent.scala rename to core/src/main/scala/minisql/norm/NormalizeAggregationIdent.scala diff --git a/src/main/scala/minisql/norm/NormalizeNestedStructures.scala b/core/src/main/scala/minisql/norm/NormalizeNestedStructures.scala similarity index 100% rename from src/main/scala/minisql/norm/NormalizeNestedStructures.scala rename to core/src/main/scala/minisql/norm/NormalizeNestedStructures.scala diff --git a/src/main/scala/minisql/norm/NormalizeReturning.scala b/core/src/main/scala/minisql/norm/NormalizeReturning.scala similarity index 100% rename from src/main/scala/minisql/norm/NormalizeReturning.scala rename to core/src/main/scala/minisql/norm/NormalizeReturning.scala diff --git a/src/main/scala/minisql/norm/OrderTerms.scala b/core/src/main/scala/minisql/norm/OrderTerms.scala similarity index 100% rename from src/main/scala/minisql/norm/OrderTerms.scala rename to core/src/main/scala/minisql/norm/OrderTerms.scala diff --git a/src/main/scala/minisql/norm/RenameProperties.scala b/core/src/main/scala/minisql/norm/RenameProperties.scala similarity index 100% rename from src/main/scala/minisql/norm/RenameProperties.scala rename to core/src/main/scala/minisql/norm/RenameProperties.scala diff --git a/src/main/scala/minisql/norm/Replacements.scala b/core/src/main/scala/minisql/norm/Replacements.scala similarity index 100% rename from src/main/scala/minisql/norm/Replacements.scala rename to core/src/main/scala/minisql/norm/Replacements.scala diff --git a/src/main/scala/minisql/norm/SimplifyNullChecks.scala b/core/src/main/scala/minisql/norm/SimplifyNullChecks.scala similarity index 100% rename from src/main/scala/minisql/norm/SimplifyNullChecks.scala rename to core/src/main/scala/minisql/norm/SimplifyNullChecks.scala diff --git a/src/main/scala/minisql/norm/SymbolicReduction.scala b/core/src/main/scala/minisql/norm/SymbolicReduction.scala similarity index 100% rename from src/main/scala/minisql/norm/SymbolicReduction.scala rename to core/src/main/scala/minisql/norm/SymbolicReduction.scala diff --git a/src/main/scala/minisql/norm/capture/AvoidAliasConflict.scala b/core/src/main/scala/minisql/norm/capture/AvoidAliasConflict.scala similarity index 100% rename from src/main/scala/minisql/norm/capture/AvoidAliasConflict.scala rename to core/src/main/scala/minisql/norm/capture/AvoidAliasConflict.scala diff --git a/src/main/scala/minisql/norm/capture/AvoidCapture.scala b/core/src/main/scala/minisql/norm/capture/AvoidCapture.scala similarity index 100% rename from src/main/scala/minisql/norm/capture/AvoidCapture.scala rename to core/src/main/scala/minisql/norm/capture/AvoidCapture.scala diff --git a/src/main/scala/minisql/norm/capture/Dealias.scala b/core/src/main/scala/minisql/norm/capture/Dealias.scala similarity index 100% rename from src/main/scala/minisql/norm/capture/Dealias.scala rename to core/src/main/scala/minisql/norm/capture/Dealias.scala diff --git a/src/main/scala/minisql/norm/capture/DemarcateExternalAliases.scala b/core/src/main/scala/minisql/norm/capture/DemarcateExternalAliases.scala similarity index 100% rename from src/main/scala/minisql/norm/capture/DemarcateExternalAliases.scala rename to core/src/main/scala/minisql/norm/capture/DemarcateExternalAliases.scala diff --git a/src/main/scala/minisql/parsing/BlockParsing.scala b/core/src/main/scala/minisql/parsing/BlockParsing.scala similarity index 100% rename from src/main/scala/minisql/parsing/BlockParsing.scala rename to core/src/main/scala/minisql/parsing/BlockParsing.scala diff --git a/src/main/scala/minisql/parsing/BoxingParsing.scala b/core/src/main/scala/minisql/parsing/BoxingParsing.scala similarity index 100% rename from src/main/scala/minisql/parsing/BoxingParsing.scala rename to core/src/main/scala/minisql/parsing/BoxingParsing.scala diff --git a/src/main/scala/minisql/parsing/InfixParsing.scala b/core/src/main/scala/minisql/parsing/InfixParsing.scala similarity index 100% rename from src/main/scala/minisql/parsing/InfixParsing.scala rename to core/src/main/scala/minisql/parsing/InfixParsing.scala diff --git a/src/main/scala/minisql/parsing/LiftParsing.scala b/core/src/main/scala/minisql/parsing/LiftParsing.scala similarity index 100% rename from src/main/scala/minisql/parsing/LiftParsing.scala rename to core/src/main/scala/minisql/parsing/LiftParsing.scala diff --git a/src/main/scala/minisql/parsing/OperationParsing.scala b/core/src/main/scala/minisql/parsing/OperationParsing.scala similarity index 100% rename from src/main/scala/minisql/parsing/OperationParsing.scala rename to core/src/main/scala/minisql/parsing/OperationParsing.scala diff --git a/src/main/scala/minisql/parsing/Parser.scala b/core/src/main/scala/minisql/parsing/Parser.scala similarity index 100% rename from src/main/scala/minisql/parsing/Parser.scala rename to core/src/main/scala/minisql/parsing/Parser.scala diff --git a/src/main/scala/minisql/parsing/Parsing.scala b/core/src/main/scala/minisql/parsing/Parsing.scala similarity index 100% rename from src/main/scala/minisql/parsing/Parsing.scala rename to core/src/main/scala/minisql/parsing/Parsing.scala diff --git a/src/main/scala/minisql/parsing/PatMatchParsing.scala b/core/src/main/scala/minisql/parsing/PatMatchParsing.scala similarity index 100% rename from src/main/scala/minisql/parsing/PatMatchParsing.scala rename to core/src/main/scala/minisql/parsing/PatMatchParsing.scala diff --git a/src/main/scala/minisql/parsing/PropertyParsing.scala b/core/src/main/scala/minisql/parsing/PropertyParsing.scala similarity index 100% rename from src/main/scala/minisql/parsing/PropertyParsing.scala rename to core/src/main/scala/minisql/parsing/PropertyParsing.scala diff --git a/src/main/scala/minisql/parsing/TraversableOperationParsing.scala b/core/src/main/scala/minisql/parsing/TraversableOperationParsing.scala similarity index 100% rename from src/main/scala/minisql/parsing/TraversableOperationParsing.scala rename to core/src/main/scala/minisql/parsing/TraversableOperationParsing.scala diff --git a/src/main/scala/minisql/parsing/ValueParsing.scala b/core/src/main/scala/minisql/parsing/ValueParsing.scala similarity index 100% rename from src/main/scala/minisql/parsing/ValueParsing.scala rename to core/src/main/scala/minisql/parsing/ValueParsing.scala diff --git a/src/main/scala/minisql/util/CollectTry.scala b/core/src/main/scala/minisql/util/CollectTry.scala similarity index 100% rename from src/main/scala/minisql/util/CollectTry.scala rename to core/src/main/scala/minisql/util/CollectTry.scala diff --git a/src/main/scala/minisql/util/EnableReflectiveCalls.scala b/core/src/main/scala/minisql/util/EnableReflectiveCalls.scala similarity index 100% rename from src/main/scala/minisql/util/EnableReflectiveCalls.scala rename to core/src/main/scala/minisql/util/EnableReflectiveCalls.scala diff --git a/src/main/scala/minisql/util/IndentUtil.scala b/core/src/main/scala/minisql/util/IndentUtil.scala similarity index 100% rename from src/main/scala/minisql/util/IndentUtil.scala rename to core/src/main/scala/minisql/util/IndentUtil.scala diff --git a/src/main/scala/minisql/util/Interleave.scala b/core/src/main/scala/minisql/util/Interleave.scala similarity index 100% rename from src/main/scala/minisql/util/Interleave.scala rename to core/src/main/scala/minisql/util/Interleave.scala diff --git a/src/main/scala/minisql/util/Interpolator.scala b/core/src/main/scala/minisql/util/Interpolator.scala similarity index 100% rename from src/main/scala/minisql/util/Interpolator.scala rename to core/src/main/scala/minisql/util/Interpolator.scala diff --git a/src/main/scala/minisql/util/LoadObject.scala b/core/src/main/scala/minisql/util/LoadObject.scala similarity index 100% rename from src/main/scala/minisql/util/LoadObject.scala rename to core/src/main/scala/minisql/util/LoadObject.scala diff --git a/src/main/scala/minisql/util/Message.scala b/core/src/main/scala/minisql/util/Message.scala similarity index 100% rename from src/main/scala/minisql/util/Message.scala rename to core/src/main/scala/minisql/util/Message.scala diff --git a/src/main/scala/minisql/util/QuotesHelper.scala b/core/src/main/scala/minisql/util/QuotesHelper.scala similarity index 100% rename from src/main/scala/minisql/util/QuotesHelper.scala rename to core/src/main/scala/minisql/util/QuotesHelper.scala diff --git a/src/main/scala/minisql/util/Show.scala b/core/src/main/scala/minisql/util/Show.scala similarity index 100% rename from src/main/scala/minisql/util/Show.scala rename to core/src/main/scala/minisql/util/Show.scala diff --git a/src/test/scala/minisql/ast/FromExprsSuite.scala b/core/src/test/scala/minisql/ast/FromExprsSuite.scala similarity index 100% rename from src/test/scala/minisql/ast/FromExprsSuite.scala rename to core/src/test/scala/minisql/ast/FromExprsSuite.scala diff --git a/src/test/scala/minisql/context/sql/MirrorSqlContextSuite.scala b/core/src/test/scala/minisql/context/sql/MirrorSqlContextSuite.scala similarity index 100% rename from src/test/scala/minisql/context/sql/MirrorSqlContextSuite.scala rename to core/src/test/scala/minisql/context/sql/MirrorSqlContextSuite.scala diff --git a/src/test/scala/minisql/context/sql/context.scala b/core/src/test/scala/minisql/context/sql/context.scala similarity index 100% rename from src/test/scala/minisql/context/sql/context.scala rename to core/src/test/scala/minisql/context/sql/context.scala diff --git a/src/test/scala/minisql/parsing/ParsingSuite.scala b/core/src/test/scala/minisql/parsing/ParsingSuite.scala similarity index 100% rename from src/test/scala/minisql/parsing/ParsingSuite.scala rename to core/src/test/scala/minisql/parsing/ParsingSuite.scala diff --git a/src/test/scala/minisql/parsing/QuerySuite.scala b/core/src/test/scala/minisql/parsing/QuerySuite.scala similarity index 100% rename from src/test/scala/minisql/parsing/QuerySuite.scala rename to core/src/test/scala/minisql/parsing/QuerySuite.scala