clean up

Author: taddes

syncstorage-postgres/src/db/db_impl.rs

@@ -382,68 +382,8 @@ impl Db for PgDb {
         let sortindex = bso.sortindex;
         let ttl = bso.ttl.map_or(DEFAULT_BSO_TTL, |ttl| ttl);
 
-        // This method is an upsert operation, which allows the update of an existing row
-        // or inserts a new one if it doesn’t exist. Postgres does not have `UPSERT` but
-        // achieves this though `INSERT...ON CONFLICT`.
-        // let q: String = r#"
-        //     INSERT INTO bso (user_id, collection_id, bso_id, sortindex, payload, modified, expiry)
-        //     VALUES ($1, $2, $3, $4, $5, $6, $7)
-        //         ON CONFLICT (user_id, collection_id, bso_id)
-        //         DO UPDATE SET
-        //            user_id = EXCLUDED.user_id,
-        //            collection_id = EXCLUDED.collection_id,
-        //            bso_id = EXCLUDED.bso_id,
-        //     "#
-        // .to_string();
-
-        // let q = format!(
-        //     "{}{}",
-        //     q,
-        //     if bso.sortindex.is_some() {
-        //         ", sortindex = VALUES(sortindex)"
-        //     } else {
-        //         ""
-        //     },
-        // );
-        // let q = format!(
-        //     "{}{}",
-        //     q,
-        //     if bso.payload.is_some() {
-        //         ", payload = VALUES(payload)"
-        //     } else {
-        //         ""
-        //     },
-        // );
-        // let q = format!(
-        //     "{}{}",
-        //     q,
-        //     if bso.ttl.is_some() {
-        //         "expiry = VALUES(expiry)"
-        //     } else {
-        //         ""
-        //     },
-        // );
-        // let q = format!(
-        //     "{}{}",
-        //     q,
-        //     if bso.payload.is_some() || bso.sortindex.is_some() {
-        //         "modified = VALUES(modified)"
-        //     } else {
-        //         ""
-        //     },
-        // );
-        // sql_query(q)
-        //     .bind::<BigInt, _>(user_id as i64) // XXX:
-        //     .bind::<Integer, _>(&collection_id)
-        //     .bind::<Text, _>(&bso.id)
-        //     .bind::<Nullable<Integer>, _>(sortindex)
-        //     .bind::<Text, _>(payload)
-        //     .bind::<BigInt, _>(timestamp)
-        //     .bind::<BigInt, _>(timestamp + (i64::from(ttl) * 1000)) // remember: this is in millis
-        //     .execute(&mut self.conn)
-        //     .await?;
-
-        let expiry_ts = SyncTimestamp::from_i64(timestamp + (i64::from(ttl) * 1000))?; // remember: original milli conversion
+        // original required millisecond conversion
+        let expiry_ts = SyncTimestamp::from_i64(timestamp + (i64::from(ttl) * 1000))?;
         let modified_ts = SyncTimestamp::from_i64(timestamp)?;
 
         let expiry_dt = expiry_ts.as_naive_datetime()?;
@@ -480,8 +420,8 @@ impl Db for PgDb {
                 bsos::bso_id.eq(&bso.id),
                 bsos::sortindex.eq(sortindex),
                 bsos::payload.eq(payload),
-                bsos::modified.eq(modified_ts.as_naive_datetime()?),
-                bsos::expiry.eq(expiry_ts.as_naive_datetime()?),
+                bsos::modified.eq(modified_dt),
+                bsos::expiry.eq(expiry_dt),
             ))
             .on_conflict((bsos::user_id, bsos::collection_id, bsos::bso_id))
             .do_update()