fix build

Author: oldGreg5

Cargo.lock

@@ -11,8 +11,7 @@ license = "MIT OR Apache-2.0"
 async-trait = "0.1.33"
 base64 = "0.13"
 time = { version = "0.3", features = ["parsing", "formatting"] }
-diesel = { version = "1.4.5", features = ["postgres", "r2d2", "64-column-tables", "serde_json"] }
-diesel_migrations = "1.4.0"
+diesel = { version = "1.4.8", features = ["postgres", "r2d2", "64-column-tables", "chrono"] }
 dotenv = "0.15"
 itertools = "0.10"
 log = { version = "0.4.11", features = ["serde"] }

src/vit-servicing-station/vit-servicing-station-lib/Cargo.toml

@@ -12,7 +12,7 @@ hex = "0.4.2"
 base64 = "0.13"
 cfg-if = "0.1"
 time = { version = "0.3", features = ["formatting", "parsing", "macros"] }
-diesel = { version = "1.4.4", features = ["postgres", "r2d2", "chrono"] }
+diesel = { version = "1.4.8", features = ["postgres", "r2d2", "64-column-tables", "chrono", "serde_json"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.53"
 clap = { workspace = true }

src/vit-servicing-station/vit-servicing-station-tests/Cargo.toml

@@ -1,6 +1,23 @@
 use std::collections::BTreeMap;
 
-use diesel::RunQueryDsl;
+use diesel::{RunQueryDsl, row::NamedRow, deserialize::{self, FromSql}, backend::Backend, sql_types::Integer};
+
+// Simple struct to receive row_id without derive macros to avoid non-local impl warnings
+struct RowId {
+    row_id: i32,
+}
+
+impl<DB> diesel::deserialize::QueryableByName<DB> for RowId
+where
+    DB: Backend,
+    i32: FromSql<Integer, DB>,
+{
+    fn build<R: NamedRow<DB>>(row: &R) -> deserialize::Result<Self> {
+        Ok(RowId {
+            row_id: NamedRow::get(row, "row_id")?,
+        })
+    }
+}
 use thiserror::Error;
 use vit_servicing_station_lib::db::models::{
     api_tokens::ApiTokenData,
@@ -11,11 +28,6 @@ use vit_servicing_station_lib::db::models::{
 };
 use vit_servicing_station_lib::db::DbConnection;
 
-#[derive(diesel::QueryableByName)]
-struct RowId {
-    #[sql_type = "diesel::sql_types::Integer"]
-    row_id: i32,
-}
 
 pub struct DbInserter<'a> {
     connection: &'a DbConnection,
@@ -199,60 +211,60 @@ impl<'a> DbInserter<'a> {
             .bind::<diesel::sql_types::Text, _>(&fund.fund_name)
             .bind::<diesel::sql_types::Text, _>(&fund.fund_goal)
             .bind::<diesel::sql_types::Nullable<diesel::sql_types::Timestamp>, _>(
-                chrono::NaiveDateTime::from_timestamp_millis(
+                chrono::DateTime::from_timestamp_millis(
                     fund.registration_snapshot_time * 1000,
-                ),
+                ).map(|dt| dt.naive_utc()),
             )
             .bind::<diesel::sql_types::BigInt, _>(fund.voting_power_threshold)
             .bind::<diesel::sql_types::Nullable<diesel::sql_types::Timestamp>, _>(
-                chrono::NaiveDateTime::from_timestamp_millis(fund.fund_start_time * 1000),
+                chrono::DateTime::from_timestamp_millis(fund.fund_start_time * 1000).map(|dt| dt.naive_utc()),
             )
             .bind::<diesel::sql_types::Nullable<diesel::sql_types::Timestamp>, _>(
-                chrono::NaiveDateTime::from_timestamp_millis(fund.fund_end_time * 1000),
+                chrono::DateTime::from_timestamp_millis(fund.fund_end_time * 1000).map(|dt| dt.naive_utc()),
             )
             .bind::<diesel::sql_types::Nullable<diesel::sql_types::Timestamp>, _>(
-                chrono::NaiveDateTime::from_timestamp_millis(
+                chrono::DateTime::from_timestamp_millis(
                     fund.stage_dates.insight_sharing_start * 1000,
-                ),
+                ).map(|dt| dt.naive_utc()),
             )
             .bind::<diesel::sql_types::Nullable<diesel::sql_types::Timestamp>, _>(
-                chrono::NaiveDateTime::from_timestamp_millis(
+                chrono::DateTime::from_timestamp_millis(
                     fund.stage_dates.proposal_submission_start * 1000,
-                ),
+                ).map(|dt| dt.naive_utc()),
             )
             .bind::<diesel::sql_types::Nullable<diesel::sql_types::Timestamp>, _>(
-                chrono::NaiveDateTime::from_timestamp_millis(
+                chrono::DateTime::from_timestamp_millis(
                     fund.stage_dates.refine_proposals_start * 1000,
-                ),
+                ).map(|dt| dt.naive_utc()),
             )
             .bind::<diesel::sql_types::Nullable<diesel::sql_types::Timestamp>, _>(
-                chrono::NaiveDateTime::from_timestamp_millis(
+                chrono::DateTime::from_timestamp_millis(
                     fund.stage_dates.finalize_proposals_start * 1000,
-                ),
+                ).map(|dt| dt.naive_utc()),
             )
             .bind::<diesel::sql_types::Nullable<diesel::sql_types::Timestamp>, _>(
-                chrono::NaiveDateTime::from_timestamp_millis(
+                chrono::DateTime::from_timestamp_millis(
                     fund.stage_dates.proposal_assessment_start * 1000,
-                ),
+                ).map(|dt| dt.naive_utc()),
             )
             .bind::<diesel::sql_types::Nullable<diesel::sql_types::Timestamp>, _>(
-                chrono::NaiveDateTime::from_timestamp_millis(
+                chrono::DateTime::from_timestamp_millis(
                     fund.stage_dates.assessment_qa_start * 1000,
-                ),
+                ).map(|dt| dt.naive_utc()),
             )
             .bind::<diesel::sql_types::Nullable<diesel::sql_types::Timestamp>, _>(
-                chrono::NaiveDateTime::from_timestamp_millis(
+                chrono::DateTime::from_timestamp_millis(
                     fund.stage_dates.snapshot_start * 1000,
-                ),
+                ).map(|dt| dt.naive_utc()),
             )
             .bind::<diesel::sql_types::Nullable<diesel::sql_types::Timestamp>, _>(
-                chrono::NaiveDateTime::from_timestamp_millis(fund.stage_dates.voting_start * 1000),
+                chrono::DateTime::from_timestamp_millis(fund.stage_dates.voting_start * 1000).map(|dt| dt.naive_utc()),
             )
             .bind::<diesel::sql_types::Nullable<diesel::sql_types::Timestamp>, _>(
-                chrono::NaiveDateTime::from_timestamp_millis(fund.stage_dates.voting_end * 1000),
+                chrono::DateTime::from_timestamp_millis(fund.stage_dates.voting_end * 1000).map(|dt| dt.naive_utc()),
             )
             .bind::<diesel::sql_types::Nullable<diesel::sql_types::Timestamp>, _>(
-                chrono::NaiveDateTime::from_timestamp_millis(fund.stage_dates.tallying_end * 1000),
+                chrono::DateTime::from_timestamp_millis(fund.stage_dates.tallying_end * 1000).map(|dt| dt.naive_utc()),
             )
             .bind::<diesel::sql_types::Jsonb, _>(serde_json::json!({
                 "url": {