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

Update finagle-mysql #549

Merged
merged 1 commit into from
Sep 2, 2016
Merged

Update finagle-mysql #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ lazy val `quill-finagle-mysql` =
.settings(
fork in Test := true,
libraryDependencies ++= Seq(
"com.twitter" %% "finagle-mysql" % "6.36.0"
"com.twitter" %% "finagle-mysql" % "6.37.0"
)
)
.dependsOn(`quill-sql-jvm` % "compile->compile;test->test")
Expand Down
16 changes: 8 additions & 8 deletions quill-finagle-mysql/src/main/scala/io/getquill/FinagleMysqlContext.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ import scala.util.Try

import org.slf4j.LoggerFactory

import com.twitter.finagle.exp.mysql.Client
import com.twitter.finagle.exp.mysql.OK
import com.twitter.finagle.exp.mysql.Parameter
import com.twitter.finagle.exp.mysql.Result
import com.twitter.finagle.exp.mysql.Row
import com.twitter.finagle.exp.mysql.Transactions
import com.twitter.finagle.mysql.Client
import com.twitter.finagle.mysql.LongValue
import com.twitter.finagle.mysql.OK
import com.twitter.finagle.mysql.Parameter
import com.twitter.finagle.mysql.Result
import com.twitter.finagle.mysql.Row
import com.twitter.finagle.mysql.Transactions
import com.twitter.util.Await
import com.twitter.util.Future
import com.twitter.util.Local
Expand All @@ -20,11 +21,10 @@ import com.typesafe.scalalogging.Logger

import io.getquill.context.finagle.mysql.FinagleMysqlDecoders
import io.getquill.context.finagle.mysql.FinagleMysqlEncoders
import io.getquill.context.finagle.mysql.SingleValueRow
import io.getquill.context.sql.SqlContext
import io.getquill.util.LoadConfig
import io.getquill.util.Messages.fail
import io.getquill.context.finagle.mysql.SingleValueRow
import com.twitter.finagle.exp.mysql.LongValue

class FinagleMysqlContext[N <: NamingStrategy](
client: Client with Transactions,
Expand Down
2 changes: 1 addition & 1 deletion quill-finagle-mysql/src/main/scala/io/getquill/FinagleMysqlContextConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package io.getquill

import java.util.TimeZone
import com.twitter.finagle.client.DefaultPool
import com.twitter.finagle.exp.Mysql
import com.twitter.finagle.Mysql
import com.twitter.util.Try
import com.typesafe.config.Config
import com.twitter.util.TimeConversions._
Expand Down
28 changes: 14 additions & 14 deletions ...finagle-mysql/src/main/scala/io/getquill/context/finagle/mysql/FinagleMysqlDecoders.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ package io.getquill.context.finagle.mysql
import java.util.Date
import scala.reflect.ClassTag
import scala.reflect.classTag
import com.twitter.finagle.exp.mysql.BigDecimalValue
import com.twitter.finagle.exp.mysql.ByteValue
import com.twitter.finagle.exp.mysql.DoubleValue
import com.twitter.finagle.exp.mysql.FloatValue
import com.twitter.finagle.exp.mysql.IntValue
import com.twitter.finagle.exp.mysql.LongValue
import com.twitter.finagle.exp.mysql.RawValue
import com.twitter.finagle.exp.mysql.Row
import com.twitter.finagle.exp.mysql.ShortValue
import com.twitter.finagle.exp.mysql.StringValue
import com.twitter.finagle.exp.mysql.TimestampValue
import com.twitter.finagle.exp.mysql.Type
import com.twitter.finagle.exp.mysql.Value
import com.twitter.finagle.mysql.BigDecimalValue
import com.twitter.finagle.mysql.ByteValue
import com.twitter.finagle.mysql.DoubleValue
import com.twitter.finagle.mysql.FloatValue
import com.twitter.finagle.mysql.IntValue
import com.twitter.finagle.mysql.LongValue
import com.twitter.finagle.mysql.NullValue
import com.twitter.finagle.mysql.RawValue
import com.twitter.finagle.mysql.Row
import com.twitter.finagle.mysql.ShortValue
import com.twitter.finagle.mysql.StringValue
import com.twitter.finagle.mysql.TimestampValue
import com.twitter.finagle.mysql.Type
import com.twitter.finagle.mysql.Value
import io.getquill.util.Messages.fail
import com.twitter.finagle.exp.mysql.NullValue
import io.getquill.FinagleMysqlContext

trait FinagleMysqlDecoders {
Expand Down
10 changes: 5 additions & 5 deletions ...finagle-mysql/src/main/scala/io/getquill/context/finagle/mysql/FinagleMysqlEncoders.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package io.getquill.context.finagle.mysql

import java.util.Date
import com.twitter.finagle.exp.mysql.BigDecimalValue
import com.twitter.finagle.exp.mysql.CanBeParameter
import com.twitter.finagle.exp.mysql.CanBeParameter._
import com.twitter.finagle.exp.mysql.Parameter
import com.twitter.finagle.exp.mysql.Parameter.wrap
import com.twitter.finagle.mysql.BigDecimalValue
import com.twitter.finagle.mysql.CanBeParameter
import com.twitter.finagle.mysql.CanBeParameter._
import com.twitter.finagle.mysql.Parameter
import com.twitter.finagle.mysql.Parameter.wrap
import io.getquill.FinagleMysqlContext

trait FinagleMysqlEncoders {
Expand Down
4 changes: 2 additions & 2 deletions quill-finagle-mysql/src/main/scala/io/getquill/context/finagle/mysql/SingleValueRow.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.getquill.context.finagle.mysql

import com.twitter.finagle.exp.mysql.Row
import com.twitter.finagle.exp.mysql.Value
import com.twitter.finagle.mysql.Row
import com.twitter.finagle.mysql.Value

case class SingleValueRow(value: Value) extends Row {
override val values = IndexedSeq(value)
Expand Down