Fix keyword conflict when rebuilding releases

This is a regression after b4fc5ab
which made a previously ignored error being raised.

Author: syphar

src/db/add_package.rs

@@ -343,18 +343,15 @@ fn add_keywords_into_database(
         conn.execute(&insert_keyword_query, &[&name, &slug])?;
     }
 
-    let affected_rows = conn.execute(
+    conn.execute(
         "INSERT INTO keyword_rels (rid, kid) 
         SELECT $1 as rid, id as kid 
         FROM keywords 
-        WHERE slug = ANY($2)",
+        WHERE slug = ANY($2)
+        ON CONFLICT DO NOTHING;",
         &[&release_id, &wanted_keywords.keys().collect::<Vec<_>>()],
     )?;
 
-    if affected_rows != pkg.keywords.len() as u64 {
-        failure::bail!("not all keywords added to database");
-    }
-
     Ok(())
 }
 
@@ -486,6 +483,26 @@ mod test {
         })
     }
 
+    #[test]
+    fn keyword_conflict_when_rebuilding_release() {
+        wrapper(|env| {
+            env.fake_release()
+                .name("dummy")
+                .version("0.13.0")
+                .keywords(vec!["kw 3".into(), "kw 4".into()])
+                .create()?;
+
+            // same version so we have the same release
+            env.fake_release()
+                .name("dummy")
+                .version("0.13.0")
+                .keywords(vec!["kw 3".into(), "kw 4".into()])
+                .create()?;
+
+            Ok(())
+        })
+    }
+
     #[test]
     fn updated_keywords() {
         wrapper(|env| {