Skip to content

Commit

Permalink
Remove obsolete import shadowings
Browse files Browse the repository at this point in the history
  • Loading branch information
kubukoz committed Oct 1, 2018
1 parent 04c18e2 commit 9f93e49
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
@@ -1,9 +1,9 @@
package com.kubukoz.slick.algebra
import com.kubukoz.slick.interpreter.DBIOInterpreter
import slick.lifted.{Query => LiftedQuery}
import slick.lifted.Query

trait SelectAlgebra[F[_], E] {
def all[T](query: LiftedQuery[T, E, Seq]): F[List[E]]
def all[T](query: Query[T, E, Seq]): F[List[E]]
}

object SelectAlgebra {
Expand All @@ -15,7 +15,7 @@ object SelectAlgebra {
private[slick] abstract class InterpSelectAlgebra[F[_], E] extends SelectAlgebra[F, E] {
protected def interpreter: DBIOInterpreter[F]

override def all[T](query: LiftedQuery[T, E, Seq]): F[List[E]] = interpreter.withApi { api =>
override def all[T](query: Query[T, E, Seq]): F[List[E]] = interpreter.withApi { api =>
import api._

interpreter.eval(query.to[List].result)
Expand Down
Expand Up @@ -2,10 +2,10 @@ package com.kubukoz.slick.algebra

import com.kubukoz.slick.interpreter.StreamingDBIOInterpreter
import fs2.Stream
import slick.lifted.{Query => LiftedQuery}
import slick.lifted.Query

trait StreamingSelectAlgebra[F[_], E] extends SelectAlgebra[F, E] {
def stream[T](query: LiftedQuery[T, E, Seq]): Stream[F, E]
def stream[T](query: Query[T, E, Seq]): Stream[F, E]
}

object StreamingSelectAlgebra {
Expand All @@ -20,7 +20,7 @@ private[slick] abstract class InterpStreamingAlgebra[F[_], E]
with StreamingSelectAlgebra[F, E] {
protected def interpreter: StreamingDBIOInterpreter[F]

override def stream[T](query: LiftedQuery[T, E, Seq]): Stream[F, E] = interpreter.withApi.apply { api =>
override def stream[T](query: Query[T, E, Seq]): Stream[F, E] = interpreter.withApi.apply { api =>
import api._

interpreter.stream(query.result)
Expand Down

0 comments on commit 9f93e49

Please sign in to comment.