forked from gorb/backend
feat: use diesel-cli instead of hand writing tables
after reading the documentation, crazy right? I figured out i was making my life hard, this makes my life easy again
This commit is contained in:
parent
f1d5b4316e
commit
a6d35b0ba2
24 changed files with 323 additions and 206 deletions
97
src/main.rs
97
src/main.rs
|
|
@ -15,7 +15,7 @@ type Conn = deadpool::managed::Object<AsyncDieselConnectionManager<diesel_async:
|
|||
|
||||
pub mod structs;
|
||||
pub mod utils;
|
||||
pub mod tables;
|
||||
pub mod schema;
|
||||
|
||||
type Error = Box<dyn std::error::Error>;
|
||||
|
||||
|
|
@ -57,101 +57,6 @@ async fn main() -> Result<(), Error> {
|
|||
|
||||
let mut conn = pool.get().await?;
|
||||
|
||||
/*
|
||||
TODO: Figure out if a table should be used here and if not then what.
|
||||
Also figure out if these should be different types from what they currently are and if we should add more "constraints"
|
||||
|
||||
TODO: References to time should be removed in favor of using the timestamp built in to UUIDv7 (apart from deleted_at in users)
|
||||
*/
|
||||
diesel::sql_query(
|
||||
r#"
|
||||
CREATE TABLE IF NOT EXISTS users (
|
||||
uuid uuid PRIMARY KEY NOT NULL,
|
||||
username varchar(32) NOT NULL,
|
||||
display_name varchar(64) DEFAULT NULL,
|
||||
password varchar(512) NOT NULL,
|
||||
email varchar(100) NOT NULL,
|
||||
email_verified boolean NOT NULL DEFAULT FALSE,
|
||||
is_deleted boolean NOT NULL DEFAULT FALSE,
|
||||
deleted_at int8 DEFAULT NULL,
|
||||
CONSTRAINT unique_username_active UNIQUE NULLS NOT DISTINCT (username, is_deleted),
|
||||
CONSTRAINT unique_email_active UNIQUE NULLS NOT DISTINCT (email, is_deleted)
|
||||
);
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS idx_unique_username_active
|
||||
ON users(username)
|
||||
WHERE is_deleted = FALSE;
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS idx_unique_email_active
|
||||
ON users(email)
|
||||
WHERE is_deleted = FALSE;
|
||||
CREATE TABLE IF NOT EXISTS instance_permissions (
|
||||
uuid uuid NOT NULL REFERENCES users(uuid),
|
||||
administrator boolean NOT NULL DEFAULT FALSE
|
||||
);
|
||||
CREATE TABLE IF NOT EXISTS refresh_tokens (
|
||||
token varchar(64) PRIMARY KEY UNIQUE NOT NULL,
|
||||
uuid uuid NOT NULL REFERENCES users(uuid),
|
||||
created_at int8 NOT NULL,
|
||||
device_name varchar(16) NOT NULL
|
||||
);
|
||||
CREATE TABLE IF NOT EXISTS access_tokens (
|
||||
token varchar(32) PRIMARY KEY UNIQUE NOT NULL,
|
||||
refresh_token varchar(64) UNIQUE NOT NULL REFERENCES refresh_tokens(token) ON UPDATE CASCADE ON DELETE CASCADE,
|
||||
uuid uuid NOT NULL REFERENCES users(uuid),
|
||||
created_at int8 NOT NULL
|
||||
);
|
||||
CREATE TABLE IF NOT EXISTS guilds (
|
||||
uuid uuid PRIMARY KEY NOT NULL,
|
||||
owner_uuid uuid NOT NULL REFERENCES users(uuid),
|
||||
name VARCHAR(100) NOT NULL,
|
||||
description VARCHAR(300)
|
||||
);
|
||||
CREATE TABLE IF NOT EXISTS guild_members (
|
||||
uuid uuid PRIMARY KEY NOT NULL,
|
||||
guild_uuid uuid NOT NULL REFERENCES guilds(uuid) ON DELETE CASCADE,
|
||||
user_uuid uuid NOT NULL REFERENCES users(uuid),
|
||||
nickname VARCHAR(100) DEFAULT NULL
|
||||
);
|
||||
CREATE TABLE IF NOT EXISTS roles (
|
||||
uuid uuid UNIQUE NOT NULL,
|
||||
guild_uuid uuid NOT NULL REFERENCES guilds(uuid) ON DELETE CASCADE,
|
||||
name VARCHAR(50) NOT NULL,
|
||||
color int NOT NULL DEFAULT 16777215,
|
||||
position int NOT NULL,
|
||||
permissions int8 NOT NULL DEFAULT 0,
|
||||
PRIMARY KEY (uuid, guild_uuid)
|
||||
);
|
||||
CREATE TABLE IF NOT EXISTS role_members (
|
||||
role_uuid uuid NOT NULL REFERENCES roles(uuid) ON DELETE CASCADE,
|
||||
member_uuid uuid NOT NULL REFERENCES guild_members(uuid) ON DELETE CASCADE,
|
||||
PRIMARY KEY (role_uuid, member_uuid)
|
||||
);
|
||||
CREATE TABLE IF NOT EXISTS channels (
|
||||
uuid uuid PRIMARY KEY NOT NULL,
|
||||
guild_uuid uuid NOT NULL REFERENCES guilds(uuid) ON DELETE CASCADE,
|
||||
name varchar(32) NOT NULL,
|
||||
description varchar(500) NOT NULL
|
||||
);
|
||||
CREATE TABLE IF NOT EXISTS channel_permissions (
|
||||
channel_uuid uuid NOT NULL REFERENCES channels(uuid) ON DELETE CASCADE,
|
||||
role_uuid uuid NOT NULL REFERENCES roles(uuid) ON DELETE CASCADE,
|
||||
permissions int8 NOT NULL DEFAULT 0,
|
||||
PRIMARY KEY (channel_uuid, role_uuid)
|
||||
);
|
||||
CREATE TABLE IF NOT EXISTS messages (
|
||||
uuid uuid PRIMARY KEY NOT NULL,
|
||||
channel_uuid uuid NOT NULL REFERENCES channels(uuid) ON DELETE CASCADE,
|
||||
user_uuid uuid NOT NULL REFERENCES users(uuid),
|
||||
message varchar(4000) NOT NULL
|
||||
);
|
||||
CREATE TABLE IF NOT EXISTS invites (
|
||||
id varchar(32) PRIMARY KEY NOT NULL,
|
||||
guild_uuid uuid NOT NULL REFERENCES guilds(uuid) ON DELETE CASCADE,
|
||||
user_uuid uuid NOT NULL REFERENCES users(uuid)
|
||||
);
|
||||
"#,
|
||||
)
|
||||
.execute(&mut conn)
|
||||
.await?;
|
||||
|
||||
/*
|
||||
**Stored for later possible use**
|
||||
|
|
|
|||
156
src/schema.rs
Normal file
156
src/schema.rs
Normal file
|
|
@ -0,0 +1,156 @@
|
|||
// @generated automatically by Diesel CLI.
|
||||
|
||||
diesel::table! {
|
||||
access_tokens (token) {
|
||||
#[max_length = 32]
|
||||
token -> Varchar,
|
||||
#[max_length = 64]
|
||||
refresh_token -> Varchar,
|
||||
uuid -> Uuid,
|
||||
created_at -> Int8,
|
||||
}
|
||||
}
|
||||
|
||||
diesel::table! {
|
||||
channel_permissions (channel_uuid, role_uuid) {
|
||||
channel_uuid -> Uuid,
|
||||
role_uuid -> Uuid,
|
||||
permissions -> Int8,
|
||||
}
|
||||
}
|
||||
|
||||
diesel::table! {
|
||||
channels (uuid) {
|
||||
uuid -> Uuid,
|
||||
guild_uuid -> Uuid,
|
||||
#[max_length = 32]
|
||||
name -> Varchar,
|
||||
#[max_length = 500]
|
||||
description -> Varchar,
|
||||
}
|
||||
}
|
||||
|
||||
diesel::table! {
|
||||
guild_members (uuid) {
|
||||
uuid -> Uuid,
|
||||
guild_uuid -> Uuid,
|
||||
user_uuid -> Uuid,
|
||||
#[max_length = 100]
|
||||
nickname -> Nullable<Varchar>,
|
||||
}
|
||||
}
|
||||
|
||||
diesel::table! {
|
||||
guilds (uuid) {
|
||||
uuid -> Uuid,
|
||||
owner_uuid -> Uuid,
|
||||
#[max_length = 100]
|
||||
name -> Varchar,
|
||||
#[max_length = 300]
|
||||
description -> Nullable<Varchar>,
|
||||
}
|
||||
}
|
||||
|
||||
diesel::table! {
|
||||
instance_permissions (uuid) {
|
||||
uuid -> Uuid,
|
||||
administrator -> Bool,
|
||||
}
|
||||
}
|
||||
|
||||
diesel::table! {
|
||||
invites (id) {
|
||||
#[max_length = 32]
|
||||
id -> Varchar,
|
||||
guild_uuid -> Uuid,
|
||||
user_uuid -> Uuid,
|
||||
}
|
||||
}
|
||||
|
||||
diesel::table! {
|
||||
messages (uuid) {
|
||||
uuid -> Uuid,
|
||||
channel_uuid -> Uuid,
|
||||
user_uuid -> Uuid,
|
||||
#[max_length = 4000]
|
||||
message -> Varchar,
|
||||
}
|
||||
}
|
||||
|
||||
diesel::table! {
|
||||
refresh_tokens (token) {
|
||||
#[max_length = 64]
|
||||
token -> Varchar,
|
||||
uuid -> Uuid,
|
||||
created_at -> Int8,
|
||||
#[max_length = 16]
|
||||
device_name -> Varchar,
|
||||
}
|
||||
}
|
||||
|
||||
diesel::table! {
|
||||
role_members (role_uuid, member_uuid) {
|
||||
role_uuid -> Uuid,
|
||||
member_uuid -> Uuid,
|
||||
}
|
||||
}
|
||||
|
||||
diesel::table! {
|
||||
roles (uuid, guild_uuid) {
|
||||
uuid -> Uuid,
|
||||
guild_uuid -> Uuid,
|
||||
#[max_length = 50]
|
||||
name -> Varchar,
|
||||
color -> Int4,
|
||||
position -> Int4,
|
||||
permissions -> Int8,
|
||||
}
|
||||
}
|
||||
|
||||
diesel::table! {
|
||||
users (uuid) {
|
||||
uuid -> Uuid,
|
||||
#[max_length = 32]
|
||||
username -> Varchar,
|
||||
#[max_length = 64]
|
||||
display_name -> Nullable<Varchar>,
|
||||
#[max_length = 512]
|
||||
password -> Varchar,
|
||||
#[max_length = 100]
|
||||
email -> Varchar,
|
||||
email_verified -> Bool,
|
||||
is_deleted -> Bool,
|
||||
deleted_at -> Nullable<Int8>,
|
||||
}
|
||||
}
|
||||
|
||||
diesel::joinable!(access_tokens -> refresh_tokens (refresh_token));
|
||||
diesel::joinable!(access_tokens -> users (uuid));
|
||||
diesel::joinable!(channel_permissions -> channels (channel_uuid));
|
||||
diesel::joinable!(channels -> guilds (guild_uuid));
|
||||
diesel::joinable!(guild_members -> guilds (guild_uuid));
|
||||
diesel::joinable!(guild_members -> users (user_uuid));
|
||||
diesel::joinable!(guilds -> users (owner_uuid));
|
||||
diesel::joinable!(instance_permissions -> users (uuid));
|
||||
diesel::joinable!(invites -> guilds (guild_uuid));
|
||||
diesel::joinable!(invites -> users (user_uuid));
|
||||
diesel::joinable!(messages -> channels (channel_uuid));
|
||||
diesel::joinable!(messages -> users (user_uuid));
|
||||
diesel::joinable!(refresh_tokens -> users (uuid));
|
||||
diesel::joinable!(role_members -> guild_members (member_uuid));
|
||||
diesel::joinable!(roles -> guilds (guild_uuid));
|
||||
|
||||
diesel::allow_tables_to_appear_in_same_query!(
|
||||
access_tokens,
|
||||
channel_permissions,
|
||||
channels,
|
||||
guild_members,
|
||||
guilds,
|
||||
instance_permissions,
|
||||
invites,
|
||||
messages,
|
||||
refresh_tokens,
|
||||
role_members,
|
||||
roles,
|
||||
users,
|
||||
);
|
||||
|
|
@ -6,7 +6,7 @@ use log::error;
|
|||
use serde::{Deserialize, Serialize};
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::{Conn, Data, tables::*};
|
||||
use crate::{Conn, Data, schema::*};
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone, Selectable)]
|
||||
#[diesel(table_name = channels)]
|
||||
|
|
|
|||
109
src/tables.rs
109
src/tables.rs
|
|
@ -1,109 +0,0 @@
|
|||
use diesel::table;
|
||||
|
||||
table! {
|
||||
users (uuid) {
|
||||
uuid -> Uuid,
|
||||
username -> VarChar,
|
||||
display_name -> Nullable<VarChar>,
|
||||
password -> VarChar,
|
||||
email -> VarChar,
|
||||
email_verified -> Bool,
|
||||
is_deleted -> Bool,
|
||||
deleted_at -> Int8,
|
||||
}
|
||||
}
|
||||
|
||||
table! {
|
||||
instance_permissions (uuid) {
|
||||
uuid -> Uuid,
|
||||
administrator -> Bool,
|
||||
}
|
||||
}
|
||||
|
||||
table! {
|
||||
refresh_tokens (token) {
|
||||
token -> VarChar,
|
||||
uuid -> Uuid,
|
||||
created_at -> Int8,
|
||||
device_name -> VarChar,
|
||||
}
|
||||
}
|
||||
|
||||
table! {
|
||||
access_tokens (token) {
|
||||
token -> VarChar,
|
||||
refresh_token -> VarChar,
|
||||
uuid -> Uuid,
|
||||
created_at -> Int8
|
||||
}
|
||||
}
|
||||
|
||||
table! {
|
||||
guilds (uuid) {
|
||||
uuid -> Uuid,
|
||||
owner_uuid -> Uuid,
|
||||
name -> VarChar,
|
||||
description -> VarChar
|
||||
}
|
||||
}
|
||||
|
||||
table! {
|
||||
guild_members (uuid) {
|
||||
uuid -> Uuid,
|
||||
guild_uuid -> Uuid,
|
||||
user_uuid -> Uuid,
|
||||
nickname -> VarChar,
|
||||
}
|
||||
}
|
||||
|
||||
table! {
|
||||
roles (uuid, guild_uuid) {
|
||||
uuid -> Uuid,
|
||||
guild_uuid -> Uuid,
|
||||
name -> VarChar,
|
||||
color -> Int4,
|
||||
position -> Int4,
|
||||
permissions -> Int8,
|
||||
}
|
||||
}
|
||||
|
||||
table! {
|
||||
role_members (role_uuid, member_uuid) {
|
||||
role_uuid -> Uuid,
|
||||
member_uuid -> Uuid,
|
||||
}
|
||||
}
|
||||
|
||||
table! {
|
||||
channels (uuid) {
|
||||
uuid -> Uuid,
|
||||
guild_uuid -> Uuid,
|
||||
name -> VarChar,
|
||||
description -> VarChar,
|
||||
}
|
||||
}
|
||||
|
||||
table! {
|
||||
channel_permissions (channel_uuid, role_uuid) {
|
||||
channel_uuid -> Uuid,
|
||||
role_uuid -> Uuid,
|
||||
permissions -> Int8,
|
||||
}
|
||||
}
|
||||
|
||||
table! {
|
||||
messages (uuid) {
|
||||
uuid -> Uuid,
|
||||
channel_uuid -> Uuid,
|
||||
user_uuid -> Uuid,
|
||||
message -> VarChar,
|
||||
}
|
||||
}
|
||||
|
||||
table! {
|
||||
invites (id) {
|
||||
id -> VarChar,
|
||||
guild_uuid -> Uuid,
|
||||
user_uuid -> Uuid,
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue