From 4b92534269451282177a6631fb33fafab7003978 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 16 Nov 2020 17:28:24 +0100
Subject: Make job belong to Endpoint, Image, Package and Submit

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 src/db/models/endpoint.rs | 2 +-
 src/db/models/image.rs    | 2 +-
 src/db/models/job.rs      | 6 +++++-
 src/db/models/package.rs  | 2 +-
 src/db/models/submit.rs   | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/db')

diff --git a/src/db/models/endpoint.rs b/src/db/models/endpoint.rs
index ab30192..d81fbfd 100644
--- a/src/db/models/endpoint.rs
+++ b/src/db/models/endpoint.rs
@@ -6,7 +6,7 @@ use diesel::prelude::*;
 use crate::schema::endpoints::*;
 use crate::schema::endpoints;
 
-#[derive(Queryable)]
+#[derive(Identifiable, Queryable)]
 pub struct Endpoint {
     pub id: i32,
     pub name: String,
diff --git a/src/db/models/image.rs b/src/db/models/image.rs
index 225bac7..5032039 100644
--- a/src/db/models/image.rs
+++ b/src/db/models/image.rs
@@ -7,7 +7,7 @@ use crate::schema::images::*;
 use crate::schema::images;
 use crate::util::docker::ImageName;
 
-#[derive(Queryable)]
+#[derive(Identifiable, Queryable)]
 pub struct Image {
     pub id: i32,
     pub name: String,
diff --git a/src/db/models/job.rs b/src/db/models/job.rs
index c4e9095..90d9732 100644
--- a/src/db/models/job.rs
+++ b/src/db/models/job.rs
@@ -9,7 +9,11 @@ use crate::schema::jobs::*;
 use crate::schema::jobs;
 use crate::util::docker::ContainerHash;
 
-#[derive(Identifiable, Queryable)]
+#[derive(Identifiable, Queryable, Associations)]
+#[belongs_to(Submit)]
+#[belongs_to(Endpoint)]
+#[belongs_to(Package)]
+#[belongs_to(Image)]
 #[table_name="jobs"]
 pub struct Job {
     pub id: i32,
diff --git a/src/db/models/package.rs b/src/db/models/package.rs
index 8f14607..b0b99ee 100644
--- a/src/db/models/package.rs
+++ b/src/db/models/package.rs
@@ -8,7 +8,7 @@ use diesel::prelude::*;
 use crate::schema::packages::*;
 use crate::schema::packages;
 
-#[derive(Queryable)]
+#[derive(Identifiable, Queryable)]
 pub struct Package {
     pub id: i32,
     pub name: String,
diff --git a/src/db/models/submit.rs b/src/db/models/submit.rs
index 102d7f2..cfd29a3 100644
--- a/src/db/models/submit.rs
+++ b/src/db/models/submit.rs
@@ -12,7 +12,7 @@ use crate::db::models::Package;
 use crate::schema::submits::*;
 use crate::schema::submits;
 
-#[derive(Clone, Debug, Queryable)]
+#[derive(Clone, Debug, Identifiable, Queryable)]
 pub struct Submit {
     pub id: i32,
     pub uuid: ::uuid::Uuid,
-- 
cgit v1.2.3