Skip to content

Commit 9707f2b

Browse files
authored
feat: select columns explicitly (#102)
1 parent 55f53cc commit 9707f2b

File tree

3 files changed

+28
-19
lines changed

3 files changed

+28
-19
lines changed

.sqlx/query-3022cb733970ae5836ab3891367b209a7e1f0974242ecd0f55e5b0098152bad5.json renamed to .sqlx/query-3ae7e28de7cb8896086c186dbc0e78f2a23eff67925322bdd3646d063d710584.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.sqlx/query-fb7ce69e70b345d2cf0ca017523c1b90b67b053add3d4cffb8d579bfc8f08345.json renamed to .sqlx/query-530d3f59ba6d986d3354242ff25faae78671d69c8935d2a2d57c0f9d1e91e832.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/actions.rs

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -593,30 +593,39 @@ pub async fn remove_filtered_policy(
593593

594594
#[cfg(feature = "postgres")]
595595
pub(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")]
605608
pub(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")]
615621
pub(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

Comments
 (0)