Skip to content

Commit f0840c1

Browse files
committed
Rebase: fix test drift
1 parent e5d6791 commit f0840c1

File tree

3 files changed

+25
-11
lines changed

3 files changed

+25
-11
lines changed

tests/sqlparser_common.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ fn parse_invalid_limit_by() {
10071007
.unwrap_err()
10081008
);
10091009
assert_eq!(
1010-
ParserError::ParserError("Expected: an SQL statement, found: BY".to_string()),
1010+
ParserError::ParserError("Expected: an SQL statement, found: name".to_string()),
10111011
all_dialects_not_requiring_semicolon_statement_delimiter()
10121012
.parse_sql_statements("SELECT * FROM user BY name")
10131013
.unwrap_err()

tests/sqlparser_databricks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ fn parse_table_time_travel() {
398398
.parse_sql_statements("SELECT 1 FROM t1 FOR TIMESTAMP AS OF 'some_timestamp'")
399399
.is_err());
400400

401-
assert!(all_dialects_where(|d| d.supports_table_versioning())
401+
assert!(all_dialects_where(|d| d.supports_table_versioning() && !d.supports_statements_without_semicolon_delimiter())
402402
.parse_sql_statements("SELECT 1 FROM t1 VERSION AS OF 1 - 2",)
403403
.is_err())
404404
}

tests/sqlparser_mssql.rs

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2899,7 +2899,9 @@ fn test_supports_statements_without_semicolon_delimiter() {
28992899
pipe_operators: vec![],
29002900
body: Box::new(SetExpr::Select(Box::new(Select {
29012901
select_token: AttachedToken::empty(),
2902+
optimizer_hints: vec![],
29022903
distinct: None,
2904+
select_modifiers: None,
29032905
top: None,
29042906
top_before_distinct: false,
29052907
projection: vec![SelectItem::UnnamedExpr(Expr::Value(
@@ -2920,7 +2922,7 @@ fn test_supports_statements_without_semicolon_delimiter() {
29202922
window_before_qualify: false,
29212923
qualify: None,
29222924
value_table_mode: None,
2923-
connect_by: None,
2925+
connect_by: vec![],
29242926
flavor: SelectFlavor::Standard,
29252927
}))),
29262928
})),
@@ -2936,7 +2938,9 @@ fn test_supports_statements_without_semicolon_delimiter() {
29362938
pipe_operators: vec![],
29372939
body: Box::new(SetExpr::Select(Box::new(Select {
29382940
select_token: AttachedToken::empty(),
2941+
optimizer_hints: vec![],
29392942
distinct: None,
2943+
select_modifiers: None,
29402944
top: None,
29412945
top_before_distinct: false,
29422946
projection: vec![SelectItem::UnnamedExpr(Expr::Value(
@@ -2957,7 +2961,7 @@ fn test_supports_statements_without_semicolon_delimiter() {
29572961
window_before_qualify: false,
29582962
qualify: None,
29592963
value_table_mode: None,
2960-
connect_by: None,
2964+
connect_by: vec![],
29612965
flavor: SelectFlavor::Standard
29622966
}))),
29632967
})),
@@ -3031,6 +3035,8 @@ fn test_supports_statements_without_semicolon_delimiter() {
30313035
behavior: None,
30323036
called_on_null: None,
30333037
parallel: None,
3038+
security: None,
3039+
set_params: vec![],
30343040
using: None,
30353041
language: None,
30363042
determinism_specifier: None,
@@ -3114,7 +3120,9 @@ fn test_supports_statements_without_semicolon_delimiter() {
31143120
with: None,
31153121
body: Box::new(SetExpr::Select(Box::new(Select {
31163122
select_token: AttachedToken::empty(),
3123+
optimizer_hints: vec![],
31173124
distinct: None,
3125+
select_modifiers: None,
31183126
top: None,
31193127
top_before_distinct: false,
31203128
projection: vec![SelectItem::UnnamedExpr(
@@ -3138,7 +3146,7 @@ fn test_supports_statements_without_semicolon_delimiter() {
31383146
qualify: None,
31393147
window_before_qualify: false,
31403148
value_table_mode: None,
3141-
connect_by: None,
3149+
connect_by: vec![],
31423150
flavor: SelectFlavor::Standard,
31433151
}),)),
31443152
order_by: None,
@@ -3195,7 +3203,9 @@ fn test_supports_statements_without_semicolon_delimiter() {
31953203
output: false,
31963204
default: false,
31973205
},
3198-
Statement::Update {
3206+
Statement::Update(Update {
3207+
update_token: AttachedToken::empty(),
3208+
optimizer_hints: vec![],
31993209
table: TableWithJoins {
32003210
relation: TableFactor::Table {
32013211
name: ObjectName::from(vec![Ident::new("my_table")]),
@@ -3218,12 +3228,13 @@ fn test_supports_statements_without_semicolon_delimiter() {
32183228
),
32193229
target: AssignmentTarget::ColumnName(ObjectName::from(vec![Ident::new("col")])),
32203230
},],
3231+
from: None,
32213232
selection: None,
32223233
returning: None,
3223-
from: None,
3234+
output: None,
32243235
or: None,
32253236
limit: None,
3226-
},
3237+
}),
32273238
]
32283239
);
32293240

@@ -3256,7 +3267,9 @@ fn test_supports_statements_without_semicolon_delimiter() {
32563267
output: false,
32573268
default: false,
32583269
},
3259-
Statement::Update {
3270+
Statement::Update(Update {
3271+
update_token: AttachedToken::empty(),
3272+
optimizer_hints: vec![],
32603273
table: TableWithJoins {
32613274
relation: TableFactor::Table {
32623275
name: ObjectName::from(vec![Ident::with_span(
@@ -3285,12 +3298,13 @@ fn test_supports_statements_without_semicolon_delimiter() {
32853298
"col"
32863299
)])),
32873300
},],
3301+
from: None,
32883302
selection: None,
32893303
returning: None,
3290-
from: None,
3304+
output: None,
32913305
or: None,
32923306
limit: None,
3293-
},
3307+
}),
32943308
]
32953309
);
32963310
}

0 commit comments

Comments
 (0)