@@ -48,14 +48,14 @@ fn transfer(tx: &postgres::transaction::Transaction) {
48
48
let from = User :: find_by_login ( tx, & from) . unwrap ( ) ;
49
49
let to = User :: find_by_login ( tx, & to) . unwrap ( ) ;
50
50
51
- if from. gh_avatar != to. gh_avatar {
51
+ if from. gh_id != to. gh_id {
52
52
println ! ( "====================================================" ) ;
53
53
println ! ( "WARNING" ) ;
54
54
println ! ( "" ) ;
55
- println ! ( "this may not be the same github user, different avatar urls " ) ;
55
+ println ! ( "this may not be the same github user, different github IDs " ) ;
56
56
println ! ( "" ) ;
57
- println ! ( "from: {:?}" , from. gh_avatar ) ;
58
- println ! ( "to: {:?}" , to. gh_avatar ) ;
57
+ println ! ( "from: {:?}" , from. gh_id ) ;
58
+ println ! ( "to: {:?}" , to. gh_id ) ;
59
59
60
60
get_confirm ( "continue?" ) ;
61
61
}
@@ -67,29 +67,28 @@ fn transfer(tx: &postgres::transaction::Transaction) {
67
67
) ;
68
68
get_confirm ( "continue" ) ;
69
69
70
-
71
70
let stmt = tx. prepare (
72
71
"SELECT * FROM crate_owners
73
72
WHERE owner_id = $1
74
73
AND owner_kind = $2" ,
75
74
) . unwrap ( ) ;
76
75
let rows = stmt. query ( & [ & from. id , & ( OwnerKind :: User as i32 ) ] ) . unwrap ( ) ;
76
+
77
77
for row in rows. iter ( ) {
78
- let id: i32 = row. get ( "id" ) ;
79
78
let krate = Crate :: find ( tx, row. get ( "crate_id" ) ) . unwrap ( ) ;
80
79
println ! ( "transferring {}" , krate. name) ;
81
80
let owners = krate. owners_old ( tx) . unwrap ( ) ;
82
81
if owners. len ( ) != 1 {
83
82
println ! ( "warning: not exactly one owner for {}" , krate. name) ;
84
83
}
85
- let n = tx. execute (
86
- "UPDATE crate_owners SET owner_id = $1
87
- WHERE id $2" ,
88
- & [ & to. id , & id] ,
89
- ) . unwrap ( ) ;
90
- assert_eq ! ( n, 1 ) ;
91
84
}
92
85
86
+ tx. execute (
87
+ "UPDATE crate_owners SET owner_id = $1
88
+ WHERE owner_id = $2" ,
89
+ & [ & to. id , & from. id ] ,
90
+ ) . unwrap ( ) ;
91
+
93
92
get_confirm ( "commit?" ) ;
94
93
}
95
94
0 commit comments