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 km...@apache.org on 2008/03/29 00:01:23 UTC
svn commit: r642420 - in /db/derby/code/trunk/java:
engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java
testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java
Author: kmarsden
Date: Fri Mar 28 16:01:18 2008
New Revision: 642420
URL: http://svn.apache.org/viewvc?rev=642420&view=rev
Log:
DERBY-3566 Alter column set data type not allowed in soft upgrade mode with unique constraint.
Contributed by Anurag Shekhar (anurag dot shekhar at sun dot com)
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java?rev=642420&r1=642419&r2=642420&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java Fri Mar 28 16:01:18 2008
@@ -188,18 +188,20 @@
}
else
{
- //if a column is part of unique constraint it can't be
- //made nullable in soft upgrade mode from a pre-10.4 db.
- if ((existingConstraint.getConstraintType() ==
- DataDictionary.UNIQUE_CONSTRAINT))
- {
- if (!dd.checkVersion(
- DataDictionary.DD_VERSION_DERBY_10_4, null))
- {
+ if (!dd.checkVersion(
+ DataDictionary.DD_VERSION_DERBY_10_4, null))
+ {
+ //if a column is part of unique constraint it can't be
+ //made nullable in soft upgrade mode from a pre-10.4 db.
+ if ((getNodeType() ==
+ C_NodeTypes.MODIFY_COLUMN_CONSTRAINT_NODE) &&
+ (existingConstraint.getConstraintType() ==
+ DataDictionary.UNIQUE_CONSTRAINT))
+ {
throw StandardException.newException(
- SQLState.LANG_MODIFY_COLUMN_EXISTING_CONSTRAINT,
- name);
- }
+ SQLState.LANG_MODIFY_COLUMN_EXISTING_CONSTRAINT,
+ name);
+ }
}
// a column that is part of a primary key
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java?rev=642420&r1=642419&r2=642420&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java Fri Mar 28 16:01:18 2008
@@ -721,4 +721,31 @@
break;
}
}
+
+ /**
+ * Tests if alter column works for a column in unique constraint.
+ */
+ public void testAlterColumnOfUniqueConstraint () throws Exception {
+ Statement stmt = createStatement();
+ switch (getPhase()) {
+ case PH_CREATE:
+ stmt.executeUpdate("create table datatype_test (fl1 varchar (2) " +
+ "not null)");
+ stmt.executeUpdate("alter table datatype_test " +
+ "add constraint ucon_datatype_test unique (fl1)");
+ stmt.executeUpdate("alter table datatype_test alter column fl1" +
+ " set data type varchar (3)");
+ break;
+ case PH_SOFT_UPGRADE:
+ stmt.executeUpdate("alter table datatype_test alter column fl1 " +
+ " set data type varchar (4)");
+ break;
+
+ case PH_HARD_UPGRADE:
+ stmt.executeUpdate("alter table datatype_test alter column fl1 " +
+ " set data type varchar (5)");
+ break;
+ }
+ stmt.close();
+ }
}