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 mi...@apache.org on 2007/04/05 18:52:33 UTC

svn commit: r525870 [2/2] - /db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java?view=diff&rev=525870&r1=525869&r2=525870
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java Thu Apr  5 09:52:32 2007
@@ -65,1808 +65,1809 @@
  */
 public interface StoredFormatIds {
 
-        /** Byte length of a two byt format id. */
-        int  TWO_BYTE_FORMAT_ID_BYTE_LENGTH = 2;
+    /** Byte length of a two byt format id. */
+    int  TWO_BYTE_FORMAT_ID_BYTE_LENGTH = 2;
 
-        /** Minimum value for a two byte format id. */
-        int  MIN_TWO_BYTE_FORMAT_ID = 0; //16384
-        /** Maximum value for a two byte format id. */
-        int  MAX_TWO_BYTE_FORMAT_ID = 0x7FFF; //32767
-        
-        int MIN_ID_2 = MIN_TWO_BYTE_FORMAT_ID;
+    /** Minimum value for a two byte format id. */
+    int  MIN_TWO_BYTE_FORMAT_ID = 0; //16384
+    /** Maximum value for a two byte format id. */
+    int  MAX_TWO_BYTE_FORMAT_ID = 0x7FFF; //32767
+    
+    int MIN_ID_2 = MIN_TWO_BYTE_FORMAT_ID;
 
-        // TEMP DJD
-        int MIN_ID_4 = MIN_ID_2 + 403;
+    // TEMP DJD
+    int MIN_ID_4 = MIN_ID_2 + 403;
 
-        /******************************************************************
-        **
-        **      How to add an ID for another Formatable class 
-    **
-        **      o       In the list of constants below, identify the module that
-        **              defines your class.
-        **
-        **      o       Add your class to the list to the end of that module 
-        **              use a number that is one greater than all existing formats
-        **              in that module, see MAX_ID_2 or MAX_ID_4 at the end of the 
-        **              file, these are the largest existing formatId.
-        **
-        **      o       update MAX_ID_2 and MAX_ID_4
-        **
-        **
-        **      o       Make sure that the getFormatId() method for your class
-        **              returns the constant that you just made up.
-        **
-        **      o       Now find your module startup code that registers Format
-        **              IDs. Add your class to that list.
-        **
-        **      o   Add a test for your new format ID to T_StoredFormat.java
-        **
-        ******************************************************************/
-
-
-        /******************************************************************
-        **
-        **      Formats for the StoredFormatModule
-        **
-        **
-        **
-        ******************************************************************/
-
-        /** Special format id for any null referance */
-        static public final int NULL_FORMAT_ID =
-                (MIN_ID_2 + 0);
-
-        /** Special format id for tagging UTF8 strings */
-        static public final int STRING_FORMAT_ID =
-                (MIN_ID_2 + 1);
-
-        /** Special format id for tagging Serializable objects. */
-        static public final int SERIALIZABLE_FORMAT_ID =
-                (MIN_ID_2 + 2);
-        
-        /******************************************************************
-        **
-        **      DataDictionary Formats
-        **
-        **
-        **
-        ******************************************************************/
-        /**
-            class org.apache.derby.iapi.types.BooleanTypeId
-         */
-        static public final int BOOLEAN_TYPE_ID =
-                (MIN_ID_2 + 4);
-        
-        /**
-            class org.apache.derby.iapi.types.BooleanTypeId
-         */
-        static public final int BOOLEAN_COMPILATION_TYPE_ID =
-                (MIN_ID_2 + 260);
-        
-        /**
-            class org.apache.derby.iapi.types.CharTypeId
-         */
-        static public final int CHAR_TYPE_ID =
-                (MIN_ID_2 + 5);
-
-        /**
-            class org.apache.derby.iapi.types.CharTypeId
-         */
-        static public final int CHAR_COMPILATION_TYPE_ID =
-                (MIN_ID_2 + 244);
-
-        /**
-            class org.apache.derby.iapi.types.DoubleTypeId
-         */
-        static public final int DOUBLE_TYPE_ID =
-                (MIN_ID_2 + 6);
-        
-        /**
-            class org.apache.derby.iapi.types.DoubleTypeId
-         */
-        static public final int DOUBLE_COMPILATION_TYPE_ID =
-                (MIN_ID_2 + 245);
-        
-        /**
-            class org.apache.derby.iapi.types.IntTypeId
-         */
-        static public final int INT_TYPE_ID =                            
-                (MIN_ID_2 + 7);
-
-        /**
-            class org.apache.derby.iapi.types.IntTypeId
-         */
-        static public final int INT_COMPILATION_TYPE_ID =                                
-                (MIN_ID_2 + 246);
-
-        /**
-            class org.apache.derby.iapi.types.RealTypeId
-         */
-        static public final int REAL_TYPE_ID =
-                (MIN_ID_2 + 8);
-
-        /**
-            class org.apache.derby.iapi.types.RealTypeId
-         */
-        static public final int REAL_COMPILATION_TYPE_ID =
-                (MIN_ID_2 + 247);
-
-        /**
-            class org.apache.derby.iapi.types.RefTypeId
-         */
-        static public final int REF_TYPE_ID =
-                (MIN_ID_2 + 9);
-
-        /**
-            class org.apache.derby.iapi.types.RefTypeId
-         */
-        static public final int REF_COMPILATION_TYPE_ID =
-                (MIN_ID_2 + 248);
-        
-        /**
-            class org.apache.derby.iapi.types.SmallintTypeId
-         */
-        static public final int SMALLINT_TYPE_ID =
-                (MIN_ID_2 + 10);
-        
-        /**
-            class org.apache.derby.iapi.types.SmallintTypeId
-         */
-        static public final int SMALLINT_COMPILATION_TYPE_ID =
-                (MIN_ID_2 + 249);
-        
-        /**
-            class org.apache.derby.iapi.types.LongintTypeId
-         */
-        static public final int LONGINT_TYPE_ID =
-                (MIN_ID_2 + 11);
-        
-        /**
-            class org.apache.derby.iapi.types.LongintTypeId
-         */
-        static public final int LONGINT_COMPILATION_TYPE_ID =
-                (MIN_ID_2 + 250);
-        
-        /**
-            class org.apache.derby.iapi.types.UserDefinedTypeId
-         */
-        //static public final int USERDEFINED_TYPE_ID =
-        //      (MIN_ID_2 + 12);
-        
-        /**
-            class org.apache.derby.iapi.types.UserDefinedTypeIdV2
-         */
-        //static public final int USERDEFINED_TYPE_ID_V2 =
-        //      (MIN_ID_2 + 267);
-        /**
-            class org.apache.derby.iapi.types.UserDefinedTypeIdV3
-         */
-        static public final int USERDEFINED_TYPE_ID_V3 =
-                (MIN_ID_2 + 267);
-        
-        /**
-            class org.apache.derby.iapi.types.UserDefinedTypeId
-         */
-        static public final int USERDEFINED_COMPILATION_TYPE_ID =
-                (MIN_ID_2 + 251);
-        
-        /**
-            class org.apache.derby.iapi.types.UserDefinedTypeIdV2
-         */
-        static public final int USERDEFINED_COMPILATION_TYPE_ID_V2 =
-                (MIN_ID_2 + 265);
-        
-        /**
-            class org.apache.derby.iapi.types.VarcharTypeId
-         */
-        static public final int VARCHAR_TYPE_ID =
-                (MIN_ID_2 + 13);
-        
-        /**
-            class org.apache.derby.iapi.types.VarcharTypeId
-         */
-        static public final int VARCHAR_COMPILATION_TYPE_ID =
-                (MIN_ID_2 + 252);
-        
-        /**
-        class org.apache.derby.catalog.types.TypeDescriptorImpl
-        */
-        static public final int DATA_TYPE_IMPL_DESCRIPTOR_V01_ID =
-                (MIN_ID_2 + 14);
-        
-        /**
-                class com.ibm.db2j.protcol.Datatypes.Execution.DataTypeDescriptor
-         */
-        static public final int DATA_TYPE_SERVICES_IMPL_V01_ID =
-                (MIN_ID_2 + 259);
+    /******************************************************************
+    **
+    **      How to add an ID for another Formatable class 
+    **
+    **      o       In the list of constants below, identify the module that
+    **              defines your class.
+    **
+    **      o       Add your class to the list to the end of that module 
+    **              use a number that is one greater than all existing formats
+    **              in that module, see MAX_ID_2 or MAX_ID_4 at the end of the 
+    **              file, these are the largest existing formatId.
+    **
+    **      o       update MAX_ID_2 and MAX_ID_4
+    **
+    **
+    **      o       Make sure that the getFormatId() method for your class
+    **              returns the constant that you just made up.
+    **
+    **      o       Now find your module startup code that registers Format
+    **              IDs. Add your class to that list.
+    **
+    **      o   Add a test for your new format ID to T_StoredFormat.java
+    **
+    ******************************************************************/
+
+
+    /******************************************************************
+    **
+    **      Formats for the StoredFormatModule
+    **
+    **
+    **
+    ******************************************************************/
+
+    /** Special format id for any null referance */
+    static public final int NULL_FORMAT_ID =
+            (MIN_ID_2 + 0);
+
+    /** Special format id for tagging UTF8 strings */
+    static public final int STRING_FORMAT_ID =
+            (MIN_ID_2 + 1);
+
+    /** Special format id for tagging Serializable objects. */
+    static public final int SERIALIZABLE_FORMAT_ID =
+            (MIN_ID_2 + 2);
+    
+    /******************************************************************
+    **
+    **      DataDictionary Formats
+    **
+    **
+    **
+    ******************************************************************/
+    /**
+        class org.apache.derby.iapi.types.BooleanTypeId
+     */
+    static public final int BOOLEAN_TYPE_ID =
+            (MIN_ID_2 + 4);
+    
+    /**
+        class org.apache.derby.iapi.types.BooleanTypeId
+     */
+    static public final int BOOLEAN_COMPILATION_TYPE_ID =
+            (MIN_ID_2 + 260);
+    
+    /**
+        class org.apache.derby.iapi.types.CharTypeId
+     */
+    static public final int CHAR_TYPE_ID =
+            (MIN_ID_2 + 5);
+
+    /**
+        class org.apache.derby.iapi.types.CharTypeId
+     */
+    static public final int CHAR_COMPILATION_TYPE_ID =
+            (MIN_ID_2 + 244);
+
+    /**
+        class org.apache.derby.iapi.types.DoubleTypeId
+     */
+    static public final int DOUBLE_TYPE_ID =
+            (MIN_ID_2 + 6);
+    
+    /**
+        class org.apache.derby.iapi.types.DoubleTypeId
+     */
+    static public final int DOUBLE_COMPILATION_TYPE_ID =
+            (MIN_ID_2 + 245);
+    
+    /**
+        class org.apache.derby.iapi.types.IntTypeId
+     */
+    static public final int INT_TYPE_ID =                            
+            (MIN_ID_2 + 7);
+
+    /**
+        class org.apache.derby.iapi.types.IntTypeId
+     */
+    static public final int INT_COMPILATION_TYPE_ID =                                
+            (MIN_ID_2 + 246);
+
+    /**
+        class org.apache.derby.iapi.types.RealTypeId
+     */
+    static public final int REAL_TYPE_ID =
+            (MIN_ID_2 + 8);
+
+    /**
+        class org.apache.derby.iapi.types.RealTypeId
+     */
+    static public final int REAL_COMPILATION_TYPE_ID =
+            (MIN_ID_2 + 247);
+
+    /**
+        class org.apache.derby.iapi.types.RefTypeId
+     */
+    static public final int REF_TYPE_ID =
+            (MIN_ID_2 + 9);
+
+    /**
+        class org.apache.derby.iapi.types.RefTypeId
+     */
+    static public final int REF_COMPILATION_TYPE_ID =
+            (MIN_ID_2 + 248);
+    
+    /**
+        class org.apache.derby.iapi.types.SmallintTypeId
+     */
+    static public final int SMALLINT_TYPE_ID =
+            (MIN_ID_2 + 10);
+    
+    /**
+        class org.apache.derby.iapi.types.SmallintTypeId
+     */
+    static public final int SMALLINT_COMPILATION_TYPE_ID =
+            (MIN_ID_2 + 249);
+    
+    /**
+        class org.apache.derby.iapi.types.LongintTypeId
+     */
+    static public final int LONGINT_TYPE_ID =
+            (MIN_ID_2 + 11);
+    
+    /**
+        class org.apache.derby.iapi.types.LongintTypeId
+     */
+    static public final int LONGINT_COMPILATION_TYPE_ID =
+            (MIN_ID_2 + 250);
+    
+    /**
+        class org.apache.derby.iapi.types.UserDefinedTypeId
+     */
+    //static public final int USERDEFINED_TYPE_ID =
+    //      (MIN_ID_2 + 12);
+    
+    /**
+        class org.apache.derby.iapi.types.UserDefinedTypeIdV2
+     */
+    //static public final int USERDEFINED_TYPE_ID_V2 =
+    //      (MIN_ID_2 + 267);
+    /**
+        class org.apache.derby.iapi.types.UserDefinedTypeIdV3
+     */
+    static public final int USERDEFINED_TYPE_ID_V3 =
+            (MIN_ID_2 + 267);
+    
+    /**
+        class org.apache.derby.iapi.types.UserDefinedTypeId
+     */
+    static public final int USERDEFINED_COMPILATION_TYPE_ID =
+            (MIN_ID_2 + 251);
+    
+    /**
+        class org.apache.derby.iapi.types.UserDefinedTypeIdV2
+     */
+    static public final int USERDEFINED_COMPILATION_TYPE_ID_V2 =
+            (MIN_ID_2 + 265);
+    
+    /**
+        class org.apache.derby.iapi.types.VarcharTypeId
+     */
+    static public final int VARCHAR_TYPE_ID =
+            (MIN_ID_2 + 13);
+    
+    /**
+        class org.apache.derby.iapi.types.VarcharTypeId
+     */
+    static public final int VARCHAR_COMPILATION_TYPE_ID =
+            (MIN_ID_2 + 252);
+    
+    /**
+    class org.apache.derby.catalog.types.TypeDescriptorImpl
+    */
+    static public final int DATA_TYPE_IMPL_DESCRIPTOR_V01_ID =
+            (MIN_ID_2 + 14);
+    
+    /**
+            class com.ibm.db2j.protcol.Datatypes.Execution.DataTypeDescriptor
+     */
+    static public final int DATA_TYPE_SERVICES_IMPL_V01_ID =
+            (MIN_ID_2 + 259);
 
-        /**
-        class org.apache.derby.impl.sql.catalog.ConglomerateDescriptorFinder
+    /**
+    class org.apache.derby.impl.sql.catalog.ConglomerateDescriptorFinder
      */
-        static public final int CONGLOMERATE_DESCRIPTOR_FINDER_V01_ID =
-                (MIN_ID_2 + 135);
-        
-        /**
-        class org.apache.derby.impl.sql.catalog.ConstraintDescriptorFinder
+    static public final int CONGLOMERATE_DESCRIPTOR_FINDER_V01_ID =
+            (MIN_ID_2 + 135);
+    
+    /**
+    class org.apache.derby.impl.sql.catalog.ConstraintDescriptorFinder
      */
-        static public final int CONSTRAINT_DESCRIPTOR_FINDER_V01_ID =
-                (MIN_ID_2 + 208);
-        
-        /**
-        class org.apache.derby.impl.sql.catalog.DefaultDescriptorFinder
+    static public final int CONSTRAINT_DESCRIPTOR_FINDER_V01_ID =
+            (MIN_ID_2 + 208);
+    
+    /**
+    class org.apache.derby.impl.sql.catalog.DefaultDescriptorFinder
      */
-        static public final int DEFAULT_DESCRIPTOR_FINDER_V01_ID =
-                (MIN_ID_2 + 325);
-        
-        /**
-        class org.apache.derby.impl.sql.catalog.AliasDescriptorFinder
+    static public final int DEFAULT_DESCRIPTOR_FINDER_V01_ID =
+            (MIN_ID_2 + 325);
+    
+    /**
+    class org.apache.derby.impl.sql.catalog.AliasDescriptorFinder
      */
-        static public final int ALIAS_DESCRIPTOR_FINDER_V01_ID =
-                (MIN_ID_2 + 136);
+    static public final int ALIAS_DESCRIPTOR_FINDER_V01_ID =
+            (MIN_ID_2 + 136);
 
-        /**
-        class org.apache.derby.impl.sql.catalog.TableDescriptorFinder
+    /**
+    class org.apache.derby.impl.sql.catalog.TableDescriptorFinder
      */
-        static public final int TABLE_DESCRIPTOR_FINDER_V01_ID =
-                (MIN_ID_2 + 137);
+    static public final int TABLE_DESCRIPTOR_FINDER_V01_ID =
+            (MIN_ID_2 + 137);
 
-        /**
-        class org.apache.derby.impl.sql.catalog.CoreDDFinderClassInfo
+    /**
+    class org.apache.derby.impl.sql.catalog.CoreDDFinderClassInfo
      */
-        static public final int ROUTINE_PERMISSION_FINDER_V01_ID =
-                (MIN_ID_2 + 461);
+    static public final int ROUTINE_PERMISSION_FINDER_V01_ID =
+            (MIN_ID_2 + 461);
 
-        /**
-        class org.apache.derby.impl.sql.catalog.CoreDDFinderClassInfo
+    /**
+    class org.apache.derby.impl.sql.catalog.CoreDDFinderClassInfo
      */
-        static public final int TABLE_PERMISSION_FINDER_V01_ID =
-                (MIN_ID_2 + 462);
+    static public final int TABLE_PERMISSION_FINDER_V01_ID =
+            (MIN_ID_2 + 462);
 
-        /**
-        class org.apache.derby.impl.sql.catalog.CoreDDFinderClassInfo
+    /**
+    class org.apache.derby.impl.sql.catalog.CoreDDFinderClassInfo
      */
-        static public final int COLUMNS_PERMISSION_FINDER_V01_ID =
-                (MIN_ID_2 + 463);
-        
-        /**
-        class org.apache.derby.impl.sql.catalog.DataDictionaryDescriptorFinder
+    static public final int COLUMNS_PERMISSION_FINDER_V01_ID =
+            (MIN_ID_2 + 463);
+    
+    /**
+    class org.apache.derby.impl.sql.catalog.DataDictionaryDescriptorFinder
      */
-        static public final int DATA_DICTIONARY_DESCRIPTOR_FINDER_V01_ID =
-                (MIN_ID_2 + 138);
-        
-        /**
-        class org.apache.derby.impl.sql.catalog.ViewDescriptorFinder
+    static public final int DATA_DICTIONARY_DESCRIPTOR_FINDER_V01_ID =
+            (MIN_ID_2 + 138);
+    
+    /**
+    class org.apache.derby.impl.sql.catalog.ViewDescriptorFinder
      */
-        static public final int VIEW_DESCRIPTOR_FINDER_V01_ID =
-                (MIN_ID_2 + 145);
-        
-        /**
-        class org.apache.derby.impl.sql.catalog.SPSDescriptorFinder
+    static public final int VIEW_DESCRIPTOR_FINDER_V01_ID =
+            (MIN_ID_2 + 145);
+    
+    /**
+    class org.apache.derby.impl.sql.catalog.SPSDescriptorFinder
      */
-        static public final int SPS_DESCRIPTOR_FINDER_V01_ID =
-                (MIN_ID_2 + 226);
+    static public final int SPS_DESCRIPTOR_FINDER_V01_ID =
+            (MIN_ID_2 + 226);
 
-        /**
-        class org.apache.derby.impl.sql.catalog.FileInfoFinder
+    /**
+    class org.apache.derby.impl.sql.catalog.FileInfoFinder
      */
-        static public final int FILE_INFO_FINDER_V01_ID =
-                (MIN_ID_2 + 273);
+    static public final int FILE_INFO_FINDER_V01_ID =
+            (MIN_ID_2 + 273);
 
-        /**
-        class org.apache.derby.impl.sql.catalog.TriggerDescriptorFinder
+    /**
+    class org.apache.derby.impl.sql.catalog.TriggerDescriptorFinder
      */
-        static public final int TRIGGER_DESCRIPTOR_FINDER_V01_ID =
-                (MIN_ID_2 + 320);
+    static public final int TRIGGER_DESCRIPTOR_FINDER_V01_ID =
+            (MIN_ID_2 + 320);
 
-        /**
-        class org.apache.derby.impl.sql.catalog.TriggerDescriptorFinder
+    /**
+    class org.apache.derby.impl.sql.catalog.TriggerDescriptorFinder
      */
-        static public final int TRIGGER_DESCRIPTOR_V01_ID =
-                (MIN_ID_2 + 316);
+    static public final int TRIGGER_DESCRIPTOR_V01_ID =
+            (MIN_ID_2 + 316);
 
-        /**
-        class org.apache.derby.impl.sql.catalog.DD_SocratesVersion
+    /**
+    class org.apache.derby.impl.sql.catalog.DD_SocratesVersion
      */
-        static public final int DD_SOCRATES_VERSION_ID =
-                (MIN_ID_2 + 174);
-        
-        /**
-        class org.apache.derby.catalog.types.ReferencedColumnsDescriptorImpl
+    static public final int DD_SOCRATES_VERSION_ID =
+            (MIN_ID_2 + 174);
+    
+    /**
+    class org.apache.derby.catalog.types.ReferencedColumnsDescriptorImpl
      */
-        static public final int REFERENCED_COLUMNS_DESCRIPTOR_IMPL_V01_ID =
-                (MIN_ID_2 + 205);
-        
-        /**
-        class org.apache.derby.impl.sql.catalog.DD_PlatoVersion
+    static public final int REFERENCED_COLUMNS_DESCRIPTOR_IMPL_V01_ID =
+            (MIN_ID_2 + 205);
+    
+    /**
+    class org.apache.derby.impl.sql.catalog.DD_PlatoVersion
      */
-        static public final int DD_PLATO_VERSION_ID =
-                (MIN_ID_2 + 206);
+    static public final int DD_PLATO_VERSION_ID =
+            (MIN_ID_2 + 206);
 
-        /**
-        class org.apache.derby.impl.sql.catalog.DD_AristotleVersion
+    /**
+    class org.apache.derby.impl.sql.catalog.DD_AristotleVersion
      */
-        static public final int DD_ARISTOTLE_VERSION_ID =
-                (MIN_ID_2 + 272);
+    static public final int DD_ARISTOTLE_VERSION_ID =
+            (MIN_ID_2 + 272);
 
-        /**
-          class org.apache.derby.impl.sql.catalog.DD_XenaVersion
+    /**
+      class org.apache.derby.impl.sql.catalog.DD_XenaVersion
      */
-        static public final int DD_XENA_VERSION_ID =
-                (MIN_ID_2 + 302);
+    static public final int DD_XENA_VERSION_ID =
+            (MIN_ID_2 + 302);
 
-        /**
-          class org.apache.derby.impl.sql.catalog.DD_BuffyVersion
+    /**
+      class org.apache.derby.impl.sql.catalog.DD_BuffyVersion
      */
-        static public final int DD_BUFFY_VERSION_ID =
-                (MIN_ID_2 + 373);
+    static public final int DD_BUFFY_VERSION_ID =
+            (MIN_ID_2 + 373);
 
-        /**
-          class org.apache.derby.impl.sql.catalog.DD_MulanVersion
+    /**
+      class org.apache.derby.impl.sql.catalog.DD_MulanVersion
      */
-        static public final int DD_MULAN_VERSION_ID =
-                (MIN_ID_2 + 376);
+    static public final int DD_MULAN_VERSION_ID =
+            (MIN_ID_2 + 376);
 
-        /**
-          class org.apache.derby.impl.sql.catalog.DD_IvanovaVersion
+    /**
+      class org.apache.derby.impl.sql.catalog.DD_IvanovaVersion
      */
-        static public final int DD_IVANOVA_VERSION_ID =
-                (MIN_ID_2 + 396);
+    static public final int DD_IVANOVA_VERSION_ID =
+            (MIN_ID_2 + 396);
 
-        /**
-          class org.apache.derby.impl.sql.catalog.DD_DB2J72
-		  now mapped to a single class DD_Version.
-		  5.0 databases will have this as the format identifier for their
-		  catalog version number.
+    /**
+      class org.apache.derby.impl.sql.catalog.DD_DB2J72
+      now mapped to a single class DD_Version.
+      5.0 databases will have this as the format identifier for their
+      catalog version number.
      */
-        static public final int DD_DB2J72_VERSION_ID =
-                (MIN_ID_2 + 401);
+    static public final int DD_DB2J72_VERSION_ID =
+            (MIN_ID_2 + 401);
 
-        /**
-          class org.apache.derby.impl.sql.catalog.DD_Version
- 		  now mapped to a single class DD_Version.
-		  5.1 and later databases will have this as the format identifier for their
-		  catalog version number.
+    /**
+      class org.apache.derby.impl.sql.catalog.DD_Version
+      now mapped to a single class DD_Version.
+      5.1 and later databases will have this as the format identifier for their
+      catalog version number.
     */
-        static public final int DD_ARWEN_VERSION_ID =
-                (MIN_ID_2 + 402);
-        
-        /**
-                class org.apache.derby.iapi.types.LongvarcharTypeId
-         */
-        static public final int LONGVARCHAR_TYPE_ID =
-                (MIN_ID_2 + 230);
-        
-        /**
-                class org.apache.derby.iapi.types.LongvarcharTypeId
-         */
-        static public final int LONGVARCHAR_COMPILATION_TYPE_ID =
-                (MIN_ID_2 + 256);
-
-        /**
-                class org.apache.derby.iapi.types.LongvarcharTypeId
-         */
-        static public final int CLOB_TYPE_ID =
-                (MIN_ID_2 + 444);
-        
-        /**
-                class org.apache.derby.iapi.types.LongvarcharTypeId
-         */
-        static public final int CLOB_COMPILATION_TYPE_ID =
-                (MIN_ID_2 + 445);
-
-        /**
-                class org.apache.derby.iapi.types.LongvarbitTypeId
-                - XXXX does not exist!!!
-         */
-        static public final int LONGVARBIT_TYPE_ID =
-                (MIN_ID_2 + 232);
-
-        /**
-                class org.apache.derby.iapi.types.LongvarbitTypeId
-                - XXXX does not exist!!!
-         */
-        static public final int LONGVARBIT_COMPILATION_TYPE_ID =
-                (MIN_ID_2 + 255);
-
-        /**
-                class org.apache.derby.iapi.types.LongvarbitTypeId
-                - XXXX does not exist!!!
-        But for BLOB we do the same as for LONGVARBIT, only need different ids
-         */
-        static public final int BLOB_TYPE_ID =
-                (MIN_ID_2 + 440);
-
-        /**
-                class org.apache.derby.iapi.types.LongvarbitTypeId
-                - XXXX does not exist!!!
-        But for BLOB we do the same as for LONGVARBIT, only need different ids
-         */
-        static public final int BLOB_COMPILATION_TYPE_ID =
-                (MIN_ID_2 + 441);
-
-        /**
-                Instance of TypeId for XML data types.
-         */
-        static public final int XML_TYPE_ID =
-                (MIN_ID_2 + 456);
-        
-        /**
-         	class org.apache.derby.iapi.types.SqlXmlUtil
-        */
-        static public final int SQL_XML_UTIL_V01_ID =
-                (MIN_ID_2 + 464);
+    static public final int DD_ARWEN_VERSION_ID =
+            (MIN_ID_2 + 402);
+    
+    /**
+            class org.apache.derby.iapi.types.LongvarcharTypeId
+     */
+    static public final int LONGVARCHAR_TYPE_ID =
+            (MIN_ID_2 + 230);
+    
+    /**
+            class org.apache.derby.iapi.types.LongvarcharTypeId
+     */
+    static public final int LONGVARCHAR_COMPILATION_TYPE_ID =
+            (MIN_ID_2 + 256);
+
+    /**
+            class org.apache.derby.iapi.types.LongvarcharTypeId
+     */
+    static public final int CLOB_TYPE_ID =
+            (MIN_ID_2 + 444);
+    
+    /**
+            class org.apache.derby.iapi.types.LongvarcharTypeId
+     */
+    static public final int CLOB_COMPILATION_TYPE_ID =
+            (MIN_ID_2 + 445);
+
+    /**
+            class org.apache.derby.iapi.types.LongvarbitTypeId
+            - XXXX does not exist!!!
+     */
+    static public final int LONGVARBIT_TYPE_ID =
+            (MIN_ID_2 + 232);
+
+    /**
+            class org.apache.derby.iapi.types.LongvarbitTypeId
+            - XXXX does not exist!!!
+     */
+    static public final int LONGVARBIT_COMPILATION_TYPE_ID =
+            (MIN_ID_2 + 255);
+
+    /**
+            class org.apache.derby.iapi.types.LongvarbitTypeId
+            - XXXX does not exist!!!
+    But for BLOB we do the same as for LONGVARBIT, only need different ids
+     */
+    static public final int BLOB_TYPE_ID =
+            (MIN_ID_2 + 440);
+
+    /**
+            class org.apache.derby.iapi.types.LongvarbitTypeId
+            - XXXX does not exist!!!
+    But for BLOB we do the same as for LONGVARBIT, only need different ids
+     */
+    static public final int BLOB_COMPILATION_TYPE_ID =
+            (MIN_ID_2 + 441);
+
+    /**
+            Instance of TypeId for XML data types.
+     */
+    static public final int XML_TYPE_ID =
+            (MIN_ID_2 + 456);
+    
+    /**
+        class org.apache.derby.iapi.types.SqlXmlUtil
+    */
+    static public final int SQL_XML_UTIL_V01_ID =
+            (MIN_ID_2 + 464);
+    
+    /**
+        class org.apache.derby.iapi.types.JSQLType
+     */
+    static public final int JSQLTYPEIMPL_ID =
+            (MIN_ID_2 + 307);
+
+    /**
+    class org.apache.derby.impl.sql.catalog.RowListImpl
+     */
+    static public final int ROW_LIST_V01_ID =
+            (MIN_ID_2 + 239);
+    
+    /**
+    class org.apache.derby.impl.sql.catalog.ListOfRowListsImpl
+     */
+    static public final int UNUSED_240 =
+            (MIN_ID_2 + 240);
+
+    /**
+    class org.apache.derby.impl.sql.catalog.IndexRowGeneratorImpl
+     */
+    static public final int INDEX_ROW_GENERATOR_V01_ID =
+            (MIN_ID_2 + 268);
+
+    /**
+    class org.apache.derby.iapi.services.io.FormatableBitSet
+     */
+    static public final int BITIMPL_V01_ID =
+            (MIN_ID_2 + 269);
+
+    /**
+    class org.apache.derby.iapi.services.io.FormatableArrayHolder
+     */
+    static public final int FORMATABLE_ARRAY_HOLDER_V01_ID =
+            (MIN_ID_2 + 270);
+    
+    /**
+    class org.apache.derby.iapi.services.io.FormatableProperties
+     */
+    static public final int FORMATABLE_PROPERTIES_V01_ID =
+            (MIN_ID_2 + 271);
+
+    /**
+    class org.apache.derby.iapi.services.io.FormatableIntHolder
+     */
+    static public final int FORMATABLE_INT_HOLDER_V01_ID =
+            (MIN_ID_2 + 303);
+    
+    /**
+    class org.apache.derby.iapi.services.io.FormatableLongHolder
+     */
+    static public final int FORMATABLE_LONG_HOLDER_V01_ID =
+            (MIN_ID_2 + 329);
+
+    /**
+    class org.apache.derby.iapi.services.io.FormatableHashtable
+     */
+    static public final int FORMATABLE_HASHTABLE_V01_ID =
+            (MIN_ID_2 + 313);
+    
+    /**
+        class org.apache.derby.iapi.types.NationalCharTypeId
+     */
+    static public final int NATIONAL_CHAR_TYPE_ID =
+            (MIN_ID_2 + 370);
+    
+    /**
+        class org.apache.derby.iapi.types.NationalLongvarcharTypeId
+     */
+    static public final int NATIONAL_LONGVARCHAR_TYPE_ID =
+            (MIN_ID_2 + 362);
+    
+    /**
+        class org.apache.derby.iapi.types.NationalLongvarcharTypeId
+     */
+    static public final int NCLOB_TYPE_ID = 
+            (MIN_ID_2 + 448);
+    
+    /**
+        class org.apache.derby.iapi.types.NationalVarcharTypeId
+     */
+    static public final int NATIONAL_VARCHAR_TYPE_ID =
+            (MIN_ID_2 + 369);
+
+    /**
+    class org.apache.derby.impl.sql.catalog.SchemaDescriptorFinder
+     */
+    static public final int SCHEMA_DESCRIPTOR_FINDER_V01_ID =
+            (MIN_ID_2 + 371);
+    
+    /**
+    class org.apache.derby.impl.sql.catalog.ColumnDescriptorFinder
+     */
+    static public final int COLUMN_DESCRIPTOR_FINDER_V01_ID =
+            (MIN_ID_2 + 393);
         
-        /**
-            class org.apache.derby.iapi.types.JSQLType
-         */
-        static public final int JSQLTYPEIMPL_ID =
-                (MIN_ID_2 + 307);
+    /******************************************************************
+    **
+    **      DependencySystem Formats
+    **
+    **
+    **
+    ******************************************************************/
+    /**
+        Unused 243
+     */
+    static public final int UNUSED_243 =
+            (MIN_ID_2 + 243);
+    
+    /**
+    ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+    ||
+    ||            DEPRECATED
+    ||
+    ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+    class org.apache.derby.impl.sql.catalog.OIDImpl
+     */
+    static public final int OIDIMPL_V01_ID =
+            (MIN_ID_2 + 15);
+    
+    /**
+        class org.apache.derby.catalog.types.BooleanTypeIdImpl
+     */
+    static public final int BOOLEAN_TYPE_ID_IMPL =
+            (MIN_ID_2 + 16);
 
-        /**
-        class org.apache.derby.impl.sql.catalog.RowListImpl
+    /**
+        class org.apache.derby.catalog.types.CharTypeIdImpl
+     */
+    static public final int CHAR_TYPE_ID_IMPL =
+            (MIN_ID_2 + 17);
+    
+    /**
+        class org.apache.derby.catalog.types.DoubleTypeIdImpl
+     */
+    static public final int DOUBLE_TYPE_ID_IMPL =
+            (MIN_ID_2 + 18);
+    
+    /**
+        class org.apache.derby.catalog.types.IntTypeIdImpl
+     */
+    static public final int INT_TYPE_ID_IMPL =
+            (MIN_ID_2 + 19);
+    
+    /**
+        class org.apache.derby.catalog.types.RealTypeIdImpl
+     */
+    static public final int REAL_TYPE_ID_IMPL =
+            (MIN_ID_2 + 20);
+    
+    /**
+        class org.apache.derby.catalog.types.RefTypeIdImpl
+     */
+    static public final int REF_TYPE_ID_IMPL =
+            (MIN_ID_2 + 21);
+    
+    /**
+        class org.apache.derby.catalog.types.SmallintTypeIdImpl
+     */
+    static public final int SMALLINT_TYPE_ID_IMPL =
+            (MIN_ID_2 + 22);
+    
+    /**
+        class org.apache.derby.catalog.types.LongintTypeIdImpl
      */
-        static public final int ROW_LIST_V01_ID =
-                (MIN_ID_2 + 239);
+    static public final int LONGINT_TYPE_ID_IMPL =
+            (MIN_ID_2 + 23);
         
-        /**
-        class org.apache.derby.impl.sql.catalog.ListOfRowListsImpl
+    /**
+        class org.apache.derby.catalog.types.UserDefinedTypeIdImpl
      */
-        static public final int UNUSED_240 =
-                (MIN_ID_2 + 240);
+    //static public final int USERDEFINED_TYPE_ID_IMPL =
+    //      (MIN_ID_2 + 24);
 
-        /**
-        class org.apache.derby.impl.sql.catalog.IndexRowGeneratorImpl
+    /**
+        class org.apache.derby.catalog.types.UserDefinedTypeIdImpl
      */
-        static public final int INDEX_ROW_GENERATOR_V01_ID =
-                (MIN_ID_2 + 268);
+    //static public final int USERDEFINED_TYPE_ID_IMPL_V2 =
+    //      (MIN_ID_2 + 264);
 
-        /**
-        class org.apache.derby.iapi.services.io.FormatableBitSet
+    /**
+        class org.apache.derby.catalog.types.UserDefinedTypeIdImpl
      */
-        static public final int BITIMPL_V01_ID =
-                (MIN_ID_2 + 269);
+    static public final int USERDEFINED_TYPE_ID_IMPL_V3 =
+            (MIN_ID_2 + 264);
+    /**
+        class org.apache.derby.catalog.types.TypesImplInstanceGetter
+     */
+    static public final int DATE_TYPE_ID_IMPL =
+            (MIN_ID_2 + 32);
 
-        /**
-        class org.apache.derby.iapi.services.io.FormatableArrayHolder
+    /**
+        class org.apache.derby.catalog.types.TypesImplInstanceGetter
      */
-        static public final int FORMATABLE_ARRAY_HOLDER_V01_ID =
-                (MIN_ID_2 + 270);
-        
-        /**
-        class org.apache.derby.iapi.services.io.FormatableProperties
+    static public final int TIME_TYPE_ID_IMPL =
+            (MIN_ID_2 + 33);
+    /**
+        class org.apache.derby.catalog.types.TypesImplInstanceGetter
      */
-        static public final int FORMATABLE_PROPERTIES_V01_ID =
-                (MIN_ID_2 + 271);
+    static public final int TIMESTAMP_TYPE_ID_IMPL =
+            (MIN_ID_2 + 34);
 
-        /**
-        class org.apache.derby.iapi.services.io.FormatableIntHolder
+    /**
+        class org.apache.derby.Database.Language.Execution.MinAggregator
      */
-        static public final int FORMATABLE_INT_HOLDER_V01_ID =
-                (MIN_ID_2 + 303);
-        
-        /**
-        class org.apache.derby.iapi.services.io.FormatableLongHolder
+    static public final int AGG_MIN_V01_ID =
+            (MIN_ID_2 + 153);
+
+    /**
+        class org.apache.derby.Database.Language.Execution.CountStarAggregator
      */
-        static public final int FORMATABLE_LONG_HOLDER_V01_ID =
-                (MIN_ID_2 + 329);
+    static public final int AGG_COUNT_STAR_V01_ID =
+            (MIN_ID_2 + 150);
+
 
-        /**
-        class org.apache.derby.iapi.services.io.FormatableHashtable
+    /**
+        class org.apache.derby.catalog.types.VarcharTypeIdImpl
      */
-        static public final int FORMATABLE_HASHTABLE_V01_ID =
-                (MIN_ID_2 + 313);
-        
-        /**
-            class org.apache.derby.iapi.types.NationalCharTypeId
-         */
-        static public final int NATIONAL_CHAR_TYPE_ID =
-                (MIN_ID_2 + 370);
-        
-        /**
-            class org.apache.derby.iapi.types.NationalLongvarcharTypeId
-         */
-        static public final int NATIONAL_LONGVARCHAR_TYPE_ID =
-                (MIN_ID_2 + 362);
-        
-        /**
-            class org.apache.derby.iapi.types.NationalLongvarcharTypeId
-         */
-        static public final int NCLOB_TYPE_ID = 
-                (MIN_ID_2 + 448);
-        
-        /**
-            class org.apache.derby.iapi.types.NationalVarcharTypeId
-         */
-        static public final int NATIONAL_VARCHAR_TYPE_ID =
-                (MIN_ID_2 + 369);
+    static public final int VARCHAR_TYPE_ID_IMPL =
+            (MIN_ID_2 + 25);
 
-        /**
-        class org.apache.derby.impl.sql.catalog.SchemaDescriptorFinder
+    /**
+        class org.apache.derby.impl.sql.catalog.ParameterDescriptorImpl
      */
-        static public final int SCHEMA_DESCRIPTOR_FINDER_V01_ID =
-                (MIN_ID_2 + 371);
-        
-        /**
-        class org.apache.derby.impl.sql.catalog.ColumnDescriptorFinder
+    static public final int PARAMETER_DESCRIPTOR_V01_ID =
+            (MIN_ID_2 + 26);
+
+    /**
+        class org.apache.derby.iapi.types.BitTypeId
      */
-        static public final int COLUMN_DESCRIPTOR_FINDER_V01_ID =
-                (MIN_ID_2 + 393);
-        
-        /******************************************************************
-        **
-        **      DependencySystem Formats
-        **
-        **
-        **
-        ******************************************************************/
-        /**
-			Unused 243
-         */
-        static public final int UNUSED_243 =
-                (MIN_ID_2 + 243);
-        
-        /**
-          ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-          ||
-          ||            DEPRECATED
-          ||
-          ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+    static public final int BIT_TYPE_ID =
+            (MIN_ID_2 + 27);
 
-        class org.apache.derby.impl.sql.catalog.OIDImpl
+    /**
+        class org.apache.derby.catalog.types.BitTypeIdImpl
      */
-        static public final int OIDIMPL_V01_ID =
-                (MIN_ID_2 + 15);
-        
-        /**
-            class org.apache.derby.catalog.types.BooleanTypeIdImpl
-         */
-        static public final int BOOLEAN_TYPE_ID_IMPL =
-                (MIN_ID_2 + 16);
-
-        /**
-            class org.apache.derby.catalog.types.CharTypeIdImpl
-         */
-        static public final int CHAR_TYPE_ID_IMPL =
-                (MIN_ID_2 + 17);
-        
-        /**
-            class org.apache.derby.catalog.types.DoubleTypeIdImpl
-         */
-        static public final int DOUBLE_TYPE_ID_IMPL =
-                (MIN_ID_2 + 18);
-        
-        /**
-            class org.apache.derby.catalog.types.IntTypeIdImpl
-         */
-        static public final int INT_TYPE_ID_IMPL =
-                (MIN_ID_2 + 19);
-        
-        /**
-            class org.apache.derby.catalog.types.RealTypeIdImpl
-         */
-        static public final int REAL_TYPE_ID_IMPL =
-                (MIN_ID_2 + 20);
-        
-        /**
-            class org.apache.derby.catalog.types.RefTypeIdImpl
-         */
-        static public final int REF_TYPE_ID_IMPL =
-                (MIN_ID_2 + 21);
-        
-        /**
-            class org.apache.derby.catalog.types.SmallintTypeIdImpl
-         */
-        static public final int SMALLINT_TYPE_ID_IMPL =
-                (MIN_ID_2 + 22);
-        
-        /**
-            class org.apache.derby.catalog.types.LongintTypeIdImpl
-         */
-        static public final int LONGINT_TYPE_ID_IMPL =
-                (MIN_ID_2 + 23);
-        
-        /**
-            class org.apache.derby.catalog.types.UserDefinedTypeIdImpl
-         */
-        //static public final int USERDEFINED_TYPE_ID_IMPL =
-        //      (MIN_ID_2 + 24);
-
-        /**
-            class org.apache.derby.catalog.types.UserDefinedTypeIdImpl
-         */
-        //static public final int USERDEFINED_TYPE_ID_IMPL_V2 =
-        //      (MIN_ID_2 + 264);
-
-        /**
-            class org.apache.derby.catalog.types.UserDefinedTypeIdImpl
-         */
-        static public final int USERDEFINED_TYPE_ID_IMPL_V3 =
-                (MIN_ID_2 + 264);
-        /**
-            class org.apache.derby.catalog.types.TypesImplInstanceGetter
-         */
-        static public final int DATE_TYPE_ID_IMPL =
-                (MIN_ID_2 + 32);
-
-        /**
-            class org.apache.derby.catalog.types.TypesImplInstanceGetter
-         */
-        static public final int TIME_TYPE_ID_IMPL =
-                (MIN_ID_2 + 33);
-        /**
-            class org.apache.derby.catalog.types.TypesImplInstanceGetter
-         */
-        static public final int TIMESTAMP_TYPE_ID_IMPL =
-                (MIN_ID_2 + 34);
-
-        /**
-            class org.apache.derby.Database.Language.Execution.MinAggregator
-         */
-        static public final int AGG_MIN_V01_ID =
-                (MIN_ID_2 + 153);
-
-        /**
-            class org.apache.derby.Database.Language.Execution.CountStarAggregator
-         */
-        static public final int AGG_COUNT_STAR_V01_ID =
-                (MIN_ID_2 + 150);
-
-
-        /**
-            class org.apache.derby.catalog.types.VarcharTypeIdImpl
-         */
-        static public final int VARCHAR_TYPE_ID_IMPL =
-                (MIN_ID_2 + 25);
-
-        /**
-            class org.apache.derby.impl.sql.catalog.ParameterDescriptorImpl
-         */
-        static public final int PARAMETER_DESCRIPTOR_V01_ID =
-                (MIN_ID_2 + 26);
-
-        /**
-            class org.apache.derby.iapi.types.BitTypeId
-         */
-        static public final int BIT_TYPE_ID =
-                (MIN_ID_2 + 27);
-
-        /**
-            class org.apache.derby.catalog.types.BitTypeIdImpl
-         */
-        static public final int BIT_TYPE_ID_IMPL =
-                (MIN_ID_2 + 28);
-
-        /**
-            class org.apache.derby.iapi.types.VarbitTypeId
-         */
-        static public final int VARBIT_TYPE_ID =
-                (MIN_ID_2 + 29);
-
-        /**
-            class org.apache.derby.iapi.types.VarbitTypeId
-         */
-        static public final int VARBIT_COMPILATION_TYPE_ID =
-                (MIN_ID_2 + 258);
-        
-        /**
-                class org.apache.derby.catalog.types.VarbitTypeIdImpl
-         */
-        static public final int VARBIT_TYPE_ID_IMPL =
-                (MIN_ID_2 + 30);
-
-
-        /**
-                class org.apache.derby.catalog.types.IndexDescriptorImpl
-         */
-        static public final int INDEX_DESCRIPTOR_IMPL_V02_ID =
-                (MIN_ID_2 + 387);
-
-        /**
-            class org.apache.derby.iapi.types.TinyintTypeId
-         */
-        static public final int TINYINT_TYPE_ID =
-                (MIN_ID_2 + 195);
-        
-        /**
-                class org.apache.derby.catalog.types.TinyintTypeIdImpl
-         */
-        static public final int TINYINT_TYPE_ID_IMPL =
-                (MIN_ID_2 + 196);
-
-        /**
-            class org.apache.derby.iapi.types.DecimalTypeId
-         */
-        static public final int DECIMAL_TYPE_ID =
-                (MIN_ID_2 + 197);
-
-        /**
-            class org.apache.derby.iapi.types.DateTypeId
-         */
-        static public final int DATE_TYPE_ID =
-                (MIN_ID_2 + 40);
-
-        /**
-            class org.apache.derby.iapi.types.TimeTypeId
-         */
-        static public final int TIME_TYPE_ID =
-                (MIN_ID_2 + 35);
-
-        /**
-            class org.apache.derby.iapi.types.TimestampTypeId
-         */
-        static public final int TIMESTAMP_TYPE_ID =
+    static public final int BIT_TYPE_ID_IMPL =
+            (MIN_ID_2 + 28);
+
+    /**
+        class org.apache.derby.iapi.types.VarbitTypeId
+     */
+    static public final int VARBIT_TYPE_ID =
+            (MIN_ID_2 + 29);
+
+    /**
+        class org.apache.derby.iapi.types.VarbitTypeId
+     */
+    static public final int VARBIT_COMPILATION_TYPE_ID =
+            (MIN_ID_2 + 258);
+    
+    /**
+            class org.apache.derby.catalog.types.VarbitTypeIdImpl
+     */
+    static public final int VARBIT_TYPE_ID_IMPL =
+            (MIN_ID_2 + 30);
+
+
+    /**
+            class org.apache.derby.catalog.types.IndexDescriptorImpl
+     */
+    static public final int INDEX_DESCRIPTOR_IMPL_V02_ID =
+            (MIN_ID_2 + 387);
+
+    /**
+        class org.apache.derby.iapi.types.TinyintTypeId
+     */
+    static public final int TINYINT_TYPE_ID =
+            (MIN_ID_2 + 195);
+    
+    /**
+            class org.apache.derby.catalog.types.TinyintTypeIdImpl
+     */
+    static public final int TINYINT_TYPE_ID_IMPL =
+            (MIN_ID_2 + 196);
+
+    /**
+        class org.apache.derby.iapi.types.DecimalTypeId
+     */
+    static public final int DECIMAL_TYPE_ID =
+            (MIN_ID_2 + 197);
+
+    /**
+        class org.apache.derby.iapi.types.DateTypeId
+     */
+    static public final int DATE_TYPE_ID =
+            (MIN_ID_2 + 40);
+
+    /**
+        class org.apache.derby.iapi.types.TimeTypeId
+     */
+    static public final int TIME_TYPE_ID =
+            (MIN_ID_2 + 35);
+
+    /**
+        class org.apache.derby.iapi.types.TimestampTypeId
+     */
+    static public final int TIMESTAMP_TYPE_ID =
                 (MIN_ID_2 + 36);
         
-        /**
-            class org.apache.derby.catalog.types.DecimalTypeIdImpl
-         */
-        static public final int DECIMAL_TYPE_ID_IMPL =
-                (MIN_ID_2 + 198);
-
-        /**
-                class org.apache.derby.catalog.types.LongvarcharTypeIdImpl
-         */
-        static public final int LONGVARCHAR_TYPE_ID_IMPL =
-                (MIN_ID_2 + 231);
-
-        /**
-                class org.apache.derby.catalog.types.LongvarcharTypeIdImpl
-         */
-        static public final int CLOB_TYPE_ID_IMPL =
-                (MIN_ID_2 + 446);
-
-        /**
-                class org.apache.derby.catalog.types.LongvarbitTypeIdImpl
-                - does nto exist
-         */
-        static public final int LONGVARBIT_TYPE_ID_IMPL =
-                (MIN_ID_2 + 233);
-
-        /**
-                class org.apache.derby.catalog.types.LongvarbitTypeIdImpl
-                - does not exist, but we do it the same way for BLOB as for Longvarbit...
-         */
-        static public final int BLOB_TYPE_ID_IMPL =
-                (MIN_ID_2 + 442);
-
-        /**
-            class org.apache.derby.iapi.types.BitTypeId
-         */
-        static public final int BIT_COMPILATION_TYPE_ID =
-                (MIN_ID_2 + 253);
-        
-        /**
-            class org.apache.derby.iapi.types.DecimalTypeId
-         */
-        static public final int DECIMAL_COMPILATION_TYPE_ID =
-                (MIN_ID_2 + 254);
-        
-        /**
-            class org.apache.derby.iapi.types.TinyintTypeId
-         */
-        static public final int TINYINT_COMPILATION_TYPE_ID =
-                (MIN_ID_2 + 257);
-
-        /**
-            class org.apache.derby.catalog.types.NationalCharTypeIdImpl
-         */
-        static public final int NATIONAL_CHAR_TYPE_ID_IMPL =
-                (MIN_ID_2 + 366);
-
-        /**
-            class org.apache.derby.catalog.types.NationalVarcharTypeIdImpl
-         */
-        static public final int NATIONAL_VARCHAR_TYPE_ID_IMPL =
-                (MIN_ID_2 + 367);
-
-        /**
-            class org.apache.derby.catalog.types.NationalLongVarcharTypeIdImpl
-         */
-        static public final int NATIONAL_LONGVARCHAR_TYPE_ID_IMPL =
-                (MIN_ID_2 + 368);
-        
-        /**
-            class org.apache.derby.catalog.types.NationalLongVarcharTypeIdImpl
-         */
-        static public final int NCLOB_TYPE_ID_IMPL =
-                (MIN_ID_2 + 449);
-        
-        /**
-            class org.apache.derby.iapi.types.XML (implementation of
-            org.apache.derby.iapi.types.XMLDataValue).
-         */
-        static public final int XML_TYPE_ID_IMPL =
-                (MIN_ID_2 + 457);
-
-        /******************************************************************
-        **
-        **      Execution MODULE CLASSES
-        **
-        ******************************************************************/
-
-        /**
-        class org.apache.derby.Database.Language.Execution.RenameConstantAction
-     */
-        static public final int RENAME_CONSTANT_ACTION_V01_ID   =
-                (MIN_ID_2 + 390);
-
-        /**
-                class org.apache.derby.Database.Language.Execution.DeleteConstantAction
-         */
-        static public final int DELETE_CONSTANT_ACTION_V01_ID =
-                (MIN_ID_2 + 37);
-
-        /**
-                class org.apache.derby.Database.Language.Execution.InsertConstantAction
-         */
-        static public final int INSERT_CONSTANT_ACTION_V01_ID =
-                (MIN_ID_2 + 38);
-
-        /**
-                class org.apache.derby.Database.Language.Execution.UpdateConstantAction
-         */
-        static public final int UPDATABLE_VTI_CONSTANT_ACTION_V01_ID =
-                (MIN_ID_2 + 375);
-
-        /**
-                class org.apache.derby.Database.Language.Execution.UpdateConstantAction
-         */
-        static public final int UPDATE_CONSTANT_ACTION_V01_ID =
-                (MIN_ID_2 + 39);
-
-        /**
-         */
-        static public final int UNUSED_2_204 =
-                (MIN_ID_2 + 204);
-
-        /**
-            UNUSED
-         */
-        static public final int UNUSED_2_41 =
-                (MIN_ID_2 + 41);
-        
-        /**
-        class org.apache.derby.Database.Language.Execution.DropAliasConstantAction
+    /**
+        class org.apache.derby.catalog.types.DecimalTypeIdImpl
      */
-        static public final int UNUSED_2_42 =
-                (MIN_ID_2 + 42);
-        
-        /**
-        class org.apache.derby.Database.Language.Execution.CreateSchemaConstantAction
+    static public final int DECIMAL_TYPE_ID_IMPL =
+            (MIN_ID_2 + 198);
+
+    /**
+        class org.apache.derby.catalog.types.LongvarcharTypeIdImpl
      */
-        static public final int UNUSED_2_141    =
-                (MIN_ID_2 + 141);
-        
-        /**
+    static public final int LONGVARCHAR_TYPE_ID_IMPL =
+            (MIN_ID_2 + 231);
+
+    /**
+        class org.apache.derby.catalog.types.LongvarcharTypeIdImpl
      */
-        static public final int UNUSED_2_142    =
-                (MIN_ID_2 + 142);
-        
-        /**
-        class org.apache.derby.Database.Language.Execution.CreateViewConstantAction
+    static public final int CLOB_TYPE_ID_IMPL =
+            (MIN_ID_2 + 446);
+
+    /**
+        class org.apache.derby.catalog.types.LongvarbitTypeIdImpl
+            - does nto exist
      */
-        static public final int UNUSED_2_143    =
-                (MIN_ID_2 + 143);
-        
-        /**
+    static public final int LONGVARBIT_TYPE_ID_IMPL =
+            (MIN_ID_2 + 233);
+
+    /**
+        class org.apache.derby.catalog.types.LongvarbitTypeIdImpl
+        - does not exist, 
+        but we do it the same way for BLOB as for Longvarbit...
      */
-        static public final int UNUSED_2_144    =
-                (MIN_ID_2 + 144);
+    static public final int BLOB_TYPE_ID_IMPL =
+            (MIN_ID_2 + 442);
 
-        /**
-            class org.apache.derby.Database.Language.Execution.ProviderInfo
-         */
-        static public final int PROVIDER_INFO_V01_ID =
-                (MIN_ID_2 + 148);
-
-        /**
-            class org.apache.derby.Database.Language.Execution.AvgAggregator
-         */
-        static public final int AGG_AVG_V01_ID =
-                (MIN_ID_2 + 149);
-
-        /**
-            class org.apache.derby.Database.Language.Execution.CountAggregator
-         */
-        static public final int AGG_COUNT_V01_ID =
-                (MIN_ID_2 + 151);
-
-        /**
-            class org.apache.derby.Database.Language.Execution.MaxMinAggregator
-         */
-        static public final int AGG_MAX_MIN_V01_ID =
-                (MIN_ID_2 + 152);
-
-        /**
-            class org.apache.derby.Database.Language.Execution.SumAggregator
-         */
-        static public final int AGG_SUM_V01_ID =
-                (MIN_ID_2 + 154);
-
-        /**
-            class org.apache.derby.Database.Language.Execution.UserAggregatorAggregator
-         */
-        static public final int AGG_USER_ADAPTOR_V01_ID =
-                (MIN_ID_2 + 323);
-
-        /**
-            class org.apache.derby.Database.Language.Execution.StatisticsConstantAction
-         */
-        static public final int STATISTICS_CONSTANT_ACTION_V01_ID =
-                (MIN_ID_2 + 155);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RunTimeStatisticsImpl
-         */
-        static public final int RUN_TIME_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 173);
-
-        /**
-            class org.apache.derby.Database.Language.Execution.LockTableConstantAction
-         */
-        static public final int UNUSED_2_275 =
-                (MIN_ID_2 + 275);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealProjectRestrictStatistics
-         */
-        static public final int REAL_PROJECT_RESTRICT_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 177);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealDistinctScalarAggregateStatistics
-         */
-        static public final int REAL_DISTINCT_SCALAR_AGGREGATE_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 284);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealScalarAggregateStatistics
-         */
-        static public final int REAL_SCALAR_AGGREGATE_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 283);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealGroupedAggregateStatistics
-         */
-        static public final int REAL_GROUPED_AGGREGATE_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 285);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealSortStatistics
-         */
-        static public final int REAL_SORT_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 178);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealTableScanStatistics
-         */
-        static public final int REAL_TABLE_SCAN_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 179);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealHashJoinStatistics
-         */
-        static public final int REAL_HASH_JOIN_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 304);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealNestedLoopJoinStatistics
-         */
-        static public final int REAL_NESTED_LOOP_JOIN_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 180);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealIndexRowToBaseRowStatistics
-         */
-        static public final int REAL_INDEX_ROW_TO_BASE_ROW_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 181);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealAnyResultSetStatistics
-         */
-        static public final int REAL_ANY_RESULT_SET_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 182);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealOnceResultSetStatistics
-         */
-        static public final int REAL_ONCE_RESULT_SET_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 183);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealCurrentOfStatistics
-         */
-        static public final int REAL_CURRENT_OF_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 184);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealRowResultSetStatistics
-         */
-        static public final int REAL_ROW_RESULT_SET_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 185);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealUnionResultSetStatistics
-         */
-        static public final int REAL_UNION_RESULT_SET_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 186);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealHashLeftOuterJoinStatistics
-         */
-        static public final int REAL_HASH_LEFT_OUTER_JOIN_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 305);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealNestedLoopLeftOuterJoinStatistics
-         */
-        static public final int REAL_NESTED_LOOP_LEFT_OUTER_JOIN_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 187);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealNormalizeResultSetStatistics
-         */
-        static public final int REAL_NORMALIZE_RESULT_SET_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 188);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealInsertResultSetStatistics
-         */
-        static public final int REAL_INSERT_RESULT_SET_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 189);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealInsertVTIResultSetStatistics
-         */
-        static public final int REAL_INSERT_VTI_RESULT_SET_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 379);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealUpdateResultSetStatistics
-         */
-        static public final int REAL_UPDATE_RESULT_SET_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 190);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealDeleteResultSetStatistics
-         */
-        static public final int REAL_DELETE_VTI_RESULT_SET_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 380);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealDeleteResultSetStatistics
-         */
-        static public final int REAL_DELETE_RESULT_SET_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 191);
-
-        /**
-           org.apache.derby.impl.sql.execute.rts.RealDeleteCascadeResultSetStatistics"
-         */
-        static public final int REAL_DELETE_CASCADE_RESULT_SET_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 439);
-
-
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealHashScanStatistics
-         */
-        static public final int REAL_HASH_SCAN_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 203);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealDistinctScanStatistics
-         */
-        static public final int REAL_DISTINCT_SCAN_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 334);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealHashTableStatistics
-         */
-        static public final int REAL_HASH_TABLE_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 306);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealVTIStatistics
-         */
-        static public final int REAL_VTI_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 214);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealMaterializedResultSetStatistics
-         */
-        static public final int REAL_MATERIALIZED_RESULT_SET_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 308);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealScrollInsensitiveResultSetStatistics
-         */
-        static public final int REAL_SCROLL_INSENSITIVE_RESULT_SET_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 330);
+    /**
+        class org.apache.derby.iapi.types.BitTypeId
+     */
+    static public final int BIT_COMPILATION_TYPE_ID =
+            (MIN_ID_2 + 253);
+    
+    /**
+        class org.apache.derby.iapi.types.DecimalTypeId
+     */
+    static public final int DECIMAL_COMPILATION_TYPE_ID =
+            (MIN_ID_2 + 254);
+    
+    /**
+        class org.apache.derby.iapi.types.TinyintTypeId
+     */
+    static public final int TINYINT_COMPILATION_TYPE_ID =
+            (MIN_ID_2 + 257);
 
-        /**
-        class org.apache.derby.Database.Language.Execution.CreateSPSConstantAction
+    /**
+        class org.apache.derby.catalog.types.NationalCharTypeIdImpl
      */
-        static public final int UNUSED_2_221    =
-                (MIN_ID_2 + 221);
-        
-        /**
-        class org.apache.derby.Database.Language.Execution.CreateSPSConstantAction
+    static public final int NATIONAL_CHAR_TYPE_ID_IMPL =
+            (MIN_ID_2 + 366);
+
+    /**
+        class org.apache.derby.catalog.types.NationalVarcharTypeIdImpl
      */
-        static public final int UNUSED_2_222    =
-                (MIN_ID_2 + 222);
+    static public final int NATIONAL_VARCHAR_TYPE_ID_IMPL =
+            (MIN_ID_2 + 367);
 
-        /**
-        class org.apache.derby.Database.Language.Execution.AlterSPSConstantAction
+    /**
+        class org.apache.derby.catalog.types.NationalLongVarcharTypeIdImpl
      */
-        static public final int ALTER_SPS_CONSTANT_ACTION_V01_ID        =
-                (MIN_ID_2 + 229);
-
-        /**
-        class org.apache.derby.Database.Language.Execution.IndexColumnOrder
-     */
-        static public final int INDEX_COLUMN_ORDER_V01_ID       =
-                (MIN_ID_2 + 218);
-
-        /**
-        class org.apache.derby.Database.Language.Execution.AggregateInfo
-     */
-        static public final int AGG_INFO_V01_ID =
-                (MIN_ID_2 + 223);
-
-        /**
-        class org.apache.derby.Database.Language.Execution.AggregateInfoList
-     */
-        static public final int AGG_INFO_LIST_V01_ID    =
-                (MIN_ID_2 + 224);
-
-        /**
-                class org.apache.derby.Database.Language.Execution.DeleteConstantAction
-                This class is abstract so it doesn't need a format id!
-         */
-        static public final int WRITE_CURSOR_CONSTANT_ACTION_V01_ID =
-                (MIN_ID_2 + 227);
-
-        /**
-                class org.apache.derby.Database.Language.Execution.ValueRow
-         */
-        static public final int VALUE_ROW_V01_ID =
-                (MIN_ID_2 + 237);
-
-        /**
-                class org.apache.derby.Database.Language.Execution.IndexRow
-         */
-        static public final int INDEX_ROW_V01_ID =
-                (MIN_ID_2 + 238);
-
-        /**
-          class org.apache.derby.impl.sql.execute.AddJarConstantAction;
-         */
-        static public final int ADD_JAR_CONSTANT_ACTION_V01_ID =
-                (MIN_ID_2 + 211);
-
-        /**
-          class org.apache.derby.impl.sql.execute.DropJarConstantAction;
-         */
-        static public final int DROP_JAR_CONSTANT_ACTION_V01_ID =
-                (MIN_ID_2 + 212);
-
-        /**
-          class org.apache.derby.impl.sql.execute.ReplaceJarConstantAction;
-         */
-        static public final int REPLACE_JAR_CONSTANT_ACTION_V01_ID =
-                (MIN_ID_2 + 213);
-
-         /**
-        class org.apache.derby.Database.Language.Execution.ConstraintInfo
-     */
-        static public final int CONSTRAINT_INFO_V01_ID  =
-                (MIN_ID_2 + 278);
-
-        /**
-         */
-        static public final int UNUSED_2_280 =
-                (MIN_ID_2 + 280);
-
-        /**
-        class org.apache.derby.Database.Language.Execution.FKInfo
-     */
-        static public final int FK_INFO_V01_ID  =
-                (MIN_ID_2 + 282);
-
-        /**
-         */
-        static public final int UNUSED_2_289    =
-                (MIN_ID_2 + 289);
-        
-        /**
-        class org.apache.derby.impl.sql.execute.CreateTriggerConstantAction
+    static public final int NATIONAL_LONGVARCHAR_TYPE_ID_IMPL =
+            (MIN_ID_2 + 368);
+    
+    /**
+        class org.apache.derby.catalog.types.NationalLongVarcharTypeIdImpl
      */
-        static public final int CREATE_TRIGGER_CONSTANT_ACTION_V01_ID   =
-                (MIN_ID_2 + 314);
-        
-        /**
-        class org.apache.derby.impl.sql.execute.DropTriggerConstantAction
+    static public final int NCLOB_TYPE_ID_IMPL =
+            (MIN_ID_2 + 449);
+    
+    /**
+        class org.apache.derby.iapi.types.XML (implementation of
+        org.apache.derby.iapi.types.XMLDataValue).
      */
-        static public final int DROP_TRIGGER_CONSTANT_ACTION_V01_ID     =
-                (MIN_ID_2 + 315);
+    static public final int XML_TYPE_ID_IMPL =
+            (MIN_ID_2 + 457);
+
+    /******************************************************************
+    **
+    **      Execution MODULE CLASSES
+    **
+    ******************************************************************/
+
+    /**
+    class org.apache.derby.Database.Language.Execution.RenameConstantAction
+    */
+    static public final int RENAME_CONSTANT_ACTION_V01_ID   =
+            (MIN_ID_2 + 390);
 
-        /**
-        class org.apache.derby.impl.sql.execute.TriggerInfo
+    /**
+        class org.apache.derby.Database.Language.Execution.DeleteConstantAction
      */
-        static public final int TRIGGER_INFO_V01_ID     =
-                (MIN_ID_2 + 317);
-
-        /**
-        class org.apache.derby.impl.sql.execute.TransactionConstantAction
-     */
-        static public final int TRANSACTION_CONSTANT_ACTION_V01_ID      =
-                (MIN_ID_2 + 318);
-
-        /**
-        class org.apache.derby.Database.Language.Execution.SetTriggersConstantAction
-         */
-        static public final int SET_TRIGGERS_CONSTANT_ACTION_V01_ID     =
-                (MIN_ID_2 + 321);
-
-        /**
-            class org.apache.derby.Replication.Database.Language.Execution.RepSetTriggersConstantAction
-         */
-        static public final int REP_SET_TRIGGERS_CONSTANT_ACTION_V01_ID =
-                (MIN_ID_2 + 322);
-
-        /**
-            class org.apache.derby.impl.sql.execute.RealLastIndexKeyScanStatistics
-         */
-        static public final int REAL_LAST_INDEX_KEY_SCAN_STATISTICS_IMPL_V01_ID =
-                (MIN_ID_2 + 327);
-
-        ////////////////////////////////////////////////////////////////////////////
-        //
-        // New versions of 2.0 Language ConstantActions, versioned in 3.0
-        //
-        ////////////////////////////////////////////////////////////////////////////
-
-
-        /** class org.apache.derby.Database.Language.Execution.SetSchemaConstantAction */
-        static public final int SET_SCHEMA_CONSTANT_ACTION_V02_ID                       = (MIN_ID_2 + 353);
-
-        /** class org.apache.derby.Database.Language.Execution.SetTransactionIsolationConstantAction */
-        static public final int SET_TRANSACTION_ISOLATION_CONSTANT_ACTION_V02_ID = (MIN_ID_2 + 354);
-
-        /** class org.apache.derby.impl.sql.execute.ColumnInfo */
-        static public final int COLUMN_INFO_V02_ID                      = (MIN_ID_2 + 358);
-
-        /** class org.apache.derby.Database.Language.DependencySystem.Generic.ProviderInfo */
-        static public final int PROVIDER_INFO_V02_ID                    = (MIN_ID_2 + 359);
-
-        /** class org.apache.derby.impl.sql.execute.SavepointConstantAction */
-        static public final int SAVEPOINT_V01_ID                      = (MIN_ID_2 + 452);
-
-        /******************************************************************
-        **
-        **      LanguageInterface MODULE CLASSES
-        **
-        ******************************************************************/
-        /**
-        class org.apache.derby.impl.sql.GenericStorablePreparedStatement
+    static public final int DELETE_CONSTANT_ACTION_V01_ID =
+            (MIN_ID_2 + 37);
+
+    /**
+        class org.apache.derby.Database.Language.Execution.InsertConstantAction
      */
-        static public final int STORABLE_PREPARED_STATEMENT_V01_ID      =
-                (MIN_ID_2 + 225);
-        
-        /**
-        class org.apache.derby.impl.sql.GenericResultDescription
+    static public final int INSERT_CONSTANT_ACTION_V01_ID =
+            (MIN_ID_2 + 38);
+
+    /**
+        class org.apache.derby.Database.Language.Execution.UpdateConstantAction
      */
-        static public final int GENERIC_RESULT_DESCRIPTION_V01_ID       =
-                (MIN_ID_2 + 228);
+    static public final int UPDATABLE_VTI_CONSTANT_ACTION_V01_ID =
+            (MIN_ID_2 + 375);
 
-        /**
+    /**
+        class org.apache.derby.Database.Language.Execution.UpdateConstantAction
+     */
+    static public final int UPDATE_CONSTANT_ACTION_V01_ID =
+            (MIN_ID_2 + 39);
+
+    /**
+     */
+    static public final int UNUSED_2_204 =
+            (MIN_ID_2 + 204);
+
+    /**
         UNUSED
      */
-        static public final int UNUSED_2_215    = (MIN_ID_2 + 215);
+    static public final int UNUSED_2_41 =
+            (MIN_ID_2 + 41);
+    
+    /**
+    class org.apache.derby.Database.Language.Execution.DropAliasConstantAction
+    */
+    static public final int UNUSED_2_42 =
+            (MIN_ID_2 + 42);
+    
+    /**
+    class org.apache.derby.Database.Language.Execution.CreateSchemaConstantAction
+    */
+    static public final int UNUSED_2_141    =
+            (MIN_ID_2 + 141);
+    
+    /**
+    */
+    static public final int UNUSED_2_142    =
+            (MIN_ID_2 + 142);
+    
+    /**
+    class org.apache.derby.Database.Language.Execution.CreateViewConstantAction
+    */
+    static public final int UNUSED_2_143    =
+            (MIN_ID_2 + 143);
+    
+    /**
+    */
+    static public final int UNUSED_2_144    =
+            (MIN_ID_2 + 144);
+
+    /**
+        class org.apache.derby.Database.Language.Execution.ProviderInfo
+     */
+    static public final int PROVIDER_INFO_V01_ID =
+            (MIN_ID_2 + 148);
+
+    /**
+        class org.apache.derby.Database.Language.Execution.AvgAggregator
+     */
+    static public final int AGG_AVG_V01_ID =
+            (MIN_ID_2 + 149);
+
+    /**
+        class org.apache.derby.Database.Language.Execution.CountAggregator
+     */
+    static public final int AGG_COUNT_V01_ID =
+            (MIN_ID_2 + 151);
+
+    /**
+        class org.apache.derby.Database.Language.Execution.MaxMinAggregator
+     */
+    static public final int AGG_MAX_MIN_V01_ID =
+            (MIN_ID_2 + 152);
+
+    /**
+        class org.apache.derby.Database.Language.Execution.SumAggregator
+     */
+    static public final int AGG_SUM_V01_ID =
+            (MIN_ID_2 + 154);
 
-        /**
-        class org.apache.derby.impl.sql.GenericTypeDescriptor
+    /**
+     class org.apache.derby.Database.Language.Execution.UserAggregatorAggregator
+    */
+    static public final int AGG_USER_ADAPTOR_V01_ID =
+            (MIN_ID_2 + 323);
+
+    /**
+        class org.apache.derby.Database.Language.Execution.StatisticsConstantAction
+    */
+    static public final int STATISTICS_CONSTANT_ACTION_V01_ID =
+            (MIN_ID_2 + 155);
+
+    /**
+        class org.apache.derby.impl.sql.execute.RunTimeStatisticsImpl
      */
-        static public final int GENERIC_TYPE_DESCRIPTOR_V01_ID  =
-                (MIN_ID_2 + 216);
+    static public final int RUN_TIME_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 173);
+
+    /**
+        class org.apache.derby.Database.Language.Execution.LockTableConstantAction
+    */
+    static public final int UNUSED_2_275 =
+            (MIN_ID_2 + 275);
 
-        /**
-        class org.apache.derby.impl.sql.GenericTypeId
+    /**
+        class org.apache.derby.impl.sql.execute.RealProjectRestrictStatistics
      */
-        static public final int GENERIC_TYPE_ID_V01_ID  =
-                (MIN_ID_2 + 217);
+    static public final int REAL_PROJECT_RESTRICT_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 177);
 
-        /**
-        class org.apache.derby.impl.sql.CursorTableReference
+    /**
+        class org.apache.derby.impl.sql.execute.RealDistinctScalarAggregateStatistics
      */
-        static public final int CURSOR_TABLE_REFERENCE_V01_ID   =
-                (MIN_ID_2 + 296);
+    static public final int REAL_DISTINCT_SCALAR_AGGREGATE_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 284);
 
-        /**
-        class org.apache.derby.impl.sql.CursorInfo
+    /**
+        class org.apache.derby.impl.sql.execute.RealScalarAggregateStatistics
+    */
+    static public final int REAL_SCALAR_AGGREGATE_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 283);
+
+    /**
+        class org.apache.derby.impl.sql.execute.RealGroupedAggregateStatistics
      */
-        static public final int CURSOR_INFO_V01_ID      =
-                (MIN_ID_2 + 297);
+    static public final int REAL_GROUPED_AGGREGATE_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 285);
 
-        /******************************************************************
-        **
-        **      ALIAS INFO CLASSES
-        **
-        ******************************************************************/
+    /**
+        class org.apache.derby.impl.sql.execute.RealSortStatistics
+     */
+    static public final int REAL_SORT_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 178);
+
+    /**
+        class org.apache.derby.impl.sql.execute.RealTableScanStatistics
+     */
+    static public final int REAL_TABLE_SCAN_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 179);
 
-        /**
-        class org.apache.derby.catalog.types.ClassAliasInfo
+    /**
+        class org.apache.derby.impl.sql.execute.RealHashJoinStatistics
      */
-        static public final int CLASS_ALIAS_INFO_V01_ID =
-                (MIN_ID_2 + 310);
+    static public final int REAL_HASH_JOIN_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 304);
 
-        /**
-        class org.apache.derby.catalog.types.MethodAliasInfo
+    /**
+        class org.apache.derby.impl.sql.execute.RealNestedLoopJoinStatistics
      */
-        static public final int METHOD_ALIAS_INFO_V01_ID        =
-                (MIN_ID_2 + 312);
+    static public final int REAL_NESTED_LOOP_JOIN_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 180);
 
-        /**
-        class org.apache.derby.catalog.types.WorkUnitAliasInfo
+    /**
+        class org.apache.derby.impl.sql.execute.RealIndexRowToBaseRowStatistics
      */
-        static public final int WORK_UNIT_ALIAS_INFO_V01_ID     =
-                (MIN_ID_2 + 309);
+    static public final int REAL_INDEX_ROW_TO_BASE_ROW_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 181);
 
-        /**
-        class org.apache.derby.catalog.types.UserAggregateAliasInfo
+    /**
+        class org.apache.derby.impl.sql.execute.RealAnyResultSetStatistics
      */
-        static public final int USER_AGGREGATE_ALIAS_INFO_V01_ID        =
-                (MIN_ID_2 + 311);
+    static public final int REAL_ANY_RESULT_SET_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 182);
 
+    /**
+        class org.apache.derby.impl.sql.execute.RealOnceResultSetStatistics
+     */
+    static public final int REAL_ONCE_RESULT_SET_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 183);
 
+    /**
+        class org.apache.derby.impl.sql.execute.RealCurrentOfStatistics
+     */
+    static public final int REAL_CURRENT_OF_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 184);
 
-	public static final int ROUTINE_INFO_V01_ID = (MIN_ID_2 + 451);
-	public static final int SYNONYM_INFO_V01_ID = (MIN_ID_2 + 455);
+    /**
+        class org.apache.derby.impl.sql.execute.RealRowResultSetStatistics
+     */
+    static public final int REAL_ROW_RESULT_SET_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 185);
 
-	/******************************************************************
-	**
-	**	DEFAULT INFO CLASSES
-	**
-	******************************************************************/
-                
-        /**
-        class org.apache.derby.catalog.types.DefaultInfoImpl
+    /**
+        class org.apache.derby.impl.sql.execute.RealUnionResultSetStatistics
      */
-        static public final int DEFAULT_INFO_IMPL_V01_ID =
-                (MIN_ID_2 + 326);
+    static public final int REAL_UNION_RESULT_SET_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 186);
 
+    /**
+        class org.apache.derby.impl.sql.execute.RealHashLeftOuterJoinStatistics
+     */
+    static public final int REAL_HASH_LEFT_OUTER_JOIN_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 305);
 
+    /**
+        class org.apache.derby.impl.sql.execute.RealNestedLoopLeftOuterJoinStatistics
+     */
+    static public final int REAL_NESTED_LOOP_LEFT_OUTER_JOIN_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 187);
 
+    /**
+        class org.apache.derby.impl.sql.execute.RealNormalizeResultSetStatistics
+     */
+    static public final int REAL_NORMALIZE_RESULT_SET_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 188);
 
+    /**
+        class org.apache.derby.impl.sql.execute.RealInsertResultSetStatistics
+     */
+    static public final int REAL_INSERT_RESULT_SET_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 189);
 
-        /**
-        class org.apache.derby.impl.sql.GenericColumnDescriptor
+    /**
+        class org.apache.derby.impl.sql.execute.RealInsertVTIResultSetStatistics
      */
-        static public final int GENERIC_COLUMN_DESCRIPTOR_V02_ID        =
-                (MIN_ID_2 + 383);
+    static public final int REAL_INSERT_VTI_RESULT_SET_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 379);
 
+    /**
+        class org.apache.derby.impl.sql.execute.RealUpdateResultSetStatistics
+     */
+    static public final int REAL_UPDATE_RESULT_SET_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 190);
 
-        /**
-                UNUSED (MIN_ID_2 + 384)
-        */
+    /**
+        class org.apache.derby.impl.sql.execute.RealDeleteResultSetStatistics
+     */
+    static public final int REAL_DELETE_VTI_RESULT_SET_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 380);
 
-        /**
-            UNUSED (MIN_ID_2 + 382)
-         */
+    /**
+        class org.apache.derby.impl.sql.execute.RealDeleteResultSetStatistics
+     */
+    static public final int REAL_DELETE_RESULT_SET_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 191);
 
-        
+    /**
+       org.apache.derby.impl.sql.execute.rts.RealDeleteCascadeResultSetStatistics"
+     */
+    static public final int REAL_DELETE_CASCADE_RESULT_SET_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 439);
+
+
+
+    /**
+        class org.apache.derby.impl.sql.execute.RealHashScanStatistics
+     */
+    static public final int REAL_HASH_SCAN_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 203);
+
+    /**
+        class org.apache.derby.impl.sql.execute.RealDistinctScanStatistics
+     */
+    static public final int REAL_DISTINCT_SCAN_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 334);
+
+    /**
+        class org.apache.derby.impl.sql.execute.RealHashTableStatistics
+     */
+    static public final int REAL_HASH_TABLE_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 306);
+
+    /**
+        class org.apache.derby.impl.sql.execute.RealVTIStatistics
+     */
+    static public final int REAL_VTI_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 214);
+
+    /**
+        class org.apache.derby.impl.sql.execute.RealMaterializedResultSetStatistics
+     */
+    static public final int REAL_MATERIALIZED_RESULT_SET_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 308);
+
+    /**
+        class org.apache.derby.impl.sql.execute.RealScrollInsensitiveResultSetStatistics
+     */
+    static public final int REAL_SCROLL_INSENSITIVE_RESULT_SET_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 330);
+
+    /**
+    class org.apache.derby.Database.Language.Execution.CreateSPSConstantAction
+    */
+    static public final int UNUSED_2_221    =
+            (MIN_ID_2 + 221);
+    
+    /**
+    class org.apache.derby.Database.Language.Execution.CreateSPSConstantAction
+    */
+    static public final int UNUSED_2_222    =
+            (MIN_ID_2 + 222);
+
+    /**
+    class org.apache.derby.Database.Language.Execution.AlterSPSConstantAction
+    */
+    static public final int ALTER_SPS_CONSTANT_ACTION_V01_ID        =
+            (MIN_ID_2 + 229);
+
+    /**
+    class org.apache.derby.Database.Language.Execution.IndexColumnOrder
+    */
+    static public final int INDEX_COLUMN_ORDER_V01_ID       =
+            (MIN_ID_2 + 218);
+
+    /**
+    class org.apache.derby.Database.Language.Execution.AggregateInfo
+    */
+    static public final int AGG_INFO_V01_ID =
+            (MIN_ID_2 + 223);
+
+    /**
+    class org.apache.derby.Database.Language.Execution.AggregateInfoList
+    */
+    static public final int AGG_INFO_LIST_V01_ID    =
+            (MIN_ID_2 + 224);
+
+    /**
+       class org.apache.derby.Database.Language.Execution.DeleteConstantAction
+       This class is abstract so it doesn't need a format id!
+     */
+    static public final int WRITE_CURSOR_CONSTANT_ACTION_V01_ID =
+            (MIN_ID_2 + 227);
+
+    /**
+            class org.apache.derby.Database.Language.Execution.ValueRow
+     */
+    static public final int VALUE_ROW_V01_ID =
+            (MIN_ID_2 + 237);
+
+    /**
+            class org.apache.derby.Database.Language.Execution.IndexRow
+     */
+    static public final int INDEX_ROW_V01_ID =
+            (MIN_ID_2 + 238);
+
+    /**
+      class org.apache.derby.impl.sql.execute.AddJarConstantAction;
+     */
+    static public final int ADD_JAR_CONSTANT_ACTION_V01_ID =
+            (MIN_ID_2 + 211);
+
+    /**
+      class org.apache.derby.impl.sql.execute.DropJarConstantAction;
+     */
+    static public final int DROP_JAR_CONSTANT_ACTION_V01_ID =
+            (MIN_ID_2 + 212);
+
+    /**
+      class org.apache.derby.impl.sql.execute.ReplaceJarConstantAction;
+     */
+    static public final int REPLACE_JAR_CONSTANT_ACTION_V01_ID =
+            (MIN_ID_2 + 213);
+
+     /**
+    class org.apache.derby.Database.Language.Execution.ConstraintInfo
+     */
+    static public final int CONSTRAINT_INFO_V01_ID  =
+            (MIN_ID_2 + 278);
+
+    /**
+     */
+    static public final int UNUSED_2_280 =
+            (MIN_ID_2 + 280);
+
+    /**
+    class org.apache.derby.Database.Language.Execution.FKInfo
+     */
+    static public final int FK_INFO_V01_ID  =
+            (MIN_ID_2 + 282);
+
+    /**
+     */
+    static public final int UNUSED_2_289    =
+            (MIN_ID_2 + 289);
+    
+    /**
+    class org.apache.derby.impl.sql.execute.CreateTriggerConstantAction
+     */
+    static public final int CREATE_TRIGGER_CONSTANT_ACTION_V01_ID   =
+            (MIN_ID_2 + 314);
+    
+    /**
+    class org.apache.derby.impl.sql.execute.DropTriggerConstantAction
+     */
+    static public final int DROP_TRIGGER_CONSTANT_ACTION_V01_ID     =
+            (MIN_ID_2 + 315);
 
+    /**
+    class org.apache.derby.impl.sql.execute.TriggerInfo
+     */
+    static public final int TRIGGER_INFO_V01_ID     =
+            (MIN_ID_2 + 317);
 
-        /******************************************************************
-        **
-        **  Type system id's
-        **
-        ******************************************************************/
+    /**
+    class org.apache.derby.impl.sql.execute.TransactionConstantAction
+     */
+    static public final int TRANSACTION_CONSTANT_ACTION_V01_ID      =
+            (MIN_ID_2 + 318);
 
-        public static final int SQL_BOOLEAN_ID = 
-                (MIN_ID_2 + 77);
+    /**
+    class org.apache.derby.Database.Language.Execution.SetTriggersConstantAction
+     */
+    static public final int SET_TRIGGERS_CONSTANT_ACTION_V01_ID     =
+            (MIN_ID_2 + 321);
 
-        public static final int SQL_CHAR_ID = 
-                (MIN_ID_2 + 78);
+    /**
+        class org.apache.derby.Replication.Database.Language.Execution.RepSetTriggersConstantAction
+     */
+    static public final int REP_SET_TRIGGERS_CONSTANT_ACTION_V01_ID =
+            (MIN_ID_2 + 322);
 
-        public static final int SQL_DOUBLE_ID = 
-                (MIN_ID_2 + 79);
+    /**
+        class org.apache.derby.impl.sql.execute.RealLastIndexKeyScanStatistics
+     */
+    static public final int REAL_LAST_INDEX_KEY_SCAN_STATISTICS_IMPL_V01_ID =
+            (MIN_ID_2 + 327);
 
-        public static final int SQL_INTEGER_ID = 
-                (MIN_ID_2 + 80);
+    ////////////////////////////////////////////////////////////////////////////
+    //
+    // New versions of 2.0 Language ConstantActions, versioned in 3.0
+    //
+    ////////////////////////////////////////////////////////////////////////////
 
-        public static final int SQL_REAL_ID = 
-                (MIN_ID_2 + 81);
 
-        public static final int SQL_REF_ID = 
-                (MIN_ID_2 + 82);
+    /** class org.apache.derby.Database.Language.Execution.SetSchemaConstantAction */
+    static public final int SET_SCHEMA_CONSTANT_ACTION_V02_ID                       = (MIN_ID_2 + 353);
 
-        public static final int SQL_SMALLINT_ID = 
-                (MIN_ID_2 + 83);
+    /** class org.apache.derby.Database.Language.Execution.SetTransactionIsolationConstantAction */
+    static public final int SET_TRANSACTION_ISOLATION_CONSTANT_ACTION_V02_ID = (MIN_ID_2 + 354);
 
-        public static final int SQL_LONGINT_ID = 
-                (MIN_ID_2 + 84);
+    /** class org.apache.derby.impl.sql.execute.ColumnInfo */
+    static public final int COLUMN_INFO_V02_ID                      = (MIN_ID_2 + 358);
 
-        public static final int SQL_VARCHAR_ID = 
-                (MIN_ID_2 + 85);
+    /** class org.apache.derby.Database.Language.DependencySystem.Generic.ProviderInfo */
+    static public final int PROVIDER_INFO_V02_ID                    = (MIN_ID_2 + 359);
 
-        //public static final int SQL_USERTYPE_ID = 
-        //      (MIN_ID_2 + 86);
+    /** class org.apache.derby.impl.sql.execute.SavepointConstantAction */
+    static public final int SAVEPOINT_V01_ID                      = (MIN_ID_2 + 452);
 
-        //public static final int SQL_USERTYPE_ID_V2 = 
-        //      (MIN_ID_2 + 266);
+    /******************************************************************
+    **
+    **      LanguageInterface MODULE CLASSES
+    **
+    ******************************************************************/
+    /**
+    class org.apache.derby.impl.sql.GenericStorablePreparedStatement
+     */
+    static public final int STORABLE_PREPARED_STATEMENT_V01_ID      =
+            (MIN_ID_2 + 225);
+    
+    /**
+    class org.apache.derby.impl.sql.GenericResultDescription
+     */
+    static public final int GENERIC_RESULT_DESCRIPTION_V01_ID       =
+            (MIN_ID_2 + 228);
 
-        public static final int SQL_USERTYPE_ID_V3 = 
-                (MIN_ID_2 + 266);
+    /**
+    UNUSED
+     */
+    static public final int UNUSED_2_215    = (MIN_ID_2 + 215);
 
-        public static final int SQL_DATE_ID = 
-                (MIN_ID_2 + 298);
+    /**
+    class org.apache.derby.impl.sql.GenericTypeDescriptor
+     */
+    static public final int GENERIC_TYPE_DESCRIPTOR_V01_ID  =
+            (MIN_ID_2 + 216);
 
-        public static final int SQL_TIME_ID = 
-                (MIN_ID_2 + 299);
+    /**
+    class org.apache.derby.impl.sql.GenericTypeId
+     */
+    static public final int GENERIC_TYPE_ID_V01_ID  =
+            (MIN_ID_2 + 217);
 
-        public static final int SQL_TIMESTAMP_ID = 
-                (MIN_ID_2 + 31);
+    /**
+    class org.apache.derby.impl.sql.CursorTableReference
+     */
+    static public final int CURSOR_TABLE_REFERENCE_V01_ID   =
+            (MIN_ID_2 + 296);
 
-        public static final int SQL_BIT_ID = 
-                (MIN_ID_2 + 87);
+    /**
+    class org.apache.derby.impl.sql.CursorInfo
+     */
+    static public final int CURSOR_INFO_V01_ID      =
+            (MIN_ID_2 + 297);
 
-        public static final int SQL_VARBIT_ID = 
-                (MIN_ID_2 + 88);
+    /******************************************************************
+    **
+    **      ALIAS INFO CLASSES
+    **
+    ******************************************************************/
 
-        public static final int SQL_TINYINT_ID = 
-                (MIN_ID_2 + 199);
+    /**
+    class org.apache.derby.catalog.types.ClassAliasInfo
+     */
+    static public final int CLASS_ALIAS_INFO_V01_ID =
+            (MIN_ID_2 + 310);
 
-        public static final int SQL_DECIMAL_ID = 
-                (MIN_ID_2 + 200);
+    /**
+    class org.apache.derby.catalog.types.MethodAliasInfo
+     */
+    static public final int METHOD_ALIAS_INFO_V01_ID        =
+            (MIN_ID_2 + 312);
 
-        public static final int SQL_LONGVARCHAR_ID =
-                (MIN_ID_2 + 235);
+    /**
+    class org.apache.derby.catalog.types.WorkUnitAliasInfo
+     */
+    static public final int WORK_UNIT_ALIAS_INFO_V01_ID     =
+            (MIN_ID_2 + 309);
 
-        public static final int SQL_CLOB_ID =
-                (MIN_ID_2 + 447);
+    /**
+    class org.apache.derby.catalog.types.UserAggregateAliasInfo
+     */
+    static public final int USER_AGGREGATE_ALIAS_INFO_V01_ID        =
+            (MIN_ID_2 + 311);
 
-        public static final int SQL_LONGVARBIT_ID =
-                (MIN_ID_2 + 234);
 
-        public static final int SQL_BLOB_ID =
-                (MIN_ID_2 + 443);
 

[... 764 lines stripped ...]