Renamed communication type to fix compiler interpreting "type" as Rust keyword

migrations/2020-02-04-023124_create_communication_targets/up.sql

@@ -4,14 +4,14 @@ create table communication_targets
     id          uuid    default uuid_generate_v1() not null,
     entity      text                               not null,
     entity_id   uuid                               not null,
-    type        uuid                               not null,
+    com_type        uuid                               not null,
     value       text                               not null,
     description text,
     visibility  boolean default false              not null,
     constraint pk___communication_targets___id
         primary key (id),
     constraint fk___communication_target___type___communication_types
-        foreign key (type) references communication_types,
+        foreign key (com_type) references communication_types,
     constraint communication_targets_entities_entity_id_fk
         foreign key (id) references entities
             on update cascade on delete cascade

src/schema.rs

@@ -1,6 +1,7 @@
 table! {
     use diesel::sql_types::*;
     use diesel_geometry::sql_types::*;
+
     addresses (id) {
         id -> Uuid,
         title -> Nullable<Text>,
@@ -13,6 +14,9 @@ table! {
 }
 
 table! {
+    use diesel::sql_types::*;
+    use diesel_geometry::sql_types::*;
+
     addresses_entities (address_id, entitiy_id) {
         address_id -> Uuid,
         entitiy_id -> Uuid,
@@ -20,6 +24,9 @@ table! {
 }
 
 table! {
+    use diesel::sql_types::*;
+    use diesel_geometry::sql_types::*;
+
     buildings (entity_id) {
         entity_id -> Uuid,
         name -> Text,
@@ -28,12 +35,14 @@ table! {
 }
 
 table! {
+    use diesel::sql_types::*;
+    use diesel_geometry::sql_types::*;
+
     communication_targets (id) {
         id -> Uuid,
         entity -> Text,
         entity_id -> Uuid,
-        #[sql_name = "type"]
-        type_ -> Uuid,
+        com_type -> Uuid,
         value -> Text,
         description -> Nullable<Text>,
         visibility -> Bool,
@@ -41,6 +50,9 @@ table! {
 }
 
 table! {
+    use diesel::sql_types::*;
+    use diesel_geometry::sql_types::*;
+
     communication_types (id) {
         id -> Uuid,
         name -> Text,
@@ -48,12 +60,18 @@ table! {
 }
 
 table! {
+    use diesel::sql_types::*;
+    use diesel_geometry::sql_types::*;
+
     entities (entity_id) {
         entity_id -> Uuid,
     }
 }
 
 table! {
+    use diesel::sql_types::*;
+    use diesel_geometry::sql_types::*;
+
     members (entity_id) {
         entity_id -> Uuid,
         users_id -> Nullable<Uuid>,
@@ -70,6 +88,49 @@ table! {
 }
 
 table! {
+    use diesel::sql_types::*;
+    use diesel_geometry::sql_types::*;
+
+    members_roles (member_id, role_id) {
+        member_id -> Uuid,
+        role_id -> Text,
+    }
+}
+
+table! {
+    use diesel::sql_types::*;
+    use diesel_geometry::sql_types::*;
+
+    permissions (permission) {
+        permission -> Text,
+        description -> Nullable<Text>,
+    }
+}
+
+table! {
+    use diesel::sql_types::*;
+    use diesel_geometry::sql_types::*;
+
+    roles (id) {
+        id -> Text,
+        description -> Nullable<Text>,
+    }
+}
+
+table! {
+    use diesel::sql_types::*;
+    use diesel_geometry::sql_types::*;
+
+    roles_permissions (role_id, permission_id) {
+        role_id -> Text,
+        permission_id -> Text,
+    }
+}
+
+table! {
+    use diesel::sql_types::*;
+    use diesel_geometry::sql_types::*;
+
     users (id) {
         id -> Uuid,
         password -> Nullable<Text>,
@@ -78,6 +139,9 @@ table! {
 }
 
 table! {
+    use diesel::sql_types::*;
+    use diesel_geometry::sql_types::*;
+
     vehicle_categories (id) {
         id -> Uuid,
         name -> Text,
@@ -86,6 +150,9 @@ table! {
 }
 
 table! {
+    use diesel::sql_types::*;
+    use diesel_geometry::sql_types::*;
+
     vehicles (entity_id) {
         entity_id -> Uuid,
         identifier -> Text,
@@ -102,10 +169,14 @@ table! {
 joinable!(addresses_entities -> addresses (address_id));
 joinable!(addresses_entities -> entities (entitiy_id));
 joinable!(buildings -> entities (entity_id));
-joinable!(communication_targets -> communication_types (type_));
+joinable!(communication_targets -> communication_types (com_type));
 joinable!(communication_targets -> entities (id));
 joinable!(members -> entities (entity_id));
 joinable!(members -> users (users_id));
+joinable!(members_roles -> entities (member_id));
+joinable!(members_roles -> roles (role_id));
+joinable!(roles_permissions -> permissions (permission_id));
+joinable!(roles_permissions -> roles (role_id));
 joinable!(vehicles -> entities (entity_id));
 joinable!(vehicles -> vehicle_categories (entity_id));
 
@@ -117,6 +188,10 @@ allow_tables_to_appear_in_same_query!(
     communication_types,
     entities,
     members,
+    members_roles,
+    permissions,
+    roles,
+    roles_permissions,
     users,
     vehicle_categories,
     vehicles,