Skip to content

Commit 7eacb56

Browse files
sypharsyphar
committed
remove owner.email and owner.name from our database & code
1 parent 5b29b23 commit 7eacb56

File tree

6 files changed

+20
-56
lines changed

6 files changed

+20
-56
lines changed

‎src/db/add_package.rs‎

Lines changed: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -393,24 +393,19 @@ fn update_owners_in_database(
393393
// Update any existing owner data since it is mutable and could have changed since last
394394
// time we pulled it
395395
let owner_upsert = conn.prepare(
396-
"INSERT INTO owners (login, avatar, name, email)
397-
VALUES ($1, $2, $3, $4)
396+
"INSERT INTO owners (login, avatar)
397+
VALUES ($1, $2)
398398
ON CONFLICT (login) DO UPDATE
399399
SET
400-
avatar = EXCLUDED.avatar,
401-
name = EXCLUDED.name,
402-
email = EXCLUDED.email
400+
avatar = EXCLUDED.avatar
403401
RETURNING id",
404402
)?;
405403

406404
let oids: Vec<i32> = owners
407405
.iter()
408406
.map(|owner| -> Result<_> {
409407
Ok(conn
410-
.query_one(
411-
&owner_upsert,
412-
&[&owner.login, &owner.avatar, &owner.name, &owner.email],
413-
)?
408+
.query_one(&owner_upsert, &[&owner.login, &owner.avatar])?
414409
.get(0))
415410
})
416411
.collect::<Result<Vec<_>>>()?;
@@ -584,22 +579,18 @@ mod test {
584579

585580
let owner1 = CrateOwner {
586581
avatar: "avatar".into(),
587-
email: "email".into(),
588582
login: "login".into(),
589-
name: "name".into(),
590583
};
591584

592585
update_owners_in_database(&mut conn, &[owner1.clone()], crate_id)?;
593586

594587
let owner_def = conn.query_one(
595-
"SELECT login, name, email, avatar
588+
"SELECT login, avatar
596589
FROM owners",
597590
&[],
598591
)?;
599592
assert_eq!(owner_def.get::<_, String>(0), owner1.login);
600-
assert_eq!(owner_def.get::<_, String>(1), owner1.name);
601-
assert_eq!(owner_def.get::<_, String>(2), owner1.email);
602-
assert_eq!(owner_def.get::<_, String>(3), owner1.avatar);
593+
assert_eq!(owner_def.get::<_, String>(1), owner1.avatar);
603594

604595
let owner_rel = conn.query_one(
605596
"SELECT o.login
@@ -627,29 +618,19 @@ mod test {
627618
&[CrateOwner {
628619
login: "login".into(),
629620
avatar: "avatar".into(),
630-
email: "email".into(),
631-
name: "name".into(),
632621
}],
633622
crate_id,
634623
)?;
635624

636625
let updated_owner = CrateOwner {
637626
login: "login".into(),
638627
avatar: "avatar2".into(),
639-
email: "email2".into(),
640-
name: "name2".into(),
641628
};
642629
update_owners_in_database(&mut conn, &[updated_owner.clone()], crate_id)?;
643630

644-
let owner_def = conn.query_one(
645-
"SELECT login, name, email, avatar
646-
FROM owners",
647-
&[],
648-
)?;
631+
let owner_def = conn.query_one("SELECT login, avatar FROM owners", &[])?;
649632
assert_eq!(owner_def.get::<_, String>(0), updated_owner.login);
650-
assert_eq!(owner_def.get::<_, String>(1), updated_owner.name);
651-
assert_eq!(owner_def.get::<_, String>(2), updated_owner.email);
652-
assert_eq!(owner_def.get::<_, String>(3), updated_owner.avatar);
633+
assert_eq!(owner_def.get::<_, String>(1), updated_owner.avatar);
653634

654635
let owner_rel = conn.query_one(
655636
"SELECT o.login
@@ -682,8 +663,6 @@ mod test {
682663
&[CrateOwner {
683664
login: "login".into(),
684665
avatar: "avatar".into(),
685-
email: "email".into(),
686-
name: "name".into(),
687666
}],
688667
crate_id,
689668
)?;
@@ -692,8 +671,6 @@ mod test {
692671
.map(|i| CrateOwner {
693672
login: format!("login{}", i),
694673
avatar: format!("avatar{}", i),
695-
email: format!("email{}", i),
696-
name: format!("name{}", i),
697674
})
698675
.collect();
699676

‎src/db/delete.rs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ mod tests {
298298
fn owners(conn: &mut Client, crate_id: i32) -> Result<Vec<String>> {
299299
Ok(conn
300300
.query(
301-
"SELECT name FROM owners
301+
"SELECT login FROM owners
302302
INNER JOIN owner_rels ON owners.id = owner_rels.oid
303303
WHERE owner_rels.cid = $1",
304304
&[&crate_id],
@@ -317,8 +317,6 @@ mod tests {
317317
.add_owner(CrateOwner {
318318
login: "malicious actor".into(),
319319
avatar: "https://example.org/malicious".into(),
320-
name: "malicious actor".into(),
321-
email: "[email protected]".into(),
322320
})
323321
.create()?;
324322
assert!(release_exists(&mut db.conn(), v1)?);
@@ -348,8 +346,6 @@ mod tests {
348346
.add_owner(CrateOwner {
349347
login: "Peter Rabbit".into(),
350348
avatar: "https://example.org/peter".into(),
351-
name: "Peter Rabbit".into(),
352-
email: "[email protected]".into(),
353349
})
354350
.create()?;
355351
assert!(release_exists(&mut db.conn(), v2)?);

‎src/db/migrate.rs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -848,6 +848,17 @@ pub fn migrate(version: Option<Version>, conn: &mut Client) -> crate::error::Res
848848
"ALTER TABLE files ADD COLUMN public BOOL NOT NULL DEFAULT FALSE;",
849849
"ALTER TABLE files DROP COLUMN public;"
850850
),
851+
sql_migration!(
852+
context, 36, "remove email & name columns from owner table",
853+
"
854+
ALTER TABLE owners DROP COLUMN email;
855+
ALTER TABLE owners DROP COLUMN name;
856+
",
857+
"
858+
ALTER TABLE owners ADD COLUMN email VARCHAR(255);
859+
ALTER TABLE owners ADD COLUMN name VARCHAR(255);
860+
",
861+
),
851862

852863
];
853864

‎src/index/api.rs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ impl Default for ReleaseData {
4444
#[derive(Debug, Clone)]
4545
pub struct CrateOwner {
4646
pub(crate) avatar: String,
47-
pub(crate) email: String,
4847
pub(crate) login: String,
49-
pub(crate) name: String,
5048
}
5149

5250
impl Api {
@@ -153,11 +151,7 @@ impl Api {
153151
#[serde(default)]
154152
avatar: Option<String>,
155153
#[serde(default)]
156-
email: Option<String>,
157-
#[serde(default)]
158154
login: Option<String>,
159-
#[serde(default)]
160-
name: Option<String>,
161155
}
162156

163157
let response: Response = self.client.get(url).send()?.error_for_status()?.json()?;
@@ -174,9 +168,7 @@ impl Api {
174168
})
175169
.map(|data| CrateOwner {
176170
avatar: data.avatar.unwrap_or_default(),
177-
email: data.email.unwrap_or_default(),
178171
login: data.login.unwrap_or_default(),
179-
name: data.name.unwrap_or_default(),
180172
})
181173
.collect();
182174

‎src/web/crate_details.rs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -776,8 +776,6 @@ mod tests {
776776
.add_owner(CrateOwner {
777777
login: "foobar".into(),
778778
avatar: "https://example.org/foobar".into(),
779-
name: "Foo Bar".into(),
780-
email: "[email protected]".into(),
781779
})
782780
.create()?;
783781

@@ -796,14 +794,10 @@ mod tests {
796794
.add_owner(CrateOwner {
797795
login: "foobar".into(),
798796
avatar: "https://example.org/foobarv2".into(),
799-
name: "Foo Bar".into(),
800-
email: "[email protected]".into(),
801797
})
802798
.add_owner(CrateOwner {
803799
login: "barfoo".into(),
804800
avatar: "https://example.org/barfoo".into(),
805-
name: "Bar Foo".into(),
806-
email: "[email protected]".into(),
807801
})
808802
.create()?;
809803

@@ -827,8 +821,6 @@ mod tests {
827821
.add_owner(CrateOwner {
828822
login: "barfoo".into(),
829823
avatar: "https://example.org/barfoo".into(),
830-
name: "Bar Foo".into(),
831-
email: "[email protected]".into(),
832824
})
833825
.create()?;
834826

@@ -847,8 +839,6 @@ mod tests {
847839
.add_owner(CrateOwner {
848840
login: "barfoo".into(),
849841
avatar: "https://example.org/barfoov2".into(),
850-
name: "Bar Foo".into(),
851-
email: "[email protected]".into(),
852842
})
853843
.create()?;
854844

‎src/web/releases.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1455,8 +1455,6 @@ mod tests {
14551455
.add_owner(CrateOwner {
14561456
login: "foobar".into(),
14571457
avatar: "https://example.org/foobar".into(),
1458-
name: "Foo Bar".into(),
1459-
email: "[email protected]".into(),
14601458
})
14611459
.create()?;
14621460

0 commit comments

Comments
 (0)