Making some audit action database columns not null.

Author: markcatley

migrations/2019-01-26-090348_create_version_owner_actions/up.sql

@@ -1,7 +1,7 @@
 CREATE TABLE version_owner_actions (
     id SERIAL PRIMARY KEY,
-    version_id INTEGER REFERENCES versions(id) ON DELETE CASCADE,
-    owner_id INTEGER REFERENCES users(id),
+    version_id INTEGER REFERENCES versions(id) ON DELETE CASCADE NOT NULL,
+    owner_id INTEGER REFERENCES users(id) NOT NULL,
     owner_token_id INTEGER REFERENCES api_tokens(id),
     action INTEGER NOT NULL,
     time TIMESTAMP NOT NULL DEFAULT now()

src/models.rs

@@ -1,4 +1,4 @@
-pub use self::action::{VersionAction, VersionOwnerAction};
+pub use self::action::{NewVersionOwnerAction, VersionAction, VersionOwnerAction};
 pub use self::badge::{Badge, CrateBadge, MaintenanceStatus};
 pub use self::category::{Category, CrateCategory, NewCategory};
 pub use self::crate_owner_invitation::{CrateOwnerInvitation, NewCrateOwnerInvitation};

src/models/action.rs

@@ -1,16 +1,60 @@
 use chrono::NaiveDateTime;
+use diesel::prelude::*;
+use diesel::{
+    deserialize::{self, FromSql},
+    expression::{bound::Bound, AsExpression},
+    pg::Pg,
+    sql_types::Integer,
+};
 
 use crate::models::{ApiToken, User, Version};
 use crate::schema::*;
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, FromSqlRow)]
 #[repr(u32)]
 pub enum VersionAction {
     Publish = 0,
     Yank = 1,
     Unyank = 2,
 }
 
+impl Into<i32> for VersionAction {
+    fn into(self) -> i32 {
+        match self {
+            VersionAction::Publish => 0,
+            VersionAction::Yank => 1,
+            VersionAction::Unyank => 2,
+        }
+    }
+}
+
+impl FromSql<Integer, Pg> for VersionAction {
+    fn from_sql(bytes: Option<&[u8]>) -> deserialize::Result<Self> {
+        match <i32 as FromSql<Integer, Pg>>::from_sql(bytes)? {
+            0 => Ok(VersionAction::Publish),
+            1 => Ok(VersionAction::Yank),
+            2 => Ok(VersionAction::Unyank),
+            n => Err(format!("unknown version action: {}", n).into()),
+        }
+    }
+}
+
+impl AsExpression<Integer> for VersionAction {
+    type Expression = Bound<Integer, i32>;
+
+    fn as_expression(self) -> Self::Expression {
+        Bound::new(self.into())
+    }
+}
+
+impl<'a> AsExpression<Integer> for &'a VersionAction {
+    type Expression = Bound<Integer, i32>;
+
+    fn as_expression(self) -> Self::Expression {
+        Bound::new((*self).into())
+    }
+}
+
 #[derive(Debug, Clone, Copy, Queryable, Identifiable, Associations)]
 #[belongs_to(Version)]
 #[belongs_to(User, foreign_key = "owner_id")]
@@ -20,7 +64,38 @@ pub struct VersionOwnerAction {
     pub id: i32,
     pub version_id: i32,
     pub owner_id: i32,
-    pub owner_token_id: i32,
+    pub owner_token_id: Option<i32>,
     pub action: VersionAction,
     pub time: NaiveDateTime,
 }
+
+#[derive(Copy, Clone, Debug, Insertable)]
+#[table_name = "version_owner_actions"]
+pub struct NewVersionOwnerAction {
+    pub version_id: i32,
+    pub owner_id: i32,
+    pub owner_token_id: Option<i32>,
+    pub action: VersionAction,
+}
+
+impl NewVersionOwnerAction {
+    pub fn new(
+        version_id: i32,
+        owner_id: i32,
+        owner_token_id: Option<i32>,
+        action: VersionAction,
+    ) -> Self {
+        Self {
+            version_id,
+            owner_id,
+            owner_token_id,
+            action,
+        }
+    }
+
+    pub fn save(&self, conn: &PgConnection) -> QueryResult<VersionOwnerAction> {
+        diesel::insert_into(version_owner_actions::table)
+            .values(self)
+            .get_result(conn)
+    }
+}

src/schema.rs

@@ -836,16 +836,16 @@ table! {
         id -> Int4,
         /// The `version_id` column of the `version_owner_actions` table.
         ///
-        /// Its SQL type is `Nullable<Int4>`.
+        /// Its SQL type is `Int4`.
         ///
         /// (Automatically generated by Diesel.)
-        version_id -> Nullable<Int4>,
+        version_id -> Int4,
         /// The `owner_id` column of the `version_owner_actions` table.
         ///
-        /// Its SQL type is `Nullable<Int4>`.
+        /// Its SQL type is `Int4`.
         ///
         /// (Automatically generated by Diesel.)
-        owner_id -> Nullable<Int4>,
+        owner_id -> Int4,
         /// The `owner_token_id` column of the `version_owner_actions` table.
         ///
         /// Its SQL type is `Nullable<Int4>`.