github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#11525] Upgrade scala version to 2.13.5

Browse Source
This commit is contained in:
Lukas Eder 2021-02-25 12:39:45 +01:00
parent 91e01b747d
commit 55fbd00a9a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ-scala_2.13/pom.xml
View File

@ -14,7 +14,7 @@
<name>jOOQ Scala 2.13</name>
<properties>
<scala.version>2.13.2</scala.version>
<scala.version>2.13.5</scala.version>
<jooq-testdata-dir>${project.basedir}/../.data</jooq-testdata-dir>
</properties>

10
jOOQ-scala_2.13/src/main/scala/org/jooq/scalaextensions/Conversions.scala
View File

@ -44,7 +44,7 @@ import org.jooq.impl._
// Avoid ambiguity with the internal org.jooq.impl.Array type.
import scala.Array
import scala.collection.JavaConverters
import scala.jdk.CollectionConverters
/**
* jOOQ type conversions used to enhance the jOOQ Java API with Scala Traits
@ -121,7 +121,7 @@ object Conversions {
i = i + 1;
}
sb.result
sb.result()
}
}
@ -172,7 +172,7 @@ object Conversions {
def fetchAnyOptionArray () : Option[Array[AnyRef]] = Option(query.fetchAnyArray)
def fetchAnyOptionInto[E] (newType : Class[_ <: E]) : Option[E] = Option(query.fetchAnyInto(newType))
def fetchAnyOptionInto[Z <: Record](table : Table[Z]) : Option[Z] = Option(query.fetchAnyInto(table))
def fetchAnyOptionMap () : Option[Map[String, AnyRef]] = Option(query.fetchAnyMap).map((m: java.util.Map[String, AnyRef]) => JavaConverters.asScala(m))
def fetchAnyOptionMap () : Option[Map[String, AnyRef]] = Option(query.fetchAnyMap).map((m: java.util.Map[String, AnyRef]) => CollectionConverters.MapHasAsScala(m).asScala)
def fetchOneOption () : Option[R] = Option(query.fetchOne)
def fetchOneOption[E] (mapper : RecordMapper[_ >: R, E]) : Option[E] = Option(query.fetchOne(mapper))
@ -188,7 +188,7 @@ object Conversions {
def fetchOneOptionArray () : Option[Array[AnyRef]] = Option(query.fetchOneArray)
def fetchOneOptionInto[E] (newType : Class[_ <: E]) : Option[E] = Option(query.fetchOneInto(newType))
def fetchOneOptionInto[Z <: Record](table : Table[Z]) : Option[Z] = Option(query.fetchOneInto(table))
def fetchOneOptionMap () : Option[Map[String, AnyRef]] = Option(query.fetchOneMap).map((m: java.util.Map[String, AnyRef]) => JavaConverters.asScala(m))
def fetchOneOptionMap () : Option[Map[String, AnyRef]] = Option(query.fetchOneMap).map((m: java.util.Map[String, AnyRef]) => CollectionConverters.MapHasAsScala(m).asScala)
}
// -------------------------------------------------------------------------
@ -314,6 +314,8 @@ object Conversions {
// Conversions from jOOQ Record[N] types to Scala Tuple[N] types
// --------------------------------------------------------------------------
import scala.language.implicitConversions
// [jooq-tools] START [tuples]
/**