Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ val munitScalaCheckVersion = "1.3.1"
val mysqlDriverVersion = "26.7.0"
val oracleDriverVersion = "23.26.3.0.0"
val postgresVersion = "42.7.13"
val skunkVersion = "1.0.0"
val skunkVersion = "2.0.0-RC3"
val sqliteDriverVersion = "3.53.4.0"
val h2DriverVersion = "2.5.250"
val shapeless2Version = "2.3.13"
Expand Down
10 changes: 4 additions & 6 deletions modules/skunk/js-jvm/src/test/scala/SkunkDatabaseSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ import java.util.UUID
import cats.effect.{IO, Resource, Sync}
import io.circe.{Decoder => CDecoder, Encoder => CEncoder, Json}
import munit.catseffect.IOFixture
import org.typelevel.otel4s.metrics.Meter
import org.typelevel.otel4s.metrics.Meter.Implicits.noop as metricsNoop
import org.typelevel.otel4s.trace.Tracer
import org.typelevel.otel4s.trace.Tracer.Implicits.noop
import org.typelevel.otel4s.metrics.MeterProvider
import org.typelevel.otel4s.trace.TracerProvider
import skunk.{Codec => SCodec, Session}
import skunk.circe.codec.{all => ccodec}
import skunk.codec.{all => codec}
Expand All @@ -35,8 +33,8 @@ import grackle.sqlpg.test._

trait SkunkDatabaseSuite extends SqlPgDatabaseSuite {

implicit val meter: Meter[IO] = metricsNoop[IO]
implicit val tracer: Tracer[IO] = noop[IO]
implicit val meterProvider: MeterProvider[IO] = MeterProvider.noop[IO]
implicit val tracerProvider: TracerProvider[IO] = TracerProvider.noop[IO]

def poolResource: Resource[IO, Resource[IO, Session[IO]]] = {
val connInfo = postgresConnectionInfo
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ trait SubscriptionMapping[F[_]] extends SkunkMapping[F] {
RootStream.computeChild("channel")((child, _, _) =>
for {
s <- fs2.Stream.resource(pool)
id <- s.channel(id"city_channel").listen(256).map(_.value.toInt)
id <- s.channel(ident"city_channel").listen(256).map(_.value.toInt)
} yield Unique(Filter(Eql(CityType / "id", Const(id)), child)).success)
)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class SubscriptionSuite extends SkunkDatabaseSuite {

// Send some notifications through Postgres, which will trigger queries on the subscription.
_ <- pool.use { s =>
val ch = s.channel(id"city_channel").contramap[Int](_.toString)
val ch = s.channel(ident"city_channel").contramap[Int](_.toString)
List(101, 102, 103).traverse_(ch.notify)
}

Expand Down
Loading