@@ -734,7 +734,7 @@ function formatFixVariableWrapper(field, info, v) {
734
734
return formatFixVariable ( _type , v ) ;
735
735
}
736
736
737
- function getFilters ( filter_arg , info , alias = 'x' ) {
737
+ function getFilters ( filter_arg , info ) {
738
738
let filters = [ ] ;
739
739
for ( let i in filter_arg ) {
740
740
let filter = filter_arg [ i ] ;
@@ -789,58 +789,58 @@ function getFilters(filter_arg, info, alias = 'x'){
789
789
790
790
if ( filter . _eq != null ) {
791
791
let preparedArg = formatFixVariableWrapper ( i , info , filter . _eq ) ;
792
- filters . push ( [ aql `${ alias } .${ i } == ${ preparedArg } ` ] ) ;
792
+ filters . push ( [ aql `x .${ i } == ${ preparedArg } ` ] ) ;
793
793
}
794
794
if ( filter . _neq != null ) {
795
795
let preparedArgs = formatFixVariableWrapper ( i , info , filter . _neq ) ;
796
- filters . push ( [ aql `${ alias } .${ i } != ${ preparedArgs } ` ] ) ;
796
+ filters . push ( [ aql `x .${ i } != ${ preparedArgs } ` ] ) ;
797
797
}
798
798
if ( filter . _gt != null ) {
799
799
let preparedArgs = formatFixVariableWrapper ( i , info , filter . _gt ) ;
800
- filters . push ( [ aql `${ alias } .${ i } > ${ preparedArgs } ` ] ) ;
800
+ filters . push ( [ aql `x .${ i } > ${ preparedArgs } ` ] ) ;
801
801
}
802
802
if ( filter . _egt != null ) {
803
803
let preparedArgs = formatFixVariableWrapper ( i , info , filter . _egt ) ;
804
- filters . push ( [ aql `${ alias } .${ i } >= ${ preparedArgs } ` ] ) ;
804
+ filters . push ( [ aql `x .${ i } >= ${ preparedArgs } ` ] ) ;
805
805
}
806
806
if ( filter . _lt != null ) {
807
807
let preparedArgs = formatFixVariableWrapper ( i , info , filter . _lt ) ;
808
- filters . push ( [ aql `${ alias } .${ i } < ${ preparedArgs } ` ] ) ;
808
+ filters . push ( [ aql `x .${ i } < ${ preparedArgs } ` ] ) ;
809
809
}
810
810
if ( filter . _elt != null ) {
811
811
let preparedArgs = formatFixVariableWrapper ( i , info , filter . _elt ) ;
812
- filters . push ( [ aql `${ alias } .${ i } <= ${ preparedArgs } ` ] ) ;
812
+ filters . push ( [ aql `x .${ i } <= ${ preparedArgs } ` ] ) ;
813
813
}
814
814
if ( filter . _in != null ) {
815
815
let preparedArgs = formatFixVariableWrapper ( i , info , filter . _in )
816
816
let q = [ ] ;
817
- q = q . concat ( [ aql `${ alias } .${ i } IN ` ] ) ;
817
+ q = q . concat ( [ aql `x .${ i } IN ` ] ) ;
818
818
q = q . concat ( asAqlArray ( preparedArgs ) ) ;
819
819
filters . push ( q ) ;
820
820
}
821
821
if ( filter . _nin != null ) {
822
822
let preparedArgs = formatFixVariableWrapper ( i , info , filter . _nin ) ;
823
823
let q = [ ] ;
824
- q = q . concat ( [ aql `${ alias } .${ i } NOT IN ` ] ) ;
824
+ q = q . concat ( [ aql `x .${ i } NOT IN ` ] ) ;
825
825
q = q . concat ( asAqlArray ( preparedArgs ) ) ;
826
826
filters . push ( q ) ;
827
827
}
828
828
829
829
if ( filter . _like != null ) {
830
830
let preparedArgs = formatFixVariableWrapper ( i , info , filter . _like ) ;
831
- filters . push ( [ aql `LIKE(${ alias } .${ i } , ${ preparedArgs } , false)` ] ) ;
831
+ filters . push ( [ aql `LIKE(x .${ i } , ${ preparedArgs } , false)` ] ) ;
832
832
}
833
833
if ( filter . _ilike != null ) {
834
834
let preparedArgs = formatFixVariableWrapper ( i , info , filter . _ilike ) ;
835
- filters . push ( [ aql `LIKE(${ alias } .${ i } , ${ preparedArgs } , true)` ] ) ;
835
+ filters . push ( [ aql `LIKE(x .${ i } , ${ preparedArgs } , true)` ] ) ;
836
836
}
837
837
if ( filter . _nlike != null ) {
838
838
let preparedArgs = formatFixVariableWrapper ( i , info , filter . _nlike ) ;
839
- filters . push ( [ aql `NOT LIKE(${ alias } .${ i } , ${ preparedArgs } , false)` ] ) ;
839
+ filters . push ( [ aql `NOT LIKE(x .${ i } , ${ preparedArgs } , false)` ] ) ;
840
840
}
841
841
if ( filter . _nilike != null ) {
842
842
let preparedArgs = formatFixVariableWrapper ( i , info , filter . _nilike ) ;
843
- filters . push ( [ aql `NOT LIKE(${ alias } .${ i } , ${ preparedArgs } , true)` ] ) ;
843
+ filters . push ( [ aql `NOT LIKE(x .${ i } , ${ preparedArgs } , true)` ] ) ;
844
844
}
845
845
846
846
}
0 commit comments