From 42a4731bdda2be44742455eceb7ed971f9625ccd Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Mon, 25 Apr 2022 20:57:36 +0200 Subject: [PATCH] Retoca las migraciones principales --- .../m20220316_000001_create_table_node_type.rs | 2 +- .../m20220316_000002_create_table_node.rs | 8 ++++---- .../m20220316_000003_create_table_node_access.rs | 6 +++--- ...20220316_000004_create_table_node_revision.rs | 6 +++--- .../m20220312_000001_create_table_role.rs | 16 +++++++++------- ...220312_000002_create_table_role_permission.rs | 11 +++-------- .../m20220312_000003_create_table_user.rs | 2 +- .../m20220312_000004_create_table_user_role.rs | 10 +++++----- 8 files changed, 29 insertions(+), 32 deletions(-) diff --git a/pagetop-node/src/migration/m20220316_000001_create_table_node_type.rs b/pagetop-node/src/migration/m20220316_000001_create_table_node_type.rs index 831a3396..50117825 100644 --- a/pagetop-node/src/migration/m20220316_000001_create_table_node_type.rs +++ b/pagetop-node/src/migration/m20220316_000001_create_table_node_type.rs @@ -2,7 +2,7 @@ use pagetop::prelude::*; #[derive(Iden)] enum NodeType { - Table, // Stores information about all defined Node types. + Table, // node_type: Stores information about all defined Node types. Type, // The machine-readable name of this type. Name, // The human-readable name of this type. diff --git a/pagetop-node/src/migration/m20220316_000002_create_table_node.rs b/pagetop-node/src/migration/m20220316_000002_create_table_node.rs index 0b70860d..62e2bda1 100644 --- a/pagetop-node/src/migration/m20220316_000002_create_table_node.rs +++ b/pagetop-node/src/migration/m20220316_000002_create_table_node.rs @@ -2,14 +2,14 @@ use pagetop::prelude::*; #[derive(Iden)] enum Node { - Table, // The base table for nodes. + Table, // node: The base table for nodes. Nid, // The primary identifier for a node. - Vid, // The current {node_revision}.vid version identifier. - Type, // The {node_type}.type of this node. + Vid, // The current NodeRevision.vid version identifier. + Type, // The NodeType.type of this node. Language, // The {languages}.language of this node. Title, // The title of this node, always treated as non-markup plain text. - Uid, // The {users}.uid that owns this node; initially, this is the user that + Uid, // The User.uid that owns this node; initially, this is the user that // created it. Status, // Boolean indicating whether the node is published (visible to // non-administrators). diff --git a/pagetop-node/src/migration/m20220316_000003_create_table_node_access.rs b/pagetop-node/src/migration/m20220316_000003_create_table_node_access.rs index 8252b5d0..140dac2d 100644 --- a/pagetop-node/src/migration/m20220316_000003_create_table_node_access.rs +++ b/pagetop-node/src/migration/m20220316_000003_create_table_node_access.rs @@ -2,10 +2,10 @@ use pagetop::prelude::*; #[derive(Iden)] enum NodeAccess { - Table, // Identifies which realm/grant pairs a user must possess in order to view, - // update, or delete specific nodes. + Table, // node_access: Identifies which realm/grant pairs a user must possess in + // order to view, update, or delete specific nodes. - Nid, // The {node}.nid this record affects. + Nid, // The Node.nid this record affects. Gid, // The grant ID a user must possess in the specified realm to gain this // row's privileges on the node. Realm, // The realm in which the user must possess the grant ID. Each node access diff --git a/pagetop-node/src/migration/m20220316_000004_create_table_node_revision.rs b/pagetop-node/src/migration/m20220316_000004_create_table_node_revision.rs index 9c414a60..0009359f 100644 --- a/pagetop-node/src/migration/m20220316_000004_create_table_node_revision.rs +++ b/pagetop-node/src/migration/m20220316_000004_create_table_node_revision.rs @@ -2,11 +2,11 @@ use pagetop::prelude::*; #[derive(Iden)] enum NodeRevision { - Table, // Stores information about each saved version of a {node}. + Table, // node_revision: Stores information about each saved version of a Node. - Nid, // The {node} this version belongs to. + Nid, // The Node this version belongs to. Vid, // The primary identifier for this version. - Uid, // The {users}.uid that created this version. + Uid, // The User.uid that created this version. Title, // The title of this version. Log, // The log entry explaining the changes in this version. Timestamp, // A Unix timestamp indicating when this version was created. diff --git a/pagetop-user/src/migration/m20220312_000001_create_table_role.rs b/pagetop-user/src/migration/m20220312_000001_create_table_role.rs index 61d21372..2557453f 100644 --- a/pagetop-user/src/migration/m20220312_000001_create_table_role.rs +++ b/pagetop-user/src/migration/m20220312_000001_create_table_role.rs @@ -2,7 +2,7 @@ use pagetop::prelude::*; #[derive(Iden)] enum Role { - Table, // Store user roles. + Table, // role: Store user roles. Rid, // Primary Key: Unique role ID. Name, // Unique role name. @@ -31,23 +31,25 @@ impl MigrationTrait for Migration { .col(ColumnDef::new(Role::Weight) .integer() .not_null() - .default(0) + .default(10) ) // INDEXES. .index(Index::create() - .name("name-weight") - .col(Role::Name) + .name("weight-name") .col(Role::Weight) + .col(Role::Name) ) .to_owned() ) .await?; + // Built-in roles. app::db::exec::(Query::insert() .into_table(Role::Table) - .columns(vec![Role::Name]) - .values_panic(vec!["anonymous".into()]) - .values_panic(vec!["authenticated".into()]) + .columns(vec![Role::Name, Role::Weight]) + .values_panic(vec!["anonymous".into(), "1".into()]) + .values_panic(vec!["authenticated".into(), "2".into()]) + .values_panic(vec!["administrator".into(), "3".into()]) ) .await.map(|_| ()) } diff --git a/pagetop-user/src/migration/m20220312_000002_create_table_role_permission.rs b/pagetop-user/src/migration/m20220312_000002_create_table_role_permission.rs index d5e5f8f1..052fed2c 100644 --- a/pagetop-user/src/migration/m20220312_000002_create_table_role_permission.rs +++ b/pagetop-user/src/migration/m20220312_000002_create_table_role_permission.rs @@ -2,11 +2,10 @@ use pagetop::prelude::*; #[derive(Iden)] enum RolePermission { - Table, // Stores the permissions assigned to user roles. + Table, // role_permission: Stores the permissions assigned to user roles. Rid, // Foreign Key: Role::Rid. Permission, // A single permission granted to the role identified by Rid. - Module, // The module declaring the permission. } #[derive(Iden)] @@ -28,10 +27,6 @@ impl MigrationTrait for Migration { .string_len(128) .not_null() ) - .col(ColumnDef::new(RolePermission::Module) - .string_len(255) - .not_null() - ) // INDEXES. .primary_key(Index::create() .col(RolePermission::Rid) @@ -45,8 +40,8 @@ impl MigrationTrait for Migration { .name("fk_role_permission-rid") .from(RolePermission::Table, RolePermission::Rid) .to(Role::Table, Role::Rid) - .on_delete(ForeignKeyAction::Cascade) - .on_update(ForeignKeyAction::Cascade) + .on_delete(ForeignKeyAction::Restrict) + .on_update(ForeignKeyAction::Restrict) ) .to_owned() ) diff --git a/pagetop-user/src/migration/m20220312_000003_create_table_user.rs b/pagetop-user/src/migration/m20220312_000003_create_table_user.rs index 4849eae5..c060c8a5 100644 --- a/pagetop-user/src/migration/m20220312_000003_create_table_user.rs +++ b/pagetop-user/src/migration/m20220312_000003_create_table_user.rs @@ -2,7 +2,7 @@ use pagetop::prelude::*; #[derive(Iden)] enum User { - Table, // Stores user data. + Table, // user: Stores user data. Uid, // Primary Key: Unique user ID. Name, // Unique user name. diff --git a/pagetop-user/src/migration/m20220312_000004_create_table_user_role.rs b/pagetop-user/src/migration/m20220312_000004_create_table_user_role.rs index 1b15810c..fedcd4be 100644 --- a/pagetop-user/src/migration/m20220312_000004_create_table_user_role.rs +++ b/pagetop-user/src/migration/m20220312_000004_create_table_user_role.rs @@ -2,7 +2,7 @@ use pagetop::prelude::*; #[derive(Iden)] enum UserRole { - Table, // Maps users to roles. + Table, // user_role: Maps users to roles. Uid, // Foreign Key: User::Uid for user. Rid, // Foreign Key: Role::Rid for role. @@ -39,15 +39,15 @@ impl MigrationTrait for Migration { .name("fk_user_role-uid") .from(UserRole::Table, UserRole::Uid) .to(User::Table, User::Uid) - .on_delete(ForeignKeyAction::Cascade) - .on_update(ForeignKeyAction::Cascade) + .on_delete(ForeignKeyAction::Restrict) + .on_update(ForeignKeyAction::Restrict) ) .foreign_key(ForeignKey::create() .name("fk_user_role-rid") .from(UserRole::Table, UserRole::Rid) .to(Role::Table, Role::Rid) - .on_delete(ForeignKeyAction::Cascade) - .on_update(ForeignKeyAction::Cascade) + .on_delete(ForeignKeyAction::Restrict) + .on_update(ForeignKeyAction::Restrict) ) .to_owned() )