Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-07 22:15:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Profile structure

Browse Source
This commit is contained in:
Naoki Takezoe
2015-03-03 10:36:14 +09:00
parent 9e67999ef0
commit e6f30ef86b
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/scala/gitbucket/core/model/Profile.scala
View File

@@ -1,16 +1,20 @@
package gitbucket.core.model package gitbucket.core.model
trait Profile { trait Profile {
// TODO Is it possible to fix instance at the sub-trait? val profile: slick.driver.JdbcProfile
val profile: slick.driver.JdbcProfile = slick.driver.H2Driver
import profile.simple._ import profile.simple._
// java.util.Date Mapped Column Types /**
* java.util.Date Mapped Column Types
*/
implicit val dateColumnType = MappedColumnType.base[java.util.Date, java.sql.Timestamp]( implicit val dateColumnType = MappedColumnType.base[java.util.Date, java.sql.Timestamp](
d => new java.sql.Timestamp(d.getTime), d => new java.sql.Timestamp(d.getTime),
t => new java.util.Date(t.getTime) t => new java.util.Date(t.getTime)
) )
/**
* Extends Column to add conditional condition
*/
implicit class RichColumn(c1: Column[Boolean]){ implicit class RichColumn(c1: Column[Boolean]){
def &&(c2: => Column[Boolean], guard: => Boolean): Column[Boolean] = if(guard) c1 && c2 else c1 def &&(c2: => Column[Boolean], guard: => Boolean): Column[Boolean] = if(guard) c1 && c2 else c1
} }
@@ -22,7 +26,11 @@ trait Profile {
} }
trait CoreProfile extends Profile trait ProfileProvider { self: Profile =>
val profile = slick.driver.H2Driver
}
trait CoreProfile extends ProfileProvider with Profile
with AccountComponent with AccountComponent
with ActivityComponent with ActivityComponent
with CollaboratorComponent with CollaboratorComponent