You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ba...@apache.org on 2006/07/31 16:48:21 UTC
svn commit: r427131 -
/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
Author: bandaram
Date: Mon Jul 31 07:48:21 2006
New Revision: 427131
URL: http://svn.apache.org/viewvc?rev=427131&view=rev
Log:
Disable attempting to drop permission descriptors in non SQL authorization mode. In soft upgrade mode to 10.2, it is possible not to have permission catalogs at all.
Submitted by Satheesh Bandaram (satheesh@sourcery.org)
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java?rev=427131&r1=427130&r2=427131&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java Mon Jul 31 07:48:21 2006
@@ -2406,6 +2406,10 @@
{
DataValueDescriptor tableIdOrderable;
+ // In Derby authorization mode, permission catalogs may not be present
+ if (!usesSqlAuthorization)
+ return;
+
/* Use tableIDOrderable in both start and stop position for scan. */
tableIdOrderable = getValueAsDVD(tableID);
@@ -2446,6 +2450,10 @@
DataValueDescriptor routineIdOrderable;
ExecRow curRow;
PermissionsDescriptor perm;
+
+ // In Derby authorization mode, permission catalogs may not be present
+ if (!usesSqlAuthorization)
+ return;
/* Use tableIDOrderable in both start and stop position for scan. */
routineIdOrderable = getValueAsDVD(routineID);