Undo rename of fetchAll

jhc-systems · Aug 26, 2014 · 6bb9e52 · 6bb9e52
1 parent a1d116b
commit 6bb9e52
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/core/src/main/scala/sqlest/executor/Executor.scala b/core/src/main/scala/sqlest/executor/Executor.scala
@@ -27,7 +27,7 @@ trait ExecutorSyntax {
     def fetchHeadOption[B](extractor: Extractor[B]): Option[extractor.SingleResult] =
       database.executeSelect(select.what(extractor.columns))(row => extractor.extractHeadOption(row))
 
-    def fetchList[B](extractor: Extractor[B]): List[extractor.SingleResult] =
+    def fetchAll[B](extractor: Extractor[B]): List[extractor.SingleResult] =
       database.executeSelect(select.what(extractor.columns))(row => extractor.extractList(row))
 
     def fetchHead[SingleResult](implicit extractable: Extractable.Aux[A, SingleResult]): SingleResult =
@@ -36,7 +36,7 @@ trait ExecutorSyntax {
     def fetchHeadOption[SingleResult](implicit extractable: Extractable.Aux[A, SingleResult]): Option[SingleResult] =
       database.executeSelect(select)(row => extractable.extractor(select.what).extractHeadOption(row))
 
-    def fetchList[SingleResult](implicit extractable: Extractable.Aux[A, SingleResult]): List[SingleResult] =
+    def fetchAll[SingleResult](implicit extractable: Extractable.Aux[A, SingleResult]): List[SingleResult] =
       database.executeSelect(select)(row => extractable.extractor(select.what).extractList(row))
   }
 

diff --git a/core/src/test/scala/sqlest/executor/ExecutorSpec.scala b/core/src/test/scala/sqlest/executor/ExecutorSpec.scala
@@ -38,11 +38,11 @@ class ExecutorSpec extends FlatSpec with Matchers {
   )
 
   "a select statement" should "be executable with an extractor" in {
-    selectStatement.fetchList(extractor)
+    selectStatement.fetchAll(extractor)
   }
 
   it should "be able to return all results" in {
-    val actualExtracted = selectStatement.fetchList(extractor)
+    val actualExtracted = selectStatement.fetchAll(extractor)
 
     actualExtracted should equal(Seq(
       One(1, "a"),
@@ -70,7 +70,7 @@ class ExecutorSpec extends FlatSpec with Matchers {
     val headOption: Option[(String)] = select(TableOne.col2).from(TableOne).fetchHeadOption
     headOption should be(Some("a"))
 
-    val all: List[(Int, String)] = select(TableOne.col1, TableOne.col2).from(TableOne).fetchList
+    val all: List[(Int, String)] = select(TableOne.col1, TableOne.col2).from(TableOne).fetchAll
     all should equal(Seq(
       (1, "a"),
       (3, "c"),

diff --git a/examples/src/main/scala/sqlest/examples/Extractor.scala b/examples/src/main/scala/sqlest/examples/Extractor.scala
@@ -13,7 +13,7 @@ object ExtractorExamples extends App with DatabaseExample {
       .from(FruitTable)
       .where(FruitTable.juiciness >= 8)
       .orderBy(FruitTable.juiciness.desc)
-      .fetchList(fruitExtractor)
+      .fetchAll(fruitExtractor)
 
   println(fruits)