@@ -55,7 +55,7 @@ fn parse_map_access_expr() {
5555 "indexOf" ,
5656 [
5757 Expr :: Identifier ( Ident :: new( "string_names" ) ) ,
58- Expr :: Value ( Value :: SingleQuotedString ( "endpoint" . to_string( ) ) )
58+ Expr :: Value ( ( Value :: SingleQuotedString ( "endpoint" . to_string( ) ) ) . with_empty_span ( ) )
5959 ]
6060 ) ,
6161 } ) ] ,
@@ -71,7 +71,7 @@ fn parse_map_access_expr() {
7171 left: Box :: new( BinaryOp {
7272 left: Box :: new( Identifier ( Ident :: new( "id" ) ) ) ,
7373 op: BinaryOperator :: Eq ,
74- right: Box :: new( Expr :: Value ( Value :: SingleQuotedString ( "test" . to_string( ) ) ) ) ,
74+ right: Box :: new( Expr :: Value ( ( Value :: SingleQuotedString ( "test" . to_string( ) ) ) . with_empty_span ( ) ) ) ,
7575 } ) ,
7676 op: BinaryOperator :: And ,
7777 right: Box :: new( BinaryOp {
@@ -82,13 +82,13 @@ fn parse_map_access_expr() {
8282 "indexOf" ,
8383 [
8484 Expr :: Identifier ( Ident :: new( "string_name" ) ) ,
85- Expr :: Value ( Value :: SingleQuotedString ( "app" . to_string( ) ) )
85+ Expr :: Value ( ( Value :: SingleQuotedString ( "app" . to_string( ) ) ) . with_empty_span ( ) )
8686 ]
8787 ) ,
8888 } ) ] ,
8989 } ) ,
9090 op: BinaryOperator :: NotEq ,
91- right: Box :: new( Expr :: Value ( Value :: SingleQuotedString ( "foo" . to_string( ) ) ) ) ,
91+ right: Box :: new( Expr :: Value ( ( Value :: SingleQuotedString ( "foo" . to_string( ) ) ) . with_empty_span ( ) ) ) ,
9292 } ) ,
9393 } ) ,
9494 group_by: GroupByExpr :: Expressions ( vec![ ] , vec![ ] ) ,
@@ -114,8 +114,8 @@ fn parse_array_expr() {
114114 assert_eq ! (
115115 & Expr :: Array ( Array {
116116 elem: vec![
117- Expr :: Value ( Value :: SingleQuotedString ( "1" . to_string( ) ) ) ,
118- Expr :: Value ( Value :: SingleQuotedString ( "2" . to_string( ) ) ) ,
117+ Expr :: Value ( ( Value :: SingleQuotedString ( "1" . to_string( ) ) ) . with_empty_span ( ) ) ,
118+ Expr :: Value ( ( Value :: SingleQuotedString ( "2" . to_string( ) ) ) . with_empty_span ( ) ) ,
119119 ] ,
120120 named: false ,
121121 } ) ,
@@ -1014,17 +1014,17 @@ fn parse_select_parametric_function() {
10141014 assert_eq ! ( parameters. args. len( ) , 2 ) ;
10151015 assert_eq ! (
10161016 parameters. args[ 0 ] ,
1017- FunctionArg :: Unnamed ( FunctionArgExpr :: Expr ( Expr :: Value ( Value :: Number (
1017+ FunctionArg :: Unnamed ( FunctionArgExpr :: Expr ( Expr :: Value ( ( Value :: Number (
10181018 "0.5" . parse( ) . unwrap( ) ,
10191019 false
1020- ) ) ) )
1020+ ) ) . with_empty_span ( ) ) ) )
10211021 ) ;
10221022 assert_eq ! (
10231023 parameters. args[ 1 ] ,
1024- FunctionArg :: Unnamed ( FunctionArgExpr :: Expr ( Expr :: Value ( Value :: Number (
1024+ FunctionArg :: Unnamed ( FunctionArgExpr :: Expr ( Expr :: Value ( ( Value :: Number (
10251025 "0.6" . parse( ) . unwrap( ) ,
10261026 false
1027- ) ) ) )
1027+ ) ) . with_empty_span ( ) ) ) )
10281028 ) ;
10291029 }
10301030 _ => unreachable ! ( ) ,
@@ -1074,19 +1074,19 @@ fn parse_select_order_by_with_fill_interpolate() {
10741074 asc: Some ( true ) ,
10751075 nulls_first: Some ( true ) ,
10761076 with_fill: Some ( WithFill {
1077- from: Some ( Expr :: Value ( number( "10" ) ) ) ,
1078- to: Some ( Expr :: Value ( number( "20" ) ) ) ,
1079- step: Some ( Expr :: Value ( number( "2" ) ) ) ,
1077+ from: Some ( Expr :: Value ( ( number( "10" ) ) . with_empty_span ( ) ) ) ,
1078+ to: Some ( Expr :: Value ( ( number( "20" ) ) . with_empty_span ( ) ) ) ,
1079+ step: Some ( Expr :: Value ( ( number( "2" ) ) . with_empty_span ( ) ) ) ,
10801080 } ) ,
10811081 } ,
10821082 OrderByExpr {
10831083 expr: Expr :: Identifier ( Ident :: new( "lname" ) ) ,
10841084 asc: Some ( false ) ,
10851085 nulls_first: Some ( false ) ,
10861086 with_fill: Some ( WithFill {
1087- from: Some ( Expr :: Value ( number( "30" ) ) ) ,
1088- to: Some ( Expr :: Value ( number( "40" ) ) ) ,
1089- step: Some ( Expr :: Value ( number( "3" ) ) ) ,
1087+ from: Some ( Expr :: Value ( ( number( "30" ) ) . with_empty_span ( ) ) ) ,
1088+ to: Some ( Expr :: Value ( ( number( "40" ) ) . with_empty_span ( ) ) ) ,
1089+ step: Some ( Expr :: Value ( ( number( "3" ) ) . with_empty_span ( ) ) ) ,
10901090 } ) ,
10911091 } ,
10921092 ] ,
@@ -1096,14 +1096,14 @@ fn parse_select_order_by_with_fill_interpolate() {
10961096 expr: Some ( Expr :: BinaryOp {
10971097 left: Box :: new( Expr :: Identifier ( Ident :: new( "col1" ) ) ) ,
10981098 op: BinaryOperator :: Plus ,
1099- right: Box :: new( Expr :: Value ( number( "1" ) ) ) ,
1099+ right: Box :: new( Expr :: Value ( ( number( "1" ) ) . with_empty_span ( ) ) ) ,
11001100 } ) ,
11011101 } ] )
11021102 } )
11031103 } ,
11041104 select. order_by. expect( "ORDER BY expected" )
11051105 ) ;
1106- assert_eq ! ( Some ( Expr :: Value ( number( "2" ) ) ) , select. limit) ;
1106+ assert_eq ! ( Some ( Expr :: Value ( ( number( "2" ) ) . with_empty_span ( ) ) ) , select. limit) ;
11071107}
11081108
11091109#[ test]
@@ -1144,9 +1144,9 @@ fn parse_with_fill() {
11441144 let select = clickhouse ( ) . verified_query ( sql) ;
11451145 assert_eq ! (
11461146 Some ( WithFill {
1147- from: Some ( Expr :: Value ( number( "10" ) ) ) ,
1148- to: Some ( Expr :: Value ( number( "20" ) ) ) ,
1149- step: Some ( Expr :: Value ( number( "2" ) ) ) ,
1147+ from: Some ( Expr :: Value ( ( number( "10" ) ) . with_empty_span ( ) ) ) ,
1148+ to: Some ( Expr :: Value ( ( number( "20" ) ) . with_empty_span ( ) ) ) ,
1149+ step: Some ( Expr :: Value ( ( number( "2" ) ) . with_empty_span ( ) ) ) ,
11501150 } ) ,
11511151 select. order_by. expect( "ORDER BY expected" ) . exprs[ 0 ] . with_fill
11521152 ) ;
@@ -1183,7 +1183,7 @@ fn parse_interpolate_body_with_columns() {
11831183 expr: Some ( Expr :: BinaryOp {
11841184 left: Box :: new( Expr :: Identifier ( Ident :: new( "col1" ) ) ) ,
11851185 op: BinaryOperator :: Plus ,
1186- right: Box :: new( Expr :: Value ( number( "1" ) ) ) ,
1186+ right: Box :: new( Expr :: Value ( ( number( "1" ) ) . with_empty_span ( ) ) ) ,
11871187 } ) ,
11881188 } ,
11891189 InterpolateExpr {
@@ -1195,7 +1195,7 @@ fn parse_interpolate_body_with_columns() {
11951195 expr: Some ( Expr :: BinaryOp {
11961196 left: Box :: new( Expr :: Identifier ( Ident :: new( "col4" ) ) ) ,
11971197 op: BinaryOperator :: Plus ,
1198- right: Box :: new( Expr :: Value ( number( "4" ) ) ) ,
1198+ right: Box :: new( Expr :: Value ( ( number( "4" ) ) . with_empty_span ( ) ) ) ,
11991199 } ) ,
12001200 } ,
12011201 ] )
@@ -1236,7 +1236,7 @@ fn test_prewhere() {
12361236 Some ( & BinaryOp {
12371237 left: Box :: new( Identifier ( Ident :: new( "x" ) ) ) ,
12381238 op: BinaryOperator :: Eq ,
1239- right: Box :: new( Expr :: Value ( Value :: Number ( "1" . parse( ) . unwrap( ) , false ) ) ) ,
1239+ right: Box :: new( Expr :: Value ( ( Value :: Number ( "1" . parse( ) . unwrap( ) , false ) ) . with_empty_span ( ) ) ) ,
12401240 } )
12411241 ) ;
12421242 let selection = query. as_ref ( ) . body . as_select ( ) . unwrap ( ) . selection . as_ref ( ) ;
@@ -1245,7 +1245,7 @@ fn test_prewhere() {
12451245 Some ( & BinaryOp {
12461246 left: Box :: new( Identifier ( Ident :: new( "y" ) ) ) ,
12471247 op: BinaryOperator :: Eq ,
1248- right: Box :: new( Expr :: Value ( Value :: Number ( "2" . parse( ) . unwrap( ) , false ) ) ) ,
1248+ right: Box :: new( Expr :: Value ( ( Value :: Number ( "2" . parse( ) . unwrap( ) , false ) ) . with_empty_span ( ) ) ) ,
12491249 } )
12501250 ) ;
12511251 }
@@ -1261,13 +1261,13 @@ fn test_prewhere() {
12611261 left: Box :: new( BinaryOp {
12621262 left: Box :: new( Identifier ( Ident :: new( "x" ) ) ) ,
12631263 op: BinaryOperator :: Eq ,
1264- right: Box :: new( Expr :: Value ( Value :: Number ( "1" . parse( ) . unwrap( ) , false ) ) ) ,
1264+ right: Box :: new( Expr :: Value ( ( Value :: Number ( "1" . parse( ) . unwrap( ) , false ) ) . with_empty_span ( ) ) ) ,
12651265 } ) ,
12661266 op: BinaryOperator :: And ,
12671267 right: Box :: new( BinaryOp {
12681268 left: Box :: new( Identifier ( Ident :: new( "y" ) ) ) ,
12691269 op: BinaryOperator :: Eq ,
1270- right: Box :: new( Expr :: Value ( Value :: Number ( "2" . parse( ) . unwrap( ) , false ) ) ) ,
1270+ right: Box :: new( Expr :: Value ( ( Value :: Number ( "2" . parse( ) . unwrap( ) , false ) ) . with_empty_span ( ) ) ) ,
12711271 } ) ,
12721272 } )
12731273 ) ;
@@ -1375,10 +1375,10 @@ fn parse_create_table_on_commit_and_as_query() {
13751375 assert_eq ! ( on_commit, Some ( OnCommit :: PreserveRows ) ) ;
13761376 assert_eq ! (
13771377 query. unwrap( ) . body. as_select( ) . unwrap( ) . projection,
1378- vec![ UnnamedExpr ( Expr :: Value ( Value :: Number (
1378+ vec![ UnnamedExpr ( Expr :: Value ( ( Value :: Number (
13791379 "1" . parse( ) . unwrap( ) ,
13801380 false
1381- ) ) ) ]
1381+ ) ) . with_empty_span ( ) ) ) ]
13821382 ) ;
13831383 }
13841384 _ => unreachable ! ( ) ,
0 commit comments