format

Author: lihaoyi

docs/tutorial.md

@@ -1334,20 +1334,46 @@ object CityId {
 
 
 ```scala
-case class City2[T[_]](
+case class City[T[_]](
     id: T[CityId],
     name: T[String],
     countryCode: T[String],
     district: T[String],
     population: T[Long]
 )
 
+object City extends Table[City]() {
+  override def tableName: String = "city"
+}
+db.run(
+  City.insert.columns(
+    _.id := CityId(313373),
+    _.name := "test",
+    _.countryCode := "XYZ",
+    _.district := "district",
+    _.population := 1000000
+  )
+)
+
+db.run(City.select.filter(_.id === 313373).single) ==>
+  City[Sc](CityId(313373), "test", "XYZ", "district", 1000000)
+```
+
+```scala
+case class City2[T[_]](
+    id: T[CityId2],
+    name: T[String],
+    countryCode: T[String],
+    district: T[String],
+    population: T[Long]
+)
+
 object City2 extends Table[City2]() {
   override def tableName: String = "city"
 }
 db.run(
   City2.insert.columns(
-    _.id := CityId(31337),
+    _.id := CityId2(31337),
     _.name := "test",
     _.countryCode := "XYZ",
     _.district := "district",
@@ -1356,8 +1382,9 @@ db.run(
 )
 
 db.run(City2.select.filter(_.id === 31337).single) ==>
-  City2[Sc](CityId(31337), "test", "XYZ", "district", 1000000)
-```
+  City2[Sc](CityId2(31337), "test", "XYZ", "district", 1000000)
+
+st("customTableColumnNames") {
 
 ## Customizing Table and Column Names
 

scalasql/core/src/TypeMapper.scala

@@ -29,7 +29,7 @@ import java.util.UUID
  * Defaults are provided for most common Scala primitives, but you can also provide
  * your own by defining an `implicit val foo: TypeMapper[T]`
  */
-trait TypeMapper[T] {outer =>
+trait TypeMapper[T] { outer =>
 
   /**
    * The JDBC type of this type. Used for `setNull` which needs to know the
@@ -54,13 +54,13 @@ trait TypeMapper[T] {outer =>
 
   /**
    * Create a new `TypeMapper[V]` based on this `TypeMapper[T]` given the
-   * two conversion functions `f: V => T`, `g: T => V` 
+   * two conversion functions `f: V => T`, `g: T => V`
    */
-  def bimap[V](f: V => T, g: T => V): TypeMapper[V] = new TypeMapper[V]{
+  def bimap[V](f: V => T, g: T => V): TypeMapper[V] = new TypeMapper[V] {
     def jdbcType: JDBCType = outer.jdbcType
     override def castTypeString: String = outer.castTypeString
     def get(r: ResultSet, idx: Int): V = g(outer.get(r, idx))
-    def put(r: PreparedStatement, idx: Int, v: V): Unit = outer.put(r, idx, f(v)) 
+    def put(r: PreparedStatement, idx: Int, v: V): Unit = outer.put(r, idx, f(v))
   }
 }