@@ -593,30 +593,39 @@ pub async fn remove_filtered_policy(
593593
594594#[ cfg( feature = "postgres" ) ]
595595pub ( crate ) async fn load_policy ( conn : & ConnectionPool ) -> Result < Vec < CasbinRule > > {
596- let casbin_rule: Vec < CasbinRule > = sqlx:: query_as!( CasbinRule , "SELECT * FROM casbin_rule" )
597- . fetch_all ( conn)
598- . await
599- . map_err ( |err| CasbinError :: from ( AdapterError ( Box :: new ( Error :: SqlxError ( err) ) ) ) ) ?;
596+ let casbin_rule: Vec < CasbinRule > = sqlx:: query_as!(
597+ CasbinRule ,
598+ "SELECT id, ptype, v0, v1, v2, v3, v4, v5 FROM casbin_rule"
599+ )
600+ . fetch_all ( conn)
601+ . await
602+ . map_err ( |err| CasbinError :: from ( AdapterError ( Box :: new ( Error :: SqlxError ( err) ) ) ) ) ?;
600603
601604 Ok ( casbin_rule)
602605}
603606
604607#[ cfg( feature = "sqlite" ) ]
605608pub ( crate ) async fn load_policy ( conn : & ConnectionPool ) -> Result < Vec < CasbinRule > > {
606- let casbin_rule: Vec < CasbinRule > = sqlx:: query_as!( CasbinRule , "SELECT * FROM casbin_rule" )
607- . fetch_all ( conn)
608- . await
609- . map_err ( |err| CasbinError :: from ( AdapterError ( Box :: new ( Error :: SqlxError ( err) ) ) ) ) ?;
609+ let casbin_rule: Vec < CasbinRule > = sqlx:: query_as!(
610+ CasbinRule ,
611+ "SELECT id, ptype, v0, v1, v2, v3, v4, v5 FROM casbin_rule"
612+ )
613+ . fetch_all ( conn)
614+ . await
615+ . map_err ( |err| CasbinError :: from ( AdapterError ( Box :: new ( Error :: SqlxError ( err) ) ) ) ) ?;
610616
611617 Ok ( casbin_rule)
612618}
613619
614620#[ cfg( feature = "mysql" ) ]
615621pub ( crate ) async fn load_policy ( conn : & ConnectionPool ) -> Result < Vec < CasbinRule > > {
616- let casbin_rule: Vec < CasbinRule > = sqlx:: query_as!( CasbinRule , "SELECT * FROM casbin_rule" )
617- . fetch_all ( conn)
618- . await
619- . map_err ( |err| CasbinError :: from ( AdapterError ( Box :: new ( Error :: SqlxError ( err) ) ) ) ) ?;
622+ let casbin_rule: Vec < CasbinRule > = sqlx:: query_as!(
623+ CasbinRule ,
624+ "SELECT id, ptype, v0, v1, v2, v3, v4, v5 FROM casbin_rule"
625+ )
626+ . fetch_all ( conn)
627+ . await
628+ . map_err ( |err| CasbinError :: from ( AdapterError ( Box :: new ( Error :: SqlxError ( err) ) ) ) ) ?;
620629
621630 Ok ( casbin_rule)
622631}
@@ -630,7 +639,7 @@ pub(crate) async fn load_filtered_policy<'a>(
630639
631640 let casbin_rule: Vec < CasbinRule > = sqlx:: query_as!(
632641 CasbinRule ,
633- "SELECT * from casbin_rule WHERE (
642+ "SELECT id, ptype, v0, v1, v2, v3, v4, v5 from casbin_rule WHERE (
634643 ptype LIKE 'g%' AND v0 LIKE $1 AND v1 LIKE $2 AND v2 LIKE $3 AND v3 LIKE $4 AND v4 LIKE $5 AND v5 LIKE $6 )
635644 OR (
636645 ptype LIKE 'p%' AND v0 LIKE $7 AND v1 LIKE $8 AND v2 LIKE $9 AND v3 LIKE $10 AND v4 LIKE $11 AND v5 LIKE $12 );
@@ -653,7 +662,7 @@ pub(crate) async fn load_filtered_policy<'a>(
653662
654663 let casbin_rule: Vec < CasbinRule > = sqlx:: query_as!(
655664 CasbinRule ,
656- "SELECT * from casbin_rule WHERE (
665+ "SELECT id, ptype, v0, v1, v2, v3, v4, v5 from casbin_rule WHERE (
657666 ptype LIKE 'g%' AND v0 LIKE $1 AND v1 LIKE $2 AND v2 LIKE $3 AND v3 LIKE $4 AND v4 LIKE $5 AND v5 LIKE $6 )
658667 OR (
659668 ptype LIKE 'p%' AND v0 LIKE $7 AND v1 LIKE $8 AND v2 LIKE $9 AND v3 LIKE $10 AND v4 LIKE $11 AND v5 LIKE $12 );
@@ -676,7 +685,7 @@ pub(crate) async fn load_filtered_policy<'a>(
676685
677686 let casbin_rule: Vec < CasbinRule > = sqlx:: query_as!(
678687 CasbinRule ,
679- "SELECT * from casbin_rule WHERE (
688+ "SELECT id, ptype, v0, v1, v2, v3, v4, v5 from casbin_rule WHERE (
680689 ptype LIKE 'g%' AND v0 LIKE ? AND v1 LIKE ? AND v2 LIKE ? AND v3 LIKE ? AND v4 LIKE ? AND v5 LIKE ? )
681690 OR (
682691 ptype LIKE 'p%' AND v0 LIKE ? AND v1 LIKE ? AND v2 LIKE ? AND v3 LIKE ? AND v4 LIKE ? AND v5 LIKE ? );
0 commit comments