Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Introduce updateSetOpt fragment (#1893) #2126

Merged
merged 4 commits into from
Nov 4, 2024
Merged

Introduce updateSetOpt fragment (#1893) #2126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36c91f6
Introduce `updateSetOpt` fragment (#1893)
matsluni Oct 30, 2024
6f8109b
Change api for condition
matsluni Oct 31, 2024
63c053e
Fix scalafmt
matsluni Oct 31, 2024
403e021
Remove where clause
matsluni Nov 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions modules/core/src/main/scala/doobie/util/fragments.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import cats.data.NonEmptyList
import cats.syntax.all.*
import cats.{Foldable, Functor, Reducible}
import doobie.implicits.*
import doobie.Fragment.*

/** Module of `Fragment` constructors. */
object fragments {
Expand All @@ -17,6 +18,14 @@ object fragments {
def values[F[_]: Reducible, A](fs: F[A])(implicit w: util.Write[A]): Fragment =
fr"VALUES" ++ comma(fs.toNonEmptyList.map(f => parentheses(values(f))))

/** Returns `UPDATE tableName SET columnUpdate0, columnUpdate1, ...`. */
def updateSetOpt[F[_]: Foldable](
tableName: Fragment,
columnUpdates: F[Fragment]
): Option[Fragment] = {
NonEmptyList.fromFoldable(columnUpdates).map(cs => fr"UPDATE" ++ tableName ++ set(cs))
}

/** Returns `(f IN (fs0, fs1, ...))`. */
def in[A: util.Put](f: Fragment, fs0: A, fs1: A, fs: A*): Fragment =
in(f, NonEmptyList(fs0, fs1 :: fs.toList))
Expand Down
11 changes: 11 additions & 0 deletions modules/core/src/test/scala/doobie/util/FragmentsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class FragmentsSuite extends munit.FunSuite {
val someF: Option[Fragment] = Some(sql"${1}")
val noneF: Option[Fragment] = None
val ofs = List(Some(sql"${1}"), None, Some(sql"${3}"))
val sqlKv = nelInt.zipWith(NonEmptyList.of("a", "b", "c"))((v, k) => fr0"${Fragment.const0(k)} = $v").toList

test("values for one column") {
assertEquals(values(nelInt).query[Unit].sql, "VALUES (?) , (?) , (?) ")
Expand All @@ -37,6 +38,16 @@ class FragmentsSuite extends munit.FunSuite {
assertEquals(values(NonEmptyList.of((1, true), (2, false))).query[Unit].sql, "VALUES (?,?) , (?,?) ")
}

test("updateSetOpt for three column") {
assertEquals(
updateSetOpt(Fragment.const("Foo"), sqlKv).map(_.query[Unit].sql),
Some("UPDATE Foo SET a = ?, b = ?, c = ?"))
}

test("updateSetOpt for empty columns") {
assertEquals(updateSetOpt(Fragment.const("Foo"), List.empty[Fragment]).map(_.query[Unit].sql), None)
}

test("in (1-column varargs)") {
assertEquals(in(sql"foo", 1, 2, 3).query[Unit].sql, "(foo IN (? , ? , ? ) ) ")
}
Expand Down