chore: cleanup

Author: psteinroe

crates/codegen/src/get_location.rs

@@ -50,6 +50,11 @@ pub fn get_location_mod(proto_file: &ProtoFile) -> proc_macro2::TokenStream {
  } else {
  None
  },
+ NodeEnum::NullTest(n) => if n.arg.is_some() {
+ get_location_internal(&n.arg.as_ref().unwrap().node.as_ref().unwrap())
+ } else {
+ Some(n.location)
+ },
  #(NodeEnum::#node_identifiers(n) => #location_idents),*
  };
  if location.is_some() && location.unwrap() < 0 {

crates/codegen/src/get_node_properties.rs

@@ -166,14 +166,34 @@ fn custom_handlers(node: &Node) -> TokenStream {
  },
  "BoolExpr" => quote! {
  match n.boolop {
+ // AndExpr = 1
  1 => tokens.push(TokenProperty::from(Token::And)),
+ // OrExpr = 2
  2 => tokens.push(TokenProperty::from(Token::Or)),
+ // NotExpr = 3
+ 3 => tokens.push(TokenProperty::from(Token::Not)),
  _ => panic!("Unknown BoolExpr {:#?}", n.boolop),
  }
  },
  "JoinExpr" => quote! {
  tokens.push(TokenProperty::from(Token::Join));
  tokens.push(TokenProperty::from(Token::On));
+ match n.jointype {
+ // JoinInner = 1
+ 1 => tokens.push(TokenProperty::from(Token::InnerP)),
+ // JoinLeft = 2
+ 2 => tokens.push(TokenProperty::from(Token::Left)),
+ // JoinFull = 3
+ 3 => tokens.push(TokenProperty::from(Token::Full)),
+ // JoinRight = 4
+ 4 => tokens.push(TokenProperty::from(Token::Right)),
+ // JoinSemi = 5
+ // JoinAnti = 6
+ // JoinUniqueOuter = 7
+ // JoinUniqueInner = 8
+ _ => panic!("Unknown JoinExpr jointype {:#?}", n.jointype),
+ }
+
  },
  "ResTarget" => quote! {
  if n.name.len() > 0 {
@@ -195,6 +215,30 @@ fn custom_handlers(node: &Node) -> TokenStream {
  "CollateClause" => quote! {
  tokens.push(TokenProperty::from(Token::Collate));
  },
+ "AExpr" => quote! {
+ match n.kind {
+ // AexprOp = 1,
+ 1 => {
+ // do nothing
+ },
+ // AexprOpAny = 2,
+ 2 => tokens.push(TokenProperty::from(Token::Any)),
+ // AexprOpAll = 3,
+ // AexprDistinct = 4,
+ // AexprNotDistinct = 5,
+ // AexprNullif = 6,
+ // AexprIn = 7,
+ 7 => tokens.push(TokenProperty::from(Token::InP)),
+ // AexprLike = 8,
+ // AexprIlike = 9,
+ // AexprSimilar = 10,
+ // AexprBetween = 11,
+ // AexprNotBetween = 12,
+ // AexprBetweenSym = 13,
+ // AexprNotBetweenSym = 14,
+ _ => panic!("Unknown AExpr kind {:#?}", n.kind),
+ }
+ },
  "WindowDef" => quote! {
  if n.partition_clause.len() > 0 || n.order_clause.len() > 0 {
  tokens.push(TokenProperty::from(Token::Window));
@@ -406,6 +450,22 @@ fn custom_handlers(node: &Node) -> TokenStream {
  "CaseExpr" => quote! {
  tokens.push(TokenProperty::from(Token::Case));
  tokens.push(TokenProperty::from(Token::EndP));
+ if n.defresult.is_some() {
+ tokens.push(TokenProperty::from(Token::Else));
+ }
+ },
+ "NullTest" => quote! {
+ match n.nulltesttype {
+ // IsNull
+ 1 => tokens.push(TokenProperty::from(Token::Is)),
+ // IsNotNull
+ 2 => {
+ tokens.push(TokenProperty::from(Token::Is));
+ tokens.push(TokenProperty::from(Token::Not));
+ },
+ _ => panic!("Unknown NullTest {:#?}", n.nulltesttype),
+ }
+ tokens.push(TokenProperty::from(Token::NullP));
  },
  "CreateFunctionStmt" => quote! {
  tokens.push(TokenProperty::from(Token::Create));

crates/parser/src/codegen.rs

@@ -25,6 +25,6 @@ mod tests {
  };
 
  let node_graph = get_nodes(&pg_query_root.unwrap(), 0);
- assert_eq!(node_graph.node_count(), 13);
+ assert_eq!(node_graph.node_count(), 14);
  }
 }

crates/parser/src/parse/libpg_query_node.rs

@@ -4,7 +4,7 @@ use crate::{
  codegen::{get_nodes, Node, SyntaxKind},
  lexer::TokenType,
 };
-use log::debug;
+use log::{debug, log_enabled};
 use petgraph::{
  stable_graph::{DefaultIx, NodeIndex, StableGraph},
  visit::{Bfs, Dfs},
@@ -67,6 +67,9 @@ impl<'p> LibpgQueryNodeParser<'p> {
  debug!("current node: {:#?}", self.current_node);
  debug!("current token: {:#?}", self.current_token());
  debug!("current location: {:#?}", self.current_location());
+ if log_enabled!(log::Level::Debug) {
+ debug!("node graph: {:#?}", self.node_graph);
+ }
  if self.at_whitespace() {
  debug!("skipping whitespace");
  self.parser.advance();
@@ -140,10 +143,9 @@ impl<'p> LibpgQueryNodeParser<'p> {
  self.parser.advance();
  } else {
  panic!(
- "could not find node for token {:?} at depth {} in {:#?}",
+ "could not find node for token {:?} at depth {}",
  self.current_token(),
  self.parser.depth,
- self.node_graph
  );
  }
  }
@@ -231,7 +233,7 @@ impl<'p> LibpgQueryNodeParser<'p> {
  debug!("found node with location at current location");
  // check if the location of the node is the current location
  // do a depth-first search to find the first node that either has a location that
- // is not the current one, or has properties that are not the current token
+ // is not the current one, or has the current token as a property
  let mut dfs = Dfs::new(&self.node_graph, nx);
  let mut target_nx = nx;
  while let Some(node_idx) = dfs.next(&self.node_graph) {
@@ -377,7 +379,10 @@ impl<'p> LibpgQueryNodeParser<'p> {
  }
 
  fn current_location(&self) -> usize {
- usize::from(self.current_token().span.start())
+ usize::from(
+ self.current_token().span.start()
+ - self.parser.tokens[self.token_range.start].span.start(),
+ )
  }
 
  fn current_token(&self) -> &crate::lexer::Token {
@@ -389,7 +394,6 @@ impl<'p> LibpgQueryNodeParser<'p> {
  }
 
  fn at_whitespace(&self) -> bool {
- // TODO: merge whitespace token def with whitespace def in parser
  self.current_token().token_type == TokenType::Whitespace
  }
 

crates/parser/src/parse/statement.rs

@@ -11,7 +11,6 @@ use crate::Parser;
 pub fn statement(parser: &mut Parser, kind: SyntaxKind) {
  let token_range = collect_statement_token_range(parser, kind);
  let tokens = parser.tokens.get(token_range.clone()).unwrap().to_vec();
- println!("tokens: {:?}", tokens);
  match pg_query::parse(
  tokens
  .iter()

crates/parser/src/parser.rs

@@ -293,116 +293,36 @@ mod tests {
  }
 
  #[test]
- fn test_parser_beefy() {
+ fn test_parser_anonther() {
  init();
 
- panic_after(Duration::from_millis(1000), || {
- let input = "SELECT
- c.oid::int8 AS id,
- nc.nspname AS schema,
- c.relname AS name,
- c.relrowsecurity AS rls_enabled,
- c.relforcerowsecurity AS rls_forced,
- CASE
- WHEN c.relreplident = 'd' THEN 'DEFAULT'
- WHEN c.relreplident = 'i' THEN 'INDEX'
- WHEN c.relreplident = 'f' THEN 'FULL'
- ELSE 'NOTHING'
- END AS replica_identity,
- pg_total_relation_size(format('%I.%I', nc.nspname, c.relname)) :: int8 AS bytes,
- pg_size_pretty(
- pg_total_relation_size(format('%I.%I', nc.nspname, c.relname))
- ) AS size,
- pg_stat_get_live_tuples(c.oid) AS live_rows_estimate,
- pg_stat_get_dead_tuples(c.oid) AS dead_rows_estimate,
- obj_description(c.oid) AS comment,
- coalesce(pk.primary_keys, '[]') as primary_keys,
- coalesce(
- jsonb_agg(relationships) filter (where relationships is not null),
- '[]'
- ) as relationships
-FROM
- pg_namespace nc
- JOIN pg_class c ON nc.oid = c.relnamespace
- left join (
- select
- table_id,
- jsonb_agg(_pk.*) as primary_keys
- from (
- select
- n.nspname as schema,
- c.relname as table_name,
- a.attname as name,
- c.oid :: int8 as table_id
- from
- pg_index i,
- pg_class c,
- pg_attribute a,
- pg_namespace n
- where
- i.indrelid = c.oid
- and c.relnamespace = n.oid
- and a.attrelid = c.oid
- and a.attnum = any (i.indkey)
- and i.indisprimary
- ) as _pk
- group by table_id
- ) as pk
- on pk.table_id = c.oid
- left join (
- select
- c.oid :: int8 as id,
- c.conname as constraint_name,
- nsa.nspname as source_schema,
- csa.relname as source_table_name,
- sa.attname as source_column_name,
- nta.nspname as target_table_schema,
- cta.relname as target_table_name,
- ta.attname as target_column_name
- from
- pg_constraint c
- join (
- pg_attribute sa
- join pg_class csa on sa.attrelid = csa.oid
- join pg_namespace nsa on csa.relnamespace = nsa.oid
- ) on sa.attrelid = c.conrelid and sa.attnum = any (c.conkey)
- join (
- pg_attribute ta
- join pg_class cta on ta.attrelid = cta.oid
- join pg_namespace nta on cta.relnamespace = nta.oid
- ) on ta.attrelid = c.confrelid and ta.attnum = any (c.confkey)
- where
- c.contype = 'f'
- ) as relationships
- on (relationships.source_schema = nc.nspname and relationships.source_table_name = c.relname)
- or (relationships.target_table_schema = nc.nspname and relationships.target_table_name = c.relname)
-WHERE
- c.relkind IN ('r', 'p')
- AND NOT pg_is_other_temp_schema(nc.oid)
- AND (
- pg_has_role(c.relowner, 'USAGE')
- OR has_table_privilege(
- c.oid,
- 'SELECT, INSERT, UPDATE, DELETE, TRUNCATE, REFERENCES, TRIGGER'
- )
- OR has_any_column_privilege(c.oid, 'SELECT, INSERT, UPDATE, REFERENCES')
- )
-group by
- c.oid,
- c.relname,
- c.relrowsecurity,
- c.relforcerowsecurity,
- c.relreplident,
- nc.nspname,
- pk.primary_keys";
-
- let mut p = Parser::new(lex(input));
- source(&mut p);
- let result = p.finish();
+ let input = "SELECT 1 from contact c
+ JOIN pg_class c ON nc.oid = c.relnamespace
+ left join (
+ select
+ table_id,
+ jsonb_agg(_pk.*) as primary_keys
+ from (
+ select 1
+ from
+ pg_index i,
+ pg_class c,
+ pg_attribute a,
+ pg_namespace n
+ where
+ i.indrelid = c.oid
+ and c.relnamespace = n.oid
+ ) as _pk
+ group by table_id
+ ) as pk
+ on pk.table_id = c.oid;";
+
+ let mut p = Parser::new(lex(input));
+ source(&mut p);
+ let result = p.finish();
 
- dbg!(&result.cst);
- println!("{:#?}", result.errors);
- })
+ dbg!(&result.cst);
+ println!("{:#?}", result.errors);
  }
 
  #[test]
@@ -425,49 +345,16 @@ group by
  fn test_parser_simple() {
  init();
 
- panic_after(Duration::from_millis(100), || {
- let input = "alter table x rename to y \n alter table x alter column z set default 1";
+ let input = "alter table x rename to y \n alter table x alter column z set default 1";
 
- let mut p = Parser::new(lex(input));
- source(&mut p);
- let result = p.finish();
-
- dbg!(&result.cst);
- println!("{:#?}", result.errors);
- })
- }
-
- #[test]
- fn test_parser_temp() {
- init();
-
- let mut p = Parser::new(lex("select 1;"));
+ let mut p = Parser::new(lex(input));
  source(&mut p);
  let result = p.finish();
 
  dbg!(&result.cst);
  println!("{:#?}", result.errors);
  }
 
- #[test]
- fn test_parser_playground() {
- init();
-
- let res = pg_query::parse(
- " CREATE TABLE weather (
- city varchar(80) references cities(name),
- temp_lo int,
- temp_hi int,
- prcp real,
- date date
- );",
- )
- .unwrap();
- res.protobuf.nodes().iter().for_each(|node| {
- println!("{:#?}", node);
- });
- }
-
  fn panic_after<T, F>(d: Duration, f: F) -> T
  where
  T: Send + 'static,