Bug fix: Correctly override implicits in SimpleQL

slick · Aug 30, 2012 · 83fba55 · 83fba55
1 parent 307bd6d
commit 83fba55
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/main/scala/scala/slick/driver/AccessDriver.scala b/src/main/scala/scala/slick/driver/AccessDriver.scala
@@ -66,7 +66,10 @@ trait AccessDriver extends ExtendedDriver { driver =>
     - BasicProfile.capabilities.zip
     )
 
-  override val Implicit: Implicits = new Implicits {
+  override val Implicit: Implicits = new Implicits
+  override val simple: SimpleQL = new Implicits with SimpleQL
+
+  class Implicits extends super.Implicits {
     override implicit def queryToQueryInvoker[T, U](q: Query[T, _ <: U]): QueryInvoker[T, U] = new QueryInvoker(q)
   }
 

diff --git a/src/main/scala/scala/slick/driver/BasicProfile.scala b/src/main/scala/scala/slick/driver/BasicProfile.scala
@@ -61,7 +61,7 @@ trait BasicProfile extends BasicTableComponent { driver: BasicDriver =>
     @inline implicit final def anyToToShapedValue[T](value: T) = new ToShapedValue[T](value)
   }
 
-  class SimpleQL extends Implicits with scala.slick.lifted.Aliases {
+  trait SimpleQL extends Implicits with scala.slick.lifted.Aliases {
     type Table[T] = driver.Table[T]
     type Database = scala.slick.session.Database
     val Database = scala.slick.session.Database
@@ -73,7 +73,7 @@ trait BasicProfile extends BasicTableComponent { driver: BasicDriver =>
     * statement. This provides the driver's implicits, the Database and
     * Session objects for DB connections, and commonly used query language
     * types and objects. */
-  val simple = new SimpleQL
+  val simple: SimpleQL = new SimpleQL {}
 }
 
 object BasicProfile {

diff --git a/src/test/scala/com/typesafe/slick/testkit/tests/MutateTest.scala b/src/test/scala/com/typesafe/slick/testkit/tests/MutateTest.scala
@@ -1,12 +1,10 @@
 package com.typesafe.slick.testkit.tests
 
 import org.junit.Assert._
-import scala.slick.lifted._
 import com.typesafe.slick.testkit.util.{TestkitTest, TestDB}
 
 class MutateTest(val tdb: TestDB) extends TestkitTest {
-  import tdb.profile.Table
-  import tdb.profile.Implicit._
+  import tdb.profile.simple._
 
   def test = ifCap(bcap.mutable) {