New case class WholeTable, so we can reference a table and keep parti…

…tioning info in query.
nrkno · Jul 12, 2023 · df3d64f · df3d64f
1 parent e8f3946
commit df3d64f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/core/src/main/scala/no/nrk/bigquery/BQShow.scala b/core/src/main/scala/no/nrk/bigquery/BQShow.scala
@@ -82,6 +82,8 @@ trait BQShowInstances {
   implicit def bqShowTablesLike[I[t] <: Iterable[t], T <: BQTableLike[Unit]]: BQShow[I[T]] =
     tables => BQSqlFrag.Combined(tables.map(_.assertPartition.bqShow).toSeq)
 
+  implicit def bqShowWholeTable[P]: BQShow[WholeTable[P]] = x => BQSqlFrag.TableRef(x.table)
+
   implicit def bqShowFill[Fill <: BQFill[Any]]: BQShow[Fill] =
     BQSqlFrag.FillRef.apply
 

diff --git a/core/src/main/scala/no/nrk/bigquery/BQSqlFrag.scala b/core/src/main/scala/no/nrk/bigquery/BQSqlFrag.scala
@@ -129,8 +129,11 @@ sealed trait BQSqlFrag {
         }
 
       case BQSqlFrag.TableRef(table) =>
-        outerRef match {
-          case Some(partitionRef: BQPartitionId.DatePartitioned) => List(table.assertPartition(partitionRef.partition))
+        (table, outerRef) match {
+          case (t: BQTableRef[LocalDate], Some(partitionRef: BQPartitionId.DatePartitioned)) =>
+            List(t.assertPartition(partitionRef.partition))
+          case (t: BQTableDef[LocalDate], Some(partitionRef: BQPartitionId.DatePartitioned)) =>
+            List(t.assertPartition(partitionRef.partition))
           case _ => List(table.unpartitioned.assertPartition)
         }
 
@@ -174,7 +177,7 @@ object BQSqlFrag {
     )
   }
   case class Combined(values: Seq[BQSqlFrag]) extends BQSqlFrag
-  case class TableRef(table: BQTableLike[LocalDate]) extends BQSqlFrag
+  case class TableRef(table: BQTableLike[_]) extends BQSqlFrag
   case class PartitionRef(ref: BQPartitionId[Any]) extends BQSqlFrag
 
   case class FillRef(fill: BQFill[Any]) extends BQSqlFrag

diff --git a/core/src/main/scala/no/nrk/bigquery/BQTableLike.scala b/core/src/main/scala/no/nrk/bigquery/BQTableLike.scala
@@ -11,6 +11,7 @@ sealed trait BQTableLike[+P] {
   def partitionType: BQPartitionType[P]
   def withTableType[PP](tpe: BQPartitionType[PP]): BQTableLike[PP]
   def unpartitioned: BQTableLike[Unit]
+  def asWholeTable: WholeTable[P] = WholeTable(this)
 }
 
 object BQTableLike {
@@ -96,6 +97,8 @@ sealed trait BQTableDef[+P] extends BQTableLike[P] {
   labels.verify(tableId)
 }
 
+case class WholeTable[+P](table: BQTableLike[P])
+
 object BQTableDef {
 
   /** @param schema