From 7717e98ae96150b65a07638815b4c760c333f266 Mon Sep 17 00:00:00 2001 From: BurnyLlama Date: Sun, 6 Nov 2022 12:14:04 +0100 Subject: [PATCH] Fixed getting timestamp. --- Cargo.toml | 1 + src/database/mod.rs | 3 ++- src/types/mod.rs | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f0fe156..58989db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,4 +8,5 @@ edition = "2021" [dependencies] rocket = { version = "0.5.0-rc.2", features = ["json"] } mysql = "22.2.0" +mysql_common = { version = "0.28.2", features = ["chrono"] } dotenv = "0.15.0" \ No newline at end of file diff --git a/src/database/mod.rs b/src/database/mod.rs index 25203fa..4e2e18e 100644 --- a/src/database/mod.rs +++ b/src/database/mod.rs @@ -3,6 +3,7 @@ use std::result::Result; use std::error::Error; use mysql::*; use mysql::prelude::*; + use crate::types; pub fn get_maps() -> Result, Box> { @@ -37,7 +38,7 @@ pub fn get_map_by_name(name: &str) -> Result, Box> -pub fn create_pool() -> Result> { +fn create_pool() -> Result> { let url = env::var("DB_URI")?; let pool = Pool::new(url.as_str())?; Ok(pool) diff --git a/src/types/mod.rs b/src/types/mod.rs index a05abae..8b0b24a 100644 --- a/src/types/mod.rs +++ b/src/types/mod.rs @@ -1,3 +1,4 @@ +use mysql_common::chrono::NaiveDateTime; use rocket::serde::{Serialize, Deserialize}; #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)] @@ -8,5 +9,5 @@ pub struct Map { pub points: i8, pub stars: i8, pub mapper: String, - pub timestamp: String, + pub timestamp: NaiveDateTime, } \ No newline at end of file