Skip to content

Commit 9f0919e

Browse files
authored
Merge pull request #73 from nrkno/feature/prepare-udf
Feature/prepare udf
2 parents e9a6ca3 + b6dd68a commit 9f0919e

File tree

12 files changed

+406
-419
lines changed

12 files changed

+406
-419
lines changed

build.sbt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,15 @@ val commonSettings = Seq(
7979
},
8080
scalacOptions -= "-source:3.0-migration",
8181
scalacOptions ++= {
82+
val compilerWarnings =
83+
List(
84+
"cat=other-match-analysis:e", // error on exhaustive match
85+
"cat=other:e" // compare values like 1 == "str"
86+
).mkString("-Wconf:", ",", ",any:wv")
8287
if (scalaVersion.value.startsWith("3")) {
83-
Seq("-source:3.2-migration")
88+
Seq("-source:3.2-migration", compilerWarnings)
8489
} else {
85-
Seq("-feature", "-language:implicitConversions")
90+
Seq("-feature", "-language:implicitConversions", compilerWarnings)
8691
}
8792
}
8893
)

core/src/main/scala/no/nrk/bigquery/BQSqlFrag.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ object BQSqlFrag {
116116
def backticks(string: String): BQSqlFrag = Frag("`" + string + "`")
117117

118118
case class Frag(string: String) extends BQSqlFrag
119-
case class Call(udf: UDF, args: Seq[BQSqlFrag]) extends BQSqlFrag {
119+
case class Call(udf: UDF, args: List[BQSqlFrag]) extends BQSqlFrag {
120120
require(
121121
udf.params.length == args.length,
122122
s"UDF ${udf.name.value}: Expected ${udf.params.length} arguments, got ${args.length}"

core/src/main/scala/no/nrk/bigquery/BigQueryClient.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import com.google.cloud.http.HttpTransportOptions
1717
import fs2.{Chunk, Stream}
1818
import io.circe.Encoder
1919
import no.nrk.bigquery.syntax.showJob
20+
import no.nrk.bigquery.internal.TableUpdateOperation
2021
import no.nrk.bigquery.metrics.{BQMetrics, MetricsOps}
2122
import no.nrk.bigquery.util.StreamUtils
2223
import org.apache.avro
@@ -319,7 +320,7 @@ class BigQueryClient[F[_]](
319320
}
320321
.flatMap(tmp =>
321322
F.interruptible {
322-
val tempTableBqDef = UpdateOperation.createNew(tmp).table
323+
val tempTableBqDef = TableUpdateOperation.createNew(tmp).table
323324
val expirationTime =
324325
Instant.now.plusMillis(expirationDuration.getOrElse(1.hour).toMillis)
325326

0 commit comments

Comments
 (0)