kill joinFromExpr

com-lihaoyi · Dec 11, 2023 · d0f3836 · d0f3836
1 parent ebeb340
commit d0f3836
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 28 deletions.
diff --git a/scalasql/query/src/CompoundSelect.scala b/scalasql/query/src/CompoundSelect.scala
@@ -35,7 +35,6 @@ class CompoundSelect[Q, R](
   )(implicit qr: Queryable.Row[Q, R]) = newCompoundSelect(lhs, compoundOps, orderBy, limit, offset)
   override protected def expr = Joinable.toFromExpr(lhs)._2
 
-  protected override def joinableToSelect = this
 
   protected def selectToSimpleSelect() = this.subquery
 
@@ -93,11 +92,6 @@ class CompoundSelect[Q, R](
     SubqueryRef.Wrapped.exprAliases(lhs, prevContext)
   }
 
-  override def joinFromExpr = {
-    val otherSelect = joinableToSelect
-    val otherFrom = new SubqueryRef(otherSelect)
-    (otherFrom, WithSqlExpr.get(otherSelect))
-  }
 }
 
 object CompoundSelect {

diff --git a/scalasql/query/src/JoinOps.scala b/scalasql/query/src/JoinOps.scala
@@ -32,7 +32,7 @@ trait JoinOps[C[_, _], Q, R] extends WithSqlExpr[Q] {
       on: Option[(Q, Q2) => Expr[Boolean]]
   ) = {
 
-    val (otherFrom, otherExpr) = other.joinFromExpr
+    val (otherFrom, otherExpr) = Joinable.toFromExpr(other)
 
     val otherOn = on.map(_(expr, otherExpr))
     val otherJoin = Join(joinPrefix, Seq(Join.From(otherFrom, otherOn)))

diff --git a/scalasql/query/src/Joinable.scala b/scalasql/query/src/Joinable.scala
@@ -9,7 +9,6 @@ trait Joinable[Q, R] {
 
   protected def joinableToFromExpr: (Context.From, Q)
 
-  def joinFromExpr: (Context.From, Q)
   /**
    * Version of `crossJoin` meant for usage in `for`-comprehensions
    */

diff --git a/scalasql/query/src/Select.scala b/scalasql/query/src/Select.scala
@@ -44,7 +44,7 @@ trait Select[Q, R]
     with SubqueryRef.Wrapped {
 
   protected def dialect: DialectTypeMappers
-  protected def joinableToFromExpr = (new SubqueryRef(this), expr)
+  protected def joinableToFromExpr: (Context.From, Q) = (new SubqueryRef(this), expr)
   protected def newCompoundSelect[Q, R](
       lhs: SimpleSelect[Q, R],
       compoundOps: Seq[CompoundSelect.Op[Q, R]],
@@ -66,7 +66,6 @@ trait Select[Q, R]
     new SimpleSelect(expr, exprPrefix, preserveAll, from, joins, where, groupBy0)
 
   def qr: Queryable.Row[Q, R]
-  protected def joinableToSelect = this
 
   /**
    * Causes this [[Select]] to ignore duplicate rows, translates into SQL `SELECT DISTINCT`

diff --git a/scalasql/query/src/SimpleSelect.scala b/scalasql/query/src/SimpleSelect.scala
@@ -33,7 +33,6 @@ class SimpleSelect[Q, R](
     val groupBy0: Option[GroupBy]
 )(implicit val qr: Queryable.Row[Q, R], protected val dialect: DialectTypeMappers)
     extends Select[Q, R] {
-  protected override def joinableToSelect = this
 
   protected def copy[Q, R](
       expr: Q = this.expr,
@@ -233,7 +232,6 @@ class SimpleSelect[Q, R](
     Seq(qr.construct(args))
   }
 
-  override def joinFromExpr = (from.head, expr)
 }
 
 object SimpleSelect {

diff --git a/scalasql/query/src/Values.scala b/scalasql/query/src/Values.scala
@@ -30,11 +30,6 @@ class Values[Q, R](val ts: Seq[R])(
       .toMap
   }
 
-  override def joinFromExpr = {
-    val otherSelect = joinableToSelect
-    val otherFrom = new SubqueryRef(otherSelect)
-    (otherFrom, WithSqlExpr.get(otherSelect))
-  }
 }
 
 object Values {

diff --git a/scalasql/query/src/WithCte.scala b/scalasql/query/src/WithCte.scala
@@ -53,7 +53,7 @@ class WithCte[Q, R](
     Query.construct(rhs, args)
 
   def joinFromExpr = {
-    val otherSelect = joinableToSelect
+    val otherSelect = selectToSimpleSelect()
     (new SubqueryRef(otherSelect), WithSqlExpr.get(otherSelect))
   }
 }
@@ -66,13 +66,11 @@ object WithCte {
       protected val dialect: DialectTypeMappers
   ) extends Select.Proxy[Q, R] {
 
-    def joinFromExpr = {
-      val otherSelect = joinableToSelect
-      val otherFrom = otherSelect.asInstanceOf[SimpleSelect[_, _]].from.head
-      (otherFrom, WithSqlExpr.get(otherSelect))
+    override def joinableToFromExpr = {
+      val otherFrom = lhsSubQueryRef
+      (otherFrom, WithSqlExpr.get(lhs))
     }
 
-    protected override def joinableToSelect = selectToSimpleSelect()
     override protected def selectToSimpleSelect(): SimpleSelect[Q, R] = {
       Select.newSimpleSelect[Q, R](
         lhs,

diff --git a/scalasql/src/dialects/TableOps.scala b/scalasql/src/dialects/TableOps.scala
@@ -62,9 +62,4 @@ class TableOps[V[_[_]]](val t: Table[V])(implicit dialect: Dialect)
     new Delete.Impl(expr, filter(Table.metadata(t).vExpr(ref, dialect)), ref)
   }
 
-  override def joinFromExpr = {
-    val (ref, expr) = toFromExpr0
-
-    (ref, expr.asInstanceOf[V[Expr]])
-  }
 }