Make diesel mapping from environment variables table to job table

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

3 files changed, 10 insertions, 4 deletions

diff --git a/src/db/models/envvar.rs b/src/db/models/envvar.rs
index f883661..51ad32a 100644
--- a/src/db/models/envvar.rs
+++ b/src/db/models/envvar.rs
@@ -6,7 +6,8 @@ use diesel::prelude::*;
 use crate::schema::envvars::*;
 use crate::schema::envvars;
 
-#[derive(Queryable)]
+#[derive(Identifiable, Queryable)]
+#[table_name="envvars"]
 pub struct EnvVar {
     pub id: i32,
     pub name: String,
diff --git a/src/db/models/job.rs b/src/db/models/job.rs
index 8240bd8..c4e9095 100644
--- a/src/db/models/job.rs
+++ b/src/db/models/job.rs
@@ -9,7 +9,8 @@ use crate::schema::jobs::*;
 use crate::schema::jobs;
 use crate::util::docker::ContainerHash;
 
-#[derive(Queryable)]
+#[derive(Identifiable, Queryable)]
+#[table_name="jobs"]
 pub struct Job {
     pub id: i32,
     pub submit_id: i32,
diff --git a/src/db/models/job_env.rs b/src/db/models/job_env.rs
index 31c7a92..3ef1ae3 100644
--- a/src/db/models/job_env.rs
+++ b/src/db/models/job_env.rs
@@ -4,9 +4,13 @@ use diesel::prelude::*;
 
 use crate::schema::job_envs::*;
 use crate::schema::job_envs;
-use crate::db::models::{Job, EnvVar};
+use crate::db::models::Job;
+use crate::db::models::EnvVar;
 
-#[derive(Queryable)]
+#[derive(Identifiable, Queryable, Associations)]
+#[belongs_to(Job)]
+#[belongs_to(EnvVar, foreign_key = "env_id")]
+#[table_name="job_envs"]
 pub struct JobEnv {
     pub id: i32,
     pub job_id: i32,