@@ -241,7 +241,7 @@ impl<'a> NewCrate<'a> {
241
241
}
242
242
}
243
243
244
- fn save_new_crate ( & self , conn : & PgConnection , user_id : i32 ) -> CargoResult < Option < Crate > > {
244
+ fn save_new_crate ( & self , conn : & PgConnection , user_id : i32 ) -> QueryResult < Option < Crate > > {
245
245
use schema:: crates:: dsl:: * ;
246
246
use diesel:: insert;
247
247
@@ -554,19 +554,6 @@ impl Crate {
554
554
Ok ( Version :: max ( vs) )
555
555
}
556
556
557
- pub fn max_version_old ( & self , conn : & GenericConnection ) -> CargoResult < semver:: Version > {
558
- let stmt = conn. prepare (
559
- "SELECT num FROM versions WHERE crate_id = $1
560
- AND yanked = 'f'" ,
561
- ) ?;
562
- let rows = stmt. query ( & [ & self . id ] ) ?;
563
- Ok ( Version :: max (
564
- rows. iter ( ) . map ( |r| r. get :: < _ , String > ( "num" ) ) . map ( |s| {
565
- semver:: Version :: parse ( & s) . unwrap ( )
566
- } ) ,
567
- ) )
568
- }
569
-
570
557
pub fn versions ( & self , conn : & GenericConnection ) -> CargoResult < Vec < Version > > {
571
558
let stmt = conn. prepare (
572
559
"SELECT * FROM versions \
@@ -600,6 +587,7 @@ impl Crate {
600
587
Ok ( users. chain ( teams) . collect ( ) )
601
588
}
602
589
590
+ // TODO: Update bin/transfer_crates to use owners() then get rid of this
603
591
pub fn owners_old ( & self , conn : & GenericConnection ) -> CargoResult < Vec < Owner > > {
604
592
let stmt = conn. prepare (
605
593
"SELECT * FROM users
@@ -687,44 +675,6 @@ impl Crate {
687
675
Ok ( ( ) )
688
676
}
689
677
690
- pub fn add_version (
691
- & mut self ,
692
- conn : & GenericConnection ,
693
- ver : & semver:: Version ,
694
- features : & HashMap < String , Vec < String > > ,
695
- authors : & [ String ] ,
696
- ) -> CargoResult < Version > {
697
- if Version :: find_by_num ( conn, self . id , ver) ?. is_some ( ) {
698
- return Err ( human (
699
- & format_args ! ( "crate version `{}` is already uploaded" , ver) ,
700
- ) ) ;
701
- }
702
- Version :: insert ( conn, self . id , ver, features, authors)
703
- }
704
-
705
- pub fn keywords ( & self , conn : & GenericConnection ) -> CargoResult < Vec < Keyword > > {
706
- let stmt = conn. prepare (
707
- "SELECT keywords.* FROM keywords
708
- LEFT JOIN crates_keywords
709
- ON keywords.id = crates_keywords.keyword_id
710
- WHERE crates_keywords.crate_id = $1" ,
711
- ) ?;
712
- let rows = stmt. query ( & [ & self . id ] ) ?;
713
- Ok ( rows. iter ( ) . map ( |r| Model :: from_row ( & r) ) . collect ( ) )
714
- }
715
-
716
- pub fn categories ( & self , conn : & GenericConnection ) -> CargoResult < Vec < Category > > {
717
- let stmt = conn. prepare (
718
- "SELECT categories.* FROM categories \
719
- LEFT JOIN crates_categories \
720
- ON categories.id = \
721
- crates_categories.category_id \
722
- WHERE crates_categories.crate_id = $1",
723
- ) ?;
724
- let rows = stmt. query ( & [ & self . id ] ) ?;
725
- Ok ( rows. iter ( ) . map ( |r| Model :: from_row ( & r) ) . collect ( ) )
726
- }
727
-
728
678
pub fn badges ( & self , conn : & PgConnection ) -> QueryResult < Vec < Badge > > {
729
679
badges:: table. filter ( badges:: crate_id. eq ( self . id ) ) . load (
730
680
conn,
@@ -737,7 +687,7 @@ impl Crate {
737
687
conn : & PgConnection ,
738
688
offset : i64 ,
739
689
limit : i64 ,
740
- ) -> CargoResult < ( Vec < ReverseDependency > , i64 ) > {
690
+ ) -> QueryResult < ( Vec < ReverseDependency > , i64 ) > {
741
691
use diesel:: expression:: dsl:: sql;
742
692
use diesel:: types:: { Integer , Text , BigInt } ;
743
693
0 commit comments