diff --git a/consumer/src/db/record.rs b/consumer/src/db/record.rs index ca73bfa2..a00ee205 100644 --- a/consumer/src/db/record.rs +++ b/consumer/src/db/record.rs @@ -68,7 +68,7 @@ pub async fn feedgen_upsert( .and_then(|v| serde_json::to_value(v).ok()); let avatar = blob_ref(rec.avatar); - conn.execute( + conn.query_one( include_str!("sql/feedgen_upsert.sql"), &[ &at_uri, @@ -84,7 +84,7 @@ pub async fn feedgen_upsert( ], ) .await - .map(|v| v == 0) + .map(|r| r.get::<_, i32>(0) == 0) } pub async fn feedgen_delete(conn: &mut C, at_uri: &str) -> PgExecResult { @@ -189,7 +189,7 @@ pub async fn list_upsert( .and_then(|v| serde_json::to_value(v).ok()); let avatar = blob_ref(rec.avatar); - conn.execute( + conn.query_one( include_str!("sql/list_upsert.sql"), &[ &at_uri, @@ -204,7 +204,7 @@ pub async fn list_upsert( ], ) .await - .map(|v| v == 0) + .map(|r| r.get::<_, i32>(0) == 0) } pub async fn list_delete(conn: &mut C, at_uri: &str) -> PgExecResult { @@ -571,7 +571,7 @@ pub async fn starter_pack_upsert( .feeds .map(|v| v.into_iter().map(|item| item.uri).collect::>()); - conn.execute( + conn.query_one( include_str!("sql/starterpack_upsert.sql"), &[ &at_uri, @@ -587,7 +587,7 @@ pub async fn starter_pack_upsert( ], ) .await - .map(|v| v == 0) + .map(|r| r.get::<_, i32>(0) == 0) } pub async fn starter_pack_delete(conn: &mut C, at_uri: &str) -> PgExecResult { diff --git a/consumer/src/db/sql/feedgen_upsert.sql b/consumer/src/db/sql/feedgen_upsert.sql index 376ec57d..dcdb5c3b 100644 --- a/consumer/src/db/sql/feedgen_upsert.sql +++ b/consumer/src/db/sql/feedgen_upsert.sql @@ -9,4 +9,4 @@ ON CONFLICT (at_uri) DO UPDATE SET cid=EXCLUDED.cid, description_facets=EXCLUDED.description_facets, avatar_cid=EXCLUDED.avatar_cid, indexed_at=NOW() -RETURNING XMAX \ No newline at end of file +RETURNING XMAX::text::int \ No newline at end of file diff --git a/consumer/src/db/sql/list_upsert.sql b/consumer/src/db/sql/list_upsert.sql index 47070520..af850932 100644 --- a/consumer/src/db/sql/list_upsert.sql +++ b/consumer/src/db/sql/list_upsert.sql @@ -7,4 +7,4 @@ ON CONFLICT (at_uri) DO UPDATE SET cid=EXCLUDED.cid, description_facets=EXCLUDED.description_facets, avatar_cid=EXCLUDED.avatar_cid, indexed_at=NOW() -RETURNING XMAX \ No newline at end of file +RETURNING XMAX::text::int \ No newline at end of file diff --git a/consumer/src/db/sql/starterpack_upsert.sql b/consumer/src/db/sql/starterpack_upsert.sql index d7a9a93b..325f32ca 100644 --- a/consumer/src/db/sql/starterpack_upsert.sql +++ b/consumer/src/db/sql/starterpack_upsert.sql @@ -8,4 +8,4 @@ ON CONFLICT (at_uri) DO UPDATE SET cid=EXCLUDED.cid, list=EXCLUDED.list, feeds=EXCLUDED.feeds, indexed_at=NOW() -RETURNING XMAX \ No newline at end of file +RETURNING XMAX::text::int \ No newline at end of file