Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Scala 3 support #11

Merged
merged 15 commits into from
May 25, 2024
Merged

Scala 3 support #11

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift click to select a range
88bd111
Enable Scala 3 in build.
mrdziuban May 22, 2024
2356551
Prevent indentation warnings on Scala 3.
mrdziuban May 22, 2024
9ffeb06
Convert `CharSequence`s to `String`s explicitly.
mrdziuban May 22, 2024
011c3f6
Remove `try` without `catch`.
mrdziuban May 22, 2024
afed97f
Add types to implicits.
mrdziuban May 22, 2024
8e767e3
Mark `renderSql` as `private[scalasql]` instead of `protected`.
mrdziuban May 22, 2024
c082117
Upgrade to Scala 2.13.14 and 3.4.2, use new Scala 3 syntax.
mrdziuban May 23, 2024
44a04a2
Add Scala 3 `TableMacros`.
mrdziuban May 23, 2024
f73c048
Get scalafix working again.
mrdziuban May 23, 2024
24eba9d
Remove need for `Internal`.
mrdziuban May 23, 2024
95607da
Update docs.
mrdziuban May 24, 2024
405ab33
Port H2Example to Scala 3 with fewer braces.
mrdziuban May 24, 2024
34cd660
Dedupe class construction with `constructV` method.
mrdziuban May 25, 2024
5fe569a
Remove name from `given DialectTypeMappers`, ensure it's always used.
mrdziuban May 25, 2024
0f142b3
Dedupe retrieval of data from `Table.ImplicitMetadata` with `fromImpl…
mrdziuban May 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Dedupe retrieval of data from Table.ImplicitMetadata with `fromImpl… 
…icitMetadata` method.
  • Loading branch information
@mrdziuban
mrdziuban committed May 25, 2024
commit 0f142b3f58c6f4b093579bc2c86c3e64231079c9
37 changes: 18 additions & 19 deletions scalasql/query/src-3/TableMacro.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 41,18 @@ object TableMacros {
}
).asExprOf[V[F]]

def fromImplicitMetadata[O](paramTpe: TypeRepr)(
f: [T[_[_]]] => Expr[Table.Metadata[T]] => Type[T] ?=> O
): O =
paramTpe match {
case AppliedType(tpeCtor, _) =>
tpeCtor.asType match {
case '[
type t[_[_]]; t] =>
f[t]('{ summonInline[Table.ImplicitMetadata[t]].value })
}
}

val queryables = '{ (dialect: DialectTypeMappers, n: Int) =>
{
given DialectTypeMappers = dialect
Expand All @@ -63,15 75,9 @@ object TableMacros {
${
Expr.ofList(constructorValueParams.map { param =>
if (isTypeParamType(param))
paramType(param) match {
case AppliedType(tpeCtor, _) =>
tpeCtor.asType match {
case '[
type t[_[_]]; t] =>
'{ summonInline[Table.ImplicitMetadata[t]].value.walkLabels0() }
}
}
else '{ Seq(${ Expr(param.name) }) }
fromImplicitMetadata(paramType(param))([T[_[_]]] => t => '{ $t.walkLabels0() })
else
'{ Seq(${ Expr(param.name) }) }
})
}.flatten
}
Expand Down Expand Up @@ -128,16 134,9 @@ object TableMacros {
${
constructV[Column]((param, _) => { case (paramTpe, _, _) =>
if (isTypeParamType(param))
paramTpe match {
case AppliedType(tpeCtor, _) =>
tpeCtor.asType match {
case '[
type t[_[_]]; t] =>
'{
summonInline[Table.ImplicitMetadata[t]].value.vExpr(tableRef, dialect)
}.asTerm
}
}
fromImplicitMetadata(paramTpe)(
[T[_[_]]] => t => '{ $t.vExpr(tableRef, dialect) }.asTerm
)
else
paramTpe.typeArgs.head.asType match {
case '[t] =>
Expand Down
Loading