This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to tag REL8_3_607 in repository libpostgresql-jdbc-java.
commit 1c4f1a66ea26eb7ecf06c83289aacb106fcfc113 Author: Kris Jurka <[email protected]> Date: Sat Oct 16 00:39:27 2010 +0000 Handle a table with no permissions correctly. Problem reported by danap. --- org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java | 5 ++++- org/postgresql/test/jdbc2/DatabaseMetaDataTest.java | 12 +++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java b/org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java index 81225cd..efeb8c5 100644 --- a/org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java +++ b/org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java @@ -3,7 +3,7 @@ * Copyright (c) 2004-2008, PostgreSQL Global Development Group * * IDENTIFICATION -* $PostgreSQL: pgjdbc/org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java,v 1.44.2.3 2009/03/12 03:59:58 jurka Exp $ +* $PostgreSQL: pgjdbc/org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java,v 1.44.2.4 2010/05/01 16:52:28 jurka Exp $ * *------------------------------------------------------------------------- */ @@ -2766,6 +2766,9 @@ public abstract class AbstractJdbc2DatabaseMetaData */ private void addACLPrivileges(String acl, Hashtable privileges) { int equalIndex = acl.lastIndexOf("="); + if (equalIndex == -1) + return; + String name = acl.substring(0, equalIndex); if (name.length() == 0) { diff --git a/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java b/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java index 09acea7..0b9ab70 100644 --- a/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java +++ b/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java @@ -3,7 +3,7 @@ * Copyright (c) 2004-2008, PostgreSQL Global Development Group * * IDENTIFICATION -* $PostgreSQL: pgjdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java,v 1.41 2008/01/20 15:13:29 jurka Exp $ +* $PostgreSQL: pgjdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java,v 1.41.2.1 2008/11/07 09:11:49 jurka Exp $ * *------------------------------------------------------------------------- */ @@ -377,6 +377,16 @@ public class DatabaseMetaDataTest extends TestCase assertTrue("Couldn't find SELECT priv on table testmetadata for " + TestUtil.getUser(), l_foundSelect); } + public void testNoTablePrivileges() throws SQLException + { + Statement stmt = con.createStatement(); + stmt.execute("REVOKE ALL ON testmetadata FROM PUBLIC"); + stmt.execute("REVOKE ALL ON testmetadata FROM " + TestUtil.getUser()); + DatabaseMetaData dbmd = con.getMetaData(); + ResultSet rs = dbmd.getTablePrivileges(null, null, "testmetadata"); + assertTrue(!rs.next()); + } + public void testPrimaryKeys() throws SQLException { // At the moment just test that no exceptions are thrown KJ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libpostgresql-jdbc-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
