mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-11 01:49:21 +00:00
c9f1407429
* Initial commit to bump diesel to 2.0.0-rc.0 and see what happens * Add chrono feature from diesel * db_schema crate is close to building? * Upgrade diesel-derive-newtype * Mostly modifying references to connections to be mutable ones; also used new way to do migrations as suggested by the migration guide; a lot more compiles now, though I can't figure out this tricky ToSql issue at the moment * Running clippy --fix * Trying to fix drone clippy 1 * Fix clippy * Upgrade clux-musl * Trying to fix drone clippy 2 * Trying to fix drone clippy 3 * Trying to fix drone clippy 5 * Adding diesel table aliases, removing sql view hack. Fixes #2101 Co-authored-by: Steven Chu <stevenc1@gmail.com> Co-authored-by: Nutomic <me@nutomic.com>
126 lines
3.9 KiB
Rust
126 lines
3.9 KiB
Rust
use diesel_ltree::Ltree;
|
|
use serde::{Deserialize, Serialize};
|
|
use std::{
|
|
fmt,
|
|
fmt::{Display, Formatter},
|
|
ops::Deref,
|
|
};
|
|
use url::Url;
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Default, Serialize, Deserialize)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType))]
|
|
pub struct PostId(pub i32);
|
|
|
|
impl fmt::Display for PostId {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
write!(f, "{}", self.0)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Default, Serialize, Deserialize)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType))]
|
|
pub struct PersonId(pub i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType))]
|
|
pub struct CommentId(pub i32);
|
|
|
|
impl fmt::Display for CommentId {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
write!(f, "{}", self.0)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Default, Serialize, Deserialize)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType))]
|
|
pub struct CommunityId(pub i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Default, Serialize, Deserialize)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType))]
|
|
pub struct LocalUserId(pub i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType))]
|
|
pub struct PrivateMessageId(i32);
|
|
|
|
impl fmt::Display for PrivateMessageId {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
write!(f, "{}", self.0)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType))]
|
|
pub struct PersonMentionId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType))]
|
|
pub struct PersonBlockId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType))]
|
|
pub struct CommunityBlockId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType))]
|
|
pub struct CommentReportId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType))]
|
|
pub struct PostReportId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType))]
|
|
pub struct PrivateMessageReportId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType))]
|
|
pub struct LanguageId(pub i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType))]
|
|
pub struct LocalUserLanguageId(pub i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType))]
|
|
pub struct CommentReplyId(i32);
|
|
|
|
#[repr(transparent)]
|
|
#[derive(Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
|
|
#[cfg_attr(feature = "full", derive(AsExpression, FromSqlRow))]
|
|
#[cfg_attr(feature = "full", diesel(sql_type = diesel::sql_types::Text))]
|
|
pub struct DbUrl(pub(crate) Url);
|
|
|
|
#[derive(Serialize, Deserialize)]
|
|
#[serde(remote = "Ltree")]
|
|
/// Do remote derivation for the Ltree struct
|
|
pub struct LtreeDef(pub String);
|
|
|
|
impl Display for DbUrl {
|
|
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
|
self.to_owned().0.fmt(f)
|
|
}
|
|
}
|
|
|
|
// the project doesnt compile with From
|
|
#[allow(clippy::from_over_into)]
|
|
impl Into<DbUrl> for Url {
|
|
fn into(self) -> DbUrl {
|
|
DbUrl(self)
|
|
}
|
|
}
|
|
#[allow(clippy::from_over_into)]
|
|
impl Into<Url> for DbUrl {
|
|
fn into(self) -> Url {
|
|
self.0
|
|
}
|
|
}
|
|
|
|
impl Deref for DbUrl {
|
|
type Target = Url;
|
|
|
|
fn deref(&self) -> &Self::Target {
|
|
&self.0
|
|
}
|
|
}
|