db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r643002 - in /db/derby/code/branches/10.4/java: engine/org/apache/derby/impl/sql/execute/ testing/org/apache/derbyTesting/functionTests/tests/lang/
Date Mon, 31 Mar 2008 14:23:00 GMT
Author: dyre
Date: Mon Mar 31 07:22:56 2008
New Revision: 643002

URL: http://svn.apache.org/viewvc?rev=643002&view=rev
Log:
DERBY-3352: truncateTable crashed, Caused by: java.lang.NullPointerException
Initializes collation array and adds JUnit test for truncate table.

Merged to 10.4 with svn merge -r 642995:642996 ../derby-scratch
No conflicts.


Added:
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TruncateTableTest.java
      - copied unchanged from r642996, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TruncateTableTest.java
Modified:
    db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java

Modified: db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java?rev=643002&r1=643001&r2=643002&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
(original)
+++ db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
Mon Mar 31 07:22:56 2008
@@ -1494,6 +1494,7 @@
 		{
 			indexRows = new ExecIndexRow[numIndexes];
 			ordering  = new ColumnOrdering[numIndexes][];
+			collation = new int[numIndexes][];
 
 			for (int index = 0; index < numIndexes; index++)
 			{

Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java?rev=643002&r1=643001&r2=643002&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
(original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
Mon Mar 31 07:22:56 2008
@@ -76,6 +76,7 @@
         suite.addTest(StreamsTest.suite());
         suite.addTest(TimeHandlingTest.suite());
         suite.addTest(TriggerTest.suite());
+        suite.addTest(TruncateTableTest.suite());
         suite.addTest(VTITest.suite());
         suite.addTest(SysDiagVTIMappingTest.suite());
         suite.addTest(UpdatableResultSetTest.suite());



Mime
View raw message