From 5535d79f31e0f0e7824bfe8f1210966f4bb2ff91 Mon Sep 17 00:00:00 2001 From: Eric Peters Date: Wed, 20 Jul 2016 12:56:02 -0700 Subject: [PATCH] Fix Scala Conversions fetchOneOption consistent typing patterns --- jOOQ-scala/src/main/scala/org/jooq/scala/Conversions.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jOOQ-scala/src/main/scala/org/jooq/scala/Conversions.scala b/jOOQ-scala/src/main/scala/org/jooq/scala/Conversions.scala index 09b0f3159a..b31b96c951 100644 --- a/jOOQ-scala/src/main/scala/org/jooq/scala/Conversions.scala +++ b/jOOQ-scala/src/main/scala/org/jooq/scala/Conversions.scala @@ -170,7 +170,7 @@ object Conversions { def fetchAnyOption[T, U] (fieldIndex : Int, converter : Converter[_ >: T, _ <: U]) : Option[U] = Option(query.fetchAny(fieldIndex, converter)) def fetchAnyOption (fieldName : String) : Option[_] = Option(query.fetchAny(fieldName)) def fetchAnyOption[T] (fieldName : String, newType : Class[_ <: T]) : Option[T] = Option(query.fetchAny(fieldName, newType)) - def fetchAnyOption[U] (fieldName : String, converter : Converter[_, _ <: U]) : Option[U] = Option(query.fetchAny(fieldName, converter)) + def fetchAnyOption[T, U] (fieldName : String, converter : Converter[_ >: T, _ <: U]): Option[U] = Option(query.fetchAny(fieldName, converter)) 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)) @@ -186,7 +186,7 @@ object Conversions { def fetchOneOption[T, U] (fieldIndex : Int, converter : Converter[_ >: T, _ <: U]) : Option[U] = Option(query.fetchOne(fieldIndex, converter)) def fetchOneOption (fieldName : String) : Option[_] = Option(query.fetchOne(fieldName)) def fetchOneOption[T] (fieldName : String, newType : Class[_ <: T]) : Option[T] = Option(query.fetchOne(fieldName, newType)) - def fetchOneOption[U] (fieldName : String, converter : Converter[_, _ <: U]) : Option[U] = Option(query.fetchOne(fieldName, converter)) + def fetchOneOption[T, U] (fieldName : String, converter : Converter[_ >: T, _ <: U]): Option[U] = Option(query.fetchOne(fieldName, converter)) 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))