Update to Slick 2.1.0-M1

Author: szeiger

.gitignore

@@ -7,3 +7,4 @@
 /logs/
 /RUNNING_PID
 *.iml
+.DS_Store

activator.properties

@@ -1,4 +1,4 @@
-name=hello-slick
-title=Hello Slick!
+name=hello-slick-2.1
+title=Hello Slick! (Slick 2.1)
 description=Slick is Typesafe's modern database query and access library for Scala. It allows you to work with stored data almost as if you were using Scala collections while at the same time giving you full control over when a database access happens and which data is transferred. You can also use SQL directly.  This tutorial will get you started with a simple standalone Scala application that uses Slick.
 tags=Basics,slick,starter

build.sbt

@@ -2,13 +2,13 @@ name := "hello-slick"
 
 version := "1.0"
 
-scalaVersion := "2.10.3"
+scalaVersion := "2.10.4"
 
 mainClass in Compile := Some("HelloSlick")
 
 libraryDependencies ++= List(
-  "com.typesafe.slick" %% "slick" % "2.0.0",
+  "com.typesafe.slick" %% "slick" % "2.1.0-M1",
   "org.slf4j" % "slf4j-nop" % "1.6.4",
   "com.h2database" % "h2" % "1.3.170",
-  "org.scalatest" %% "scalatest" % "2.0" % "test"
+  "org.scalatest" %% "scalatest" % "2.1.6" % "test"
 )

src/main/scala/HelloSlick.scala

@@ -57,7 +57,7 @@ object HelloSlick extends App {
     /* Filtering / Where */
 
     // Construct a query where the price of Coffees is > 9.0
-    val filterQuery: Query[Coffees, (String, Int, Double, Int, Int)] =
+    val filterQuery: Query[Coffees, (String, Int, Double, Int, Int), Seq] =
       coffees.filter(_.price > 9.0)
 
     println("Generated SQL for filter query:\n" + filterQuery.selectStatement)
@@ -69,7 +69,7 @@ object HelloSlick extends App {
     /* Update */
 
     // Construct an update query with the sales column being the one to update
-    val updateQuery: Query[Column[Int], Int] = coffees.map(_.sales)
+    val updateQuery: Query[Column[Int], Int, Seq] = coffees.map(_.sales)
 
     // Print the SQL for the Coffees update query
     println("Generated SQL for Coffees update:\n" + updateQuery.updateStatement)
@@ -83,7 +83,7 @@ object HelloSlick extends App {
     /* Delete */
 
     // Construct a delete query that deletes coffees with a price less than 8.0
-    val deleteQuery: Query[Coffees,(String, Int, Double, Int, Int)] =
+    val deleteQuery: Query[Coffees,(String, Int, Double, Int, Int), Seq] =
       coffees.filter(_.price < 8.0)
 
     // Print the SQL for the Coffees delete query
@@ -98,7 +98,7 @@ object HelloSlick extends App {
     /* Selecting Specific Columns */
 
     // Construct a new coffees query that just selects the name
-    val justNameQuery: Query[Column[String], String] = coffees.map(_.name)
+    val justNameQuery: Query[Column[String], String, Seq] = coffees.map(_.name)
 
     println("Generated SQL for query returning just the name:\n" +
       justNameQuery.selectStatement)
@@ -109,7 +109,7 @@ object HelloSlick extends App {
 
     /* Sorting / Order By */
 
-    val sortByPriceQuery: Query[Coffees, (String, Int, Double, Int, Int)] =
+    val sortByPriceQuery: Query[Coffees, (String, Int, Double, Int, Int), Seq] =
       coffees.sortBy(_.price)
 
     println("Generated SQL for query sorted by price:\n" +
@@ -121,7 +121,7 @@ object HelloSlick extends App {
 
     /* Query Composition */
 
-    val composedQuery: Query[Column[String], String] =
+    val composedQuery: Query[Column[String], String, Seq] =
       coffees.sortBy(_.name).take(3).filter(_.price > 9.0).map(_.name)
 
     println("Generated SQL for composed query:\n" +
@@ -134,7 +134,7 @@ object HelloSlick extends App {
     /* Joins */
 
     // Join the tables using the relationship defined in the Coffees table
-    val joinQuery: Query[(Column[String], Column[String]), (String, String)] = for {
+    val joinQuery: Query[(Column[String], Column[String]), (String, String), Seq] = for {
       c <- coffees if c.price > 9.0
       s <- c.supplier
     } yield (c.name, s.name)

src/main/scala/InvokerMethods.scala

@@ -38,7 +38,7 @@ object InvokerMethods extends App {
 
     println("All keys in an unboxed Array[Int]")
     val allKeys = dict.map(_.key)
-    println("  " + allKeys.buildColl[Array]())
+    println("  " + allKeys.buildColl[Array])
 
     println("Stream k/v pairs up to 3 via an Iterator")
     val it = upTo(3).iterator

src/test/scala/TablesSuite.scala

@@ -21,7 +21,7 @@ class TablesSuite extends FunSuite with BeforeAndAfter {
   test("Creating the Schema works") {
     createSchema()
 
-    val tables = MTable.getTables().list()
+    val tables = MTable.getTables.list
 
     assert(tables.size == 2)
     assert(tables.count(_.name.name.equalsIgnoreCase("suppliers")) == 1)
@@ -38,7 +38,7 @@ class TablesSuite extends FunSuite with BeforeAndAfter {
   test("Query Suppliers works") {
     createSchema()
     insertSupplier()
-    val results = suppliers.list()
+    val results = suppliers.list
     assert(results.size == 1)
     assert(results.head._1 == 101)
   }