Switch back to SERIAL. (u64 support)

Author: penatem1

backend/migrations/2019-01-13-203149_create_users/up.sql

@@ -1,6 +1,6 @@
 -- Your SQL goes here
 CREATE TABLE users (
-  id BIGINT SIGNED NOT NULL AUTO_INCREMENT UNIQUE PRIMARY KEY,
+  id SERIAL PRIMARY KEY,
   first_name VARCHAR(255) NOT NULL,
   last_name VARCHAR(255) NOT NULL,
   banner_id INT(9) UNSIGNED NOT NULL,

backend/migrations/2019-03-08-171503_create_access/up.sql

@@ -1,6 +1,6 @@
 -- Your SQL goes here
 CREATE TABLE access (
-  id BIGINT SIGNED NOT NULL AUTO_INCREMENT UNIQUE PRIMARY KEY,
+  id SERIAL PRIMARY KEY,
   access_name VARCHAR(255) NOT NULL
 );
 
@@ -12,9 +12,9 @@ INSERT INTO access (access_name) VALUES
   ("DeleteUser");
 
 CREATE TABLE user_access (
-  permission_id BIGINT SIGNED NOT NULL AUTO_INCREMENT UNIQUE PRIMARY KEY,
-  access_id BIGINT SIGNED NOT NULL,
-  user_id BIGINT SIGNED NOT NULL,
+  permission_id SERIAL PRIMARY KEY,
+  access_id BIGINT UNSIGNED NOT NULL,
+  user_id BIGINT UNSIGNED NOT NULL,
   FOREIGN KEY (access_id)
     REFERENCES access(id)
     ON DELETE CASCADE

backend/src/access/models.rs

@@ -17,7 +17,7 @@ use super::schema::{access, user_access};
 
 #[derive(Queryable, Serialize, Deserialize)]
 pub struct Access {
-    pub id: i64,
+    pub id: u64,
     pub access_name: String,
 }
 
@@ -34,18 +34,18 @@ pub struct PartialAccess {
 }
 
 pub enum AccessRequest {
-    GetAccess(i64), //id of access name searched
+    GetAccess(u64), //id of access name searched
     CreateAccess(NewAccess), //new access type of some name to be created
-    UpdateAccess(i64, PartialAccess), //Contains id to be changed to new access_name
-    DeleteAccess(i64), //if of access to be deleted
+    UpdateAccess(u64, PartialAccess), //Contains id to be changed to new access_name
+    DeleteAccess(u64), //if of access to be deleted
 }
 
 impl AccessRequest {
     pub fn from_rouille(request: &rouille::Request) -> Result<AccessRequest, WebdevError> {
         trace!("Creating AccessRequest from {:#?}", request);
 
         router!(request,
-            (GET) (/{id: i64}) => {
+            (GET) (/{id: u64}) => {
                 Ok(AccessRequest::GetAccess(id))
             },
 
@@ -56,14 +56,14 @@ impl AccessRequest {
                 Ok(AccessRequest::CreateAccess(new_access))
             },
 
-            (POST) (/{id: i64}) => {
+            (POST) (/{id: u64}) => {
                 let request_body = request.data().ok_or(WebdevError::new(WebdevErrorKind::Format))?;
                 let update_access: PartialAccess = serde_json::from_reader(request_body)?;
 
                 Ok(AccessRequest::UpdateAccess(id, update_access))
             },
 
-            (DELETE) (/{id: i64}) => {
+            (DELETE) (/{id: u64}) => {
                 Ok(AccessRequest::DeleteAccess(id))
             },
 
@@ -94,41 +94,41 @@ impl AccessResponse {
 
 #[derive(Queryable, Serialize, Deserialize)]
 pub struct UserAccess {
-    pub permission_id: i64,
-    pub access_id: i64,
-    pub user_id: i64,
+    pub permission_id: u64,
+    pub access_id: u64,
+    pub user_id: u64,
     pub permission_level: Option<String>,
 }
 
 #[derive(Insertable, Serialize, Deserialize)]
 #[table_name = "user_access"]
 pub struct NewUserAccess {
-    pub access_id: i64,
-    pub user_id: i64,
+    pub access_id: u64,
+    pub user_id: u64,
     pub permission_level: Option<String>,
 }
 
 #[derive(AsChangeset, Serialize, Deserialize)]
 #[table_name = "user_access"]
 pub struct PartialUserAccess {
-    pub access_id: i64,
-    pub user_id: i64,
+    pub access_id: u64,
+    pub user_id: u64,
     pub permission_level: Option<Option<String>>,
 }
 
 pub struct SearchUserAccess {
-    pub access_id: Search<i64>,
-    pub user_id: Search<i64>,
+    pub access_id: Search<u64>,
+    pub user_id: Search<u64>,
     pub permission_level: NullableSearch<String>,
 }
 
 pub enum UserAccessRequest {
     SearchAccess(SearchUserAccess), //list of users with access id or (?) name
-    GetAccess(i64), //get individual access entry from its id
-    CheckAccess(i64, i64), //entry allowing user of user_id to perform action of action_id
+    GetAccess(u64), //get individual access entry from its id
+    CheckAccess(u64, u64), //entry allowing user of user_id to perform action of action_id
     CreateAccess(NewUserAccess), //entry to add to database
-    UpdateAccess(i64, PartialUserAccess), //entry to update with new information
-    DeleteAccess(i64), //entry to delete from database
+    UpdateAccess(u64, PartialUserAccess), //entry to update with new information
+    DeleteAccess(u64), //entry to delete from database
 }
 
 impl UserAccessRequest {
@@ -160,11 +160,11 @@ impl UserAccessRequest {
                 }))
             },
 
-            (GET) (/{permission_id: i64}) => {
+            (GET) (/{permission_id: u64}) => {
                 Ok(UserAccessRequest::GetAccess(permission_id))
             },
 
-            (GET) (/{user_id:i64}/{access_id: i64}) => {
+            (GET) (/{user_id:u64}/{access_id: u64}) => {
                 Ok(UserAccessRequest::CheckAccess(user_id, access_id))
             },
 
@@ -175,14 +175,14 @@ impl UserAccessRequest {
                 Ok(UserAccessRequest::CreateAccess(new_user_access))
             },
 
-            (POST) (/{id: i64}) => {
+            (POST) (/{id: u64}) => {
                 let request_body = request.data().ok_or(WebdevError::new(WebdevErrorKind::Format))?;
                 let update_user_access: PartialUserAccess = serde_json::from_reader(request_body)?;
 
                 Ok(UserAccessRequest::UpdateAccess(id, update_user_access))
             },
 
-            (DELETE) (/{id: i64}) => {
+            (DELETE) (/{id: u64}) => {
                 Ok(UserAccessRequest::DeleteAccess(id))
             },
 
@@ -216,9 +216,9 @@ impl UserAccessResponse {
 
 #[derive(Queryable, Serialize, Deserialize)]
 pub struct JoinedUserAccess {
-    pub permission_id: i64,
-    pub user_id: i64,
-    pub access_id: i64,
+    pub permission_id: u64,
+    pub user_id: u64,
+    pub access_id: u64,
     pub first_name: String,
     pub last_name: String,
     pub banner_id: u32,

backend/src/access/requests.rs

@@ -2,6 +2,7 @@ use diesel;
 use diesel::types;
 use diesel::mysql::MysqlConnection;
 use diesel::mysql::Mysql;
+use diesel::mysql::types::Unsigned;
 use diesel::query_builder::AsQuery;
 use diesel::QueryDsl;
 use diesel::RunQueryDsl;
@@ -49,7 +50,7 @@ pub fn handle_access(
     }
 }
 
-fn get_access(id: i64, database_connection: &MysqlConnection) -> Result<Access, WebdevError> {
+fn get_access(id: u64, database_connection: &MysqlConnection) -> Result<Access, WebdevError> {
     let mut found_access = access_schema::table
         .filter(access_schema::id.eq(id))
         .load::<Access>(database_connection)?;
@@ -65,7 +66,7 @@ fn create_access(access: NewAccess, database_connection: &MysqlConnection) -> Re
         .values(access)
         .execute(database_connection)?;
 
-    no_arg_sql_function!(last_insert_id, types::Bigint);
+    no_arg_sql_function!(last_insert_id, Unsigned<types::Bigint>);
 
     let mut inserted_accesses = access_schema::table
         .filter(access_schema::id.eq(last_insert_id))
@@ -79,15 +80,15 @@ fn create_access(access: NewAccess, database_connection: &MysqlConnection) -> Re
     }
 }
 
-fn update_access(id: i64, access: PartialAccess, database_connection: &MysqlConnection) -> Result<(), WebdevError> {
+fn update_access(id: u64, access: PartialAccess, database_connection: &MysqlConnection) -> Result<(), WebdevError> {
     diesel::update(access_schema::table)
         .filter(access_schema::id.eq(id))
         .set(&access)
         .execute(database_connection)?;
     Ok(())
 }
 
-fn delete_access(id: i64, database_connection: &MysqlConnection) -> Result<(), WebdevError> {
+fn delete_access(id: u64, database_connection: &MysqlConnection) -> Result<(), WebdevError> {
     diesel::delete(access_schema::table.filter(access_schema::id.eq(id)))
         .execute(database_connection)?;
 
@@ -196,7 +197,7 @@ fn search_user_access(
 }
 
 fn get_user_access(
-    permission_id: i64,
+    permission_id: u64,
     database_connection: &MysqlConnection
 ) -> Result<UserAccess, WebdevError> {
     let mut found_user_accesses = user_access_schema::table
@@ -210,8 +211,8 @@ fn get_user_access(
 }
 
 fn check_user_access(
-    user_id: i64,
-    access_id: i64,
+    user_id: u64,
+    access_id: u64,
     database_connection: &MysqlConnection
 ) -> Result<bool, WebdevError> {
     let found_user_accesses = user_access_schema::table
@@ -240,7 +241,7 @@ fn create_user_access(
         .values(user_access)
         .execute(database_connection)?;
 
-    no_arg_sql_function!(last_insert_id, types::Bigint);
+    no_arg_sql_function!(last_insert_id, Unsigned<types::Bigint>);
 
     let mut inserted_accesses = user_access_schema::table
         .filter(user_access_schema::permission_id.eq(last_insert_id))
@@ -255,7 +256,7 @@ fn create_user_access(
 }
 
 fn update_user_access(
-    id: i64,
+    id: u64,
     user_access: PartialUserAccess,
     database_connection: &MysqlConnection
 ) -> Result<(), WebdevError> {
@@ -267,7 +268,7 @@ fn update_user_access(
     Ok(())
 }
 
-fn delete_user_access(id: i64, database_connection: &MysqlConnection) -> Result<(), WebdevError> {
+fn delete_user_access(id: u64, database_connection: &MysqlConnection) -> Result<(), WebdevError> {
     diesel::delete(user_access_schema::table.filter(user_access_schema::permission_id.eq(id)))
         .execute(database_connection)?;
 

backend/src/access/schema.rs

@@ -2,16 +2,16 @@ use crate::users::schema::users;
 
 table! {
     access (id) {
-        id -> Bigint,
+        id -> Unsigned<Bigint>,
         access_name -> Varchar,
     }
 }
 
 table! {
     user_access (permission_id) {
-        permission_id -> Bigint,
-        access_id -> Bigint,
-        user_id -> Bigint,
+        permission_id -> Unsigned<Bigint>,
+        access_id -> Unsigned<Bigint>,
+        user_id -> Unsigned<Bigint>,
         permission_level -> Nullable<Varchar>,
     }
 }

backend/src/users/models.rs

@@ -20,7 +20,7 @@ use crate::users::requests;
 
 #[derive(Queryable, Serialize, Deserialize)]
 pub struct User {
-    pub id: i64,
+    pub id: u64,
     pub first_name: String,
     pub last_name: String,
     pub banner_id: u32,
@@ -59,10 +59,10 @@ pub struct UserList {
 
 pub enum UserRequest {
     SearchUsers(SearchUser),
-    GetUser(i64),
+    GetUser(u64),
     CreateUser(NewUser),
-    UpdateUser(i64, PartialUser),
-    DeleteUser(i64),
+    UpdateUser(u64, PartialUser),
+    DeleteUser(u64),
 }
 
 impl UserRequest {
@@ -97,7 +97,7 @@ impl UserRequest {
                 }))
             },
 
-            (GET) (/{id: i64}) => {
+            (GET) (/{id: u64}) => {
                 Ok(UserRequest::GetUser(id))
             },
 
@@ -108,14 +108,14 @@ impl UserRequest {
                 Ok(UserRequest::CreateUser(new_user))
             },
 
-            (POST) (/{id: i64}) => {
+            (POST) (/{id: u64}) => {
                 let request_body = request.data().ok_or(WebdevError::new(WebdevErrorKind::Format))?;
                 let update_user: PartialUser = serde_json::from_reader(request_body)?;
 
                 Ok(UserRequest::UpdateUser(id, update_user))
             },
 
-            (DELETE) (/{id: i64}) => {
+            (DELETE) (/{id: u64}) => {
                 Ok(UserRequest::DeleteUser(id))
             },
 

backend/src/users/requests.rs

@@ -117,7 +117,7 @@ fn search_users(
     Ok(user_list)
 }
 
-fn get_user(id: i64, database_connection: &MysqlConnection) -> Result<User, WebdevError> {
+fn get_user(id: u64, database_connection: &MysqlConnection) -> Result<User, WebdevError> {
     let mut found_users = users_schema::table
         .filter(users_schema::id.eq(id))
         .load::<User>(database_connection)?;
@@ -145,7 +145,7 @@ fn create_user(user: NewUser, database_connection: &MysqlConnection) -> Result<U
 }
 
 fn update_user(
-    id: i64,
+    id: u64,
     user: PartialUser,
     database_connection: &MysqlConnection,
 ) -> Result<(), WebdevError> {
@@ -156,7 +156,7 @@ fn update_user(
     Ok(())
 }
 
-fn delete_user(id: i64, database_connection: &MysqlConnection) -> Result<(), WebdevError> {
+fn delete_user(id: u64, database_connection: &MysqlConnection) -> Result<(), WebdevError> {
     diesel::delete(users_schema::table.filter(users_schema::id.eq(id)))
         .execute(database_connection)?;
 

backend/src/users/schema.rs

@@ -1,6 +1,6 @@
 table! {
     users (id) {
-        id -> Bigint,
+        id -> Unsigned<Bigint>,
         first_name -> Varchar,
         last_name -> Varchar,
         banner_id -> Unsigned<Integer>,