@@ -9,7 +9,7 @@ use std::sync::Arc;
99
1010/// make count sql remove `limit`
1111/// make select sql append limit ${page_no},${page_size}
12- /// notice:
12+ /// notice:
1313/// ```log
1414/// sql must be starts with 'select ' and ' from '
1515/// this PageIntercept only support sqlite,mysql,mssql,postgres...
@@ -48,6 +48,14 @@ impl PageIntercept {
4848count_ids : Arc :: new ( SyncHashMap :: new ( ) ) ,
4949}
5050}
51+
52+ //driver_type=['postgres','pg','mssql','mysql','sqlite'...],but sql default is use '?'
53+ pub fn count_param_count ( & self , _driver_type : & str , sql : & str ) ->usize {
54+ sql. replace ( "$" , "?" )
55+ . replace ( "@p" , "?" )
56+ . matches ( '?' )
57+ . count ( )
58+ }
5159}
5260#[ async_trait]
5361impl Intercept for PageIntercept {
@@ -56,7 +64,7 @@ impl Intercept for PageIntercept {
5664_task_id : i64 ,
5765executor : & dyn Executor ,
5866sql : & mut String ,
59- _args : & mut Vec < Value > ,
67+ args : & mut Vec < Value > ,
6068result : ResultType < & mut Result < ExecResult , Error > , & mut Result < Vec < Value > , Error > > ,
6169) ->Result < Option < bool > , Error > {
6270if let ResultType :: Exec ( _) = result{
@@ -73,6 +81,14 @@ impl Intercept for PageIntercept {
7381* sql =( & sql[ ..idx] ) . to_string ( ) ;
7482}
7583if let Some ( idx) = sql. rfind ( " order by " ) {
84+ //remove args(args.pop())
85+ let order_by_clause =& sql[ idx..] ;
86+ let driver_type = executor. driver_type ( ) . unwrap_or_default ( ) ;
87+ let param_count =self . count_param_count ( driver_type, & order_by_clause) ;
88+ // 移除对应的参数
89+ for _in 0 ..param_count{
90+ args. pop ( ) ;
91+ }
7692* sql =( & sql[ ..idx] ) . to_string ( ) ;
7793}
7894}