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 dj...@apache.org on 2006/08/21 02:14:25 UTC
svn commit: r433096 - in
/db/derby/code/branches/10.2/java/engine/org/apache/derby:
iapi/sql/dictionary/ impl/sql/catalog/
Author: djd
Date: Sun Aug 20 17:14:23 2006
New Revision: 433096
URL: http://svn.apache.org/viewvc?rev=433096&view=rev
Log:
DERBY-1674 (partial) Move PermissionsCatalogRowFactory into its correct location under impl/sql/catalog.
System tables are a detail of the catalog implementation, not the dictionary api. The class was only ever referenced
in the impl/sql/catalog package.
Merge of 432972 from trunk
Added:
db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/PermissionsCatalogRowFactory.java (props changed)
- copied unchanged from r432972, db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/PermissionsCatalogRowFactory.java
Removed:
db/derby/code/branches/10.2/java/engine/org/apache/derby/iapi/sql/dictionary/PermissionsCatalogRowFactory.java
Modified:
db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java
db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java
db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java
Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java?rev=433096&r1=433095&r2=433096&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java (original)
+++ db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java Sun Aug 20 17:14:23 2006
@@ -29,7 +29,6 @@
import org.apache.derby.iapi.sql.dictionary.AliasDescriptor;
import org.apache.derby.iapi.sql.dictionary.CatalogRowFactory;
-import org.apache.derby.iapi.sql.dictionary.PermissionsCatalogRowFactory;
import org.apache.derby.iapi.sql.dictionary.ColumnDescriptor;
import org.apache.derby.iapi.sql.dictionary.ColumnDescriptorList;
@@ -10171,7 +10170,7 @@
perm.setGrantee( grantee);
TabInfo ti = getNonCoreTI( catalogNumber);
PermissionsCatalogRowFactory rf = (PermissionsCatalogRowFactory) ti.getCatalogRowFactory();
- int primaryIndexNumber = rf.getPrimaryIndexNumber();
+ int primaryIndexNumber = rf.getPrimaryKeyIndexNumber();
ConglomerateController heapCC = tc.openConglomerate( ti.getHeapConglomerate(),
false, // do not keep open across commits
0,
Propchange: db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/PermissionsCatalogRowFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java?rev=433096&r1=433095&r2=433096&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java (original)
+++ db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java Sun Aug 20 17:14:23 2006
@@ -21,7 +21,6 @@
package org.apache.derby.impl.sql.catalog;
-import org.apache.derby.iapi.sql.dictionary.PermissionsCatalogRowFactory;
import org.apache.derby.iapi.sql.dictionary.ColPermsDescriptor;
import org.apache.derby.iapi.sql.dictionary.DataDescriptorGenerator;
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
@@ -312,7 +311,7 @@
return row;
} // end of buildIndexKeyRow
- public int getPrimaryIndexNumber()
+ public int getPrimaryKeyIndexNumber()
{
return GRANTEE_TABLE_TYPE_GRANTOR_INDEX_NUM;
}
Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java?rev=433096&r1=433095&r2=433096&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java (original)
+++ db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java Sun Aug 20 17:14:23 2006
@@ -25,7 +25,6 @@
import org.apache.derby.iapi.sql.dictionary.TupleDescriptor;
import org.apache.derby.iapi.sql.dictionary.RoutinePermsDescriptor;
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
-import org.apache.derby.iapi.sql.dictionary.PermissionsCatalogRowFactory;
import org.apache.derby.iapi.sql.dictionary.PermissionsDescriptor;
import org.apache.derby.iapi.error.StandardException;
@@ -280,7 +279,7 @@
return row;
} // end of buildIndexKeyRow
- public int getPrimaryIndexNumber()
+ public int getPrimaryKeyIndexNumber()
{
return GRANTEE_ALIAS_GRANTOR_INDEX_NUM;
}
Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java?rev=433096&r1=433095&r2=433096&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java (original)
+++ db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java Sun Aug 20 17:14:23 2006
@@ -25,7 +25,6 @@
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.services.sanity.SanityManager;
import org.apache.derby.iapi.services.uuid.UUIDFactory;
-import org.apache.derby.iapi.sql.dictionary.PermissionsCatalogRowFactory;
import org.apache.derby.iapi.sql.dictionary.PermissionsDescriptor;
import org.apache.derby.iapi.sql.dictionary.DataDescriptorGenerator;
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
@@ -368,7 +367,7 @@
return row;
} // end of buildIndexRow
- public int getPrimaryIndexNumber()
+ public int getPrimaryKeyIndexNumber()
{
return GRANTEE_TABLE_GRANTOR_INDEX_NUM;
}