db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1353578 - in /db/derby/code/trunk/java: engine/org/apache/derby/impl/sql/catalog/ testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/
Date Mon, 25 Jun 2012 14:35:07 GMT
Author: rhillegas
Date: Mon Jun 25 14:35:05 2012
New Revision: 1353578

URL: http://svn.apache.org/viewvc?rev=1353578&view=rev
Log:
DERBY-5688: Add 10.9.1.0 as a starting point in the upgrade tests.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/OldVersions.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java?rev=1353578&r1=1353577&r2=1353578&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java Mon
Jun 25 14:35:05 2012
@@ -495,7 +495,7 @@ public	class DD_Version implements	Forma
             bootingDictionary.upgradeSYSROUTINEPERMS_10_6( tc );
         }
         
-        if (fromMajorVersionNumber <= DataDictionary.DD_VERSION_DERBY_10_9)
+        if (fromMajorVersionNumber <= DataDictionary.DD_VERSION_DERBY_10_8)
         {
             // On ugrade from versions before 10.9, create system procedures
             // added in 10.9.
@@ -513,6 +513,13 @@ public	class DD_Version implements	Forma
             bootingDictionary.upgradeJarStorage(tc);
         }
 
+        if (fromMajorVersionNumber <= DataDictionary.DD_VERSION_DERBY_10_9)
+        {
+            // On ugrade from versions before 10.10, create system procedures
+            // added in 10.10.
+            bootingDictionary.create_10_10_system_procedures( tc, newlyCreatedRoutines );
+        }
+
         // Grant PUBLIC access to some system routines
         bootingDictionary.grantPublicAccessToSystemRoutines(newlyCreatedRoutines, tc, aid);
 	}

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=1353578&r1=1353577&r2=1353578&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 Jun 25 14:35:05 2012
@@ -11486,6 +11486,8 @@ public final class	DataDictionaryImpl
         create_10_6_system_procedures(tc, newlyCreatedRoutines );
         // add 10.9 specific system procedures
         create_10_9_system_procedures( tc, newlyCreatedRoutines );
+        // add 10.10 specific system procedures
+        create_10_10_system_procedures( tc, newlyCreatedRoutines );
     }
 
     /**
@@ -13283,6 +13285,21 @@ public final class	DataDictionaryImpl
                 tc);
         }
         
+    }
+
+    /**
+     * <p>
+     * Create system procedures that are part of the SYSCS_UTIL schema, added in version
10.10.
+     * </p>
+     *
+     * @param tc an instance of the Transaction Controller.
+     * @param newlyCreatedRoutines set of routines we are creating (used to add permissions
later on)
+     **/
+    void create_10_10_system_procedures( TransactionController   tc, HashSet newlyCreatedRoutines
)
+        throws StandardException
+    {
+        UUID  sysUtilUUID = getSystemUtilSchemaDescriptor().getUUID();
+
         // void SYSCS_UTIL.SYSCS_INVALIDATE_STORED_STATEMENTS()
         {               
             createSystemProcedureOrFunction(
@@ -13298,6 +13315,7 @@ public final class	DataDictionaryImpl
                 newlyCreatedRoutines,
                 tc);
         }
+        
     }
 
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/OldVersions.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/OldVersions.java?rev=1353578&r1=1353577&r2=1353578&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/OldVersions.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/OldVersions.java
Mon Jun 25 14:35:05 2012
@@ -54,6 +54,7 @@ public class OldVersions
         {10, 7, 1, 1}, // 10.7.1.1 (December 14, 2010/ SVN 1040133)
         {10, 8, 1, 2}, // 10.8.1.2 (April 29, 2011/ SVN 1095077)
         {10, 8, 2, 2}, // 10.8.2.2 (October 24, 2011/ SVN 1181258)
+        {10, 9, 1, 0}, // 10.9.1.0 (June 25, 2012/ SVN 1344872)
     };
 
     //Constant for special upgrade testing with both upgrade and create 



Mime
View raw message