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 2011/06/07 03:58:40 UTC
svn commit: r1132853 - in /db/derby/code/branches/10.4: ./
java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java
java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
Author: kmarsden
Date: Tue Jun 7 01:58:39 2011
New Revision: 1132853
URL: http://svn.apache.org/viewvc?rev=1132853&view=rev
Log:
DERBY-5249 A table created with 10.0.2.1 with constraints cannot be dropped with 10.5 due to NullPointerException with insane build or ASSERT FAILED Failed to find sharable conglomerate descriptor for index conglomerate with sane build
merge revision 1132738 from 10.8
Modified:
db/derby/code/branches/10.4/ (props changed)
db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java
db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
Propchange: db/derby/code/branches/10.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 7 01:58:39 2011
@@ -1,3 +1,3 @@
-/db/derby/code/branches/10.5:814216,904472,958230
+/db/derby/code/branches/10.5:814216,904472,958230,1132842,1132844
/db/derby/code/branches/10.6:1055601
/db/derby/code/trunk:788436,788968,793588,794303,796316,796372,797147,798347,798742,800523,803548,805696,809643,812669,816536,835286,882732,898635,903108,915177,915733,917771,928065,934996,946794,954544,958163,958230,959550,980684,999119,1053724,1057542,1062096
Modified: db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java?rev=1132853&r1=1132852&r2=1132853&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java (original)
+++ db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java Tue Jun 7 01:58:39 2011
@@ -598,8 +598,15 @@ public final class ConglomerateDescripto
}
// Skip if ignoreThis is true and it describes "this".
+ // DERBY-5249. We need to check both the UUID and the
+ // conglomerateName to see if this is a match, because
+ // databases prior to the DERBY-655 fix may have a
+ // duplicate conglomerateID
if (ignoreThis &&
- getUUID().equals(descriptors[i].getUUID()))
+ getUUID().equals(descriptors[i].getUUID()) &&
+ getConglomerateName().equals(descriptors[i].
+ getConglomerateName())
+ )
{
continue;
}
Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java?rev=1132853&r1=1132852&r2=1132853&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java (original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java Tue Jun 7 01:58:39 2011
@@ -1,6 +1,6 @@
/*
-Derby - Class org.apache.derbyTesting.functionTests.tests.upgradeTests.BasicSetup
+Derby - Class org.apache.dertbyTesting.functionTests.tests.upgradeTests.BasicSetup
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -205,5 +205,59 @@ public class BasicSetup extends UpgradeC
}
break;
}
+ }
+
+
+ /**
+ * DERBY-5249 table created with primary and foreign key can't be dropped
+ * Test currently disabled. Remove the x from the name to enable the
+ * test once the bug is fixed.
+ *
+ */
+ public void testDropTableAfterUpgradeWithConstraint() throws SQLException {
+ final int phase = getPhase();
+
+ Statement s = createStatement();
+
+ switch (phase) {
+ case PH_CREATE:
+ s.executeUpdate("CREATE SCHEMA S");
+ s.executeUpdate("CREATE TABLE S.RS (R_TYPE_ID VARCHAR(64) "
+ + "NOT NULL)");
+ s.executeUpdate("ALTER TABLE S.RS ADD CONSTRAINT PK_RS "
+ + "PRIMARY KEY (R_TYPE_ID)");
+ s.executeUpdate("CREATE TABLE S.R_TYPE_ID (R_TYPE_ID "
+ + "VARCHAR(64) NOT NULL)");
+ s.executeUpdate("ALTER TABLE S.R_TYPE_ID ADD CONSTRAINT "
+ + "PK_R_TYPE_ID PRIMARY KEY (R_TYPE_ID)");
+ s.executeUpdate("ALTER TABLE S.RS ADD CONSTRAINT "
+ + "FK_RS_TYPEID FOREIGN KEY (R_TYPE_ID) REFERENCES "
+ + "S.R_TYPE_ID (R_TYPE_ID) ON DELETE CASCADE ON "
+ + "UPDATE NO ACTION");
+ /*
+ * With 10.0 and early 10.1 releases a duplicate conglomerate entry
+ * shows in sys.sysconglomerates for the primary key PK_RS. It can
+ * be seen with this query.
+
+ Utilities.showResultSet(s.executeQuery(
+ "select c.constraintname, c.constraintid, cong.conglomerateid, cong.conglomeratename from sys.sysconglomerates cong, sys.syskeys k, sys.sysconstraints c where c.constraintname = 'PK_RS' and c.constraintid =k.constraintid and k.conglomerateid = cong.conglomerateid "
+ ));
+ */
+ break;
+ case PH_SOFT_UPGRADE:
+ s.executeUpdate("ALTER TABLE S.RS DROP CONSTRAINT FK_RS_TYPEID");
+ s.executeUpdate("ALTER TABLE S.R_TYPE_ID DROP CONSTRAINT "
+ + "PK_R_TYPE_ID");
+ s.executeUpdate("ALTER TABLE S.RS DROP CONSTRAINT PK_RS");
+ s.executeUpdate("DROP TABLE S.RS");
+ s.executeUpdate("DROP TABLE S.R_TYPE_ID");
+ s.executeUpdate("DROP SCHEMA S RESTRICT");
+ break;
+ case PH_POST_SOFT_UPGRADE:
+ break;
+ case PH_HARD_UPGRADE:
+ break;
+ }
+
}
}