progress

Author: psteinroe

agentic/pretty_printer.md

@@ -139,10 +139,13 @@ fn emit_aexpr_op_any(e: &mut EventEmitter, n: &AExpr) {
 
     e.token(TokenKind::ANY_KW);
     e.space();
+    e.token(TokenKind::L_PAREN);
 
     if let Some(ref rexpr) = n.rexpr {
         super::emit_node(rexpr, e);
     }
+
+    e.token(TokenKind::R_PAREN);
 }
 
 // expr op ALL (subquery)
@@ -163,10 +166,13 @@ fn emit_aexpr_op_all(e: &mut EventEmitter, n: &AExpr) {
 
     e.token(TokenKind::ALL_KW);
     e.space();
+    e.token(TokenKind::L_PAREN);
 
     if let Some(ref rexpr) = n.rexpr {
         super::emit_node(rexpr, e);
     }
+
+    e.token(TokenKind::R_PAREN);
 }
 
 // expr IS DISTINCT FROM expr2

agentic/session_log.md

@@ -10,19 +10,29 @@ pub(super) fn emit_a_indices(e: &mut EventEmitter, n: &AIndices) {
 
     e.token(TokenKind::L_BRACK);
 
-    // Lower bound (if slice)
-    if let Some(ref lidx) = n.lidx {
-        super::emit_node(lidx, e);
-    }
+    if n.is_slice {
+        if let Some(ref lidx) = n.lidx {
+            super::emit_node(lidx, e);
+        }
 
-    // If upper bound exists, this is a slice [lower:upper]
-    if n.uidx.is_some() {
+        // Colon distinguishes slice syntax from single index lookups.
         e.token(TokenKind::IDENT(":".to_string()));
-    }
 
-    // Upper bound
-    if let Some(ref uidx) = n.uidx {
-        super::emit_node(uidx, e);
+        if let Some(ref uidx) = n.uidx {
+            super::emit_node(uidx, e);
+        }
+    } else {
+        // Non-slice access should render whichever bound PostgreSQL stored.
+        match (&n.lidx, &n.uidx) {
+            (Some(lidx), None) => super::emit_node(lidx, e),
+            (None, Some(uidx)) => super::emit_node(uidx, e),
+            (Some(lidx), Some(uidx)) => {
+                debug_assert!(false, "AIndices with both bounds but is_slice = false");
+                super::emit_node(lidx, e);
+                super::emit_node(uidx, e);
+            }
+            (None, None) => {}
+        }
     }
 
     e.token(TokenKind::R_BRACK);

crates/pgls_pretty_print/src/nodes/a_expr.rs

@@ -11,7 +11,22 @@ pub(super) fn emit_a_indirection(e: &mut EventEmitter, n: &AIndirection) {
     // Emit the base expression
     // Some expressions need parentheses when used with indirection (e.g., ROW(...))
     let needs_parens = if let Some(ref arg) = n.arg {
+        let has_indices = n
+            .indirection
+            .iter()
+            .any(|node| matches!(node.node.as_ref(), Some(pgls_query::NodeEnum::AIndices(_))));
+
+        let safe_without_parens = matches!(
+            arg.node.as_ref(),
+            Some(
+                pgls_query::NodeEnum::ColumnRef(_)
+                    | pgls_query::NodeEnum::ParamRef(_)
+                    | pgls_query::NodeEnum::AIndirection(_)
+            )
+        );
+
         matches!(arg.node.as_ref(), Some(pgls_query::NodeEnum::RowExpr(_)))
+            || (has_indices && !safe_without_parens)
     } else {
         false
     };

crates/pgls_pretty_print/src/nodes/a_indices.rs

@@ -1,5 +1,7 @@
 use crate::TokenKind;
-use crate::emitter::{EventEmitter, GroupKind};
+use crate::emitter::{EventEmitter, GroupKind, LineType};
+
+use super::node_list::emit_dot_separated_list;
 use pgls_query::protobuf::{AlterObjectSchemaStmt, ObjectType};
 
 pub(super) fn emit_alter_object_schema_stmt(e: &mut EventEmitter, n: &AlterObjectSchemaStmt) {
@@ -15,6 +17,8 @@ pub(super) fn emit_alter_object_schema_stmt(e: &mut EventEmitter, n: &AlterObjec
         ObjectType::ObjectView => "VIEW",
         ObjectType::ObjectMatview => "MATERIALIZED VIEW",
         ObjectType::ObjectIndex => "INDEX",
+        ObjectType::ObjectOpclass => "OPERATOR CLASS",
+        ObjectType::ObjectOpfamily => "OPERATOR FAMILY",
         ObjectType::ObjectForeignTable => "FOREIGN TABLE",
         ObjectType::ObjectCollation => "COLLATION",
         ObjectType::ObjectConversion => "CONVERSION",
@@ -45,12 +49,17 @@ pub(super) fn emit_alter_object_schema_stmt(e: &mut EventEmitter, n: &AlterObjec
     if let Some(ref relation) = n.relation {
         super::emit_range_var(e, relation);
     } else if let Some(ref object) = n.object {
-        super::emit_node(object, e);
+        match n.object_type() {
+            ObjectType::ObjectOpclass | ObjectType::ObjectOpfamily => {
+                emit_operator_collection_object(e, object)
+            }
+            _ => super::emit_node(object, e),
+        }
     }
 
     // Emit new schema
     if !n.newschema.is_empty() {
-        e.space();
+        e.line(LineType::SoftOrSpace);
         e.token(TokenKind::SET_KW);
         e.space();
         e.token(TokenKind::IDENT("SCHEMA".to_string()));
@@ -62,3 +71,19 @@ pub(super) fn emit_alter_object_schema_stmt(e: &mut EventEmitter, n: &AlterObjec
 
     e.group_end();
 }
+
+fn emit_operator_collection_object(e: &mut EventEmitter, object: &pgls_query::Node) {
+    if let Some(pgls_query::NodeEnum::List(list)) = &object.node {
+        if list.items.len() >= 2 {
+            let (method_node, name_nodes) = list.items.split_first().unwrap();
+            emit_dot_separated_list(e, name_nodes);
+            e.space();
+            e.token(TokenKind::USING_KW);
+            e.space();
+            super::emit_node(method_node, e);
+            return;
+        }
+    }
+
+    super::emit_node(object, e);
+}