test: Handle cleanup of privileged connection in DatabaseMetaDataTest

sehrope · sehrope · commit 5c6041b49146 · 2021-09-11T09:03:08.000-04:00
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
@@ -64,7 +64,6 @@ public static Iterable<Object[]> data() {
 
   @Before
   public void setUp() throws Exception {
-    Connection conPriv = TestUtil.openPrivilegedDB();
     if (binaryMode == BinaryMode.FORCE) {
       final Properties props = new Properties();
       PGProperty.PREPARE_THRESHOLD.set(props, -1);
@@ -93,7 +92,9 @@ public void setUp() throws Exception {
     TestUtil.execute("comment on table duplicate is 'duplicate table'", con);
     TestUtil.execute("create or replace function bar() returns integer language sql as $$ select 1 $$", con);
     TestUtil.execute("comment on function bar() is 'bar function'", con);
-    TestUtil.execute("update pg_description set objoid = 'duplicate'::regclass where objoid = 'bar'::regproc",conPriv);
+    try (Connection conPriv = TestUtil.openPrivilegedDB()) {
+      TestUtil.execute("update pg_description set objoid = 'duplicate'::regclass where objoid = 'bar'::regproc", conPriv);
+    }
 
     // 8.2 does not support arrays of composite types
     TestUtil.createTable(con, "customtable", "c1 custom, c2 _custom"
