remove some calls to Joinable.toSelect

com-lihaoyi · Dec 11, 2023 · e0ac8bc · e0ac8bc
1 parent 78f772f
commit e0ac8bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/scalasql/query/src/CompoundSelect.scala b/scalasql/query/src/CompoundSelect.scala
@@ -33,7 +33,7 @@ class CompoundSelect[Q, R](
       limit: Option[Int] = this.limit,
       offset: Option[Int] = this.offset
   )(implicit qr: Queryable.Row[Q, R]) = newCompoundSelect(lhs, compoundOps, orderBy, limit, offset)
-  override protected def expr = WithSqlExpr.get(Joinable.toSelect(lhs))
+  override protected def expr = Joinable.toFromExpr(lhs)._2
 
   protected override def joinableToSelect = this
 

diff --git a/scalasql/query/src/WithCte.scala b/scalasql/query/src/WithCte.scala
@@ -24,7 +24,7 @@ class WithCte[Q, R](
 )(implicit val qr: Queryable.Row[Q, R], protected val dialect: DialectTypeMappers)
     extends Select.Proxy[Q, R] {
 
-  override protected def expr = WithSqlExpr.get(Joinable.toSelect(rhs))
+  override protected def expr = Joinable.toFromExpr(rhs)._2
   private def unprefixed = new WithCte(lhs, lhsSubQuery, rhs, SqlStr.commaSep)
 
   protected def selectToSimpleSelect() = this.subquery