progress

Author: psteinroe

crates/pgt_pretty_print/src/nodes.rs

@@ -711,25 +711,27 @@ impl ToTokens for pgt_query::protobuf::ResTarget {
         if e.is_within_group(GroupKind::UpdateStmt) {
             if !self.name.is_empty() {
                 e.token(TokenKind::IDENT(self.name.clone()));
+                for d in &self.indirection {
+                    e.token(TokenKind::DOT);
+                    d.to_tokens(e);
+                }
                 e.space();
                 e.token(TokenKind::IDENT("=".to_string()));
                 e.space();
             }
             if let Some(ref val) = self.val {
                 val.to_tokens(e);
             }
-        } else {
-            if let Some(ref val) = self.val {
-                val.to_tokens(e);
-                if !self.name.is_empty() {
-                    e.space();
-                    e.token(TokenKind::AS_KW);
-                    e.space();
-                    e.token(TokenKind::IDENT(self.name.clone()));
-                }
-            } else if !self.name.is_empty() {
+        } else if let Some(ref val) = self.val {
+            val.to_tokens(e);
+            if !self.name.is_empty() {
+                e.space();
+                e.token(TokenKind::AS_KW);
+                e.space();
                 e.token(TokenKind::IDENT(self.name.clone()));
             }
+        } else if !self.name.is_empty() {
+            e.token(TokenKind::IDENT(self.name.clone()));
         }
 
         e.group_end();
@@ -4183,14 +4185,21 @@ impl ToTokens for pgt_query::protobuf::CreateDomainStmt {
 
 impl ToTokens for pgt_query::protobuf::CollateClause {
     fn to_tokens(&self, e: &mut EventEmitter) {
+        if let Some(arg) = &self.arg {
+            arg.to_tokens(e);
+            e.space();
+        }
+
         e.token(TokenKind::COLLATE_KW);
         e.space();
 
         for (i, name) in self.collname.iter().enumerate() {
             if i > 0 {
                 e.token(TokenKind::DOT);
             }
+            e.token(TokenKind::IDENT('"'.to_string()));
             name.to_tokens(e);
+            e.token(TokenKind::IDENT('"'.to_string()));
         }
     }
 }

crates/pgt_pretty_print/tests/data/collate_expr_test_0_60.sql

@@ -0,0 +1,6 @@
+---
+source: crates/pgt_pretty_print/tests/tests.rs
+input_file: crates/pgt_pretty_print/tests/data/field_store_0_60.sql
+snapshot_kind: text
+---
+UPDATE my_table SET composite_col.field1 = 'new_value';

crates/pgt_pretty_print/tests/data/subscripting_ref_0_60.sql

@@ -13,6 +13,9 @@ use pgt_pretty_print::{
 )]
 fn test_formatter(fixture: Fixture<&str>) {
     let content = fixture.content();
+
+    println!("Original content: {}", content);
+
     let absolute_fixture_path = Utf8Path::new(fixture.path());
     let input_file = absolute_fixture_path;
     let test_name = absolute_fixture_path
@@ -30,6 +33,8 @@ fn test_formatter(fixture: Fixture<&str>) {
     let parsed = pgt_query::parse(content).expect("Failed to parse SQL");
     let mut ast = parsed.into_root().expect("No root node found");
 
+    println!("Original AST: {:?}", ast);
+
     let mut emitter = EventEmitter::new();
     ast.to_tokens(&mut emitter);
 
@@ -67,7 +72,7 @@ fn test_formatter(fixture: Fixture<&str>) {
 fn validate_test_data(fixture: Fixture<&str>) {
     let content = fixture.content();
     let absolute_fixture_path = Utf8Path::new(fixture.path());
-    let test_name = absolute_fixture_path
+    let _test_name = absolute_fixture_path
         .file_name()
         .and_then(|x| x.strip_suffix(".sql"))
         .unwrap();