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 my...@apache.org on 2014/10/03 23:52:52 UTC
svn commit: r1629328 - in /db/derby/code/branches/10.10: ./
java/engine/org/apache/derby/impl/sql/execute/
java/testing/org/apache/derbyTesting/functionTests/testData/
java/testing/org/apache/derbyTesting/functionTests/testData/Derby6587/
java/testing/...
Author: myrnavl
Date: Fri Oct 3 21:52:52 2014
New Revision: 1629328
URL: http://svn.apache.org/r1629328
Log:
DERBY-6587; Foreign Key constraint not matched when using UUID in a composite foreign key when using SYSCS_UTIL.SYSCS_IMPORT_TABLE
backport of revision 1600788 and revision 1601169 from trunk.
Added:
db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/testData/Derby6587/
- copied from r1600788, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/Derby6587/
db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/testData/Derby6587/Derby6587_TABLE1_T.csv
- copied unchanged from r1600788, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/Derby6587/Derby6587_TABLE1_T.csv
db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/testData/Derby6587/Derby6587_TABLE2_T.csv
- copied unchanged from r1600788, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/Derby6587/Derby6587_TABLE2_T.csv
db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby6587Test.java
- copied, changed from r1600788, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby6587Test.java
Modified:
db/derby/code/branches/10.10/ (props changed)
db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java
db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml
db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
Propchange: db/derby/code/branches/10.10/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1600788,1601169
Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java?rev=1629328&r1=1629327&r2=1629328&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java Fri Oct 3 21:52:52 2014
@@ -324,11 +324,11 @@ public class RIBulkChecker
result = fkCol.compare(refCol);
- if (result == 1)
+ if (result > 0)
{
return GREATER_THAN;
}
- else if (result == -1)
+ else if (result < 0)
{
return LESS_THAN;
}
Modified: db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml?rev=1629328&r1=1629327&r2=1629328&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml (original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml Fri Oct 3 21:52:52 2014
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -59,6 +60,10 @@
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/serializedDataSources"
includes="*.ser"/>
</copy>
+ <copy todir="${out.dir}/${derby.testing.functest.dir}/testData/Derby6587">
+ <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/Derby6587"
+ includes="*.csv"/>
+ </copy>
</target>
<target name="compile_jdk15" >
Copied: db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby6587Test.java (from r1600788, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby6587Test.java)
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby6587Test.java?p2=db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby6587Test.java&p1=db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby6587Test.java&r1=1600788&r2=1629328&rev=1629328&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby6587Test.java (original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/lang/Derby6587Test.java Fri Oct 3 21:52:52 2014
@@ -104,7 +104,6 @@ public class Derby6587Test extends BaseJ
}
}
- @Override
protected void tearDown() throws Exception {
BaseJDBCTestCase.dropTable(getConnection(), "TABLE2_T");
BaseJDBCTestCase.dropTable(getConnection(), "TABLE1_T");
Modified: db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java?rev=1629328&r1=1629327&r2=1629328&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java (original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java Fri Oct 3 21:52:52 2014
@@ -158,6 +158,7 @@ public class _Suite extends BaseTestCase
suite.addTest(UngroupedAggregatesNegativeTest.suite());
suite.addTest(XplainStatisticsTest.suite());
suite.addTest(SelectivityTest.suite());
+ suite.addTest(Derby6587Test.suite());
// Add the XML tests, which exist as a separate suite
// so that users can "run all XML tests" easily.
suite.addTest(XMLSuite.suite());