You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ba...@apache.org on 2005/05/13 20:35:34 UTC

svn commit: r170069 [2/2] - in /incubator/derby/code/trunk/java: drda/org/apache/derby/impl/drda/ engine/org/apache/derby/diag/ engine/org/apache/derby/iapi/reference/ engine/org/apache/derby/iapi/sql/compile/ engine/org/apache/derby/iapi/types/ engine/org/apache/derby/impl/jdbc/ engine/org/apache/derby/impl/jdbc/authentication/ engine/org/apache/derby/impl/load/ engine/org/apache/derby/impl/sql/catalog/ engine/org/apache/derby/impl/sql/compile/ engine/org/apache/derby/impl/sql/conn/ engine/org/apache/derby/impl/sql/execute/ engine/org/apache/derby/impl/store/raw/data/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ testing/org/apache/derbyTesting/functionTests/tests/lang/ testing/org/apache/derbyTesting/functionTests/tests/store/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetSchemaConstantAction.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetSchemaConstantAction.java?rev=170069&r1=170068&r2=170069&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetSchemaConstantAction.java (original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetSchemaConstantAction.java Fri May 13 11:35:33 2005
@@ -31,6 +31,8 @@
 
 import org.apache.derby.iapi.types.DataValueDescriptor;
 
+import org.apache.derby.iapi.reference.Limits;
+
 import org.apache.derby.iapi.error.StandardException;
 
 import org.apache.derby.iapi.sql.Activation;
@@ -109,7 +111,7 @@
 			DataValueDescriptor dvs = pvs.getParameter(0);
 			thisSchemaName = dvs.getString();
 			//null parameter is not allowed
-			if (thisSchemaName == null || thisSchemaName.length() > 128)
+			if (thisSchemaName == null || thisSchemaName.length() > Limits.MAX_IDENTIFIER_LENGTH)
 				throw StandardException.newException(SQLState.LANG_DB2_REPLACEMENT_ERROR, "CURRENT SCHEMA");
 		}
 		else if (type == StatementType.SET_SCHEMA_USER)

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java?rev=170069&r1=170068&r2=170069&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java (original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java Fri May 13 11:35:33 2005
@@ -22,7 +22,7 @@
 
 import org.apache.derby.iapi.reference.Property;
 
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.Limits;
 import org.apache.derby.iapi.reference.SQLState;
 
 import org.apache.derby.impl.store.raw.data.BaseContainer;
@@ -1111,8 +1111,8 @@
 		pageSize = 
 			PropertyUtil.getServiceInt(tc, createArgs,
 				Property.PAGE_SIZE_PARAMETER,  
-				DB2Limit.DB2_MIN_PAGE_SIZE, 
-				DB2Limit.DB2_MAX_PAGE_SIZE, 
+				Limits.DB2_MIN_PAGE_SIZE, 
+				Limits.DB2_MAX_PAGE_SIZE, 
 				RawStoreFactory.PAGE_SIZE_DEFAULT); 
 
         // rather than throw error, just automatically set page size to 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dbMetaDataJdbc30.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dbMetaDataJdbc30.out?rev=170069&r1=170068&r2=170069&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dbMetaDataJdbc30.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dbMetaDataJdbc30.out Fri May 13 11:35:33 2005
@@ -14,9 +14,9 @@
 getDatabaseMajorVersion() : 10
 getDatabaseMinorVersion() : 1
 supportsStatementPooling() : false
-getMaxColumnNameLength() = 30
-getMaxCursorNameLength() = 18
-getMaxSchemaNameLength() = 30
+getMaxColumnNameLength() = 128
+getMaxCursorNameLength() = 128
+getMaxSchemaNameLength() = 128
 getMaxProcedureNameLength() = 128
 getMaxTableNameLength() = 128
 getMaxUserNameLength() = 30

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out?rev=170069&r1=170068&r2=170069&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out Fri May 13 11:35:33 2005
@@ -12,7 +12,7 @@
 JDBC Driver 'IBM DB2 JDBC Universal Driver Architecture', version (EXPECTED VERSION)
 The URL is: jdbc:derby:net://localhost:1527/wombat;create=true
 allTablesAreSelectable(): true
-maxColumnNameLength(): 30
+maxColumnNameLength(): 128
 getSchemas():
 TABLE_SCHEM[VARCHAR]
 APP
@@ -131,9 +131,9 @@
 getMaxColumnsInSelect(): 0
 getMaxColumnsInTable(): 0
 getMaxConnections(): 0
-getMaxCursorNameLength(): 18
+getMaxCursorNameLength(): 128
 getMaxIndexLength(): 0
-getMaxSchemaNameLength(): 30
+getMaxSchemaNameLength(): 128
 getMaxProcedureNameLength(): 128
 getMaxCatalogNameLength(): 0
 getMaxRowSize(): 0

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out?rev=170069&r1=170068&r2=170069&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out Fri May 13 11:35:33 2005
@@ -42,7 +42,7 @@
 JDBC Driver 'IBM DB2 JDBC Universal Driver Architecture', version (EXPECTED VERSION)
 The URL is: jdbc:derby:net://localhost:1527/wombat;create=true
 allTablesAreSelectable(): true
-maxColumnNameLength(): 30
+maxColumnNameLength(): 128
 getSchemas():
 TABLE_SCHEM[VARCHAR]
 APP
@@ -161,9 +161,9 @@
 getMaxColumnsInSelect(): 0
 getMaxColumnsInTable(): 0
 getMaxConnections(): 0
-getMaxCursorNameLength(): 18
+getMaxCursorNameLength(): 128
 getMaxIndexLength(): 0
-getMaxSchemaNameLength(): 30
+getMaxSchemaNameLength(): 128
 getMaxProcedureNameLength(): 128
 getMaxCatalogNameLength(): 0
 getMaxRowSize(): 0

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out?rev=170069&r1=170068&r2=170069&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out Fri May 13 11:35:33 2005
@@ -14,9 +14,9 @@
 getDatabaseMajorVersion() : 10
 getDatabaseMinorVersion() : 1
 supportsStatementPooling() : false
-getMaxColumnNameLength() = 30
-getMaxCursorNameLength() = 18
-getMaxSchemaNameLength() = 30
+getMaxColumnNameLength() = 128
+getMaxCursorNameLength() = 128
+getMaxSchemaNameLength() = 128
 getMaxProcedureNameLength() = 128
 getMaxTableNameLength() = 128
 getMaxUserNameLength() = 30

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out?rev=170069&r1=170068&r2=170069&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out Fri May 13 11:35:33 2005
@@ -12,7 +12,7 @@
 JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.1 (10.1.0.0 alpha)
 The URL is: jdbc:derby://localhost:1527/wombat;create=true
 allTablesAreSelectable(): true
-maxColumnNameLength(): 30
+maxColumnNameLength(): 128
 getSchemas():
 TABLE_SCHEM[VARCHAR]
 APP
@@ -131,9 +131,9 @@
 getMaxColumnsInSelect(): 0
 getMaxColumnsInTable(): 0
 getMaxConnections(): 0
-getMaxCursorNameLength(): 18
+getMaxCursorNameLength(): 128
 getMaxIndexLength(): 0
-getMaxSchemaNameLength(): 30
+getMaxSchemaNameLength(): 128
 getMaxProcedureNameLength(): 128
 getMaxCatalogNameLength(): 0
 getMaxRowSize(): 0

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out?rev=170069&r1=170068&r2=170069&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out Fri May 13 11:35:33 2005
@@ -42,7 +42,7 @@
 JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.1 (10.1.0.0 alpha)
 The URL is: jdbc:derby://localhost:1527/wombat;create=true
 allTablesAreSelectable(): true
-maxColumnNameLength(): 30
+maxColumnNameLength(): 128
 getSchemas():
 TABLE_SCHEM[VARCHAR]
 APP
@@ -161,9 +161,9 @@
 getMaxColumnsInSelect(): 0
 getMaxColumnsInTable(): 0
 getMaxConnections(): 0
-getMaxCursorNameLength(): 18
+getMaxCursorNameLength(): 128
 getMaxIndexLength(): 0
-getMaxSchemaNameLength(): 30
+getMaxSchemaNameLength(): 128
 getMaxProcedureNameLength(): 128
 getMaxCatalogNameLength(): 0
 getMaxRowSize(): 0

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/currentSchema.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/currentSchema.out?rev=170069&r1=170068&r2=170069&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/currentSchema.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/currentSchema.out Fri May 13 11:35:33 2005
@@ -305,20 +305,20 @@
 1                                                                                                                               
 --------------------------------------------------------------------------------------------------------------------------------
 T23456789012345678901234567890                                                                                                  
-ij> -- the following should fail - 31 length
-create schema t234567890123456789012345678901;
-ERROR 42622: The name 'T234567890123456789012345678901' is too long. The maximum length is '30'.
-ij> set schema t234567890123456789012345678901;
-ERROR 42622: The name 'T234567890123456789012345678901' is too long. The maximum length is '30'.
-ij> set schema 'T234567890123456789012345678901';
-ERROR 42622: The name 'T234567890123456789012345678901' is too long. The maximum length is '30'.
-ij> execute p1 using 'values(''T234567890123456789012345678901'')';
-ERROR 42Y07: Schema 'T234567890123456789012345678901' does not exist
+ij> -- the following should fail - 129 length
+create schema TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT;
+ERROR 42622: The name 'TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT' is too long. The maximum length is '128'.
+ij> set schema TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT;
+ERROR 42622: The name 'TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT' is too long. The maximum length is '128'.
+ij> set schema 'TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT';
+ERROR 42622: The name 'TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT' is too long. The maximum length is '128'.
+ij> execute p1 using 'values(''TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT'')';
+ERROR 42815: The replacement value for 'CURRENT SCHEMA' is invalid.
 ij> rollback;
 ij> autocommit on;
 ij> -- clean up
 drop schema judy restrict;
 0 rows inserted/updated/deleted
-ij> drop schema t234567890123456789012345678901 restrict;
-ERROR 42622: The name 'T234567890123456789012345678901' is too long. The maximum length is '30'.
+ij> drop schema TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT restrict;
+ERROR 42622: The name 'TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT' is too long. The maximum length is '128'.
 ij> 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dbMetaDataJdbc30.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dbMetaDataJdbc30.out?rev=170069&r1=170068&r2=170069&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dbMetaDataJdbc30.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dbMetaDataJdbc30.out Fri May 13 11:35:33 2005
@@ -14,9 +14,9 @@
 getDatabaseMajorVersion() : 10
 getDatabaseMinorVersion() : 1
 supportsStatementPooling() : false
-getMaxColumnNameLength() = 30
-getMaxCursorNameLength() = 18
-getMaxSchemaNameLength() = 30
+getMaxColumnNameLength() = 128
+getMaxCursorNameLength() = 128
+getMaxSchemaNameLength() = 128
 getMaxProcedureNameLength() = 128
 getMaxTableNameLength() = 128
 getMaxUserNameLength() = 30

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/identifier.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/identifier.out?rev=170069&r1=170068&r2=170069&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/identifier.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/identifier.out Fri May 13 11:35:33 2005
@@ -61,7 +61,13 @@
 select c1, "c1 ", " C1", " C1 ", "  C1  "  from success1;
 ERROR 42X04: Column 'c1 ' is not in any table in the FROM list or it appears within a join specification and is outside the scope of the join specification or it appears in a HAVING clause and is not in the GROUP BY list.  If this is a CREATE or ALTER TABLE statement then 'c1 ' is not a column in the target table.
 ij> -- negative test for max identifier width
--- 4567890123456789012345678901234567890123456789012345678901234567890
+-- NOTE: no negative test for max identifier length of function, savepoint and cursor
+-- tables needed for index, trigger and view test
+create table idtest1 (i integer, j integer);
+0 rows inserted/updated/deleted
+ij> create table idtest2 (i integer, j integer);
+0 rows inserted/updated/deleted
+ij> -- table
 create table
 asdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfaslast6
 (c1 int);
@@ -70,7 +76,46 @@
 "asdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfaslast7"
 (c1 int);
 ERROR 42622: The name 'asdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfaslast7' is too long. The maximum length is '128'.
+ij> -- column
+create table fail1 (ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccx integer);
+ERROR 42622: The name 'CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCX' is too long. The maximum length is '128'.
+ij> create table fail2 ("ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccx" integer);
+ERROR 42622: The name 'ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccx' is too long. The maximum length is '128'.
+ij> -- view
+create view vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvx as select * from idtest1;
+ERROR 42622: The name 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVX' is too long. The maximum length is '128'.
+ij> create view "vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvy" as select * from idtest1;
+ERROR 42622: The name 'vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvy' is too long. The maximum length is '128'.
+ij> -- trigger
+create trigger ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttx after insert on idtest1 for each row mode db2sql update idtest2 set i=i;
+ERROR 42622: The name 'TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTX' is too long. The maximum length is '128'.
+ij> create trigger "ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttx" after insert on idtest1 for each row mode db2sql update idtest2 set i=i;
+ERROR 42622: The name 'ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttx' is too long. The maximum length is '128'.
+ij> -- schema
+create schema ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssx;
+ERROR 42622: The name 'SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSX' is too long. The maximum length is '128'.
+ij> create schema "ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssx";
+ERROR 42622: The name 'ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssx' is too long. The maximum length is '128'.
+ij> -- index
+CREATE INDEX iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiix 
+ON idtest1 (i);
+ERROR 42622: The name 'IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIX' is too long. The maximum length is '128'.
+ij> CREATE INDEX "iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiix" 
+ON idtest1 (j);
+ERROR 42622: The name 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiix' is too long. The maximum length is '128'.
+ij> -- constraint
+create table fail3 (i integer, constraint ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccx check (i > 0));
+ERROR 42622: The name 'CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCX' is too long. The maximum length is '128'.
+ij> create table fail4 (i integer, constraint "ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccx" check (i > 0));
+ERROR 42622: The name 'ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccx' is too long. The maximum length is '128'.
+ij> --- procedure
+create procedure ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppx(in i integer) external name 'a.b.c.d' language java parameter style java;
+ERROR 42622: The name 'PPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPX' is too long. The maximum length is '128'.
+ij> create procedure "ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppx"(in i integer) external name 'a.b.c.d' language java parameter style java;
+ERROR 42622: The name 'ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppx' is too long. The maximum length is '128'.
 ij> -- positive test for max identifier width
+-- NOTE: no positive test for max identifier length of function, savepoint and cursor
+-- table
 create table
 asdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfaslast
 (c1 int);
@@ -97,8 +142,61 @@
 C1         
 -----------
 2          
-ij> -- drop the tables
-drop table success1;
+ij> -- column
+create table longid1 (cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc integer);
+0 rows inserted/updated/deleted
+ij> create table longid2 ("cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" integer);
+0 rows inserted/updated/deleted
+ij> -- view
+create view vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv as select * from idtest1;
+0 rows inserted/updated/deleted
+ij> create view "vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvw" as select * from idtest1;
+0 rows inserted/updated/deleted
+ij> -- trigger
+create trigger tttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt after insert on idtest1 for each row mode db2sql update idtest2 set i=i;
+0 rows inserted/updated/deleted
+ij> create trigger "tttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt" after insert on idtest1 for each row mode db2sql update idtest2 set i=i;
+0 rows inserted/updated/deleted
+ij> -- schema
+create schema ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss;
+0 rows inserted/updated/deleted
+ij> create schema "ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss";
+0 rows inserted/updated/deleted
+ij> -- index
+CREATE INDEX iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii 
+ON idtest1 (i);
+0 rows inserted/updated/deleted
+ij> CREATE INDEX "iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii" 
+ON idtest1 (j);
+0 rows inserted/updated/deleted
+ij> -- constraint
+create table longid3 (i integer, constraint cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc check (i > 0));
+0 rows inserted/updated/deleted
+ij> create table longid4 (i integer, constraint "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" check (i > 0));
+0 rows inserted/updated/deleted
+ij> --- procedure
+create procedure pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp(in i integer) external name 'a.b.c.d' language java parameter style java;
+0 rows inserted/updated/deleted
+ij> create procedure "pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp"(in i integer) external name 'a.b.c.d' language java parameter style java;
+0 rows inserted/updated/deleted
+ij> -- drop the tables etc.
+drop view vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv;
+0 rows inserted/updated/deleted
+ij> drop view "vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvw";
+0 rows inserted/updated/deleted
+ij> drop trigger tttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt;
+0 rows inserted/updated/deleted
+ij> drop trigger "tttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt";
+0 rows inserted/updated/deleted
+ij> drop schema ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss restrict;
+0 rows inserted/updated/deleted
+ij> drop schema "ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss" restrict;
+0 rows inserted/updated/deleted
+ij> drop index iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii;
+0 rows inserted/updated/deleted
+ij> drop index "iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii";
+0 rows inserted/updated/deleted
+ij> drop table success1;
 0 rows inserted/updated/deleted
 ij> drop table success2;
 0 rows inserted/updated/deleted
@@ -106,11 +204,27 @@
 0 rows inserted/updated/deleted
 ij> drop table success4;
 0 rows inserted/updated/deleted
+ij> drop table idtest1;
+0 rows inserted/updated/deleted
+ij> drop table idtest2;
+0 rows inserted/updated/deleted
+ij> drop table longid1;
+0 rows inserted/updated/deleted
+ij> drop table longid2;
+0 rows inserted/updated/deleted
+ij> drop table longid3;
+0 rows inserted/updated/deleted
+ij> drop table longid4;
+0 rows inserted/updated/deleted
 ij> drop table
 asdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfaslast;
 0 rows inserted/updated/deleted
 ij> drop table
 "delimitedsdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfaslast";
+0 rows inserted/updated/deleted
+ij> drop procedure pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp;
+0 rows inserted/updated/deleted
+ij> drop procedure "pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp";
 0 rows inserted/updated/deleted
 ij> -- xxxxxxFILTERED-TIMESTAMPxxxxx
 -- new testcases for SQL92 reserved keywords as identifiers

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out?rev=170069&r1=170068&r2=170069&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out Fri May 13 11:35:33 2005
@@ -12,7 +12,7 @@
 JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.1 (10.1.0.0 alpha)
 The URL is: jdbc:derby:wombat
 allTablesAreSelectable(): true
-maxColumnNameLength(): 30
+maxColumnNameLength(): 128
 getSchemas():
 TABLE_SCHEM[VARCHAR]
 APP
@@ -131,9 +131,9 @@
 getMaxColumnsInSelect(): 0
 getMaxColumnsInTable(): 0
 getMaxConnections(): 0
-getMaxCursorNameLength(): 18
+getMaxCursorNameLength(): 128
 getMaxIndexLength(): 0
-getMaxSchemaNameLength(): 30
+getMaxSchemaNameLength(): 128
 getMaxProcedureNameLength(): 128
 getMaxCatalogNameLength(): 0
 getMaxRowSize(): 0

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out?rev=170069&r1=170068&r2=170069&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out Fri May 13 11:35:33 2005
@@ -42,7 +42,7 @@
 JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.1 (10.1.0.0 alpha)
 The URL is: jdbc:derby:wombat
 allTablesAreSelectable(): true
-maxColumnNameLength(): 30
+maxColumnNameLength(): 128
 getSchemas():
 TABLE_SCHEM[VARCHAR]
 APP
@@ -161,9 +161,9 @@
 getMaxColumnsInSelect(): 0
 getMaxColumnsInTable(): 0
 getMaxConnections(): 0
-getMaxCursorNameLength(): 18
+getMaxCursorNameLength(): 128
 getMaxIndexLength(): 0
-getMaxSchemaNameLength(): 30
+getMaxSchemaNameLength(): 128
 getMaxProcedureNameLength(): 128
 getMaxCatalogNameLength(): 0
 getMaxRowSize(): 0

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/currentSchema.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/currentSchema.sql?rev=170069&r1=170068&r2=170069&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/currentSchema.sql (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/currentSchema.sql Fri May 13 11:35:33 2005
@@ -170,18 +170,18 @@
 
 values current schema;
 
--- the following should fail - 31 length
-create schema t234567890123456789012345678901;
+-- the following should fail - 129 length
+create schema TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT;
 
-set schema t234567890123456789012345678901;
+set schema TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT;
 
-set schema 'T234567890123456789012345678901';
+set schema 'TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT';
 
-execute p1 using 'values(''T234567890123456789012345678901'')';
+execute p1 using 'values(''TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT'')';
 
 rollback;
 autocommit on;
 
 -- clean up
 drop schema judy restrict;
-drop schema t234567890123456789012345678901 restrict;
+drop schema TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT restrict;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dbManagerLimits.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dbManagerLimits.java?rev=170069&r1=170068&r2=170069&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dbManagerLimits.java (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dbManagerLimits.java Fri May 13 11:35:33 2005
@@ -23,7 +23,7 @@
 import java.sql.*;
 
 import org.apache.derby.tools.ij;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.Limits;
 import org.apache.derbyTesting.functionTests.util.Formatters;
 
 /**
@@ -206,7 +206,7 @@
 			String tempString = new String();
 			int i = 0;
 			sbTableElements.append("create table t1 (");
-			for (i = 0; i < DB2Limit.DB2_MAX_COLUMNS_IN_TABLE-2; i++)
+			for (i = 0; i < Limits.DB2_MAX_COLUMNS_IN_TABLE-2; i++)
 				sbTableElements.append("c" + i +" int, ");
 
 			Statement s = conn.createStatement();
@@ -296,7 +296,7 @@
 			StringBuffer sbViewColumnNames = new StringBuffer();
 			String tempString = new String();
 			int i = 0;
-			for (i = 0; i < DB2Limit.DB2_MAX_COLUMNS_IN_VIEW-2; i++) {
+			for (i = 0; i < Limits.DB2_MAX_COLUMNS_IN_VIEW-2; i++) {
 				sbValuesClause.append(1 + ", ");
 				sbViewColumnNames.append("c" + i + ", ");
 			}
@@ -355,7 +355,7 @@
 			String tempString = new String();
 			int i = 0;
 			sb.append("create table t1 (");
-			for (i = 0; i < DB2Limit.DB2_MAX_COLUMNS_IN_TABLE-2; i++)
+			for (i = 0; i < Limits.DB2_MAX_COLUMNS_IN_TABLE-2; i++)
 				sb.append("c" + i +" int, ");
 
 			Statement s = conn.createStatement();
@@ -408,7 +408,7 @@
 			String tempString = new String();
 			int i = 0;
 			sbOrderBy.append("select * from t1 order by ");
-			for (i = 0; i < DB2Limit.DB2_MAX_ELEMENTS_IN_ORDER_BY-2; i++)
+			for (i = 0; i < Limits.DB2_MAX_ELEMENTS_IN_ORDER_BY-2; i++)
 				sbOrderBy.append("c1, ");
 
 			Statement s = conn.createStatement();
@@ -467,11 +467,11 @@
 
 			//first create 7 views with 5000 columns each
 			int i = 0;
-			for (i = 0; i < DB2Limit.DB2_MAX_COLUMNS_IN_VIEW-1; i++)
+			for (i = 0; i < Limits.DB2_MAX_COLUMNS_IN_VIEW-1; i++)
 				sbValuesClause.append(1 + ", ");
 
 			for (int j = 1; j < 8; j++) {
-				for (i = 0; i < DB2Limit.DB2_MAX_COLUMNS_IN_VIEW-1; i++) {
+				for (i = 0; i < Limits.DB2_MAX_COLUMNS_IN_VIEW-1; i++) {
 					sbViewColumnNames.append("c" + j + "" + i + ", ");
 				}
 				tempString = "create view v" + j + "(" + sbViewColumnNames.toString() + "c" + j + "" + i + ") as values (" + sbValuesClause.toString() + "1)";
@@ -480,7 +480,7 @@
 			}
       
 			for (int j = 1; j < 7; j++) {
-				for (i = 0; i < DB2Limit.DB2_MAX_COLUMNS_IN_VIEW; i++)
+				for (i = 0; i < Limits.DB2_MAX_COLUMNS_IN_VIEW; i++)
 					sbGroupBy.append("c" + j + "" + i + ", ");
 			}
 			for (i = 0; i < 2675; i++)
@@ -533,7 +533,7 @@
 			String tempString = new String();
 			int i = 0;
 
-			for (i = 0; i < DB2Limit.DB2_MAX_PARAMS_IN_STORED_PROCEDURE-2; i++) {
+			for (i = 0; i < Limits.DB2_MAX_PARAMS_IN_STORED_PROCEDURE-2; i++) {
 				sbCreateProcParams.append("i" + i + " int, ");
 				sbExecuteProcParams.append("1, ");
 			}
@@ -584,7 +584,7 @@
 
 			s.executeUpdate("create table t1 (c1 int not null, c2 int, primary key(c1))");
 			System.out.println("First create one index less than maximum allowed number of indexes");
-			for (i = 0; i < DB2Limit.DB2_MAX_INDEXES_ON_TABLE-2; i++) {
+			for (i = 0; i < Limits.DB2_MAX_INDEXES_ON_TABLE-2; i++) {
 				s.executeUpdate("create index i" + i + " on t1(c1,c2)");
 			System.out.println("   create index" + i);
 			}

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/identifier.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/identifier.sql?rev=170069&r1=170068&r2=170069&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/identifier.sql (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/identifier.sql Fri May 13 11:35:33 2005
@@ -61,15 +61,45 @@
 select c1, "c1 ", " C1", " C1 ", "  C1  "  from success1;
 
 -- negative test for max identifier width
--- 4567890123456789012345678901234567890123456789012345678901234567890
+-- NOTE: no negative test for max identifier length of function, savepoint and cursor
+-- tables needed for index, trigger and view test
+create table idtest1 (i integer, j integer);
+create table idtest2 (i integer, j integer);
+-- table
+
 create table
 asdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfaslast6
 (c1 int);
 create table
 "asdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfaslast7"
 (c1 int);
+-- column
+create table fail1 (ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccx integer);
+create table fail2 ("ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccx" integer);
+-- view
+create view vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvx as select * from idtest1;
+create view "vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvy" as select * from idtest1;
+-- trigger
+create trigger ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttx after insert on idtest1 for each row mode db2sql update idtest2 set i=i;
+create trigger "ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttx" after insert on idtest1 for each row mode db2sql update idtest2 set i=i;
+-- schema
+create schema ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssx;
+create schema "ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssx";
+-- index
+CREATE INDEX iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiix 
+ON idtest1 (i);
+CREATE INDEX "iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiix" 
+ON idtest1 (j);
+-- constraint
+create table fail3 (i integer, constraint ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccx check (i > 0));
+create table fail4 (i integer, constraint "ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccx" check (i > 0));
+--- procedure
+create procedure ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppx(in i integer) external name 'a.b.c.d' language java parameter style java;
+create procedure "ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppx"(in i integer) external name 'a.b.c.d' language java parameter style java;
 
 -- positive test for max identifier width
+-- NOTE: no positive test for max identifier length of function, savepoint and cursor
+-- table
 create table
 asdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfaslast
 (c1 int);
@@ -87,16 +117,55 @@
 values (2);
 select * from 
 "delimitedsdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfaslast";
+-- column
+create table longid1 (cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc integer);
+create table longid2 ("cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" integer);
+-- view
+create view vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv as select * from idtest1;
+create view "vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvw" as select * from idtest1;
+-- trigger
+create trigger tttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt after insert on idtest1 for each row mode db2sql update idtest2 set i=i;
+create trigger "tttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt" after insert on idtest1 for each row mode db2sql update idtest2 set i=i;
+-- schema
+create schema ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss;
+create schema "ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss";
+-- index
+CREATE INDEX iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii 
+ON idtest1 (i);
+CREATE INDEX "iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii" 
+ON idtest1 (j);
+-- constraint
+create table longid3 (i integer, constraint cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc check (i > 0));
+create table longid4 (i integer, constraint "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" check (i > 0));
+--- procedure
+create procedure pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp(in i integer) external name 'a.b.c.d' language java parameter style java;
+create procedure "pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp"(in i integer) external name 'a.b.c.d' language java parameter style java;
 
--- drop the tables
+-- drop the tables etc.
+drop view vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv;
+drop view "vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvw";
+drop trigger tttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt;
+drop trigger "tttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt";
+drop schema ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss restrict;
+drop schema "ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss" restrict;
+drop index iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii;
+drop index "iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii";
 drop table success1;
 drop table success2;
 drop table success3;
 drop table success4;
+drop table idtest1;
+drop table idtest2;
+drop table longid1;
+drop table longid2;
+drop table longid3;
+drop table longid4;
 drop table
 asdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfaslast;
 drop table
 "delimitedsdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfaslast";
+drop procedure pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp;
+drop procedure "pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp";
 
 
 -- 2003-04-14 14:04:38 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/streamingColumn.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/streamingColumn.java?rev=170069&r1=170068&r2=170069&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/streamingColumn.java (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/streamingColumn.java Fri May 13 11:35:33 2005
@@ -32,7 +32,7 @@
 import org.apache.derby.tools.JDBCDisplayUtil;
 import org.apache.derbyTesting.functionTests.util.Formatters;
 import org.apache.derbyTesting.functionTests.util.TestUtil;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.Limits;
 import java.io.*;
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
@@ -167,8 +167,8 @@
 					System.out.println("No truncation and hence no error");
 				}
 				catch (SQLException e) {
-					if (fileLength[i] > DB2Limit.DB2_LONGVARCHAR_MAXWIDTH && e.getSQLState().equals("22001")) //was getting data longer than maxValueAllowed
-						System.out.println("expected exception for data > " + DB2Limit.DB2_LONGVARCHAR_MAXWIDTH + " in length");
+					if (fileLength[i] > Limits.DB2_LONGVARCHAR_MAXWIDTH && e.getSQLState().equals("22001")) //was getting data longer than maxValueAllowed
+						System.out.println("expected exception for data > " + Limits.DB2_LONGVARCHAR_MAXWIDTH + " in length");
 					else
 						dumpSQLExceptions(e);
 				}
@@ -941,8 +941,8 @@
 					System.out.println("No truncation and hence no error");
 				}
 				catch (SQLException e) {
-					if (fileLength[i] > DB2Limit.DB2_LONGVARCHAR_MAXWIDTH && e.getSQLState().equals("22001")) //was getting data longer than maxValueAllowed
-						System.out.println("expected exception for data > " + DB2Limit.DB2_LONGVARCHAR_MAXWIDTH + " in length");
+					if (fileLength[i] > Limits.DB2_LONGVARCHAR_MAXWIDTH && e.getSQLState().equals("22001")) //was getting data longer than maxValueAllowed
+						System.out.println("expected exception for data > " + Limits.DB2_LONGVARCHAR_MAXWIDTH + " in length");
 					else
 						dumpSQLExceptions(e);
 				}
@@ -1067,24 +1067,24 @@
 
 			// prepare an InputStream from the file which has 3 trailing blanks in the end, so after blank truncation, there won't be any overflow
 			// try this using setAsciiStream, setCharacterStream, setString and setObject
-			insertDataUsingAsciiStream(ps, 1, fileName1, DB2Limit.DB2_VARCHAR_MAXWIDTH);
-			insertDataUsingCharacterStream(ps, 2, fileName1, DB2Limit.DB2_VARCHAR_MAXWIDTH);
-			insertDataUsingStringOrObject(ps, 3, DB2Limit.DB2_VARCHAR_MAXWIDTH, true, true);
-			insertDataUsingStringOrObject(ps, 4, DB2Limit.DB2_VARCHAR_MAXWIDTH, true, false);
+			insertDataUsingAsciiStream(ps, 1, fileName1, Limits.DB2_VARCHAR_MAXWIDTH);
+			insertDataUsingCharacterStream(ps, 2, fileName1, Limits.DB2_VARCHAR_MAXWIDTH);
+			insertDataUsingStringOrObject(ps, 3, Limits.DB2_VARCHAR_MAXWIDTH, true, true);
+			insertDataUsingStringOrObject(ps, 4, Limits.DB2_VARCHAR_MAXWIDTH, true, false);
 			System.out.println("===> testing trailing blanks using concatenation");
-			insertDataUsingConcat(stmt, 5, DB2Limit.DB2_VARCHAR_MAXWIDTH, true, false);
+			insertDataUsingConcat(stmt, 5, Limits.DB2_VARCHAR_MAXWIDTH, true, false);
 
 			// prepare an InputStream from the file which has 3 trailing non-blanks in the end, and hence there would be overflow exception
 			// try this using setAsciiStream, setCharacterStream, setString and setObject
-			insertDataUsingAsciiStream(ps, 6, fileName2, DB2Limit.DB2_VARCHAR_MAXWIDTH);
-			insertDataUsingCharacterStream(ps, 7, fileName2, DB2Limit.DB2_VARCHAR_MAXWIDTH);
-			insertDataUsingStringOrObject(ps, 8, DB2Limit.DB2_VARCHAR_MAXWIDTH, false, true);
-			insertDataUsingStringOrObject(ps, 9, DB2Limit.DB2_VARCHAR_MAXWIDTH, false, false);
+			insertDataUsingAsciiStream(ps, 6, fileName2, Limits.DB2_VARCHAR_MAXWIDTH);
+			insertDataUsingCharacterStream(ps, 7, fileName2, Limits.DB2_VARCHAR_MAXWIDTH);
+			insertDataUsingStringOrObject(ps, 8, Limits.DB2_VARCHAR_MAXWIDTH, false, true);
+			insertDataUsingStringOrObject(ps, 9, Limits.DB2_VARCHAR_MAXWIDTH, false, false);
 			System.out.println("===> testing trailing non-blank characters using concatenation");
-			insertDataUsingConcat(stmt, 10, DB2Limit.DB2_VARCHAR_MAXWIDTH, false, false);
+			insertDataUsingConcat(stmt, 10, Limits.DB2_VARCHAR_MAXWIDTH, false, false);
 
 			rs = stmt.executeQuery("select a, b from testVarChar");
-			streamTestDataVerification(rs, DB2Limit.DB2_VARCHAR_MAXWIDTH);
+			streamTestDataVerification(rs, Limits.DB2_VARCHAR_MAXWIDTH);
     }
 		catch (SQLException e) {
 			dumpSQLExceptions(e);
@@ -1114,26 +1114,26 @@
 
 			// prepare an InputStream from the file which has 3 trailing blanks in the end. For long varchar, this would throw a truncation error
 			// try this using setAsciiStream, setCharacterStream, setString and setObject
-			insertDataUsingAsciiStream(ps, 1, fileName1, DB2Limit.DB2_LONGVARCHAR_MAXWIDTH);
-			insertDataUsingCharacterStream(ps, 2, fileName1, DB2Limit.DB2_LONGVARCHAR_MAXWIDTH);
-			insertDataUsingStringOrObject(ps, 3, DB2Limit.DB2_LONGVARCHAR_MAXWIDTH, true, true);
-			insertDataUsingStringOrObject(ps, 4, DB2Limit.DB2_LONGVARCHAR_MAXWIDTH, true, false);
+			insertDataUsingAsciiStream(ps, 1, fileName1, Limits.DB2_LONGVARCHAR_MAXWIDTH);
+			insertDataUsingCharacterStream(ps, 2, fileName1, Limits.DB2_LONGVARCHAR_MAXWIDTH);
+			insertDataUsingStringOrObject(ps, 3, Limits.DB2_LONGVARCHAR_MAXWIDTH, true, true);
+			insertDataUsingStringOrObject(ps, 4, Limits.DB2_LONGVARCHAR_MAXWIDTH, true, false);
 			//bug 5600- Can't test data overflow in longvarchar using concatenation because longvarchar concatenated string can't be longer than 32700
 			//System.out.println("===> testing trailing blanks using concatenation");
-			//insertDataUsingConcat(stmt, 5, DB2Limit.DB2_LONGVARCHAR_MAXWIDTH, true, true);
+			//insertDataUsingConcat(stmt, 5, Limits.DB2_LONGVARCHAR_MAXWIDTH, true, true);
 
 			// prepare an InputStream from the file which has 3 trailing non-blanks in the end, and hence there would be overflow exception
 			// try this using setAsciiStream, setCharacterStream, setString and setObject
-			insertDataUsingAsciiStream(ps, 6, fileName2, DB2Limit.DB2_LONGVARCHAR_MAXWIDTH);
-			insertDataUsingCharacterStream(ps, 7, fileName2, DB2Limit.DB2_LONGVARCHAR_MAXWIDTH);
-			insertDataUsingStringOrObject(ps, 7, DB2Limit.DB2_LONGVARCHAR_MAXWIDTH, false, true);
-			insertDataUsingStringOrObject(ps, 9, DB2Limit.DB2_LONGVARCHAR_MAXWIDTH, false, false);
+			insertDataUsingAsciiStream(ps, 6, fileName2, Limits.DB2_LONGVARCHAR_MAXWIDTH);
+			insertDataUsingCharacterStream(ps, 7, fileName2, Limits.DB2_LONGVARCHAR_MAXWIDTH);
+			insertDataUsingStringOrObject(ps, 7, Limits.DB2_LONGVARCHAR_MAXWIDTH, false, true);
+			insertDataUsingStringOrObject(ps, 9, Limits.DB2_LONGVARCHAR_MAXWIDTH, false, false);
 			//bug 5600 - Can't test data overflow in longvarchar using concatenation because longvarchar concatenated string can't be longer than 32700
 			//System.out.println("===> testing trailing non-blank characters using concatenation");
-			//insertDataUsingConcat(stmt, 10, DB2Limit.DB2_LONGVARCHAR_MAXWIDTH, false, true);
+			//insertDataUsingConcat(stmt, 10, Limits.DB2_LONGVARCHAR_MAXWIDTH, false, true);
 
 			rs = stmt.executeQuery("select a, b from testLongVarChars");
-			streamTestDataVerification(rs, DB2Limit.DB2_LONGVARCHAR_MAXWIDTH);
+			streamTestDataVerification(rs, Limits.DB2_LONGVARCHAR_MAXWIDTH);
 		}
 		catch (SQLException e) {
 			dumpSQLExceptions(e);