Support Scala3 #474
Merged
Support Scala3 #474
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cchantep
force-pushed
the
task/dotty
branch
14 times, most recently
from
25f953a to
2b83f43
Compare
cchantep
commented
Aug 17, 2022
|
|
||
| private[anorm] trait PackageCompat: | ||
|
|
||
| extension (query: SqlQuery) |
There was a problem hiding this comment.
More Scala2 implicit conversion that previously pimps SqlQuery as SimpleSql[Row] with extended combinators
| @@ -57,12 +57,8 @@ private[anorm] object SealedRowParserImpl { | |||
| val caseName = TermName(c.freshName("discriminated")) | |||
| val key = q"$discriminate(${subclass.typeSymbol.fullName})" | |||
| val caseDecl = q"val $caseName = $key" | |||
| val subtype = { | |||
| if (subclass.typeSymbol.asClass.typeParams.isEmpty) subclass | |||
There was a problem hiding this comment.
Generic subclass is not supported anyway (error raised therebefore)
| @@ -0,0 +1,3 @@ | |||
| package com.github.ghik.silencer | |||
|
|
|||
| class silent(s: String = "") extends scala.annotation.StaticAnnotation | |||
There was a problem hiding this comment.
Compatibility workaround
| @@ -262,7 +277,6 @@ object Sql { // TODO: Rename to SQL | |||
| private def toSql(ts: List[StatementToken], buf: StringBuilder): StringBuilder = ts.foldLeft(buf) { | |||
| case (sql, StringToken(t)) => sql ++= t | |||
| case (sql, PercentToken) => sql += '%' | |||
| case (sql, _) => sql | |||
| @@ -0,0 +1,104 @@ | |||
| package anorm | |||
|
|
|||
| private[anorm] trait MacroOptions { | |||
There was a problem hiding this comment.
Common to both versions
| @@ -0,0 +1,180 @@ | |||
| package anorm | |||
|
|
|||
| trait RowParser[+A] extends (Row => SqlResult[A]) { parent => | |||
There was a problem hiding this comment.
Extracted from SqlParser.scala
| @@ -567,185 +567,6 @@ sealed trait DeprecatedSqlParser { _: SqlParser.type => | |||
| @SuppressWarnings(Array("ClassNames")) | |||
| final case class ~[+A, +B](_1: A, _2: B) | |||
|
|
|||
| object RowParser { | |||
cchantep
force-pushed
the
task/dotty
branch
3 times, most recently
from
22d381a to
d8922c0
Compare
cchantep
commented
Aug 18, 2022
| import scala.language.experimental.macros | ||
| import scala.reflect.macros.whitebox | ||
|
|
||
| /** Only for internal purposes */ |
There was a problem hiding this comment.
Moved down or extracted to common MacroOptions trait
cchantep
force-pushed
the
task/dotty
branch
5 times, most recently
from
1c0fbec to
c3bb316
Compare
cchantep
force-pushed
the
task/dotty
branch
7 times, most recently
from
cfe9d74 to
514c03c
Compare
cchantep
commented
Aug 22, 2022
|
|
||
| // Not enough column names for class parameters | ||
| shapeless.test.illTyped("""anorm.Macro.parser[Foo[Int]]("Foo", "Bar")""") | ||
| "not be resolved" in { |
There was a problem hiding this comment.
Improve compile-time tests
| @@ -263,8 +325,23 @@ lazy val `anorm-postgres` = (project in file("postgres")) | |||
|
|
|||
| lazy val `anorm-enumeratum` = (project in file("enumeratum")) | |||
| .settings( | |||
| sourceDirectory := { | |||
| if (scalaBinaryVersion.value == "3") new java.io.File("/no/sources") | |||
There was a problem hiding this comment.
Enumeratum not released to Scala 3
| @@ -14,6 +14,20 @@ sealed trait SqlResult[+A] { self => | |||
| case e @ Error(_) => e | |||
| } | |||
|
|
|||
| def collect[B](f: PartialFunction[A, B]): SqlResult[B] = self match { | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.