Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
takezoe committed Jan 22, 2018
2 parents f58f139 + 2318c70 commit 04936e5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -17,8 +17,8 @@ import java.sql.ResultSet
case class User(userId: String, userName: String, companyId: Option[Int])

class Users extends TableDef[User]("USERS") {
val userId = new Column[String](this, "USER_ID"),
val userName = new Column[String](this, "USER_NAME"),
val userId = new Column[String](this, "USER_ID")
val userName = new Column[String](this, "USER_NAME")
val companyId = new OptionalColumn[Int](this, "COMPANY_ID")

override def toModel(rs: ResultSet): User = {
Expand All @@ -29,7 +29,7 @@ class Users extends TableDef[User]("USERS") {
case class Company(companyId: Int, companyName: String)

class Companies extends TableDef[Company]("COMPANIES") {
val companyId = new Column[Int](this, "COMPANY_ID"),
val companyId = new Column[Int](this, "COMPANY_ID")
val companyName = new Column[String](this, "COMPANY_NAME")

override def toModel(rs: ResultSet): Company = {
Expand Down

0 comments on commit 04936e5

Please sign in to comment.