one important thing: please make sure that DB2Limits.java is renamed to DerbyLimits.java in subversion and not just deleted and added again..
otherwise history of the file will be lost
philipp
Lance J. Andersen wrote:
+1 IMHO.
Regards Lance
Philipp Hug wrote:
Ok, I could create a new patch that also renames DB2_ into DERBY_ and renames DB2Limit into DerbyLimit.
How does that sound?
philipp
Lance J. Andersen wrote:
If the changes being made differ from the DB2 limits, and it does make sense to change this now that Derby is part of apache, I would pull the constants out of DB2Limit.java as this seems confusing from the outside looking in.
Philipp Hug wrote:
this patch changes maximum length of column names, index/contraint names, cursor names and schema names to 128 and keeps MaxUserNameLength at 30.
it also fixes the metadata to return correct values
philipp Philipp Hug wrote:
I know this has been discussed before, but there hasn't been a consus if those limitations should be extended...------------------------------------------------------------------------
At the moment, I patched Derby to allow longer identifier for index/constraint names, because the CMP engine I'm using, uses getMaxColumnNameLength() as limitation for index name.
Does anyone know of any metadata attribute that would specify the maximum allowed length for an index/constraint name? If there is such an attribute, I could live with that and would just fix the CMP engine? Otherwise we should really think about extending it to a decent value (e.g. 30 or 128).
btw: cloudscape 9 didn't have this limitation, it has been added in cloudscape 10/derby
greets philipp
Index: java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj (revision 111709)
+++ java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj (working copy)
@@ -2648,8 +2648,8 @@
String cursorName = null;
}
{
- //cursor names are limited to 18 characters
- <CURRENT> <OF> cursorName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18, true)
+ //cursor names are limited to 128 characters
+ <CURRENT> <OF> cursorName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true)
{ return (FromTable) nodeFactory.getNode(
C_NodeTypes.CURRENT_OF_NODE,
@@ -3240,8 +3240,8 @@
*/
/* identifier() used to be columnName() */
- //unqualified column names are limited to 30 characters
- columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true) + //unqualified column names are limited to 128 characters
+ columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true) ( typeDescriptor = dataTypeDDL() )
[ defaultNode = defaultAndConstraints(typeDescriptor, tableElementList, columnName, autoIncrementInfo) ]
@@ -4115,7 +4115,7 @@
//limit the qualifiedId to the id length limit passed to this method
checkIdentifierLengthLimit(qualifiedId, id_length_limit);
if (schemaName != null)
- checkIdentifierLengthLimit(schemaName, DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30);
+ checkIdentifierLengthLimit(schemaName, DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128);
return (TableName) nodeFactory.getNode(
nodeType,
@@ -4418,8 +4418,8 @@
}
{
/* identifier() used to be columnName() */
- //unqualified column names are limited to 30 characters
- [ <AS> ] columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true)
+ //unqualified column names are limited to 128 characters
+ [ <AS> ] columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true)
{
return columnName;
}
@@ -6402,10 +6402,10 @@
columnName = thirdName;
}
- //column name and schema name can not be longer than 30 characters and table name can not be longer than 128 characters
- checkIdentifierLengthLimit(columnName, DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30);
+ //column name, schema name and table name can not be longer than 128 characters
+ checkIdentifierLengthLimit(columnName, DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128);
if (schemaName != null)
- checkIdentifierLengthLimit(schemaName, DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30);
+ checkIdentifierLengthLimit(schemaName, DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128);
if (tableName != null)
checkIdentifierLengthLimit(tableName, DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128);
@@ -6549,10 +6549,10 @@ columnName = thirdName; }
- //column name and schema name can not be longer than 30 characters and correlation name can not be longer than 128 characters
- checkIdentifierLengthLimit(columnName, DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30);
+ //column name, schema name and correlation name can not be longer than 128 characters
+ checkIdentifierLengthLimit(columnName, DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128);
if (schemaName != null)
- checkIdentifierLengthLimit(schemaName, DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30);
+ checkIdentifierLengthLimit(schemaName, DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128);
if (correlationName != null)
checkIdentifierLengthLimit(correlationName, DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128);
return (OrderByColumn) nodeFactory.getNode(
@@ -6632,8 +6632,8 @@
}
{
/* identifier() used to be columnName() */
- //unqualified column names are limited to 30 characters
- columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true)
+ //unqualified column names are limited to 128 characters
+ columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true)
{
columnList.addElement(columnName);
}
@@ -7681,8 +7681,8 @@
}
{
/* identifier() used to be columnName() */
- //unqualified column names are limited to 30 characters
- columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true)
+ //unqualified column names are limited to 128 characters
+ columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true)
{
/*
** Store the column names for the result columns in the
@@ -7719,7 +7719,7 @@
}
{
/* identifier never ends with a space; appending a space meaning desc */
- columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true) [<ASC> | <DESC> {columnName = columnName + ' ';}]
+ columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true) [<ASC> | <DESC> {columnName = columnName + ' ';}]
{
/*
** Store the column names for the index columns in the
@@ -8310,7 +8310,7 @@
** We are not currently handling character set
** specifications for schema, or schema bodies.
*/
- <SCHEMA> schemaName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true)
+ <SCHEMA> schemaName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true)
{
if (schemaName.startsWith("SYS"))
@@ -8461,7 +8461,7 @@
** production to get the grammar to work...
*/
[ unique = unique() ] <INDEX>
- indexName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18) <ON> tableName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
+ indexName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128) <ON> tableName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
<LEFT_PAREN> indexColumnList(indexColumnList) <RIGHT_PAREN>
[ properties = propertyList()]
{
@@ -8709,7 +8709,7 @@
Object[] functionElements = new Object[9];
}
{
- <FUNCTION> functionName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18)
+ <FUNCTION> functionName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
functionElements[0] = functionParameterList()
<RETURNS> functionElements[8] = dataTypeCommon() ( routineElement(false, functionElements) ) +
@@ -8839,7 +8839,7 @@
Vector refClause = null;
}
{
- <TRIGGER> triggerName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18)
+ <TRIGGER> triggerName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
isBefore = beforeOrAfter()
triggerEvent = triggerEvent(triggerColumns) // { INSERT | DELETE | UPDATE [ colList ] }
<ON> tableName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
@@ -9491,7 +9491,7 @@
}
{
/* changed constraintName() to qualifiedName() for compaction */
- <CONSTRAINT> constraintName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18)
+ <CONSTRAINT> constraintName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
{
return constraintName;
}
@@ -9599,7 +9599,7 @@
String newIndexName;
}
{
- <INDEX> oldIndexName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18, true) <TO> newIndexName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18, true)
+ <INDEX> oldIndexName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true) <TO> newIndexName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true)
{
QueryTreeNode qtn = nodeFactory.getNode(
C_NodeTypes.RENAME_NODE,
@@ -9889,7 +9889,7 @@
String schemaName;
}
{
- schemaName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true)
+ schemaName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true)
{
return (QueryTreeNode) nodeFactory.getNode(
C_NodeTypes.SET_SCHEMA_NODE,
@@ -9917,7 +9917,7 @@
| schemaName = string()
{
/* Max length for schema name is DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128 */
- checkIdentifierLengthLimit(schemaName, DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30);
+ checkIdentifierLengthLimit(schemaName, DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128);
return (QueryTreeNode) nodeFactory.getNode(
C_NodeTypes.SET_SCHEMA_NODE,
schemaName,
@@ -10456,7 +10456,7 @@
String schemaName;
}
{
- <SCHEMA> schemaName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true) <RESTRICT>
+ <SCHEMA> schemaName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true) <RESTRICT>
{
QueryTreeNode stmt = nodeFactory.getNode(
C_NodeTypes.DROP_SCHEMA_NODE,
@@ -10557,7 +10557,7 @@
String newColumnName;
}
{
- oldColumnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true) <TO> newColumnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true)
+ oldColumnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true) <TO> newColumnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true)
{
return (QueryTreeNode) nodeFactory.getNode(
C_NodeTypes.RENAME_NODE,
@@ -10600,7 +10600,7 @@
return lockGranularity;
}
|
- <ALTER> [ <COLUMN> ] columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true) <SET>
+ <ALTER> [ <COLUMN> ] columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true) <SET>
typeDescriptor = DB2AlterColumn(autoIncrementInfo)
{
changeType[0] = CreateStatementNode.MODIFY_TYPE;
@@ -10660,7 +10660,7 @@
TableElementNode tn;
}
{
- columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true) tn = columnAlterClause(columnName)
+ columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true) tn = columnAlterClause(columnName)
{
return tn;
}
@@ -10763,7 +10763,7 @@
{
LOOKAHEAD( {getToken(2).kind == CONSTRAINT} )
/* changed constraintName() to qualifiedName() for compaction */
- <DROP> <CONSTRAINT> constraintName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18)
+ <DROP> <CONSTRAINT> constraintName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
{
return (TableElementNode) nodeFactory.getNode(
C_NodeTypes.CONSTRAINT_DEFINITION_NODE,
@@ -10795,7 +10795,7 @@
}
|
LOOKAHEAD( {getToken(2).kind == FOREIGN} )
- <DROP> <FOREIGN> <KEY> constraintName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18)
+ <DROP> <FOREIGN> <KEY> constraintName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
{
return (TableElementNode) nodeFactory.getNode(
C_NodeTypes.CONSTRAINT_DEFINITION_NODE,
@@ -10812,7 +10812,7 @@
}
|
LOOKAHEAD( {getToken(2).kind == UNIQUE} )
- <DROP> <UNIQUE> constraintName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18)
+ <DROP> <UNIQUE> constraintName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
{
return (TableElementNode) nodeFactory.getNode(
C_NodeTypes.CONSTRAINT_DEFINITION_NODE,
@@ -10828,7 +10828,7 @@
);
}
|
- <DROP> <CHECK> constraintName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18)
+ <DROP> <CHECK> constraintName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
{
return (TableElementNode) nodeFactory.getNode(
C_NodeTypes.CONSTRAINT_DEFINITION_NODE,
@@ -10874,7 +10874,7 @@
TableName indexName;
}
{
- <INDEX> indexName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18)
+ <INDEX> indexName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
{
return (QueryTreeNode) nodeFactory.getNode(
C_NodeTypes.DROP_INDEX_NODE,
@@ -10940,7 +10940,7 @@
TableName triggerName;
}
{
- <TRIGGER> triggerName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18) + <TRIGGER> triggerName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128) {
return (QueryTreeNode) nodeFactory.getNode(
C_NodeTypes.DROP_TRIGGER_NODE,
Index: java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java (revision 111709)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java (working copy)
@@ -1108,7 +1108,7 @@
* @return max literal length
*/
public int getMaxColumnNameLength() {
- return DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30;
+ return DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128;
}
/** @@ -1173,7 +1173,7 @@ * @return max cursor name length in bytes */ public int getMaxCursorNameLength() { - return DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18; + return DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128; }
/** @@ -1191,7 +1191,7 @@ * @return max name length in bytes */ public int getMaxSchemaNameLength() { - return DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30; + return DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128; }
/** @@ -1274,7 +1274,7 @@ * @return max name length in bytes */ public int getMaxUserNameLength() { - return DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30; + return DB2Limit.MAX_USERID_LENGTH; }
//----------------------------------------------------------------------
Index: java/engine/org/apache/derby/iapi/reference/DB2Limit.java
===================================================================
--- java/engine/org/apache/derby/iapi/reference/DB2Limit.java (revision 111709)
+++ java/engine/org/apache/derby/iapi/reference/DB2Limit.java (working copy)
@@ -53,12 +53,7 @@
// SQLCAMESSAGE procedure. See org.apache.derby.impl.sql.catalog.
public static final int DB2_JCC_MAX_EXCEPTION_PARAM_LENGTH = 2400;
- /* Some identifiers like Constraint name, Cursor name, Function name, Index name, Trigger name
- * are limited to 18 character in DB2*/
- public static final int DB2_MAX_IDENTIFIER_LENGTH18 = 18;
- /* Some identifiers like Column name, Schema name are limited to 30 characters in DB2*/
- public static final int DB2_MAX_IDENTIFIER_LENGTH30 = 30;
- /* Some identifiers like Savepoint names, Table names, view names etc are limited to 128 characters in DB2*/
+ /* Some identifiers like Constraint name, Cursor name, Function name, Index name, Trigger name, Column name, Schema name, Savepoint names, Table names, view names etc are limited to 128 characters in DB2*/
public static final int DB2_MAX_IDENTIFIER_LENGTH128 = 128;
public static final int DB2_CHAR_MAXWIDTH = 254;
public static final int DB2_VARCHAR_MAXWIDTH = 32672;
Index: java/engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java
(revision 111709)
+++ java/engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java
(working copy)
@@ -41,7 +41,7 @@
import org.apache.derby.iapi.sql.compile.TypeCompiler;
import org.apache.derby.iapi.reference.ClassName;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.reference.SQLState;
/**
@@ -437,9 +437,9 @@
val = this.getScale(operator, leftType, rightType) +
Math.max(lprec - lscale, rprec -
rscale) + 1;
- if (val > DB2Limit.MAX_DECIMAL_PRECISION_SCALE)
+ if (val > DerbyLimit.MAX_DECIMAL_PRECISION_SCALE)
// then, like DB2, just set it to the max possible.
- val = DB2Limit.MAX_DECIMAL_PRECISION_SCALE;
+ val = DerbyLimit.MAX_DECIMAL_PRECISION_SCALE;
}
if (val > Integer.MAX_VALUE)
Index: java/engine/org/apache/derby/impl/sql/compile/SelectNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/SelectNode.java
(revision 111709)
+++ java/engine/org/apache/derby/impl/sql/compile/SelectNode.java
(working copy)
@@ -32,7 +32,7 @@
import org.apache.derby.iapi.types.TypeId;
import org.apache.derby.iapi.types.DataTypeDescriptor;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.reference.SQLState;
import org.apache.derby.iapi.error.StandardException;
@@ -661,7 +661,7 @@
super.bindResultColumns(fromListParam);
/* Only 1012 elements allowed in select list */
- if (resultColumns.size() >
DB2Limit.DB2_MAX_ELEMENTS_IN_SELECT_LIST)
+ if (resultColumns.size() >
DerbyLimit.DERBY_MAX_ELEMENTS_IN_SELECT_LIST)
{
throw
StandardException.newException(SQLState.LANG_TOO_MANY_ELEMENTS);
}
Index: java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java
(revision 111709)
+++ java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java
(working copy)
@@ -21,7 +21,7 @@
package org.apache.derby.impl.sql.compile;
import org.apache.derby.iapi.reference.SQLState;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.services.sanity.SanityManager;
@@ -236,12 +236,12 @@
tableElementList.validate(this, dd, baseTable);
/* Only 1012 columns allowed per table */
- if ((tableElementList.countNumberOfColumns() +
baseTable.getNumberOfColumns()) > DB2Limit.DB2_MAX_COLUMNS_IN_TABLE)
+ if ((tableElementList.countNumberOfColumns() +
baseTable.getNumberOfColumns()) > DerbyLimit.DERBY_MAX_COLUMNS_IN_TABLE)
{
throw
StandardException.newException(SQLState.LANG_TOO_MANY_COLUMNS_IN_TABLE_OR_VIEW,
String.valueOf(tableElementList.countNumberOfColumns() +
baseTable.getNumberOfColumns()),
getRelativeName(),
-
String.valueOf(DB2Limit.DB2_MAX_COLUMNS_IN_TABLE));
+
String.valueOf(DerbyLimit.DERBY_MAX_COLUMNS_IN_TABLE));
}
/* Number of backing indexes in the alter table
statment */
numBackingIndexes =
tableElementList.countConstraints(DataDictionary.PRIMARYKEY_CONSTRAINT) +
@@ -254,12 +254,12 @@
//If the sum of backing indexes for constraints in alter table
statement and total number of indexes on the table
//so far is more than 32767, then we need to throw an exception
- if ((numBackingIndexes + baseTable.getTotalNumberOfIndexes()) >
DB2Limit.DB2_MAX_INDEXES_ON_TABLE)
+ if ((numBackingIndexes + baseTable.getTotalNumberOfIndexes()) >
DerbyLimit.DERBY_MAX_INDEXES_ON_TABLE)
{
throw
StandardException.newException(SQLState.LANG_TOO_MANY_INDEXES_ON_TABLE,
String.valueOf(numBackingIndexes +
baseTable.getTotalNumberOfIndexes()),
getRelativeName(),
-
String.valueOf(DB2Limit.DB2_MAX_INDEXES_ON_TABLE));
+
String.valueOf(DerbyLimit.DERBY_MAX_INDEXES_ON_TABLE));
}
if (numCheckConstraints > 0)
Index: java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java
(revision 111709)
+++ java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java
(working copy)
@@ -24,7 +24,7 @@
import org.apache.derby.iapi.services.sanity.SanityManager;
import org.apache.derby.iapi.services.io.StoredFormatIds;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.sql.compile.CompilerContext;
@@ -582,7 +582,7 @@
ValueNode defaultNode, String defaultText)
{
- if (defaultText.length() > DB2Limit.DB2_CHAR_MAXWIDTH)
+ if (defaultText.length() > DerbyLimit.DERBY_CHAR_MAXWIDTH)
// DB2 spec says this isn't allowed.
return false;
@@ -624,13 +624,13 @@
// DB2 enforces min length of 8.
// Note also: any size under 30 gives a warning
in DB2.
return (charCol &&
(columnDesc.getMaximumWidth() >=
-
DB2Limit.MIN_COL_LENGTH_FOR_CURRENT_USER));
+
DerbyLimit.MIN_COL_LENGTH_FOR_CURRENT_USER));
if ((defaultText.indexOf("schema") != -1) ||
(defaultText.indexOf("sqlid") != -1))
// DB2 enforces min length of 128.
return (charCol &&
(columnDesc.getMaximumWidth() >=
-
DB2Limit.MIN_COL_LENGTH_FOR_CURRENT_SCHEMA));
+
DerbyLimit.MIN_COL_LENGTH_FOR_CURRENT_SCHEMA));
// else, function not allowed.
return false;
Index: java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java
(revision 111709)
+++ java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java
(working copy)
@@ -22,7 +22,7 @@
import org.apache.derby.iapi.reference.Property;
import org.apache.derby.iapi.reference.SQLState;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.services.property.PropertyUtil;
import org.apache.derby.iapi.services.sanity.SanityManager;
@@ -212,12 +212,12 @@
tableElementList.validate(this, dataDictionary,
(TableDescriptor) null);
/* Only 1012 columns allowed per table */
- if (tableElementList.countNumberOfColumns() >
DB2Limit.DB2_MAX_COLUMNS_IN_TABLE)
+ if (tableElementList.countNumberOfColumns() >
DerbyLimit.DERBY_MAX_COLUMNS_IN_TABLE)
{
throw
StandardException.newException(SQLState.LANG_TOO_MANY_COLUMNS_IN_TABLE_OR_VIEW,
String.valueOf(tableElementList.countNumberOfColumns()),
getRelativeName(),
-
String.valueOf(DB2Limit.DB2_MAX_COLUMNS_IN_TABLE));
+
String.valueOf(DerbyLimit.DERBY_MAX_COLUMNS_IN_TABLE));
}
numPrimaryKeys = tableElementList.countConstraints(
@@ -246,12 +246,12 @@
//each of these constraints have a backing index in the back.
We need to make sure that a table never has more
//more than 32767 indexes on it and that is why this check.
- if ((numPrimaryKeys + numReferenceConstraints +
numUniqueConstraints) > DB2Limit.DB2_MAX_INDEXES_ON_TABLE)
+ if ((numPrimaryKeys + numReferenceConstraints +
numUniqueConstraints) > DerbyLimit.DERBY_MAX_INDEXES_ON_TABLE)
{
throw
StandardException.newException(SQLState.LANG_TOO_MANY_INDEXES_ON_TABLE,
String.valueOf(numPrimaryKeys +
numReferenceConstraints + numUniqueConstraints),
getRelativeName(),
-
String.valueOf(DB2Limit.DB2_MAX_INDEXES_ON_TABLE));
+
String.valueOf(DerbyLimit.DERBY_MAX_INDEXES_ON_TABLE));
}
if (numCheckConstraints > 0)
Index: java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java
(revision 111709)
+++ java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java
(working copy)
@@ -35,7 +35,7 @@
import org.apache.derby.iapi.sql.dictionary.ColumnDescriptor;
import org.apache.derby.iapi.reference.SQLState;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.reference.Property;
import org.apache.derby.iapi.sql.execute.ConstantAction;
@@ -182,12 +182,12 @@
}
//If total number of indexes on the table so far is more than
32767, then we need to throw an exception
- if (td.getTotalNumberOfIndexes() >
DB2Limit.DB2_MAX_INDEXES_ON_TABLE)
+ if (td.getTotalNumberOfIndexes() >
DerbyLimit.DERBY_MAX_INDEXES_ON_TABLE)
{
throw
StandardException.newException(SQLState.LANG_TOO_MANY_INDEXES_ON_TABLE,
String.valueOf(td.getTotalNumberOfIndexes()),
tableName,
-
String.valueOf(DB2Limit.DB2_MAX_INDEXES_ON_TABLE));
+
String.valueOf(DerbyLimit.DERBY_MAX_INDEXES_ON_TABLE));
}
/* Validate the column name list */
Index: java/engine/org/apache/derby/impl/sql/compile/OrderByList.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/OrderByList.java
(revision 111709)
+++ java/engine/org/apache/derby/impl/sql/compile/OrderByList.java
(working copy)
@@ -47,7 +47,7 @@
import org.apache.derby.iapi.types.DataValueDescriptor;
import org.apache.derby.iapi.reference.ClassName;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.reference.SQLState;
import org.apache.derby.iapi.util.JBitSet;
@@ -142,7 +142,7 @@
int size = size();
/* Only 1012 columns allowed in ORDER BY clause */
- if (size > DB2Limit.DB2_MAX_ELEMENTS_IN_ORDER_BY)
+ if (size > DerbyLimit.DERBY_MAX_ELEMENTS_IN_ORDER_BY)
{
throw
StandardException.newException(SQLState.LANG_TOO_MANY_ELEMENTS);
}
Index: java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java
(revision 111709)
+++ java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java
(working copy)
@@ -28,7 +28,7 @@
import org.apache.derby.iapi.sql.compile.C_NodeTypes;
import org.apache.derby.iapi.reference.SQLState;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.sql.ResultSet;
import org.apache.derby.iapi.sql.execute.ConstantAction;
@@ -126,9 +126,9 @@
TypeDescriptor[] types = null;
int[] modes = null;
- if (paramCount >
DB2Limit.DB2_MAX_PARAMS_IN_STORED_PROCEDURE)
+ if (paramCount >
DerbyLimit.DB2_MAX_PARAMS_IN_STORED_PROCEDURE)
throw
StandardException.newException(SQLState.LANG_TOO_MANY_PARAMETERS_FOR_STORED_PROC,
-
String.valueOf(DB2Limit.DB2_MAX_PARAMS_IN_STORED_PROCEDURE), aliasName,
String.valueOf(paramCount));
+
String.valueOf(DerbyLimit.DB2_MAX_PARAMS_IN_STORED_PROCEDURE), aliasName,
String.valueOf(paramCount));
if (paramCount != 0) {
Index: java/engine/org/apache/derby/impl/sql/compile/GroupByList.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/GroupByList.java
(revision 111709)
+++ java/engine/org/apache/derby/impl/sql/compile/GroupByList.java
(working copy)
@@ -29,7 +29,7 @@
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
import org.apache.derby.iapi.reference.SQLState;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.impl.sql.compile.ActivationClassBuilder;
@@ -130,7 +130,7 @@
int size = size();
/* Only 32677 columns allowed in GROUP BY clause */
- if (size > DB2Limit.DB2_MAX_ELEMENTS_IN_GROUP_BY)
+ if (size > DerbyLimit.DERBY_MAX_ELEMENTS_IN_GROUP_BY)
{
throw
StandardException.newException(SQLState.LANG_TOO_MANY_ELEMENTS);
}
Index: java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj (revision
111709)
+++ java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj (working copy)
@@ -2648,8 +2648,8 @@
String cursorName = null;
}
{
- //cursor names are limited to 18 characters
- <CURRENT> <OF> cursorName =
identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18, true)
+ //cursor names are limited to 128 characters
+ <CURRENT> <OF> cursorName =
identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true)
{
return (FromTable) nodeFactory.getNode(
C_NodeTypes.CURRENT_OF_NODE,
@@ -3240,8 +3240,8 @@
*/
/* identifier() used to be columnName() */
- //unqualified column names are limited to 30 characters
- columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true)
+ //unqualified column names are limited to 128 characters
+ columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true)
( typeDescriptor = dataTypeDDL()
)
[ defaultNode = defaultAndConstraints(typeDescriptor, tableElementList,
columnName, autoIncrementInfo) ]
@@ -4115,7 +4115,7 @@
//limit the qualifiedId to the id length limit passed to this
method
checkIdentifierLengthLimit(qualifiedId, id_length_limit);
if (schemaName != null)
- checkIdentifierLengthLimit(schemaName,
DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30);
+ checkIdentifierLengthLimit(schemaName,
DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128);
return (TableName) nodeFactory.getNode(
nodeType,
@@ -4418,8 +4418,8 @@
}
{
/* identifier() used to be columnName() */
- //unqualified column names are limited to 30 characters
- [ <AS> ] columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30,
true)
+ //unqualified column names are limited to 128 characters
+ [ <AS> ] columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128,
true)
{
return columnName;
}
@@ -6402,10 +6402,10 @@
columnName = thirdName;
}
- //column name and schema name can not be longer than 30
characters and table name can not be longer than 128 characters
- checkIdentifierLengthLimit(columnName,
DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30);
+ //column name, schema name and table name can not be longer
than 128 characters
+ checkIdentifierLengthLimit(columnName,
DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128);
if (schemaName != null)
- checkIdentifierLengthLimit(schemaName,
DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30);
+ checkIdentifierLengthLimit(schemaName,
DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128);
if (tableName != null)
checkIdentifierLengthLimit(tableName,
DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128);
@@ -6549,10 +6549,10 @@
columnName = thirdName;
}
- //column name and schema name can not be longer than 30
characters and correlation name can not be longer than 128 characters
- checkIdentifierLengthLimit(columnName,
DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30);
+ //column name, schema name and correlation name can not be
longer than 128 characters
+ checkIdentifierLengthLimit(columnName,
DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128);
if (schemaName != null)
- checkIdentifierLengthLimit(schemaName,
DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30);
+ checkIdentifierLengthLimit(schemaName,
DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128);
if (correlationName != null)
checkIdentifierLengthLimit(correlationName,
DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128);
return (OrderByColumn) nodeFactory.getNode(
@@ -6632,8 +6632,8 @@
}
{
/* identifier() used to be columnName() */
- //unqualified column names are limited to 30 characters
- columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true)
+ //unqualified column names are limited to 128 characters
+ columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true)
{
columnList.addElement(columnName);
}
@@ -7681,8 +7681,8 @@
}
{
/* identifier() used to be columnName() */
- //unqualified column names are limited to 30 characters
- columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true)
+ //unqualified column names are limited to 128 characters
+ columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true)
{
/*
** Store the column names for the result columns in the
@@ -7719,7 +7719,7 @@
}
{
/* identifier never ends with a space; appending a space meaning desc */
- columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true)
[<ASC> | <DESC> {columnName = columnName + ' ';}]
+ columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true)
[<ASC> | <DESC> {columnName = columnName + ' ';}]
{
/*
** Store the column names for the index columns in the
@@ -8310,7 +8310,7 @@
** We are not currently handling character set
** specifications for schema, or schema bodies.
*/
- <SCHEMA> schemaName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30,
true)
+ <SCHEMA> schemaName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128,
true)
{
if (schemaName.startsWith("SYS"))
@@ -8461,7 +8461,7 @@
** production to get the grammar to work...
*/
[ unique = unique() ] <INDEX>
- indexName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18)
<ON> tableName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
+ indexName =
qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128) <ON> tableName =
qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
<LEFT_PAREN> indexColumnList(indexColumnList)
<RIGHT_PAREN>
[ properties = propertyList()]
{
@@ -8709,7 +8709,7 @@
Object[] functionElements = new Object[9];
}
{
- <FUNCTION> functionName =
qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18)
+ <FUNCTION> functionName =
qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
functionElements[0] = functionParameterList()
<RETURNS> functionElements[8] = dataTypeCommon()
( routineElement(false, functionElements) ) +
@@ -8839,7 +8839,7 @@
Vector refClause = null;
}
{
- <TRIGGER> triggerName =
qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18)
+ <TRIGGER> triggerName =
qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
isBefore = beforeOrAfter()
triggerEvent = triggerEvent(triggerColumns) // {
INSERT | DELETE | UPDATE [ colList ] }
<ON> tableName =
qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
@@ -9491,7 +9491,7 @@
}
{
/* changed constraintName() to qualifiedName() for compaction */
- <CONSTRAINT> constraintName =
qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18)
+ <CONSTRAINT> constraintName =
qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
{
return constraintName;
}
@@ -9599,7 +9599,7 @@
String newIndexName;
}
{
- <INDEX> oldIndexName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18,
true) <TO> newIndexName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18, true)
+ <INDEX> oldIndexName =
identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true) <TO> newIndexName =
identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true)
{
QueryTreeNode qtn = nodeFactory.getNode(
C_NodeTypes.RENAME_NODE,
@@ -9889,7 +9889,7 @@
String schemaName;
}
{
- schemaName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true)
+ schemaName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true)
{
return (QueryTreeNode) nodeFactory.getNode(
C_NodeTypes.SET_SCHEMA_NODE,
@@ -9917,7 +9917,7 @@
| schemaName = string()
{
/* Max length for schema name is
DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128 */
- checkIdentifierLengthLimit(schemaName,
DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30);
+ checkIdentifierLengthLimit(schemaName,
DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128);
return (QueryTreeNode) nodeFactory.getNode(
C_NodeTypes.SET_SCHEMA_NODE,
schemaName,
@@ -10456,7 +10456,7 @@
String schemaName;
}
{
- <SCHEMA> schemaName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30,
true) <RESTRICT>
+ <SCHEMA> schemaName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128,
true) <RESTRICT>
{
QueryTreeNode stmt = nodeFactory.getNode(
C_NodeTypes.DROP_SCHEMA_NODE,
@@ -10557,7 +10557,7 @@
String newColumnName;
}
{
- oldColumnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true)
<TO> newColumnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true)
+ oldColumnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true)
<TO> newColumnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true)
{
return (QueryTreeNode) nodeFactory.getNode(
C_NodeTypes.RENAME_NODE,
@@ -10600,7 +10600,7 @@
return lockGranularity;
}
|
- <ALTER> [ <COLUMN> ] columnName =
identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true) <SET>
+ <ALTER> [ <COLUMN> ] columnName =
identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true) <SET>
typeDescriptor = DB2AlterColumn(autoIncrementInfo)
{
changeType[0] = CreateStatementNode.MODIFY_TYPE;
@@ -10660,7 +10660,7 @@
TableElementNode tn;
}
{
- columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30, true) tn
= columnAlterClause(columnName)
+ columnName = identifier(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128, true) tn
= columnAlterClause(columnName)
{
return tn;
}
@@ -10763,7 +10763,7 @@
{
LOOKAHEAD( {getToken(2).kind == CONSTRAINT} )
/* changed constraintName() to qualifiedName() for compaction */
- <DROP> <CONSTRAINT> constraintName =
qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18)
+ <DROP> <CONSTRAINT> constraintName =
qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
{
return (TableElementNode) nodeFactory.getNode(
C_NodeTypes.CONSTRAINT_DEFINITION_NODE,
@@ -10795,7 +10795,7 @@
}
|
LOOKAHEAD( {getToken(2).kind == FOREIGN} )
- <DROP> <FOREIGN> <KEY> constraintName =
qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18)
+ <DROP> <FOREIGN> <KEY> constraintName =
qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
{
return (TableElementNode) nodeFactory.getNode(
C_NodeTypes.CONSTRAINT_DEFINITION_NODE,
@@ -10812,7 +10812,7 @@
}
|
LOOKAHEAD( {getToken(2).kind == UNIQUE} )
- <DROP> <UNIQUE> constraintName =
qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18)
+ <DROP> <UNIQUE> constraintName =
qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
{
return (TableElementNode) nodeFactory.getNode(
C_NodeTypes.CONSTRAINT_DEFINITION_NODE,
@@ -10828,7 +10828,7 @@
);
}
|
- <DROP> <CHECK> constraintName =
qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18)
+ <DROP> <CHECK> constraintName =
qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
{
return (TableElementNode) nodeFactory.getNode(
C_NodeTypes.CONSTRAINT_DEFINITION_NODE,
@@ -10874,7 +10874,7 @@
TableName indexName;
}
{
- <INDEX> indexName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18)
+ <INDEX> indexName = qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
{
return (QueryTreeNode) nodeFactory.getNode(
C_NodeTypes.DROP_INDEX_NODE,
@@ -10940,7 +10940,7 @@
TableName triggerName;
}
{
- <TRIGGER> triggerName =
qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18)
+ <TRIGGER> triggerName =
qualifiedName(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128)
{
return (QueryTreeNode) nodeFactory.getNode(
C_NodeTypes.DROP_TRIGGER_NODE,
Index: java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java
(revision 111709)
+++ java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java
(working copy)
@@ -45,7 +45,7 @@
import org.apache.derby.iapi.sql.depend.ProviderList;
import org.apache.derby.iapi.reference.SQLState;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.sql.execute.ConstantAction;
@@ -221,12 +221,12 @@
/* Only 5000 columns allowed per view */
- if (queryExpression.getResultColumns().size() >
DB2Limit.DB2_MAX_COLUMNS_IN_VIEW)
+ if (queryExpression.getResultColumns().size() >
DerbyLimit.DERBY_MAX_COLUMNS_IN_VIEW)
{
throw
StandardException.newException(SQLState.LANG_TOO_MANY_COLUMNS_IN_TABLE_OR_VIEW,
String.valueOf(queryExpression.getResultColumns().size()),
getRelativeName(),
-
String.valueOf(DB2Limit.DB2_MAX_COLUMNS_IN_VIEW));
+
String.valueOf(DerbyLimit.DERBY_MAX_COLUMNS_IN_VIEW));
}
// for each column, stuff system.column
Index:
java/engine/org/apache/derby/impl/sql/compile/ConcatenationOperatorNode.java
===================================================================
---
java/engine/org/apache/derby/impl/sql/compile/ConcatenationOperatorNode.java
(revision 111709)
+++
java/engine/org/apache/derby/impl/sql/compile/ConcatenationOperatorNode.java
(working copy)
@@ -40,7 +40,7 @@
import org.apache.derby.iapi.services.compiler.LocalField;
import org.apache.derby.impl.sql.compile.ExpressionClassBuilder;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.reference.SQLState;
import org.apache.derby.iapi.reference.ClassName;
@@ -360,7 +360,7 @@
{
case Types.CHAR:
case Types.BINARY:
- if (resultLength >
DB2Limit.DB2_CHAR_MAXWIDTH) {
+ if (resultLength >
DerbyLimit.DERBY_CHAR_MAXWIDTH) {
if (rightTypeId.getJDBCTypeId()
== Types.CHAR)
//operands
CHAR(A) CHAR(B) and A+B>254 then result is VARCHAR(A+B)
higherType =
TypeId.VARCHAR_NAME;
@@ -372,7 +372,7 @@
case Types.VARCHAR:
case Types.VARBINARY:
- if (resultLength >
DB2Limit.DB2_CONCAT_VARCHAR_LENGTH) {
+ if (resultLength >
DerbyLimit.DERBY_CONCAT_VARCHAR_LENGTH) {
if (rightTypeId.getJDBCTypeId()
== Types.VARCHAR)
//operands
CHAR(A) VARCHAR(B) and A+B>4000 then result is LONG VARCHAR
higherType =
TypeId.LONGVARCHAR_NAME;
@@ -394,7 +394,7 @@
{
case Types.CHAR: //operands CHAR(A) VARCHAR(B)
and A+B>4000 then result is LONG VARCHAR
case Types.VARCHAR: //operands VARCHAR(A)
VARCHAR(B) and A+B>4000 then result is LONG VARCHAR
- if (resultLength >
DB2Limit.DB2_CONCAT_VARCHAR_LENGTH)
+ if (resultLength >
DerbyLimit.DERBY_CONCAT_VARCHAR_LENGTH)
higherType =
TypeId.LONGVARCHAR_NAME;
break;
@@ -408,7 +408,7 @@
{
case Types.BINARY: //operands CHAR FOR BIT
DATA(A) VARCHAR FOR BIT DATA(B) and A+B>4000 then result is LONG VARCHAR FOR
BIT DATA
case Types.VARBINARY://operands VARCHAR FOR BIT
DATA(A) VARCHAR FOR BIT DATA(B) and A+B>4000 then result is LONG VARCHAR FOR
BIT DATA
- if (resultLength >
DB2Limit.DB2_CONCAT_VARCHAR_LENGTH)
+ if (resultLength >
DerbyLimit.DERBY_CONCAT_VARCHAR_LENGTH)
higherType =
TypeId.LONGVARBIT_NAME;
break;
Index:
java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
===================================================================
---
java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
(revision 111709)
+++
java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
(working copy)
@@ -59,7 +59,7 @@
import org.apache.derby.iapi.sql.depend.DependencyManager;
import org.apache.derby.iapi.sql.depend.Provider;
import org.apache.derby.iapi.reference.SQLState;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.sql.execute.ConstantAction;
import org.apache.derby.iapi.sql.execute.CursorActivation;
import org.apache.derby.iapi.sql.execute.ExecPreparedStatement;
@@ -2068,7 +2068,7 @@
}
/* Maximum 16 nesting levels allowed */
- if (triggerExecutionContexts.size() >=
DB2Limit.DB2_MAX_TRIGGER_RECURSION)
+ if (triggerExecutionContexts.size() >=
DerbyLimit.DERBY_MAX_TRIGGER_RECURSION)
{
throw
StandardException.newException(SQLState.LANG_TRIGGER_RECURSION_EXCEEDED);
}
Index: java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
(revision 111709)
+++ java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
(working copy)
@@ -23,7 +23,7 @@
import org.apache.derby.iapi.reference.JDBC30Translation;
import org.apache.derby.iapi.reference.Property;
import org.apache.derby.iapi.reference.SQLState;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.sql.compile.CompilerContext;
@@ -8180,7 +8180,7 @@
// void SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
- // varchar(128), varchar(DB2Limit.DB2_VARCHAR_MAXWIDTH))
+ // varchar(128), varchar(DerbyLimit.DERBY_VARCHAR_MAXWIDTH))
{
// procedure argument names
@@ -8193,7 +8193,7 @@
DataTypeDescriptor.getBuiltInDataTypeDescriptor(
Types.VARCHAR, 128),
DataTypeDescriptor.getBuiltInDataTypeDescriptor(
- Types.VARCHAR, DB2Limit.DB2_VARCHAR_MAXWIDTH)
+ Types.VARCHAR, DerbyLimit.DERBY_VARCHAR_MAXWIDTH)
};
createSystemProcedureOrFunction(
@@ -8279,7 +8279,7 @@
tc);
}
- // void SYSCS_UTIL.SYSCS_BACKUP_DATABASE(varchar
DB2Limit.DB2_VARCHAR_MAXWIDTH)
+ // void SYSCS_UTIL.SYSCS_BACKUP_DATABASE(varchar
DerbyLimit.DERBY_VARCHAR_MAXWIDTH)
{
// procedure argument names
String[] arg_names = {"BACKUPDIR"};
@@ -8287,7 +8287,7 @@
// procedure argument types
TypeDescriptor[] arg_types = {
DataTypeDescriptor.getBuiltInDataTypeDescriptor(
- Types.VARCHAR, DB2Limit.DB2_VARCHAR_MAXWIDTH)
+ Types.VARCHAR, DerbyLimit.DERBY_VARCHAR_MAXWIDTH)
};
createSystemProcedureOrFunction(
@@ -8303,7 +8303,7 @@
}
// void SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE(
- // varchar DB2Limit.DB2_VARCHAR_MAXWIDTH, smallint)
+ // varchar DerbyLimit.DERBY_VARCHAR_MAXWIDTH, smallint)
{
// procedure argument names
String[] arg_names = {"BACKUPDIR", "DELETE_ARCHIVED_LOG_FILES"};
@@ -8311,7 +8311,7 @@
// procedure argument types
TypeDescriptor[] arg_types = {
DataTypeDescriptor.getBuiltInDataTypeDescriptor(
- Types.VARCHAR, DB2Limit.DB2_VARCHAR_MAXWIDTH),
+ Types.VARCHAR, DerbyLimit.DERBY_VARCHAR_MAXWIDTH),
DataTypeDescriptor.getBuiltInDataTypeDescriptor(
Types.SMALLINT)
};
@@ -8404,7 +8404,7 @@
// the following need to be functions when that is supported.
// until then calling them will not work.
- // VARCHAR(DB2Limit.DB2_VARCHAR_MAXWIDTH)
+ // VARCHAR(DerbyLimit.DERBY_VARCHAR_MAXWIDTH)
// SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY(varchar(128))
{
@@ -8426,7 +8426,7 @@
0,
RoutineAliasInfo.READS_SQL_DATA,
DataTypeDescriptor.getBuiltInDataTypeDescriptor(
- Types.VARCHAR, DB2Limit.DB2_VARCHAR_MAXWIDTH),
+ Types.VARCHAR, DerbyLimit.DERBY_VARCHAR_MAXWIDTH),
tc);
}
@@ -8468,13 +8468,13 @@
0,
RoutineAliasInfo.CONTAINS_SQL,
DataTypeDescriptor.getBuiltInDataTypeDescriptor(
- Types.VARCHAR, DB2Limit.DB2_VARCHAR_MAXWIDTH),
+ Types.VARCHAR, DerbyLimit.DERBY_VARCHAR_MAXWIDTH),
/*
TODO - mikem, wants to be a CLOB, but don't know how to do
that yet. Testing it with varchar for now.
DataTypeDescriptor.getBuiltInDataTypeDescriptor(
- Types.CLOB, DB2Limit.DB2_LOB_MAXWIDTH),
+ Types.CLOB, DerbyLimit.DERBY_LOB_MAXWIDTH),
*/
tc);
}
@@ -8822,7 +8822,7 @@
DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.INTEGER),
DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.SMALLINT),
DataTypeDescriptor.getBuiltInDataTypeDescriptor(
- Types.VARCHAR,
DB2Limit.DB2_JCC_MAX_EXCEPTION_PARAM_LENGTH),
+ Types.VARCHAR,
DerbyLimit.DERBY_JCC_MAX_EXCEPTION_PARAM_LENGTH),
DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.CHAR, 8),
DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.INTEGER),
DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.INTEGER),
Index: java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
(revision 111709)
+++ java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
(working copy)
@@ -47,7 +47,7 @@
import org.apache.derby.iapi.services.info.ProductGenusNames;
import org.apache.derby.iapi.services.info.ProductVersionHolder;
import org.apache.derby.iapi.reference.JDBC30Translation;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.services.uuid.UUIDFactory;
import org.apache.derby.catalog.UUID;
Index: java/engine/org/apache/derby/impl/load/ImportResultSetMetaData.java
===================================================================
--- java/engine/org/apache/derby/impl/load/ImportResultSetMetaData.java
(revision 111709)
+++ java/engine/org/apache/derby/impl/load/ImportResultSetMetaData.java
(working copy)
@@ -23,7 +23,7 @@
import java.sql.SQLException;
import org.apache.derby.vti.VTIMetaDataTemplate;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
class ImportResultSetMetaData extends VTIMetaDataTemplate {
@@ -55,7 +55,7 @@
}
public int getColumnDisplaySize(int column) {
if (columnWidths == null)
- return DB2Limit.DB2_VARCHAR_MAXWIDTH;
+ return DerbyLimit.DERBY_VARCHAR_MAXWIDTH;
else
return columnWidths[column-1];
}
Index:
java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java
===================================================================
---
java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java
(revision 111709)
+++
java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java
(working copy)
@@ -24,7 +24,7 @@
import org.apache.derby.iapi.reference.Property;
import org.apache.derby.iapi.jdbc.AuthenticationService;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.services.i18n.MessageService;
@@ -188,7 +188,7 @@
return false;
String userName = userInfo.getProperty(Attribute.USERNAME_ATTR);
- if ((userName != null) && userName.length() >
DB2Limit.MAX_USERID_LENGTH) {
+ if ((userName != null) && userName.length() >
DerbyLimit.MAX_USERID_LENGTH) {
// DB2 has limits on length of the user id, so we enforce the
same.
// This used to be error 28000 "Invalid authorization ID", but
with v82,
// DB2 changed the behavior to return a normal "authorization
failure
Index: java/engine/org/apache/derby/impl/jdbc/EmbedConnection30.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedConnection30.java
(revision 111709)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedConnection30.java
(working copy)
@@ -28,7 +28,7 @@
import org.apache.derby.jdbc.Driver169;
import org.apache.derby.iapi.reference.SQLState;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.error.ExceptionSeverity;
@@ -138,8 +138,8 @@
if (userSuppliedSavepointName && (name ==
null))//make sure that if it is a named savepoint then supplied name is not null
throw
newSQLException(SQLState.NULL_NAME_FOR_SAVEPOINT);
//make sure that if it is a named savepoint
then supplied name length is not > 128
- if (userSuppliedSavepointName && (name.length()
> DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128))
- throw
newSQLException(SQLState.LANG_IDENTIFIER_TOO_LONG, name,
String.valueOf(DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128));
+ if (userSuppliedSavepointName && (name.length()
> DerbyLimit.DERBY_MAX_IDENTIFIER_LENGTH128))
+ throw
newSQLException(SQLState.LANG_IDENTIFIER_TOO_LONG, name,
String.valueOf(DerbyLimit.DERBY_MAX_IDENTIFIER_LENGTH128));
if (userSuppliedSavepointName &&
name.startsWith("SYS")) //to enforce DB2 restriction which is savepoint name
can't start with SYS
throw
newSQLException(SQLState.INVALID_SCHEMA_SYS, "SYS");
Savepoint savePt = new EmbedSavepoint30(this,
name);
Index: java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
(revision 111709)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
(working copy)
@@ -45,7 +45,7 @@
import org.apache.derby.catalog.UUID;
import org.apache.derby.iapi.reference.SQLState;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.reference.JDBC20Translation;
import org.apache.derby.iapi.reference.JDBC30Translation;
@@ -1108,7 +1108,7 @@
* @return max literal length
*/
public int getMaxColumnNameLength() {
- return DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30;
+ return DerbyLimit.DERBY_MAX_IDENTIFIER_LENGTH128;
}
/**
@@ -1173,7 +1173,7 @@
* @return max cursor name length in bytes
*/
public int getMaxCursorNameLength() {
- return DB2Limit.DB2_MAX_IDENTIFIER_LENGTH18;
+ return DerbyLimit.DERBY_MAX_IDENTIFIER_LENGTH128;
}
/**
@@ -1191,7 +1191,7 @@
* @return max name length in bytes
*/
public int getMaxSchemaNameLength() {
- return DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30;
+ return DerbyLimit.DERBY_MAX_IDENTIFIER_LENGTH128;
}
/**
@@ -1200,7 +1200,7 @@
* @return max name length in bytes
*/
public int getMaxProcedureNameLength() {
- return DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128;
+ return DerbyLimit.DERBY_MAX_IDENTIFIER_LENGTH128;
}
/**
@@ -1256,7 +1256,7 @@
* @return max name length in bytes
*/
public int getMaxTableNameLength() {
- return DB2Limit.DB2_MAX_IDENTIFIER_LENGTH128;
+ return DerbyLimit.DERBY_MAX_IDENTIFIER_LENGTH128;
}
/**
@@ -1274,7 +1274,7 @@
* @return max name length in bytes
*/
public int getMaxUserNameLength() {
- return DB2Limit.DB2_MAX_IDENTIFIER_LENGTH30;
+ return DerbyLimit.MAX_USERID_LENGTH;
}
//----------------------------------------------------------------------
Index: java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java
(revision 111709)
+++ java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java
(working copy)
@@ -22,7 +22,7 @@
import org.apache.derby.iapi.reference.Property;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
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,
+ DerbyLimit.DERBY_MIN_PAGE_SIZE,
+ DerbyLimit.DERBY_MAX_PAGE_SIZE,
RawStoreFactory.PAGE_SIZE_DEFAULT);
// rather than throw error, just automatically set page size to
Index: java/engine/org/apache/derby/iapi/sql/compile/TypeCompiler.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/TypeCompiler.java
(revision 111709)
+++ java/engine/org/apache/derby/iapi/sql/compile/TypeCompiler.java
(working copy)
@@ -31,7 +31,7 @@
import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
/**
* This interface defines methods associated with a TypeId that are used
@@ -61,9 +61,9 @@
// Need to leave space for '-' and decimal point
public static final int REAL_MAXWIDTH_AS_CHAR = 25;
- public static final int DEFAULT_DECIMAL_PRECISION =
DB2Limit.DEFAULT_DECIMAL_PRECISION;
- public static final int DEFAULT_DECIMAL_SCALE =
DB2Limit.DEFAULT_DECIMAL_SCALE;
- public static final int MAX_DECIMAL_PRECISION_SCALE =
DB2Limit.MAX_DECIMAL_PRECISION_SCALE;
+ public static final int DEFAULT_DECIMAL_PRECISION =
DerbyLimit.DEFAULT_DECIMAL_PRECISION;
+ public static final int DEFAULT_DECIMAL_SCALE =
DerbyLimit.DEFAULT_DECIMAL_SCALE;
+ public static final int MAX_DECIMAL_PRECISION_SCALE =
DerbyLimit.MAX_DECIMAL_PRECISION_SCALE;
public static final int BOOLEAN_MAXWIDTH_AS_CHAR = 5;
Index: java/engine/org/apache/derby/iapi/types/TypeId.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/TypeId.java (revision 111709)
+++ java/engine/org/apache/derby/iapi/types/TypeId.java (working copy)
@@ -31,7 +31,7 @@
import org.apache.derby.catalog.types.DecimalTypeIdImpl;
import org.apache.derby.catalog.types.UserDefinedTypeIdImpl;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import java.io.ObjectOutput;
import java.io.ObjectInput;
@@ -94,21 +94,21 @@
public static final int REAL_SCALE = 0;
public static final int REAL_MAXWIDTH = 4;
- public static final int DECIMAL_PRECISION =
DB2Limit.MAX_DECIMAL_PRECISION_SCALE;
- public static final int DECIMAL_SCALE =
DB2Limit.MAX_DECIMAL_PRECISION_SCALE;
- public static final int DECIMAL_MAXWIDTH =
DB2Limit.MAX_DECIMAL_PRECISION_SCALE;
+ public static final int DECIMAL_PRECISION =
DerbyLimit.MAX_DECIMAL_PRECISION_SCALE;
+ public static final int DECIMAL_SCALE =
DerbyLimit.MAX_DECIMAL_PRECISION_SCALE;
+ public static final int DECIMAL_MAXWIDTH =
DerbyLimit.MAX_DECIMAL_PRECISION_SCALE;
public static final int BOOLEAN_MAXWIDTH = 1;
- public static final int CHAR_MAXWIDTH =
DB2Limit.DB2_CHAR_MAXWIDTH;
- public static final int VARCHAR_MAXWIDTH =
DB2Limit.DB2_VARCHAR_MAXWIDTH;
- public static final int LONGVARCHAR_MAXWIDTH =
DB2Limit.DB2_LONGVARCHAR_MAXWIDTH;
+ public static final int CHAR_MAXWIDTH =
DerbyLimit.DERBY_CHAR_MAXWIDTH;
+ public static final int VARCHAR_MAXWIDTH =
DerbyLimit.DERBY_VARCHAR_MAXWIDTH;
+ public static final int LONGVARCHAR_MAXWIDTH =
DerbyLimit.DERBY_LONGVARCHAR_MAXWIDTH;
public static final int NATIONAL_CHAR_MAXWIDTH = Integer.MAX_VALUE;
public static final int NATIONAL_VARCHAR_MAXWIDTH =
Integer.MAX_VALUE;
- public static final int NATIONAL_LONGVARCHAR_MAXWIDTH =
DB2Limit.DB2_LONGVARCHAR_MAXWIDTH;
- public static final int BIT_MAXWIDTH =
DB2Limit.DB2_CHAR_MAXWIDTH;
- public static final int VARBIT_MAXWIDTH =
DB2Limit.DB2_VARCHAR_MAXWIDTH;
- public static final int LONGVARBIT_MAXWIDTH =
DB2Limit.DB2_LONGVARCHAR_MAXWIDTH;
+ public static final int NATIONAL_LONGVARCHAR_MAXWIDTH =
DerbyLimit.DERBY_LONGVARCHAR_MAXWIDTH;
+ public static final int BIT_MAXWIDTH =
DerbyLimit.DERBY_CHAR_MAXWIDTH;
+ public static final int VARBIT_MAXWIDTH =
DerbyLimit.DERBY_VARCHAR_MAXWIDTH;
+ public static final int LONGVARBIT_MAXWIDTH =
DerbyLimit.DERBY_LONGVARCHAR_MAXWIDTH;
// not supposed to be limited! 4096G should be ok(?), if Cloudscape
can handle...
public static final int BLOB_MAXWIDTH = Integer.MAX_VALUE; // to
change long
Index: java/engine/org/apache/derby/iapi/types/NumberDataType.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/NumberDataType.java (revision
111709)
+++ java/engine/org/apache/derby/iapi/types/NumberDataType.java (working copy)
@@ -28,7 +28,7 @@
import org.apache.derby.iapi.types.DataValueDescriptor;
import org.apache.derby.iapi.types.TypeId;
import org.apache.derby.iapi.reference.SQLState;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.types.*;
import java.math.BigDecimal;
@@ -317,9 +317,9 @@
public static float normalizeREAL(float v) throws StandardException
{
if ( (Float.isNaN(v) || Float.isInfinite(v)) ||
- ((v < DB2Limit.DB2_SMALLEST_REAL) || (v >
DB2Limit.DB2_LARGEST_REAL)) ||
- ((v > 0) && (v < DB2Limit.DB2_SMALLEST_POSITIVE_REAL)) ||
- ((v < 0) && (v > DB2Limit.DB2_LARGEST_NEGATIVE_REAL)) )
+ ((v < DerbyLimit.DERBY_SMALLEST_REAL) || (v >
DerbyLimit.DERBY_LARGEST_REAL)) ||
+ ((v > 0) && (v < DerbyLimit.DERBY_SMALLEST_POSITIVE_REAL)) ||
+ ((v < 0) && (v > DerbyLimit.DERBY_LARGEST_NEGATIVE_REAL)) )
{
throw
StandardException.newException(SQLState.LANG_OUTSIDE_RANGE_FOR_DATATYPE,
TypeId.REAL_NAME);
}
@@ -343,9 +343,9 @@
{
// can't just cast it to float and call normalizeFloat(float) since
casting can round down to 0.0
if ( (Double.isNaN(v) || Double.isInfinite(v)) ||
- ((v < DB2Limit.DB2_SMALLEST_REAL) || (v >
DB2Limit.DB2_LARGEST_REAL)) ||
- ((v > 0) && (v < DB2Limit.DB2_SMALLEST_POSITIVE_REAL)) ||
- ((v < 0) && (v > DB2Limit.DB2_LARGEST_NEGATIVE_REAL)) )
+ ((v < DerbyLimit.DERBY_SMALLEST_REAL) || (v >
DerbyLimit.DERBY_LARGEST_REAL)) ||
+ ((v > 0) && (v < DerbyLimit.DERBY_SMALLEST_POSITIVE_REAL)) ||
+ ((v < 0) && (v > DerbyLimit.DERBY_LARGEST_NEGATIVE_REAL)) )
{
throw
StandardException.newException(SQLState.LANG_OUTSIDE_RANGE_FOR_DATATYPE,
TypeId.REAL_NAME);
}
@@ -363,9 +363,9 @@
public static double normalizeDOUBLE(double v) throws StandardException
{
if ( (Double.isNaN(v) || Double.isInfinite(v)) ||
- ((v < DB2Limit.DB2_SMALLEST_DOUBLE) || (v >
DB2Limit.DB2_LARGEST_DOUBLE)) ||
- ((v > 0) && (v < DB2Limit.DB2_SMALLEST_POSITIVE_DOUBLE)) ||
- ((v < 0) && (v > DB2Limit.DB2_LARGEST_NEGATIVE_DOUBLE)) )
+ ((v < DerbyLimit.DERBY_SMALLEST_DOUBLE) || (v >
DerbyLimit.DERBY_LARGEST_DOUBLE)) ||
+ ((v > 0) && (v < DerbyLimit.DERBY_SMALLEST_POSITIVE_DOUBLE)) ||
+ ((v < 0) && (v > DerbyLimit.DERBY_LARGEST_NEGATIVE_DOUBLE)) )
{
throw
StandardException.newException(SQLState.LANG_OUTSIDE_RANGE_FOR_DATATYPE,
TypeId.DOUBLE_NAME);
}
Index: java/engine/org/apache/derby/iapi/reference/DerbyLimit.java
===================================================================
--- java/engine/org/apache/derby/iapi/reference/DerbyLimit.java (revision
111709)
+++ java/engine/org/apache/derby/iapi/reference/DerbyLimit.java (working copy)
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.iapi.reference.DB2Limit
+ Derby - Class org.apache.derby.iapi.reference.DerbyLimit
Copyright 2004 The Apache Software Foundation or its licensors, as
applicable.
@@ -20,54 +20,49 @@
package org.apache.derby.iapi.reference;
-public interface DB2Limit
+public interface DerbyLimit
{
/**
* Various fixed numbers related to DB2 limits.
*/
- public static final int DB2_MAX_TRIGGER_RECURSION = 16; /* Maximum
nesting level for triggers */
+ public static final int DERBY_MAX_TRIGGER_RECURSION = 16; /* Maximum
nesting level for triggers */
/** Maximum number of indexes on a table */
- public static final int DB2_MAX_INDEXES_ON_TABLE = 32767;
+ public static final int DERBY_MAX_INDEXES_ON_TABLE = 32767;
/* Maximum number of columns in a table */
- public static final int DB2_MAX_COLUMNS_IN_TABLE = 1012;
+ public static final int DERBY_MAX_COLUMNS_IN_TABLE = 1012;
/* Maximum number of columns in a view */
- public static final int DB2_MAX_COLUMNS_IN_VIEW = 5000;
+ public static final int DERBY_MAX_COLUMNS_IN_VIEW = 5000;
/* Maximum number of parameters in a stored procedure */
public static final int DB2_MAX_PARAMS_IN_STORED_PROCEDURE = 90;
/* Maximum number of elements in a select list */
- public static final int DB2_MAX_ELEMENTS_IN_SELECT_LIST = 1012;
+ public static final int DERBY_MAX_ELEMENTS_IN_SELECT_LIST = 1012;
/* Maximum number of columns in a group by list */
- public static final int DB2_MAX_ELEMENTS_IN_GROUP_BY = 32677;
+ public static final int DERBY_MAX_ELEMENTS_IN_GROUP_BY = 32677;
/* Maximum number of columns in an order by list */
- public static final int DB2_MAX_ELEMENTS_IN_ORDER_BY = 1012;
+ public static final int DERBY_MAX_ELEMENTS_IN_ORDER_BY = 1012;
// Max length for an exception parameter string over CCC server.
- public static final int DB2_CCC_MAX_EXCEPTION_PARAM_LENGTH = 70;
+ public static final int DERBY_CCC_MAX_EXCEPTION_PARAM_LENGTH = 70;
// Warning. Changing this value will affect upgrade and the creation of
the
// SQLCAMESSAGE procedure. See org.apache.derby.impl.sql.catalog.
- public static final int DB2_JCC_MAX_EXCEPTION_PARAM_LENGTH = 2400;
+ public static final int DERBY_JCC_MAX_EXCEPTION_PARAM_LENGTH = 2400;
- /* Some identifiers like Constraint name, Cursor name, Function name,
Index name, Trigger name
- * are limited to 18 character in DB2*/
- public static final int DB2_MAX_IDENTIFIER_LENGTH18 = 18;
- /* Some identifiers like Column name, Schema name are limited to 30
characters in DB2*/
- public static final int DB2_MAX_IDENTIFIER_LENGTH30 = 30;
- /* Some identifiers like Savepoint names, Table names, view names etc
are limited to 128 characters in DB2*/
- public static final int DB2_MAX_IDENTIFIER_LENGTH128 = 128;
- public static final int DB2_CHAR_MAXWIDTH = 254;
- public static final int DB2_VARCHAR_MAXWIDTH = 32672;
- public static final int DB2_LOB_MAXWIDTH = 2147483647;
- public static final int DB2_LONGVARCHAR_MAXWIDTH = 32700;
- public static final int DB2_CONCAT_VARCHAR_LENGTH = 4000;
- public static final int DB2_MAX_FLOATINGPOINT_LITERAL_LENGTH = 30; //
note, this value 30 is also contained in err msg 42820
- public static final int DB2_MAX_CHARACTER_LITERAL_LENGTH = 32672;
- public static final int DB2_MAX_HEX_LITERAL_LENGTH = 16336;
+ /* Some identifiers like Constraint name, Cursor name, Function name,
Index name, Trigger name, Column name, Schema name, Savepoint names, Table
names, view names etc are limited to 128 characters in DB2*/
+ public static final int DERBY_MAX_IDENTIFIER_LENGTH128 = 128;
+ public static final int DERBY_CHAR_MAXWIDTH = 254;
+ public static final int DERBY_VARCHAR_MAXWIDTH = 32672;
+ public static final int DERBY_LOB_MAXWIDTH = 2147483647;
+ public static final int DERBY_LONGVARCHAR_MAXWIDTH = 32700;
+ public static final int DERBY_CONCAT_VARCHAR_LENGTH = 4000;
+ public static final int DERBY_MAX_FLOATINGPOINT_LITERAL_LENGTH = 30; //
note, this value 30 is also contained in err msg 42820
+ public static final int DERBY_MAX_CHARACTER_LITERAL_LENGTH = 32672;
+ public static final int DERBY_MAX_HEX_LITERAL_LENGTH = 16336;
public static final int MIN_COL_LENGTH_FOR_CURRENT_USER = 8;
public static final int MIN_COL_LENGTH_FOR_CURRENT_SCHEMA = 128;
@@ -76,8 +71,8 @@
/**
* DB2 TABLESPACE page size limits
*/
- public static final int DB2_MIN_PAGE_SIZE = 4096; // 4k
- public static final int DB2_MAX_PAGE_SIZE = 32768; // 32k
+ public static final int DERBY_MIN_PAGE_SIZE = 4096; // 4k
+ public static final int DERBY_MAX_PAGE_SIZE = 32768; // 32k
/**
* DECIMAL type limits
@@ -91,15 +86,15 @@
* REAL/DOUBLE range limits
*/
- static final float DB2_SMALLEST_REAL = -3.402E+38f;
- static final float DB2_LARGEST_REAL = +3.402E+38f;
- static final float DB2_SMALLEST_POSITIVE_REAL = +1.175E-37f;
- static final float DB2_LARGEST_NEGATIVE_REAL = -1.175E-37f;
+ static final float DERBY_SMALLEST_REAL = -3.402E+38f;
+ static final float DERBY_LARGEST_REAL = +3.402E+38f;
+ static final float DERBY_SMALLEST_POSITIVE_REAL = +1.175E-37f;
+ static final float DERBY_LARGEST_NEGATIVE_REAL = -1.175E-37f;
- static final double DB2_SMALLEST_DOUBLE = -1.79769E+308d;
- static final double DB2_LARGEST_DOUBLE = +1.79769E+308d;
- static final double DB2_SMALLEST_POSITIVE_DOUBLE = +2.225E-307d;
- static final double DB2_LARGEST_NEGATIVE_DOUBLE = -2.225E-307d;
+ static final double DERBY_SMALLEST_DOUBLE = -1.79769E+308d;
+ static final double DERBY_LARGEST_DOUBLE = +1.79769E+308d;
+ static final double DERBY_SMALLEST_POSITIVE_DOUBLE = +2.225E-307d;
+ static final double DERBY_LARGEST_NEGATIVE_DOUBLE = -2.225E-307d;
}
Index: java/engine/org/apache/derby/iapi/reference/DB2Limit.java
===================================================================
--- java/engine/org/apache/derby/iapi/reference/DB2Limit.java (revision
111709)
+++ java/engine/org/apache/derby/iapi/reference/DB2Limit.java (working copy)
@@ -1,105 +0,0 @@
-/*
-
- Derby - Class org.apache.derby.iapi.reference.DB2Limit
-
- Copyright 2004 The Apache Software Foundation or its licensors, as
applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- */
-
-package org.apache.derby.iapi.reference;
-
-public interface DB2Limit
-{
- /**
- * Various fixed numbers related to DB2 limits.
- */
-
- public static final int DB2_MAX_TRIGGER_RECURSION = 16; /* Maximum
nesting level for triggers */
-
- /** Maximum number of indexes on a table */
- public static final int DB2_MAX_INDEXES_ON_TABLE = 32767;
- /* Maximum number of columns in a table */
- public static final int DB2_MAX_COLUMNS_IN_TABLE = 1012;
-
- /* Maximum number of columns in a view */
- public static final int DB2_MAX_COLUMNS_IN_VIEW = 5000;
-
- /* Maximum number of parameters in a stored procedure */
- public static final int DB2_MAX_PARAMS_IN_STORED_PROCEDURE = 90;
-
- /* Maximum number of elements in a select list */
- public static final int DB2_MAX_ELEMENTS_IN_SELECT_LIST = 1012;
- /* Maximum number of columns in a group by list */
- public static final int DB2_MAX_ELEMENTS_IN_GROUP_BY = 32677;
- /* Maximum number of columns in an order by list */
- public static final int DB2_MAX_ELEMENTS_IN_ORDER_BY = 1012;
-
- // Max length for an exception parameter string over CCC server.
- public static final int DB2_CCC_MAX_EXCEPTION_PARAM_LENGTH = 70;
-
- // Warning. Changing this value will affect upgrade and the creation of
the
- // SQLCAMESSAGE procedure. See org.apache.derby.impl.sql.catalog.
- public static final int DB2_JCC_MAX_EXCEPTION_PARAM_LENGTH = 2400;
-
- /* Some identifiers like Constraint name, Cursor name, Function name,
Index name, Trigger name
- * are limited to 18 character in DB2*/
- public static final int DB2_MAX_IDENTIFIER_LENGTH18 = 18;
- /* Some identifiers like Column name, Schema name are limited to 30
characters in DB2*/
- public static final int DB2_MAX_IDENTIFIER_LENGTH30 = 30;
- /* Some identifiers like Savepoint names, Table names, view names etc
are limited to 128 characters in DB2*/
- public static final int DB2_MAX_IDENTIFIER_LENGTH128 = 128;
- public static final int DB2_CHAR_MAXWIDTH = 254;
- public static final int DB2_VARCHAR_MAXWIDTH = 32672;
- public static final int DB2_LOB_MAXWIDTH = 2147483647;
- public static final int DB2_LONGVARCHAR_MAXWIDTH = 32700;
- public static final int DB2_CONCAT_VARCHAR_LENGTH = 4000;
- public static final int DB2_MAX_FLOATINGPOINT_LITERAL_LENGTH = 30; //
note, this value 30 is also contained in err msg 42820
- public static final int DB2_MAX_CHARACTER_LITERAL_LENGTH = 32672;
- public static final int DB2_MAX_HEX_LITERAL_LENGTH = 16336;
-
- public static final int MIN_COL_LENGTH_FOR_CURRENT_USER = 8;
- public static final int MIN_COL_LENGTH_FOR_CURRENT_SCHEMA = 128;
- public static final int MAX_USERID_LENGTH = 30;
-
- /**
- * DB2 TABLESPACE page size limits
- */
- public static final int DB2_MIN_PAGE_SIZE = 4096; // 4k
- public static final int DB2_MAX_PAGE_SIZE = 32768; // 32k
-
- /**
- * DECIMAL type limits
- */
-
- public static final int MAX_DECIMAL_PRECISION_SCALE = 31;
- public static final int DEFAULT_DECIMAL_PRECISION = 5;
- public static final int DEFAULT_DECIMAL_SCALE = 0;
-
- /**
- * REAL/DOUBLE range limits
- */
-
- static final float DB2_SMALLEST_REAL = -3.402E+38f;
- static final float DB2_LARGEST_REAL = +3.402E+38f;
- static final float DB2_SMALLEST_POSITIVE_REAL = +1.175E-37f;
- static final float DB2_LARGEST_NEGATIVE_REAL = -1.175E-37f;
-
- static final double DB2_SMALLEST_DOUBLE = -1.79769E+308d;
- static final double DB2_LARGEST_DOUBLE = +1.79769E+308d;
- static final double DB2_SMALLEST_POSITIVE_DOUBLE = +2.225E-307d;
- static final double DB2_LARGEST_NEGATIVE_DOUBLE = -2.225E-307d;
-
-
-}
Index: java/engine/org/apache/derby/diag/ErrorMessages.java
===================================================================
--- java/engine/org/apache/derby/diag/ErrorMessages.java (revision
111709)
+++ java/engine/org/apache/derby/diag/ErrorMessages.java (working copy)
@@ -35,7 +35,7 @@
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.error.ExceptionSeverity;
import org.apache.derby.iapi.services.i18n.MessageService;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.util.StringUtil;
import org.apache.derby.vti.VTITemplate;
@@ -113,7 +113,7 @@
if (retCode) {
SQLState =StandardException.getSQLStateFromIdentifier(k);
message = MessageService.getTextMessage(k);
- message = StringUtil.truncate(message,
DB2Limit.DB2_VARCHAR_MAXWIDTH);
+ message = StringUtil.truncate(message,
DerbyLimit.DERBY_VARCHAR_MAXWIDTH);
}
return retCode;
}
@@ -228,7 +228,7 @@
private static final ResultColumnDescriptor[] columnInfo = {
EmbedResultSetMetaData.getResultColumnDescriptor("SQL_STATE",
Types.VARCHAR, true, 5),
- EmbedResultSetMetaData.getResultColumnDescriptor("MESSAGE",
Types.VARCHAR, true, DB2Limit.DB2_VARCHAR_MAXWIDTH),
+ EmbedResultSetMetaData.getResultColumnDescriptor("MESSAGE",
Types.VARCHAR, true, DerbyLimit.DERBY_VARCHAR_MAXWIDTH),
EmbedResultSetMetaData.getResultColumnDescriptor("SEVERITY",
Types.INTEGER, true),
};
Index: java/engine/org/apache/derby/diag/StatementCache.java
===================================================================
--- java/engine/org/apache/derby/diag/StatementCache.java (revision
111709)
+++ java/engine/org/apache/derby/diag/StatementCache.java (working copy)
@@ -29,7 +29,7 @@
import org.apache.derby.iapi.sql.ResultColumnDescriptor;
import org.apache.derby.impl.jdbc.EmbedResultSetMetaData;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.util.StringUtil;
import java.sql.Types;
@@ -147,7 +147,7 @@
return ((GenericStatement)
currentPs.statement).getCompilationSchema();
case 3:
String sql = currentPs.getSource();
- sql = StringUtil.truncate(sql,
DB2Limit.DB2_VARCHAR_MAXWIDTH);
+ sql = StringUtil.truncate(sql,
DerbyLimit.DERBY_VARCHAR_MAXWIDTH);
return sql;
default:
return null;
@@ -184,7 +184,7 @@
EmbedResultSetMetaData.getResultColumnDescriptor("ID",
Types.CHAR, false, 36),
EmbedResultSetMetaData.getResultColumnDescriptor("SCHEMANAME",
Types.VARCHAR, true, 128),
- EmbedResultSetMetaData.getResultColumnDescriptor("SQL_TEXT",
Types.VARCHAR, false, DB2Limit.DB2_VARCHAR_MAXWIDTH),
+ EmbedResultSetMetaData.getResultColumnDescriptor("SQL_TEXT",
Types.VARCHAR, false, DerbyLimit.DERBY_VARCHAR_MAXWIDTH),
EmbedResultSetMetaData.getResultColumnDescriptor("UNICODE",
Types.BIT, false),
EmbedResultSetMetaData.getResultColumnDescriptor("VALID",
Types.BIT, false),
EmbedResultSetMetaData.getResultColumnDescriptor("COMPILED_AT",
Types.TIMESTAMP, true),
Index: java/engine/org/apache/derby/diag/StatementDuration.java
===================================================================
--- java/engine/org/apache/derby/diag/StatementDuration.java (revision
111709)
+++ java/engine/org/apache/derby/diag/StatementDuration.java (working copy)
@@ -36,7 +36,7 @@
import org.apache.derby.vti.VTITemplate;
import org.apache.derby.iapi.sql.ResultColumnDescriptor;
import org.apache.derby.impl.jdbc.EmbedResultSetMetaData;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.util.StringUtil;
/**
@@ -306,7 +306,7 @@
}
}
- output = StringUtil.truncate(output,
DB2Limit.DB2_VARCHAR_MAXWIDTH);
+ output = StringUtil.truncate(output,
DerbyLimit.DERBY_VARCHAR_MAXWIDTH);
return output;
@@ -334,7 +334,7 @@
EmbedResultSetMetaData.getResultColumnDescriptor("THREADID",
Types.VARCHAR, false, 80),
EmbedResultSetMetaData.getResultColumnDescriptor("XID",
Types.VARCHAR, false, 15),
EmbedResultSetMetaData.getResultColumnDescriptor("LCCID",
Types.VARCHAR, false, 10),
- EmbedResultSetMetaData.getResultColumnDescriptor("LOGTEXT",
Types.VARCHAR, true, DB2Limit.DB2_VARCHAR_MAXWIDTH),
+ EmbedResultSetMetaData.getResultColumnDescriptor("LOGTEXT",
Types.VARCHAR, true, DerbyLimit.DERBY_VARCHAR_MAXWIDTH),
EmbedResultSetMetaData.getResultColumnDescriptor("DURATION",
Types.VARCHAR, false, 10),
};
Index: java/engine/org/apache/derby/diag/TransactionTable.java
===================================================================
--- java/engine/org/apache/derby/diag/TransactionTable.java (revision
111709)
+++ java/engine/org/apache/derby/diag/TransactionTable.java (working copy)
@@ -35,7 +35,7 @@
import org.apache.derby.iapi.sql.ResultColumnDescriptor;
import org.apache.derby.impl.jdbc.EmbedResultSetMetaData;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.util.StringUtil;
import java.sql.ResultSetMetaData;
@@ -175,7 +175,7 @@
case 7:
str = info.getStatementTextString();
- str = StringUtil.truncate(str,
DB2Limit.DB2_VARCHAR_MAXWIDTH);
+ str = StringUtil.truncate(str,
DerbyLimit.DERBY_VARCHAR_MAXWIDTH);
break;
default:
@@ -235,7 +235,7 @@
EmbedResultSetMetaData.getResultColumnDescriptor("TYPE",
Types.VARCHAR, false, 30),
EmbedResultSetMetaData.getResultColumnDescriptor("STATUS",
Types.VARCHAR, false, 8),
EmbedResultSetMetaData.getResultColumnDescriptor("FIRST_INSTANT",
Types.VARCHAR, true, 20),
- EmbedResultSetMetaData.getResultColumnDescriptor("SQL_TEXT",
Types.VARCHAR, true, DB2Limit.DB2_VARCHAR_MAXWIDTH),
+ EmbedResultSetMetaData.getResultColumnDescriptor("SQL_TEXT",
Types.VARCHAR, true, DerbyLimit.DERBY_VARCHAR_MAXWIDTH),
};
private static final ResultSetMetaData metadata = new
EmbedResultSetMetaData(columnInfo);
Index: java/engine/org/apache/derby/diag/ErrorLogReader.java
===================================================================
--- java/engine/org/apache/derby/diag/ErrorLogReader.java (revision
111709)
+++ java/engine/org/apache/derby/diag/ErrorLogReader.java (working copy)
@@ -33,7 +33,7 @@
import java.sql.SQLException;
import java.sql.Types;
import org.apache.derby.vti.VTITemplate;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.util.StringUtil;
import org.apache.derby.iapi.sql.ResultColumnDescriptor;
@@ -294,7 +294,7 @@
}
}
- output = StringUtil.truncate(output,
DB2Limit.DB2_VARCHAR_MAXWIDTH);
+ output = StringUtil.truncate(output,
DerbyLimit.DERBY_VARCHAR_MAXWIDTH);
return output;
@@ -329,7 +329,7 @@
EmbedResultSetMetaData.getResultColumnDescriptor("LCCID",
Types.VARCHAR, false, 15),
EmbedResultSetMetaData.getResultColumnDescriptor("DATABASE",
Types.VARCHAR, false, 128),
EmbedResultSetMetaData.getResultColumnDescriptor("DRDAID",
Types.VARCHAR, true, 50),
-
EmbedResultSetMetaData.getResultColumnDescriptor("LOGTEXT",Types.VARCHAR,
false, DB2Limit.DB2_VARCHAR_MAXWIDTH)
+
EmbedResultSetMetaData.getResultColumnDescriptor("LOGTEXT",Types.VARCHAR,
false, DerbyLimit.DERBY_VARCHAR_MAXWIDTH)
};
private static final ResultSetMetaData metadata = new
EmbedResultSetMetaData(columnInfo);
Index: java/drda/org/apache/derby/impl/drda/FdocaConstants.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/FdocaConstants.java (revision
111709)
+++ java/drda/org/apache/derby/impl/drda/FdocaConstants.java (working copy)
@@ -22,7 +22,7 @@
import java.sql.Types;
import org.apache.derby.iapi.reference.JDBC30Translation;
import java.sql.SQLException;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
class FdocaConstants
{
@@ -240,8 +240,8 @@
// their toString() method and their limit is 64K as well.
// BUT, that said, we ultimately have to match DB2's limit,
// so just use that...
- protected static int LONGVARCHAR_MAX_LEN =
DB2Limit.DB2_LONGVARCHAR_MAXWIDTH;
- protected static int LONGVARBINARY_MAX_LEN =
DB2Limit.DB2_LONGVARCHAR_MAXWIDTH;
+ protected static int LONGVARCHAR_MAX_LEN =
DerbyLimit.DERBY_LONGVARCHAR_MAXWIDTH;
+ protected static int LONGVARBINARY_MAX_LEN =
DerbyLimit.DERBY_LONGVARCHAR_MAXWIDTH;
protected static int LONGVARCHAR_LEN_NUMBYTES = 2;
// JCC only supports a max precision of 31 like DB2
Index: java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/DRDAConnThread.java (revision
111709)
+++ java/drda/org/apache/derby/impl/drda/DRDAConnThread.java (working copy)
@@ -56,7 +56,7 @@
import org.apache.derby.iapi.tools.i18n.LocalizedResource;
import org.apache.derby.iapi.reference.SQLState;
import org.apache.derby.iapi.reference.Attribute;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
import org.apache.derby.iapi.error.ExceptionSeverity;
import org.apache.derby.impl.jdbc.Util;
import org.apache.derby.impl.jdbc.EmbedSQLException;
Index: java/drda/org/apache/derby/impl/drda/AppRequester.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/AppRequester.java (revision
111709)
+++ java/drda/org/apache/derby/impl/drda/AppRequester.java (working copy)
@@ -20,7 +20,7 @@
package org.apache.derby.impl.drda;
import org.apache.derby.iapi.services.sanity.SanityManager;
-import org.apache.derby.iapi.reference.DB2Limit;
+import org.apache.derby.iapi.reference.DerbyLimit;
/**
AppRequester stores information about the application requester.
@@ -228,12 +228,12 @@
switch (clientType) {
case JCC_CLIENT:
- return
DB2Limit.DB2_JCC_MAX_EXCEPTION_PARAM_LENGTH;
+ return
DerbyLimit.DERBY_JCC_MAX_EXCEPTION_PARAM_LENGTH;
default:
// Default is the max for C clients, since that is more
// restricted than for JCC clients. Note, though, that
// JCC clients are the only ones supported right now.
- return
DB2Limit.DB2_CCC_MAX_EXCEPTION_PARAM_LENGTH;
+ return
DerbyLimit.DERBY_CCC_MAX_EXCEPTION_PARAM_LENGTH;
}
Index:
java/testing/org/apache/derbyTesting/functionTests/tests/lang/dbManagerLimits.java
===================================================================
---
java/testing/org/apache/derbyTesting/functionTests/tests/lang/dbManagerLimits.java
(revision 111709)
+++
java/testing/org/apache/derbyTesting/functionTests/tests/lang/dbManagerLimits.java
(working copy)
@@ -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.DerbyLimit;
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 <
DerbyLimit.DERBY_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 < DerbyLimit.DERBY_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 <
DerbyLimit.DERBY_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 <
DerbyLimit.DERBY_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 < DerbyLimit.DERBY_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 <
DerbyLimit.DERBY_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 <
DerbyLimit.DERBY_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 <
DerbyLimit.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 <
DerbyLimit.DERBY_MAX_INDEXES_ON_TABLE-2; i++) {
s.executeUpdate("create index i" + i + " on
t1(c1,c2)");
System.out.println(" create index" + i);
}
