expose joinOn and leftJoinOn

after #101 they do make a lot of sense to use
oyvindberg · May 28, 2024 · ecf7d8c · ecf7d8c
1 parent 249a516
commit ecf7d8c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/typo-dsl-anorm/src/scala/typo/dsl/SelectBuilder.scala b/typo-dsl-anorm/src/scala/typo/dsl/SelectBuilder.scala
@@ -122,11 +122,11 @@ trait SelectBuilder[Fields, Row] {
 
   protected def withParams(sqlParams: SelectParams[Fields, Row]): SelectBuilder[Fields, Row]
 
-  protected def joinOn[Fields2, N[_]: Nullability, Row2](other: SelectBuilder[Fields2, Row2])(
+  def joinOn[Fields2, N[_]: Nullability, Row2](other: SelectBuilder[Fields2, Row2])(
       pred: Joined[Fields, Fields2] => SqlExpr[Boolean, N]
   ): SelectBuilder[Joined[Fields, Fields2], (Row, Row2)]
 
-  protected def leftJoinOn[Fields2, N[_]: Nullability, Row2](other: SelectBuilder[Fields2, Row2])(
+  def leftJoinOn[Fields2, N[_]: Nullability, Row2](other: SelectBuilder[Fields2, Row2])(
       pred: Joined[Fields, Fields2] => SqlExpr[Boolean, N]
   ): SelectBuilder[LeftJoined[Fields, Fields2], (Row, Option[Row2])]
 }
diff --git a/typo-dsl-doobie/src/scala/typo/dsl/SelectBuilder.scala b/typo-dsl-doobie/src/scala/typo/dsl/SelectBuilder.scala
@@ -123,11 +123,11 @@ trait SelectBuilder[Fields, Row] {
 
   protected def withParams(sqlParams: SelectParams[Fields, Row]): SelectBuilder[Fields, Row]
 
-  protected def joinOn[Fields2, N[_]: Nullability, Row2](other: SelectBuilder[Fields2, Row2])(
+  def joinOn[Fields2, N[_]: Nullability, Row2](other: SelectBuilder[Fields2, Row2])(
       pred: Joined[Fields, Fields2] => SqlExpr[Boolean, N]
   ): SelectBuilder[Joined[Fields, Fields2], (Row, Row2)]
 
-  protected def leftJoinOn[Fields2, N[_]: Nullability, Row2](other: SelectBuilder[Fields2, Row2])(
+  def leftJoinOn[Fields2, N[_]: Nullability, Row2](other: SelectBuilder[Fields2, Row2])(
       pred: Joined[Fields, Fields2] => SqlExpr[Boolean, N]
   ): SelectBuilder[LeftJoined[Fields, Fields2], (Row, Option[Row2])]
 }
diff --git a/typo-dsl-zio-jdbc/src/scala/typo/dsl/SelectBuilder.scala b/typo-dsl-zio-jdbc/src/scala/typo/dsl/SelectBuilder.scala
@@ -123,11 +123,9 @@ trait SelectBuilder[Fields, Row] {
 
   protected def withParams(sqlParams: SelectParams[Fields, Row]): SelectBuilder[Fields, Row]
 
-  protected def joinOn[Fields2, N[_]: Nullability, Row2](other: SelectBuilder[Fields2, Row2])(
-      pred: Joined[Fields, Fields2] => SqlExpr[Boolean, N]
-  ): SelectBuilder[Joined[Fields, Fields2], (Row, Row2)]
+  def joinOn[Fields2, N[_]: Nullability, Row2](other: SelectBuilder[Fields2, Row2])(pred: Joined[Fields, Fields2] => SqlExpr[Boolean, N]): SelectBuilder[Joined[Fields, Fields2], (Row, Row2)]
 
-  protected def leftJoinOn[Fields2, N[_]: Nullability, Row2](other: SelectBuilder[Fields2, Row2])(
+  def leftJoinOn[Fields2, N[_]: Nullability, Row2](other: SelectBuilder[Fields2, Row2])(
       pred: Joined[Fields, Fields2] => SqlExpr[Boolean, N]
   ): SelectBuilder[LeftJoined[Fields, Fields2], (Row, Option[Row2])]
 }