From bcc165c7493e6bf993c762e48392badae3cbaf30 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Sat, 17 Jan 2026 07:46:59 +0000 Subject: ActualbudgetDate is i64 internally --- .../actualbudget_models/src/actualbudget_date.rs | 23 ++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/transformers/actualbudget_transformer/actualbudget_models/src/actualbudget_date.rs b/transformers/actualbudget_transformer/actualbudget_models/src/actualbudget_date.rs index 13525fc..622e22b 100644 --- a/transformers/actualbudget_transformer/actualbudget_models/src/actualbudget_date.rs +++ b/transformers/actualbudget_transformer/actualbudget_models/src/actualbudget_date.rs @@ -1,8 +1,14 @@ -use diesel::{backend::Backend, deserialize::{FromSql, FromSqlRow}, expression::AsExpression, sql_types::Integer, sqlite::Sqlite}; +use diesel::{ + backend::Backend, + deserialize::{FromSql, FromSqlRow}, + expression::AsExpression, + sql_types::Integer, + sqlite::Sqlite, +}; #[derive(Clone, Hash, PartialEq, Eq, Debug, AsExpression, FromSqlRow)] #[diesel(sql_type=Integer)] -pub struct ActualbudgetDate(i32); +pub struct ActualbudgetDate(i64); #[derive(Clone, PartialOrd, PartialEq, Eq)] enum DatePart { @@ -17,7 +23,12 @@ enum DatePart { impl ActualbudgetDate { pub fn to_iso(&self) -> String { - format!("{0}-{1}-{2}T00:00:00.000Z", self.year(), self.month(), self.day()) + format!( + "{0}-{1}-{2}T00:00:00.000Z", + self.year(), + self.month(), + self.day() + ) } pub fn to_iso_date(&self) -> String { @@ -40,7 +51,7 @@ impl ActualbudgetDate { } pub fn from_i32(i: i32) -> Self { - ActualbudgetDate(i) + ActualbudgetDate(i.into()) } fn date_part(&self) -> DatePart { @@ -51,7 +62,7 @@ impl ActualbudgetDate { } } - fn dayified_value(&self) -> i32 { + fn dayified_value(&self) -> i64 { match self.date_part() { DatePart::DayOfMonth => self.0, DatePart::MonthOfYear => self.0 * 100 + 1, @@ -74,6 +85,6 @@ impl PartialOrd for ActualbudgetDate { impl FromSql for ActualbudgetDate { fn from_sql(bytes: ::RawValue<'_>) -> diesel::deserialize::Result { let int: i32 = FromSql::::from_sql(bytes)?; - Ok(ActualbudgetDate(int)) + Ok(ActualbudgetDate(int.into())) } } -- cgit v1.2.3