sql: pluralize the object type in abbreviated grants (#38438)

Author: sjwiesman

src/sql-parser/src/ast/defs/statement.rs

@@ -5836,8 +5836,8 @@ impl<T: AstInfo> AstDisplay for AbbreviatedGrantStatement<T> {
         f.write_str("GRANT ");
         f.write_node(&self.privileges);
         f.write_str(" ON ");
-        f.write_node(&self.object_type);
-        f.write_str("S TO ");
+        write_grant_object_type_plural(f, &self.object_type);
+        f.write_str(" TO ");
         f.write_node(&display::comma_separated(&self.grantees));
     }
 }
@@ -5860,8 +5860,8 @@ impl<T: AstInfo> AstDisplay for AbbreviatedRevokeStatement<T> {
         f.write_str("REVOKE ");
         f.write_node(&self.privileges);
         f.write_str(" ON ");
-        f.write_node(&self.object_type);
-        f.write_str("S FROM ");
+        write_grant_object_type_plural(f, &self.object_type);
+        f.write_str(" FROM ");
         f.write_node(&display::comma_separated(&self.revokees));
     }
 }

src/sql-parser/tests/sqlparser_common.rs

@@ -377,6 +377,27 @@ fn test_grant_revoke_all_policies_roundtrips() {
     }
 }
 
+#[mz_ore::test]
+fn test_alter_default_privileges_policies_roundtrips() {
+    for sql in [
+        "ALTER DEFAULT PRIVILEGES FOR ROLE owner GRANT USAGE ON POLICIES TO j",
+        "ALTER DEFAULT PRIVILEGES FOR ROLE owner REVOKE USAGE ON POLICIES FROM j",
+    ] {
+        let displayed = parse_statements(sql)
+            .unwrap_or_else(|e| panic!("{sql:?} should parse: {e}"))
+            .into_iter()
+            .next()
+            .unwrap()
+            .ast
+            .to_ast_string_simple();
+        assert!(
+            displayed.contains("ON POLICIES") && !displayed.contains("POLICYS"),
+            "{sql:?} mis-pluralized network policies: {displayed:?}"
+        );
+        assert_display_roundtrips(sql);
+    }
+}
+
 #[mz_ore::test]
 #[cfg_attr(miri, ignore)] // unsupported operation: can't call foreign function `rust_psm_stack_pointer` on OS `linux`
 fn test_negated_cast_display_roundtrip() {