(refs #341) Migrate model package.

project/build.scala

@@ -38,7 +38,7 @@ object MyBuild extends Build {
         "org.apache.commons" % "commons-email" % "1.3.1",
         "org.apache.httpcomponents" % "httpclient" % "4.3",
         "org.apache.sshd" % "apache-sshd" % "0.11.0",
-        "com.typesafe.slick" %% "slick" % "1.0.1",
+        "com.typesafe.slick" %% "slick" % "2.0.2",
         "com.novell.ldap" % "jldap" % "2009-10-07",
         "com.h2database" % "h2" % "1.3.173",
         "ch.qos.logback" % "logback-classic" % "1.0.13" % "runtime",

src/main/scala/model/Account.scala

@@ -1,24 +1,28 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait AccountComponent { self: Profile =>
+  import profile.simple._
+  import self._
 
-object Accounts extends Table[Account]("ACCOUNT") {
+  lazy val Accounts = TableQuery[Accounts]
-  def userName = column[String]("USER_NAME", O PrimaryKey)
-  def fullName = column[String]("FULL_NAME")
-  def mailAddress = column[String]("MAIL_ADDRESS")
-  def password = column[String]("PASSWORD")
-  def isAdmin = column[Boolean]("ADMINISTRATOR")
-  def url = column[String]("URL")
-  def registeredDate = column[java.util.Date]("REGISTERED_DATE")
-  def updatedDate = column[java.util.Date]("UPDATED_DATE")
-  def lastLoginDate = column[java.util.Date]("LAST_LOGIN_DATE")
-  def image = column[String]("IMAGE")
-  def groupAccount = column[Boolean]("GROUP_ACCOUNT")
-  def removed = column[Boolean]("REMOVED")
-  def * = userName ~ fullName ~ mailAddress ~ password ~ isAdmin ~ url.? ~ registeredDate ~ updatedDate ~ lastLoginDate.? ~ image.? ~ groupAccount ~ removed <> (Account, Account.unapply _)
-}
 
-case class Account(
+  class Accounts(tag: Tag) extends Table[Account](tag, "ACCOUNT") {
+    val userName = column[String]("USER_NAME", O PrimaryKey)
+    val fullName = column[String]("FULL_NAME")
+    val mailAddress = column[String]("MAIL_ADDRESS")
+    val password = column[String]("PASSWORD")
+    val isAdmin = column[Boolean]("ADMINISTRATOR")
+    val url = column[String]("URL")
+    val registeredDate = column[java.util.Date]("REGISTERED_DATE")
+    val updatedDate = column[java.util.Date]("UPDATED_DATE")
+    val lastLoginDate = column[java.util.Date]("LAST_LOGIN_DATE")
+    val image = column[String]("IMAGE")
+    val groupAccount = column[Boolean]("GROUP_ACCOUNT")
+    val removed = column[Boolean]("REMOVED")
+    def * = (userName, fullName, mailAddress, password, isAdmin, url.?, registeredDate, updatedDate, lastLoginDate.?, image.?, groupAccount, removed) <> (Account.tupled, Account.unapply)
+  }
+
+  case class Account(
     userName: String,
     fullName: String,
     mailAddress: String,
@@ -31,4 +35,5 @@ case class Account(
     image: Option[String],
     isGroupAccount: Boolean,
     isRemoved: Boolean
-)
+  )
+}

src/main/scala/model/Activity.scala

@@ -1,19 +1,22 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait ActivityComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
+  import self._
 
-object Activities extends Table[Activity]("ACTIVITY") with BasicTemplate {
+  lazy val Activities = TableQuery[Activities]
-  def activityId = column[Int]("ACTIVITY_ID", O AutoInc)
-  def activityUserName = column[String]("ACTIVITY_USER_NAME")
-  def activityType = column[String]("ACTIVITY_TYPE")
-  def message = column[String]("MESSAGE")
-  def additionalInfo = column[String]("ADDITIONAL_INFO")
-  def activityDate = column[java.util.Date]("ACTIVITY_DATE")
-  def * = activityId ~ userName ~ repositoryName ~ activityUserName ~ activityType ~ message ~ additionalInfo.? ~ activityDate <> (Activity, Activity.unapply _)
-  def autoInc = userName ~ repositoryName ~ activityUserName ~ activityType ~ message ~ additionalInfo.? ~ activityDate returning activityId
-}
 
-case class Activity(
+  class Activities(tag: Tag) extends Table[Activity](tag, "ACTIVITY") with BasicTemplate {
+    val activityId = column[Int]("ACTIVITY_ID", O AutoInc)
+    val activityUserName = column[String]("ACTIVITY_USER_NAME")
+    val activityType = column[String]("ACTIVITY_TYPE")
+    val message = column[String]("MESSAGE")
+    val additionalInfo = column[String]("ADDITIONAL_INFO")
+    val activityDate = column[java.util.Date]("ACTIVITY_DATE")
+    def * = (activityId, userName, repositoryName, activityUserName, activityType, message, additionalInfo.?, activityDate) <> (Activity.tupled, Activity.unapply)
+  }
+
+  case class Activity(
     activityId: Int,
     userName: String,
     repositoryName: String,
@@ -22,4 +25,5 @@ case class Activity(
     message: String,
     additionalInfo: Option[String],
     activityDate: java.util.Date
-)
+  )
+}

src/main/scala/model/BasicTemplate.scala

@@ -1,44 +1,47 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+protected[model] trait TemplateComponent { self: Profile =>
+  import profile.simple._
 
-protected[model] trait BasicTemplate { self: Table[_] =>
+  trait BasicTemplate { self: Table[_] =>
-  def userName = column[String]("USER_NAME")
+    val userName = column[String]("USER_NAME")
-  def repositoryName = column[String]("REPOSITORY_NAME")
+    val repositoryName = column[String]("REPOSITORY_NAME")
 
     def byRepository(owner: String, repository: String) =
       (userName is owner.bind) && (repositoryName is repository.bind)
 
     def byRepository(userName: Column[String], repositoryName: Column[String]) =
       (this.userName is userName) && (this.repositoryName is repositoryName)
-}
+  }
 
-protected[model] trait IssueTemplate extends BasicTemplate { self: Table[_] =>
+  trait IssueTemplate extends BasicTemplate { self: Table[_] =>
-  def issueId = column[Int]("ISSUE_ID")
+    val issueId = column[Int]("ISSUE_ID")
 
     def byIssue(owner: String, repository: String, issueId: Int) =
       byRepository(owner, repository) && (this.issueId is issueId.bind)
 
     def byIssue(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) =
       byRepository(userName, repositoryName) && (this.issueId is issueId)
-}
+  }
 
-protected[model] trait LabelTemplate extends BasicTemplate { self: Table[_] =>
+  trait LabelTemplate extends BasicTemplate { self: Table[_] =>
-  def labelId = column[Int]("LABEL_ID")
+    val labelId = column[Int]("LABEL_ID")
 
     def byLabel(owner: String, repository: String, labelId: Int) =
       byRepository(owner, repository) && (this.labelId is labelId.bind)
 
     def byLabel(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) =
       byRepository(userName, repositoryName) && (this.labelId is labelId)
-}
+  }
 
-protected[model] trait MilestoneTemplate extends BasicTemplate { self: Table[_] =>
+  trait MilestoneTemplate extends BasicTemplate { self: Table[_] =>
-  def milestoneId = column[Int]("MILESTONE_ID")
+    val milestoneId = column[Int]("MILESTONE_ID")
 
     def byMilestone(owner: String, repository: String, milestoneId: Int) =
       byRepository(owner, repository) && (this.milestoneId is milestoneId.bind)
 
     def byMilestone(userName: Column[String], repositoryName: Column[String], milestoneId: Column[Int]) =
       byRepository(userName, repositoryName) && (this.milestoneId is milestoneId)
+  }
+
 }

src/main/scala/model/Collaborator.scala

@@ -1,17 +1,21 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait CollaboratorComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
 
-object Collaborators extends Table[Collaborator]("COLLABORATOR") with BasicTemplate {
+  lazy val Collaborators = TableQuery[Collaborators]
-  def collaboratorName = column[String]("COLLABORATOR_NAME")
+
-  def * = userName ~ repositoryName ~ collaboratorName <> (Collaborator, Collaborator.unapply _)
+  class Collaborators(tag: Tag) extends Table[Collaborator](tag, "COLLABORATOR") with BasicTemplate {
+    val collaboratorName = column[String]("COLLABORATOR_NAME")
+    def * = (userName, repositoryName, collaboratorName) <> (Collaborator.tupled, Collaborator.unapply)
 
     def byPrimaryKey(owner: String, repository: String, collaborator: String) =
       byRepository(owner, repository) && (collaboratorName is collaborator.bind)
-}
+  }
 
-case class Collaborator(
+  case class Collaborator(
     userName: String,
     repositoryName: String,
     collaboratorName: String
-)
+  )
+}

src/main/scala/model/GroupMembers.scala

@@ -1,16 +1,20 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait GroupMemberComponent { self: Profile =>
+  import profile.simple._
 
-object GroupMembers extends Table[GroupMember]("GROUP_MEMBER") {
+  lazy val GroupMembers = TableQuery[GroupMembers]
-  def groupName = column[String]("GROUP_NAME", O PrimaryKey)
-  def userName = column[String]("USER_NAME", O PrimaryKey)
-  def isManager = column[Boolean]("MANAGER")
-  def * = groupName ~ userName ~ isManager <> (GroupMember, GroupMember.unapply _)
-}
 
-case class GroupMember(
+  class GroupMembers(tag: Tag) extends Table[GroupMember](tag, "GROUP_MEMBER") {
+    val groupName = column[String]("GROUP_NAME", O PrimaryKey)
+    val userName = column[String]("USER_NAME", O PrimaryKey)
+    val isManager = column[Boolean]("MANAGER")
+    def * = (groupName, userName, isManager) <> (GroupMember.tupled, GroupMember.unapply)
+  }
+
+  case class GroupMember(
     groupName: String,
     userName: String,
     isManager: Boolean
-)
+  )
+}

src/main/scala/model/Issue.scala

@@ -1,32 +1,38 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait IssueComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
+  import self._
 
-object IssueId extends Table[(String, String, Int)]("ISSUE_ID") with IssueTemplate {
+  lazy val IssueId = TableQuery[IssueId]
-  def * = userName ~ repositoryName ~ issueId
+  lazy val IssueOutline = TableQuery[IssueOutline]
+  lazy val Issues = TableQuery[Issues]
+
+  class IssueId(tag: Tag) extends Table[(String, String, Int)](tag, "ISSUE_ID") with IssueTemplate {
+    def * = (userName, repositoryName, issueId)
     def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
-}
+  }
 
-object IssueOutline extends Table[(String, String, Int, Int)]("ISSUE_OUTLINE_VIEW") with IssueTemplate {
+  class IssueOutline(tag: Tag) extends Table[(String, String, Int, Int)](tag, "ISSUE_OUTLINE_VIEW") with IssueTemplate {
-  def commentCount = column[Int]("COMMENT_COUNT")
+    val commentCount = column[Int]("COMMENT_COUNT")
-  def * = userName ~ repositoryName ~ issueId ~ commentCount
+    def * = (userName, repositoryName, issueId, commentCount)
-}
+  }
 
-object Issues extends Table[Issue]("ISSUE") with IssueTemplate with MilestoneTemplate {
+  class Issues(tag: Tag) extends Table[Issue](tag, "ISSUE") with IssueTemplate with MilestoneTemplate {
-  def openedUserName = column[String]("OPENED_USER_NAME")
+    val openedUserName = column[String]("OPENED_USER_NAME")
-  def assignedUserName = column[String]("ASSIGNED_USER_NAME")
+    val assignedUserName = column[String]("ASSIGNED_USER_NAME")
-  def title = column[String]("TITLE")
+    val title = column[String]("TITLE")
-  def content = column[String]("CONTENT")
+    val content = column[String]("CONTENT")
-  def closed = column[Boolean]("CLOSED")
+    val closed = column[Boolean]("CLOSED")
-  def registeredDate = column[java.util.Date]("REGISTERED_DATE")
+    val registeredDate = column[java.util.Date]("REGISTERED_DATE")
-  def updatedDate = column[java.util.Date]("UPDATED_DATE")
+    val updatedDate = column[java.util.Date]("UPDATED_DATE")
-  def pullRequest = column[Boolean]("PULL_REQUEST")
+    val pullRequest = column[Boolean]("PULL_REQUEST")
-  def * = userName ~ repositoryName ~ issueId ~ openedUserName ~ milestoneId.? ~ assignedUserName.? ~ title ~ content.? ~ closed ~ registeredDate ~ updatedDate ~ pullRequest <> (Issue, Issue.unapply _)
+    def * = (userName, repositoryName, issueId, openedUserName, milestoneId.?, assignedUserName.?, title, content.?, closed, registeredDate, updatedDate, pullRequest) <> (Issue.tupled, Issue.unapply)
 
     def byPrimaryKey(owner: String, repository: String, issueId: Int) = byIssue(owner, repository, issueId)
-}
+  }
 
-case class Issue(
+  case class Issue(
     userName: String,
     repositoryName: String,
     issueId: Int,
@@ -39,3 +45,4 @@ case class Issue(
     registeredDate: java.util.Date,
     updatedDate: java.util.Date,
     isPullRequest: Boolean)
+}

src/main/scala/model/IssueComment.scala

@@ -1,21 +1,26 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait IssueCommentComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
+  import self._
 
-object IssueComments extends Table[IssueComment]("ISSUE_COMMENT") with IssueTemplate {
+  lazy val IssueComments = new TableQuery(tag => new IssueComments(tag)){
-  def commentId = column[Int]("COMMENT_ID", O AutoInc)
+    def autoInc = this returning this.map(_.commentId)
-  def action = column[String]("ACTION")
+  }
-  def commentedUserName = column[String]("COMMENTED_USER_NAME")
+
-  def content = column[String]("CONTENT")
+  class IssueComments(tag: Tag) extends Table[IssueComment](tag, "ISSUE_COMMENT") with IssueTemplate {
-  def registeredDate = column[java.util.Date]("REGISTERED_DATE")
+    val commentId = column[Int]("COMMENT_ID", O AutoInc)
-  def updatedDate = column[java.util.Date]("UPDATED_DATE")
+    val action = column[String]("ACTION")
-  def * = userName ~ repositoryName ~ issueId ~ commentId ~ action ~ commentedUserName ~ content ~ registeredDate ~ updatedDate <> (IssueComment, IssueComment.unapply _)
+    val commentedUserName = column[String]("COMMENTED_USER_NAME")
+    val content = column[String]("CONTENT")
+    val registeredDate = column[java.util.Date]("REGISTERED_DATE")
+    val updatedDate = column[java.util.Date]("UPDATED_DATE")
+    def * = (userName, repositoryName, issueId, commentId, action, commentedUserName, content, registeredDate, updatedDate) <> (IssueComment.tupled, IssueComment.unapply)
 
-  def autoInc = userName ~ repositoryName ~ issueId ~ action ~ commentedUserName ~ content ~ registeredDate ~ updatedDate returning commentId
     def byPrimaryKey(commentId: Int) = this.commentId is commentId.bind
-}
+  }
 
-case class IssueComment(
+  case class IssueComment(
     userName: String,
     repositoryName: String,
     issueId: Int,
@@ -25,4 +30,5 @@ case class IssueComment(
     content: String,
     registeredDate: java.util.Date,
     updatedDate: java.util.Date
-)
+  )
+}

src/main/scala/model/IssueLabels.scala

@@ -1,15 +1,19 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait IssueLabelComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
 
-object IssueLabels extends Table[IssueLabel]("ISSUE_LABEL") with IssueTemplate with LabelTemplate {
+  lazy val IssueLabels = TableQuery[IssueLabels]
-  def * = userName ~ repositoryName ~ issueId ~ labelId <> (IssueLabel, IssueLabel.unapply _)
+
+  class IssueLabels(tag: Tag) extends Table[IssueLabel](tag, "ISSUE_LABEL") with IssueTemplate with LabelTemplate {
+    def * = (userName, repositoryName, issueId, labelId) <> (IssueLabel.tupled, IssueLabel.unapply)
     def byPrimaryKey(owner: String, repository: String, issueId: Int, labelId: Int) =
       byIssue(owner, repository, issueId) && (this.labelId is labelId.bind)
-}
+  }
 
-case class IssueLabel(
+  case class IssueLabel(
     userName: String,
     repositoryName: String,
     issueId: Int,
     labelId: Int)
+}

src/main/scala/model/Labels.scala

@@ -1,18 +1,21 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait LabelComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
 
-object Labels extends Table[Label]("LABEL") with LabelTemplate {
+  lazy val Labels = TableQuery[Labels]
-  def labelName = column[String]("LABEL_NAME")
+
-  def color = column[String]("COLOR")
+  class Labels(tag: Tag) extends Table[Label](tag, "LABEL") with LabelTemplate {
-  def * = userName ~ repositoryName ~ labelId ~ labelName ~ color <> (Label, Label.unapply _)
+    override val labelId = column[Int]("LABEL_ID", O AutoInc)
+    val labelName = column[String]("LABEL_NAME")
+    val color = column[String]("COLOR")
+    def * = (userName, repositoryName, labelId, labelName, color) <> (Label.tupled, Label.unapply)
 
-  def ins = userName ~ repositoryName ~ labelName ~ color
     def byPrimaryKey(owner: String, repository: String, labelId: Int) = byLabel(owner, repository, labelId)
     def byPrimaryKey(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) = byLabel(userName, repositoryName, labelId)
-}
+  }
 
-case class Label(
+  case class Label(
     userName: String,
     repositoryName: String,
     labelId: Int,
@@ -30,5 +33,5 @@ case class Label(
         "FFFFFF"
       }
     }
-
+  }
 }

src/main/scala/model/Milestone.scala

@@ -1,20 +1,24 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait MilestoneComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
+  import self._
 
-object Milestones extends Table[Milestone]("MILESTONE") with MilestoneTemplate {
+  lazy val Milestones = TableQuery[Milestones]
-  def title = column[String]("TITLE")
+
-  def description = column[String]("DESCRIPTION")
+  class Milestones(tag: Tag) extends Table[Milestone](tag, "MILESTONE") with MilestoneTemplate {
-  def dueDate = column[java.util.Date]("DUE_DATE")
+    override val milestoneId = column[Int]("MILESTONE_ID", O AutoInc)
-  def closedDate = column[java.util.Date]("CLOSED_DATE")
+    val title = column[String]("TITLE")
-  def * = userName ~ repositoryName ~ milestoneId ~ title ~ description.? ~ dueDate.? ~ closedDate.? <> (Milestone, Milestone.unapply _)
+    val description = column[String]("DESCRIPTION")
+    val dueDate = column[java.util.Date]("DUE_DATE")
+    val closedDate = column[java.util.Date]("CLOSED_DATE")
+    def * = (userName, repositoryName, milestoneId, title, description.?, dueDate.?, closedDate.?) <> (Milestone.tupled, Milestone.unapply)
 
-  def ins = userName ~ repositoryName ~ title ~ description.? ~ dueDate.? ~ closedDate.?
     def byPrimaryKey(owner: String, repository: String, milestoneId: Int) = byMilestone(owner, repository, milestoneId)
     def byPrimaryKey(userName: Column[String], repositoryName: Column[String], milestoneId: Column[Int]) = byMilestone(userName, repositoryName, milestoneId)
-}
+  }
 
-case class Milestone(
+  case class Milestone(
     userName: String,
     repositoryName: String,
     milestoneId: Int,
@@ -22,3 +26,4 @@ case class Milestone(
     description: Option[String],
     dueDate: Option[java.util.Date],
     closedDate: Option[java.util.Date])
+}

src/main/scala/model/Profile.scala

@@ -0,0 +1,20 @@
+package model
+
+import slick.driver.JdbcProfile
+
+//private[model]
+trait Profile {
+  val profile: JdbcProfile
+  import profile.simple._
+
+  // java.util.Date Mapped Column Types
+  implicit val dateColumnType = MappedColumnType.base[java.util.Date, java.sql.Timestamp](
+      d => new java.sql.Timestamp(d.getTime),
+      t => new java.util.Date(t.getTime)
+  )
+
+  implicit class RichColumn(c1: Column[Boolean]){
+    def &&(c2: => Column[Boolean], guard: => Boolean): Column[Boolean] = if(guard) c1 && c2 else c1
+  }
+
+}

src/main/scala/model/PullRequest.scala

@@ -1,21 +1,24 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait PullRequestComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
 
-object PullRequests extends Table[PullRequest]("PULL_REQUEST") with IssueTemplate {
+  lazy val PullRequests = TableQuery[PullRequests]
-  def branch = column[String]("BRANCH")
+
-  def requestUserName = column[String]("REQUEST_USER_NAME")
+  class PullRequests(tag: Tag) extends Table[PullRequest](tag, "PULL_REQUEST") with IssueTemplate {
-  def requestRepositoryName = column[String]("REQUEST_REPOSITORY_NAME")
+    val branch = column[String]("BRANCH")
-  def requestBranch = column[String]("REQUEST_BRANCH")
+    val requestUserName = column[String]("REQUEST_USER_NAME")
-  def commitIdFrom = column[String]("COMMIT_ID_FROM")
+    val requestRepositoryName = column[String]("REQUEST_REPOSITORY_NAME")
-  def commitIdTo = column[String]("COMMIT_ID_TO")
+    val requestBranch = column[String]("REQUEST_BRANCH")
-  def * = userName ~ repositoryName ~ issueId ~ branch ~ requestUserName ~ requestRepositoryName ~ requestBranch ~ commitIdFrom ~ commitIdTo <> (PullRequest, PullRequest.unapply _)
+    val commitIdFrom = column[String]("COMMIT_ID_FROM")
+    val commitIdTo = column[String]("COMMIT_ID_TO")
+    def * = (userName, repositoryName, issueId, branch, requestUserName, requestRepositoryName, requestBranch, commitIdFrom, commitIdTo) <> (PullRequest.tupled, PullRequest.unapply)
 
     def byPrimaryKey(userName: String, repositoryName: String, issueId: Int) = byIssue(userName, repositoryName, issueId)
     def byPrimaryKey(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) = byIssue(userName, repositoryName, issueId)
-}
+  }
 
-case class PullRequest(
+  case class PullRequest(
     userName: String,
     repositoryName: String,
     issueId: Int,
@@ -25,4 +28,5 @@ case class PullRequest(
     requestBranch: String,
     commitIdFrom: String,
     commitIdTo: String
-)
+  )
+}

src/main/scala/model/Repository.scala

@@ -1,24 +1,28 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait RepositoryComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
+  import self._
 
-object Repositories extends Table[Repository]("REPOSITORY") with BasicTemplate {
+  lazy val Repositories = TableQuery[Repositories]
-  def isPrivate = column[Boolean]("PRIVATE")
+
-  def description = column[String]("DESCRIPTION")
+  class Repositories(tag: Tag) extends Table[Repository](tag, "REPOSITORY") with BasicTemplate {
-  def defaultBranch = column[String]("DEFAULT_BRANCH")
+    val isPrivate = column[Boolean]("PRIVATE")
-  def registeredDate = column[java.util.Date]("REGISTERED_DATE")
+    val description = column[String]("DESCRIPTION")
-  def updatedDate = column[java.util.Date]("UPDATED_DATE")
+    val defaultBranch = column[String]("DEFAULT_BRANCH")
-  def lastActivityDate = column[java.util.Date]("LAST_ACTIVITY_DATE")
+    val registeredDate = column[java.util.Date]("REGISTERED_DATE")
-  def originUserName = column[String]("ORIGIN_USER_NAME")
+    val updatedDate = column[java.util.Date]("UPDATED_DATE")
-  def originRepositoryName = column[String]("ORIGIN_REPOSITORY_NAME")
+    val lastActivityDate = column[java.util.Date]("LAST_ACTIVITY_DATE")
-  def parentUserName = column[String]("PARENT_USER_NAME")
+    val originUserName = column[String]("ORIGIN_USER_NAME")
-  def parentRepositoryName = column[String]("PARENT_REPOSITORY_NAME")
+    val originRepositoryName = column[String]("ORIGIN_REPOSITORY_NAME")
-  def * = userName ~ repositoryName ~ isPrivate ~ description.? ~ defaultBranch ~ registeredDate ~ updatedDate ~ lastActivityDate ~ originUserName.? ~ originRepositoryName.? ~ parentUserName.? ~ parentRepositoryName.? <> (Repository, Repository.unapply _)
+    val parentUserName = column[String]("PARENT_USER_NAME")
+    val parentRepositoryName = column[String]("PARENT_REPOSITORY_NAME")
+    def * = (userName, repositoryName, isPrivate, description.?, defaultBranch, registeredDate, updatedDate, lastActivityDate, originUserName.?, originRepositoryName.?, parentUserName.?, parentRepositoryName.?) <> (Repository.tupled, Repository.unapply)
 
     def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
-}
+  }
 
-case class Repository(
+  case class Repository(
     userName: String,
     repositoryName: String,
     isPrivate: Boolean,
@@ -31,4 +35,5 @@ case class Repository(
     originRepositoryName: Option[String],
     parentUserName: Option[String],
     parentRepositoryName: Option[String]
-)
+  )
+}

src/main/scala/model/SshKey.scala

@@ -1,22 +1,24 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait SshKeyComponent { self: Profile =>
+  import profile.simple._
 
-object SshKeys extends Table[SshKey]("SSH_KEY") {
+  lazy val SshKeys = TableQuery[SshKeys]
-  def userName = column[String]("USER_NAME")
-  def sshKeyId = column[Int]("SSH_KEY_ID", O AutoInc)
-  def title = column[String]("TITLE")
-  def publicKey = column[String]("PUBLIC_KEY")
 
-  def ins = userName ~ title ~ publicKey returning sshKeyId
+  class SshKeys(tag: Tag) extends Table[SshKey](tag, "SSH_KEY") {
-  def * = userName ~ sshKeyId ~ title ~ publicKey <> (SshKey, SshKey.unapply _)
+    val userName = column[String]("USER_NAME")
+    val sshKeyId = column[Int]("SSH_KEY_ID", O AutoInc)
+    val title = column[String]("TITLE")
+    val publicKey = column[String]("PUBLIC_KEY")
+    def * = (userName, sshKeyId, title, publicKey) <> (SshKey.tupled, SshKey.unapply)
 
     def byPrimaryKey(userName: String, sshKeyId: Int) = (this.userName is userName.bind) && (this.sshKeyId is sshKeyId.bind)
-}
+  }
 
-case class SshKey(
+  case class SshKey(
     userName: String,
     sshKeyId: Int,
     title: String,
     publicKey: String
-)
+  )
+}

src/main/scala/model/WebHook.scala

@@ -1,16 +1,20 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait WebHookComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
 
-object WebHooks extends Table[WebHook]("WEB_HOOK") with BasicTemplate {
+  lazy val WebHooks = TableQuery[WebHooks]
-  def url = column[String]("URL")
+
-  def * = userName ~ repositoryName ~ url <> (WebHook, WebHook.unapply _)
+  class WebHooks(tag: Tag) extends Table[WebHook](tag, "WEB_HOOK") with BasicTemplate {
+    val url = column[String]("URL")
+    def * = (userName, repositoryName, url) <> (WebHook.tupled, WebHook.unapply)
 
     def byPrimaryKey(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url is url.bind)
-}
+  }
 
-case class WebHook(
+  case class WebHook(
     userName: String,
     repositoryName: String,
     url: String
-)
+  )
+}

src/main/scala/model/package.scala

@@ -1,20 +1,22 @@
-package object model {
+package object model extends {
-  import scala.slick.driver.BasicDriver.Implicit._
+  // TODO
-  import scala.slick.lifted.{Column, MappedTypeMapper}
+  val profile = slick.driver.H2Driver
-
-  // java.util.Date TypeMapper
-  implicit val dateTypeMapper = MappedTypeMapper.base[java.util.Date, java.sql.Timestamp](
-      d => new java.sql.Timestamp(d.getTime),
-      t => new java.util.Date(t.getTime)
-  )
-
-  implicit class RichColumn(c1: Column[Boolean]){
-    def &&(c2: => Column[Boolean], guard: => Boolean): Column[Boolean] = if(guard) c1 && c2 else c1
-  }
 
+} with AccountComponent
+  with ActivityComponent
+  with CollaboratorComponent
+  with GroupMemberComponent
+  with IssueComponent
+  with IssueCommentComponent
+  with IssueLabelComponent
+  with LabelComponent
+  with MilestoneComponent
+  with PullRequestComponent
+  with RepositoryComponent
+  with SshKeyComponent
+  with WebHookComponent with Profile {
   /**
    * Returns system date.
    */
   def currentDate = new java.util.Date()
-
 }