Skip to content

Commit 7fc634c

Browse files
authored
Bump parser version (#1168)
There's one place we can benefit from mutable lists, and a couple of things that slipped through resolving a merge conflict
1 parent 2d2079b commit 7fc634c

7 files changed

Lines changed: 12 additions & 14 deletions

File tree

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pgdog/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ smallvec = "1"
8080
reqwest.workspace = true
8181
hex = "0.4"
8282
x509-parser = "0.18"
83-
pg_raw_parse = { git = "https://github.com/pgdogdev/pg_raw_parse.git", rev = "6c7cee4", optional = true }
83+
pg_raw_parse = { git = "https://github.com/pgdogdev/pg_raw_parse.git", rev = "48b4944", optional = true }
8484
itertools = "0.15.0"
8585

8686
[target.'cfg(unix)'.dependencies]

pgdog/src/frontend/router/parser/function.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ mod test {
139139
unreachable!();
140140
};
141141

142-
for node in stmt.targetList() {
142+
for node in stmt.target_list() {
143143
let func = Function::try_from(node.val()).unwrap();
144144
check(func);
145145
}

pgdog/src/frontend/router/parser/rewrite/statement/aggregate/engine.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,9 @@ impl AggregatesRewrite {
6969
if helper_nodes.is_empty() {
7070
RewriteOutput::default()
7171
} else {
72-
let mut target_list = select
73-
.target_list()
74-
.into_iter()
75-
.map(|n| mem.make_unique(n))
76-
.collect::<Vec<_>>();
77-
target_list.extend(helper_nodes);
78-
select.set_target_list(mem.make_list(&target_list));
72+
select
73+
.target_list_mut()
74+
.extend(mem, mem.make_list(&helper_nodes));
7975
RewriteOutput::new(plan)
8076
}
8177
}

pgdog/src/frontend/router/parser/rewrite/statement/simple_prepared.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ use pg_raw_parse::{NodeMut, make::MemoryToken};
55
#[cfg(not(feature = "new_parser"))]
66
use pgdog_config::QueryParserEngine;
77

8+
#[cfg(not(feature = "new_parser"))]
9+
use crate::backend::ShardingSchema;
10+
use crate::frontend::PreparedStatements;
811
use crate::net::Parse;
9-
use crate::{backend::ShardingSchema, frontend::PreparedStatements};
1012

1113
use super::{Error, StatementRewrite};
1214

@@ -55,7 +57,7 @@ impl StatementRewrite<'_> {
5557
return Ok(result);
5658
}
5759

58-
match rewrite_single_prepared(node, mem, self.prepared_statements, self.schema)? {
60+
match rewrite_single_prepared(node, mem, self.prepared_statements)? {
5961
SimplePreparedRewrite::Prepared => {
6062
result.rewritten = true;
6163
}

pgdog/src/frontend/router/parser/rewrite/statement/update.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ impl<'a> StatementRewrite<'a> {
622622
fn rewrite_params(node: NodeMut<'_, '_>) -> IndexSet<u16> {
623623
let mut params = IndexSet::new();
624624
walk::walk_mut(node, |node| match node {
625-
NodeMut::ParamRef(mut param) => {
625+
NodeMut::ParamRef(param) => {
626626
params.insert(param.number as _);
627627
param.set_number(params.get_index_of(&(param.number as u16)).unwrap() as i32 + 1)
628628
}

pgdog/src/frontend/router/parser/value.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ mod test {
281281
fn selected_expr(result: &pg_raw_parse::ParseResult) -> Node<'_> {
282282
let stmt = result.stmts().exactly_one().ok().unwrap();
283283
match stmt {
284-
Node::SelectStmt(s) => s.targetList().into_iter().exactly_one().unwrap().val(),
284+
Node::SelectStmt(s) => s.target_list().into_iter().exactly_one().unwrap().val(),
285285
_ => unreachable!(),
286286
}
287287
}

0 commit comments

Comments
 (0)