diff options
| author | Conrad Ludgate <conradludgate@gmail.com> | 2023-09-29 02:56:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-28 18:56:40 -0700 |
| commit | 7067d772bc8c7e3c829a0b43ff9b5579bc07aef3 (patch) | |
| tree | 731b44997e3ffc86ddc527ffb87827bd8ab9cea1 /atuin-server-postgres/src/wrappers.rs | |
| parent | Update support.yml (#1268) (diff) | |
| download | atuin-7067d772bc8c7e3c829a0b43ff9b5579bc07aef3.zip | |
fix sync timestamps (#1258)
* fix timestamp
* add sync test
* skip all sync tests
Diffstat (limited to '')
| -rw-r--r-- | atuin-server-postgres/src/wrappers.rs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/atuin-server-postgres/src/wrappers.rs b/atuin-server-postgres/src/wrappers.rs index 8bd482b1..b4ae48ae 100644 --- a/atuin-server-postgres/src/wrappers.rs +++ b/atuin-server-postgres/src/wrappers.rs @@ -2,6 +2,7 @@ use ::sqlx::{FromRow, Result}; use atuin_common::record::{EncryptedData, Record}; use atuin_server_database::models::{History, Session, User}; use sqlx::{postgres::PgRow, Row}; +use time::PrimitiveDateTime; pub struct DbUser(pub User); pub struct DbSession(pub Session); @@ -36,9 +37,13 @@ impl<'a> ::sqlx::FromRow<'a, PgRow> for DbHistory { client_id: row.try_get("client_id")?, user_id: row.try_get("user_id")?, hostname: row.try_get("hostname")?, - timestamp: row.try_get("timestamp")?, + timestamp: row + .try_get::<PrimitiveDateTime, _>("timestamp")? + .assume_utc(), data: row.try_get("data")?, - created_at: row.try_get("created_at")?, + created_at: row + .try_get::<PrimitiveDateTime, _>("created_at")? + .assume_utc(), })) } } |
