db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r905472 - in /db/derby/code/trunk/java/engine/org/apache/derby: catalog/types/ iapi/sql/dictionary/ iapi/types/ impl/load/ impl/sql/catalog/ impl/sql/compile/
Date Tue, 02 Feb 2010 00:21:44 GMT
Author: rhillegas
Date: Tue Feb  2 00:21:42 2010
New Revision: 905472

URL: http://svn.apache.org/viewvc?rev=905472&view=rev
Log:
DERBY-4484: Improve error handling during UDT instantiation and import.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/JSQLType.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSPERMSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROLESRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSEQUENCESRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj

Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java
Tue Feb  2 00:21:42 2010
@@ -81,30 +81,28 @@
 	 * @param className	The SQL name of the type
 	 */
 
-	public UserDefinedTypeIdImpl(String className)
+	public UserDefinedTypeIdImpl(String className) throws StandardException
 	{
-        try {
-            //
-            // If the name begins with a quote, then it is the schema-qualified name
-            // of a UDT. Parse the name.
-            //
-            if ( className.charAt( 0 ) == '"' )
-            {
-                String[] nameParts = IdUtil.parseMultiPartSQLIdentifier( className );
-                
-                schemaName = nameParts[ 0 ];
-                unqualifiedName = nameParts[ 1 ];
-                className = null;
-            }
-            else
-            {
-                schemaName = null;
-                unqualifiedName = className;
-                this.className = className;
-            }
+        //
+        // If the name begins with a quote, then it is the schema-qualified name
+        // of a UDT. Parse the name.
+        //
+        if ( className.charAt( 0 ) == '"' )
+        {
+            String[] nameParts = IdUtil.parseMultiPartSQLIdentifier( className );
             
-            JDBCTypeId = java.sql.Types.JAVA_OBJECT;
-        } catch (Exception e) { throw new IllegalArgumentException( e.getMessage() ); }
+            schemaName = nameParts[ 0 ];
+            unqualifiedName = nameParts[ 1 ];
+            className = null;
+        }
+        else
+        {
+            schemaName = null;
+            unqualifiedName = className;
+            this.className = className;
+        }
+        
+        JDBCTypeId = java.sql.Types.JAVA_OBJECT;
 	}
 
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -327,7 +327,7 @@
 		throws StandardException;
 
 	/** builds a column list for the catalog */
-	public abstract SystemColumn[]	buildColumnList();
+	public abstract SystemColumn[]	buildColumnList() throws StandardException;
 
 	/** Return the column positions for a given index number */
 	public int[] getIndexColumnPositions(int indexNumber)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java Tue
Feb  2 00:21:42 2010
@@ -320,6 +320,7 @@
 	(
 		String	javaTypeName
 	)
+        throws StandardException
 	{
 			return DataTypeDescriptor.getSQLDataTypeDescriptor(javaTypeName, true);
 	}
@@ -340,6 +341,7 @@
 		String	javaTypeName, 
 		boolean	isNullable
 	)
+        throws StandardException
 	{
 		TypeId typeId = TypeId.getSQLTypeForJavaType(javaTypeName);
 		if (typeId == null)
@@ -373,6 +375,7 @@
 		boolean	isNullable, 
 		int 	maximumWidth
 	)
+        throws StandardException
 	{
 		TypeId typeId = TypeId.getSQLTypeForJavaType(javaTypeName);
 		if (typeId == null)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/JSQLType.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/JSQLType.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/JSQLType.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/JSQLType.java Tue Feb  2 00:21:42
2010
@@ -23,6 +23,7 @@
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 import org.apache.derby.iapi.services.io.Formatable;
+import org.apache.derby.iapi.error.StandardException;
 
 import java.io.IOException;
 import java.io.ObjectInput;
@@ -175,6 +176,7 @@
 	public	DataTypeDescriptor	getSQLType
 	(
     )
+        throws StandardException
 	{
 		// might not be filled in if this is a JAVA_CLASS or JAVA_PRIMITIVE
 		if ( sqlType == null )

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java Tue Feb  2 00:21:42
2010
@@ -33,6 +33,7 @@
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 import org.apache.derby.iapi.services.loader.ClassFactory;
 import org.apache.derby.iapi.services.sanity.SanityManager;
+import org.apache.derby.iapi.error.StandardException;
 
 /**
  * TypeId describes the static information about a SQL type
@@ -373,6 +374,7 @@
     }
 
         public static TypeId getUserDefinedTypeId(String className, boolean delimitedIdentifier)
+            throws StandardException
         {
                 return new TypeId(StoredFormatIds.USERDEFINED_TYPE_ID_V3,
                                         new UserDefinedTypeIdImpl(className), delimitedIdentifier
@@ -390,6 +392,7 @@
      * @return A bound type TypeId describing this ANSI UDT.
      */
     public static TypeId getUserDefinedTypeId(String schemaName, String unqualifiedName,
String className )
+        throws StandardException
     {
         return new TypeId
             (
@@ -409,6 +412,7 @@
          *         null if there is no corresponding type.
          */
         public static TypeId getSQLTypeForJavaType(String javaTypeName)
+            throws StandardException
         {
                 if (javaTypeName.equals("java.lang.Boolean") ||
                         javaTypeName.equals("boolean"))

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java Tue Feb  2
00:21:42 2010
@@ -242,7 +242,7 @@
             }
             rs.close();
         }
-        catch (Exception e) { throw new SQLException( e.getMessage() ); }
+        catch (Exception e) { throw LoadError.unexpectedError( e ); }
 
         if ( className == null ) { className = "???"; }
         

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -366,6 +366,7 @@
      * @return array of SystemColumn suitable for making this catalog.
      */
     public SystemColumn[]   buildColumnList()
+        throws StandardException
     {
       return new SystemColumn[] {
         

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -214,7 +214,9 @@
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 
-    public SystemColumn[] buildColumnList() {
+    public SystemColumn[] buildColumnList()
+        throws StandardException
+    {
         
        return new SystemColumn[] {
             SystemColumnImpl.getUUIDColumn("CONSTRAINTID", false),

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -174,6 +174,7 @@
 
 	/** builds a column list for the catalog */
     public SystemColumn[] buildColumnList()
+        throws StandardException
     {
         return new SystemColumn[] {
            SystemColumnImpl.getUUIDColumn("COLPERMSID", false),

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -443,6 +443,7 @@
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 	public SystemColumn[]	buildColumnList()
+        throws StandardException
 	{
         
         return new SystemColumn[] {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -430,6 +430,7 @@
 	 */
     	        
 	public SystemColumn[]	buildColumnList()
+        throws StandardException
 	{
             return new SystemColumn[] {
                SystemColumnImpl.getUUIDColumn("SCHEMAID", false),

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -232,6 +232,7 @@
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 	public SystemColumn[]	buildColumnList()
+        throws StandardException
 	{
             return new SystemColumn[] {
                 SystemColumnImpl.getUUIDColumn("DEPENDENTID", false),

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -246,6 +246,7 @@
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
     public SystemColumn[]   buildColumnList()
+        throws StandardException
     {
         return new SystemColumn[] {
            SystemColumnImpl.getUUIDColumn(ID_COL_NAME, false),

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -246,6 +246,7 @@
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 	public SystemColumn[]	buildColumnList()
+        throws StandardException
 	{
             return new SystemColumn[] {
                  SystemColumnImpl.getUUIDColumn("CONSTRAINTID", false),

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -198,6 +198,7 @@
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 	public SystemColumn[]	buildColumnList()
+        throws StandardException
 	{
             return new SystemColumn[] {
                 SystemColumnImpl.getUUIDColumn("CONSTRAINTID", false),

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSPERMSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSPERMSRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSPERMSRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSPERMSRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -323,7 +323,9 @@
      *
      * @return array of SystemColumn suitable for making this catalog.
      */
-    public SystemColumn[] buildColumnList() {
+    public SystemColumn[] buildColumnList()
+        throws StandardException
+    {
         return new SystemColumn[]{
                 SystemColumnImpl.getUUIDColumn("UUID", false),
                 SystemColumnImpl.getColumn("OBJECTTYPE", Types.VARCHAR, false, 36),

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROLESRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROLESRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROLESRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROLESRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -242,6 +242,7 @@
      * @return array of SystemColumn suitable for making this catalog.
      */
     public SystemColumn[]   buildColumnList()
+        throws StandardException
     {
         return new SystemColumn[] {
             SystemColumnImpl.getUUIDColumn("UUID", false),

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -152,6 +152,7 @@
 
 	/** builds a column list for the catalog */
 	public SystemColumn[] buildColumnList()
+        throws StandardException
     {
          return new SystemColumn[] {
              SystemColumnImpl.getUUIDColumn("ROUTINEPERMSID", false),

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -221,6 +221,7 @@
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 	public SystemColumn[]	buildColumnList() 
+        throws StandardException
 	{
             return new SystemColumn[] {
                 SystemColumnImpl.getUUIDColumn("SCHEMAID", false),

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSEQUENCESRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSEQUENCESRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSEQUENCESRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSEQUENCESRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -283,7 +283,9 @@
      *
      * @return array of SystemColumn suitable for making this catalog.
      */
-    public SystemColumn[] buildColumnList() {
+    public SystemColumn[] buildColumnList()
+        throws StandardException
+    {
         return new SystemColumn[]{
 
                 SystemColumnImpl.getUUIDColumn("SEQUENCEID", false),

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -385,6 +385,7 @@
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 	public SystemColumn[] buildColumnList()
+        throws StandardException
 	{
             return new SystemColumn[] {
                 SystemColumnImpl.getUUIDColumn("STMTID", false),

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -238,6 +238,7 @@
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 	public SystemColumn[] buildColumnList()
+        throws StandardException
 	{
             return new SystemColumn[] {
                 SystemColumnImpl.getUUIDColumn("STATID", false),

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -196,6 +196,7 @@
 
 	/** builds a column list for the catalog */
 	public SystemColumn[] buildColumnList()
+        throws StandardException
     {
         return new SystemColumn[] {
             SystemColumnImpl.getUUIDColumn("TABLEPERMSID", false),

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -422,6 +422,7 @@
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 	public SystemColumn[]	buildColumnList()
+        throws StandardException
 	{
         return new SystemColumn[] {
             SystemColumnImpl.getUUIDColumn("TABLEID", false),

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -434,6 +434,7 @@
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 	public SystemColumn[] buildColumnList()
+        throws StandardException
 	{
         return new SystemColumn[] {
             SystemColumnImpl.getUUIDColumn("TRIGGERID", false),

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java
Tue Feb  2 00:21:42 2010
@@ -261,6 +261,7 @@
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 	public SystemColumn[]	buildColumnList()
+        throws StandardException
 	{
             return new SystemColumn[] {
                 SystemColumnImpl.getUUIDColumn("TABLEID", false),

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java
Tue Feb  2 00:21:42 2010
@@ -26,6 +26,7 @@
 import org.apache.derby.iapi.sql.dictionary.SystemColumn;
 import org.apache.derby.iapi.types.DataTypeDescriptor;
 import org.apache.derby.iapi.types.TypeId;
+import org.apache.derby.iapi.error.StandardException;
 
 /**
  * Implements the description of a column in a system table.
@@ -129,7 +130,9 @@
      * @return Object representing the column.
      */
     static SystemColumn getJavaColumn(String name, String javaClassName,
-            boolean nullability) {
+            boolean nullability)
+        throws StandardException
+    {
 
         TypeId typeId = TypeId.getUserDefinedTypeId(javaClassName, false);
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java Tue
Feb  2 00:21:42 2010
@@ -172,6 +172,7 @@
 	  *
 	  */
 	public	TypeId	mapToTypeID( JSQLType jsqlType )
+        throws StandardException
 	{
 		DataTypeDescriptor	dts = jsqlType.getSQLType();
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj?rev=905472&r1=905471&r2=905472&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj Tue Feb
 2 00:21:42 2010
@@ -279,6 +279,7 @@
 
 	private DataTypeDescriptor getDataTypeServices(int type, int precision, int scale,
 			int length)
+        throws StandardException
 	{
 		return new DataTypeDescriptor(
 					TypeId.getBuiltInTypeId(type),
@@ -290,6 +291,7 @@
 	}
 
 	private DataTypeDescriptor getJavaClassDataTypeDescriptor(TableName typeName) 
+        throws StandardException
 	{
 		return new DataTypeDescriptor
             (



Mime
View raw message