Skip to content

Commit 0e8b278

Browse files
refactor eventhub peer
1 parent 9fbfb42 commit 0e8b278

File tree

4 files changed

+14
-17
lines changed

4 files changed

+14
-17
lines changed

src/ast/mod.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -2372,11 +2372,10 @@ pub enum PeerType {
23722372
Mongo,
23732373
Snowflake,
23742374
Postgres,
2375-
EventHub,
2376-
EventHubGroup,
23772375
S3,
23782376
SQLServer,
23792377
Kafka,
2378+
Eventhubs,
23802379
}
23812380

23822381
impl fmt::Display for PeerType {
@@ -2386,11 +2385,10 @@ impl fmt::Display for PeerType {
23862385
PeerType::Mongo => write!(f, "MONGO"),
23872386
PeerType::Snowflake => write!(f, "SNOWFLAKE"),
23882387
PeerType::Postgres => write!(f, "POSTGRES"),
2389-
PeerType::EventHub => write!(f, "EVENTHUB"),
2390-
PeerType::EventHubGroup => write!(f, "EVENTHUBGROUP"),
23912388
PeerType::S3 => write!(f, "S3"),
23922389
PeerType::SQLServer => write!(f, "SQLSERVER"),
23932390
PeerType::Kafka => write!(f, "KAFKA"),
2391+
PeerType::Eventhubs => write!(f, "EVENTHUBS"),
23942392
}
23952393
}
23962394
}

src/keywords.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,7 @@ define_keywords!(
254254
ERROR,
255255
ESCAPE,
256256
EVENT,
257-
EVENTHUB,
258-
EVENTHUBGROUP,
257+
EVENTHUBS,
259258
EVERY,
260259
EXCEPT,
261260
EXCLUDE,

src/parser/mod.rs

+3-6
Original file line numberDiff line numberDiff line change
@@ -8396,18 +8396,16 @@ impl<'a> Parser<'a> {
83968396
Keyword::KAFKA,
83978397
Keyword::S3,
83988398
Keyword::SQLSERVER,
8399-
Keyword::EVENTHUB,
8400-
Keyword::EVENTHUBGROUP,
8399+
Keyword::EVENTHUBS,
84018400
]) {
84028401
Some(Keyword::BIGQUERY) => Ok(PeerType::Bigquery),
84038402
Some(Keyword::MONGO) => Ok(PeerType::Mongo),
84048403
Some(Keyword::SNOWFLAKE) => Ok(PeerType::Snowflake),
84058404
Some(Keyword::POSTGRES) => Ok(PeerType::Postgres),
84068405
Some(Keyword::KAFKA) => Ok(PeerType::Kafka),
84078406
Some(Keyword::S3) => Ok(PeerType::S3),
8408-
Some(Keyword::EVENTHUB) => Ok(PeerType::EventHub),
84098407
Some(Keyword::SQLSERVER) => Ok(PeerType::SQLServer),
8410-
Some(Keyword::EVENTHUBGROUP) => Ok(PeerType::EventHubGroup),
8408+
Some(Keyword::EVENTHUBS) => Ok(PeerType::Eventhubs),
84118409
other => {
84128410
let supported_peer_types = [
84138411
"BIGQUERY",
@@ -8417,8 +8415,7 @@ impl<'a> Parser<'a> {
84178415
"KAFKA",
84188416
"S3",
84198417
"SQLSERVER",
8420-
"EVENTHUB",
8421-
"EVENTHUBGROUP",
8418+
"EVENTHUBS",
84228419
];
84238420
let err = format!(
84248421
"expected peertype as one of {}, got {:#?}",

tests/sqlparser_postgres.rs

+8-5
Original file line numberDiff line numberDiff line change
@@ -3415,22 +3415,25 @@ fn parse_create_single_mirror_no_options() {
34153415
}
34163416

34173417
#[test]
3418-
fn parse_create_eventhub_group_peer() {
3418+
fn parse_create_eventhubs_peer() {
34193419
match pg()
3420-
.verified_stmt("CREATE PEER eventhub_group_1 FROM EVENTHUBGROUP WITH (customer_1 = true)")
3420+
.verified_stmt("CREATE PEER myevent FROM EVENTHUBS WITH (eventhubs = '{\"subscription_id\":\"mysubscriptionid\",\"resource_group\":\"sai-test\",\"namespace\":\"test-namespace\",\"location\":\"eastus\",\"partition_count\":5,\"message_retention_in_days\":2}')")
34213421
{
34223422
Statement::CreatePeer {
34233423
if_not_exists: _,
34243424
peer_name: _,
34253425
peer_type,
34263426
with_options,
34273427
} => {
3428-
assert_eq!(peer_type, PeerType::EventHubGroup);
3428+
assert_eq!(peer_type, PeerType::Eventhubs);
34293429
assert_eq!(
34303430
with_options,
34313431
vec![SqlOption {
3432-
name: Ident::new("customer_1"),
3433-
value: sqlparser::ast::Value::Boolean(true)
3432+
name: Ident::new("eventhubs"),
3433+
value: sqlparser::ast::Value::SingleQuotedString(
3434+
"{\"subscription_id\":\"mysubscriptionid\",\"resource_group\":\"sai-test\",\"namespace\":\"test-namespace\",\"location\":\"eastus\",\"partition_count\":5,\"message_retention_in_days\":2}"
3435+
.into()
3436+
)
34343437
}]
34353438
);
34363439
}

0 commit comments

Comments
 (0)