Skip to content

Commit 6bb9e52

Browse files
author
Brendan Maginnis
committed
Undo rename of fetchAll
1 parent a1d116b commit 6bb9e52

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

core/src/main/scala/sqlest/executor/Executor.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ trait ExecutorSyntax {
2727
def fetchHeadOption[B](extractor: Extractor[B]): Option[extractor.SingleResult] =
2828
database.executeSelect(select.what(extractor.columns))(row => extractor.extractHeadOption(row))
2929

30-
def fetchList[B](extractor: Extractor[B]): List[extractor.SingleResult] =
30+
def fetchAll[B](extractor: Extractor[B]): List[extractor.SingleResult] =
3131
database.executeSelect(select.what(extractor.columns))(row => extractor.extractList(row))
3232

3333
def fetchHead[SingleResult](implicit extractable: Extractable.Aux[A, SingleResult]): SingleResult =
@@ -36,7 +36,7 @@ trait ExecutorSyntax {
3636
def fetchHeadOption[SingleResult](implicit extractable: Extractable.Aux[A, SingleResult]): Option[SingleResult] =
3737
database.executeSelect(select)(row => extractable.extractor(select.what).extractHeadOption(row))
3838

39-
def fetchList[SingleResult](implicit extractable: Extractable.Aux[A, SingleResult]): List[SingleResult] =
39+
def fetchAll[SingleResult](implicit extractable: Extractable.Aux[A, SingleResult]): List[SingleResult] =
4040
database.executeSelect(select)(row => extractable.extractor(select.what).extractList(row))
4141
}
4242

core/src/test/scala/sqlest/executor/ExecutorSpec.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ class ExecutorSpec extends FlatSpec with Matchers {
3838
)
3939

4040
"a select statement" should "be executable with an extractor" in {
41-
selectStatement.fetchList(extractor)
41+
selectStatement.fetchAll(extractor)
4242
}
4343

4444
it should "be able to return all results" in {
45-
val actualExtracted = selectStatement.fetchList(extractor)
45+
val actualExtracted = selectStatement.fetchAll(extractor)
4646

4747
actualExtracted should equal(Seq(
4848
One(1, "a"),
@@ -70,7 +70,7 @@ class ExecutorSpec extends FlatSpec with Matchers {
7070
val headOption: Option[(String)] = select(TableOne.col2).from(TableOne).fetchHeadOption
7171
headOption should be(Some("a"))
7272

73-
val all: List[(Int, String)] = select(TableOne.col1, TableOne.col2).from(TableOne).fetchList
73+
val all: List[(Int, String)] = select(TableOne.col1, TableOne.col2).from(TableOne).fetchAll
7474
all should equal(Seq(
7575
(1, "a"),
7676
(3, "c"),

examples/src/main/scala/sqlest/examples/Extractor.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ object ExtractorExamples extends App with DatabaseExample {
1313
.from(FruitTable)
1414
.where(FruitTable.juiciness >= 8)
1515
.orderBy(FruitTable.juiciness.desc)
16-
.fetchList(fruitExtractor)
16+
.fetchAll(fruitExtractor)
1717

1818
println(fruits)
1919

0 commit comments

Comments
 (0)