progress

Author: psteinroe

crates/pgt_pretty_print/src/nodes/boolean.rs

@@ -7,8 +7,6 @@ use crate::{
 
 pub(super) fn emit_boolean(e: &mut EventEmitter, n: &Boolean) {
     e.group_start(GroupKind::Boolean);
-    // todo: user needs to be able to configure the case of boolean literals
-    let val_str = if n.boolval { "TRUE" } else { "FALSE" };
-    e.token(TokenKind::IDENT(val_str.to_string()));
+    e.token(TokenKind::BOOLEAN(n.boolval));
     e.group_end();
 }

crates/pgt_pretty_print/src/nodes/mod.rs

@@ -1,3 +1,12 @@
+macro_rules! assert_node_variant {
+    ($variant:ident, $expr:expr) => {
+        match $expr.node.as_ref() {
+            Some(pgt_query::NodeEnum::$variant(inner)) => inner,
+            other => panic!("Expected {}, got {:?}", stringify!($variant), other),
+        }
+    };
+}
+
 mod a_const;
 mod a_expr;
 mod a_star;
@@ -26,7 +35,7 @@ use integer::emit_integer;
 use range_var::emit_range_var;
 use res_target::emit_res_target;
 use select_stmt::emit_select_stmt;
-use string::{emit_string, emit_string_identifier, emit_string_literal};
+use string::{emit_identifier, emit_string, emit_string_identifier, emit_string_literal};
 use update_stmt::emit_update_stmt;
 
 use crate::emitter::EventEmitter;

crates/pgt_pretty_print/src/nodes/node_list.rs

@@ -3,13 +3,16 @@ use pgt_query::Node;
 use crate::TokenKind;
 use crate::emitter::{EventEmitter, LineType};
 
-pub(super) fn emit_comma_separated_list(e: &mut EventEmitter, nodes: &[Node]) {
+pub(super) fn emit_comma_separated_list<F>(e: &mut EventEmitter, nodes: &[Node], render: F)
+where
+    F: Fn(&Node, &mut EventEmitter),
+{
     for (i, n) in nodes.iter().enumerate() {
         if i > 0 {
             e.token(TokenKind::COMMA);
             e.line(LineType::SoftOrSpace);
         }
-        super::emit_node(n, e);
+        render(n, e);
     }
 }
 

crates/pgt_pretty_print/src/nodes/res_target.rs

@@ -3,26 +3,62 @@ use pgt_query::protobuf::ResTarget;
 use crate::TokenKind;
 use crate::emitter::{EventEmitter, GroupKind};
 
+use super::emit_identifier;
 use super::emit_node;
 
 pub(super) fn emit_res_target(e: &mut EventEmitter, n: &ResTarget) {
     e.group_start(GroupKind::ResTarget);
 
+    if let Some(ref val) = n.val {
+        emit_node(val, e);
+    } else {
+        return;
+    }
+
+    emit_column_name_with_indirection(e, n);
+
     if !n.name.is_empty() {
-        e.token(TokenKind::IDENT(n.name.clone()));
-        for i in &n.indirection {
-            if !matches!(i.node, Some(pgt_query::protobuf::node::Node::AIndices(_))) {
-                e.token(TokenKind::DOT);
-            }
-            emit_node(i, e);
-        }
         e.space();
-        e.token(TokenKind::IDENT("=".to_string()));
+        e.token(TokenKind::AS_KW);
         e.space();
+        emit_identifier(e, &n.name);
+    }
+
+    e.group_end();
+}
+
+pub(super) fn emit_set_clause(e: &mut EventEmitter, n: &ResTarget) {
+    e.group_start(GroupKind::ResTarget);
+
+    if n.name.is_empty() {
+        return;
     }
+
+    emit_column_name_with_indirection(e, n);
+
     if let Some(ref val) = n.val {
+        e.space();
+        e.token(TokenKind::IDENT("=".to_string()));
+        e.space();
         emit_node(val, e);
     }
 
     e.group_end();
 }
+
+pub(super) fn emit_column_name_with_indirection(e: &mut EventEmitter, n: &ResTarget) {
+    if n.name.is_empty() {
+        return;
+    }
+
+    e.token(TokenKind::IDENT(n.name.clone()));
+
+    for i in &n.indirection {
+        match &i.node {
+            // Field selection
+            Some(pgt_query::NodeEnum::String(n)) => super::emit_string_identifier(e, n),
+            Some(n) => super::emit_node_enum(n, e),
+            None => {}
+        }
+    }
+}

crates/pgt_pretty_print/src/nodes/select_stmt.rs

@@ -14,7 +14,7 @@ pub(super) fn emit_select_stmt(e: &mut EventEmitter, n: &SelectStmt) {
         e.indent_start();
         e.line(LineType::SoftOrSpace);
 
-        emit_comma_separated_list(e, &n.target_list);
+        emit_comma_separated_list(e, &n.target_list, super::emit_node);
 
         e.indent_end();
     }
@@ -26,7 +26,7 @@ pub(super) fn emit_select_stmt(e: &mut EventEmitter, n: &SelectStmt) {
 
         e.indent_start();
 
-        emit_comma_separated_list(e, &n.from_clause);
+        emit_comma_separated_list(e, &n.from_clause, super::emit_node);
 
         e.indent_end();
     }

crates/pgt_pretty_print/src/nodes/string.rs

@@ -19,6 +19,10 @@ pub(super) fn emit_string_literal(e: &mut EventEmitter, n: &String) {
 
 pub(super) fn emit_string_identifier(e: &mut EventEmitter, n: &String) {
     e.group_start(GroupKind::String);
-    e.token(TokenKind::IDENT(format!("\"{}\"", n.sval.clone())));
+    emit_identifier(e, &n.sval);
     e.group_end();
 }
+
+pub(super) fn emit_identifier(e: &mut EventEmitter, n: &str) {
+    e.token(TokenKind::IDENT(format!("\"{}\"", n)));
+}

crates/pgt_pretty_print/src/nodes/update_stmt.rs

@@ -1,7 +1,8 @@
-use pgt_query::protobuf::UpdateStmt;
+use pgt_query::protobuf::{ResTarget, UpdateStmt};
 
 use crate::TokenKind;
 use crate::emitter::{EventEmitter, GroupKind};
+use crate::nodes::res_target::emit_set_clause;
 
 use super::emit_node;
 use super::node_list::emit_comma_separated_list;
@@ -20,7 +21,9 @@ pub(super) fn emit_update_stmt(e: &mut EventEmitter, n: &UpdateStmt) {
         e.space();
         e.token(TokenKind::SET_KW);
         e.space();
-        emit_comma_separated_list(e, &n.target_list);
+        emit_comma_separated_list(e, &n.target_list, |n, e| {
+            emit_set_clause(e, assert_node_variant!(ResTarget, n))
+        });
     }
 
     if let Some(ref where_clause) = n.where_clause {