Skip to content

Commit

Permalink
fix table names for postgres
Browse files Browse the repository at this point in the history
  • Loading branch information
nemoo committed Mar 8, 2024
1 parent ae684e0 commit edba315
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
6 changes: 3 additions & 3 deletions app/models/Project.scala
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ class ProjectRepo @Inject()(taskRepo: TaskRepo)(protected val dbConfigProvider:
}


private[models] class ProjectsTable(tag: Tag) extends Table[Project](tag, "PROJECT") {
private[models] class ProjectsTable(tag: Tag) extends Table[Project](tag, "project") {

def id = column[Long]("ID", O.AutoInc, O.PrimaryKey)
def name = column[String]("NAME")
def id = column[Long]("id", O.AutoInc, O.PrimaryKey)
def name = column[String]("name")

def * = (id, name) <> (Project.tupled, Project.unapply)
def ? = (id.?, name.?).shaped.<>({ r => import r._; _1.map(_ => Project.tupled((_1.get, _2.get))) }, (_: Any) => throw new Exception("Inserting into ? projection not supported."))
Expand Down
18 changes: 8 additions & 10 deletions app/models/Task.scala
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package models

import javax.inject.Inject

import play.api.db.slick.DatabaseConfigProvider

import slick.jdbc.JdbcProfile

import scala.concurrent.Future
Expand All @@ -20,9 +18,9 @@ case class Task(id: Long, color: String, status: TaskStatus.Value, project: Long
}

object TaskStatus extends Enumeration {
val ready = Value("ready")
val set = Value("set")
val go = Value("go")
val ready: TaskStatus.Value = Value("ready")
val set: TaskStatus.Value = Value("set")
val go: TaskStatus.Value = Value("go")
}

class TaskRepo @Inject()(protected val dbConfigProvider: DatabaseConfigProvider) {
Expand Down Expand Up @@ -68,12 +66,12 @@ class TaskRepo @Inject()(protected val dbConfigProvider: DatabaseConfigProvider)
def _deleteAllInProject(projectId: Long): DBIO[Int] =
Tasks.filter(_.project === projectId).delete

private[models] class TasksTable(tag: Tag) extends Table[Task](tag, "TASK") {
private[models] class TasksTable(tag: Tag) extends Table[Task](tag, "task") {

def id = column[Long]("ID", O.AutoInc, O.PrimaryKey)
def color = column[String]("COLOR")
def status = column[TaskStatus.Value]("STATUS")
def project = column[Long]("PROJECT")
def id = column[Long]("id", O.AutoInc, O.PrimaryKey)
def color = column[String]("color")
def status = column[TaskStatus.Value]("status")
def project = column[Long]("project")

def * = (id, color, status, project) <> (Task.tupled, Task.unapply)
def ? = (id.?, color.?, status.?, project.?).shaped.<>({ r => import r._; _1.map(_ => Task.tupled((_1.get, _2.get, _3.get, _4.get))) }, (_: Any) => throw new Exception("Inserting into ? projection not supported."))
Expand Down

0 comments on commit edba315

Please sign in to comment.