db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r545681 - in /db/derby/code/trunk/java: client/org/apache/derby/client/am/ testing/org/apache/derbyTesting/functionTests/tests/lang/
Date Sat, 09 Jun 2007 02:01:04 GMT
Author: myrnavl
Date: Fri Jun  8 19:01:04 2007
New Revision: 545681

URL: http://svn.apache.org/viewvc?view=rev&rev=545681
Log:
DERBY-1355 - ClientDriver ResultSetMetaData.isAutoIncrement(column) now returns appropriate
value. 
Patch contributed by Mayuresh Nirhali.
In addition, corrected text to be printed out in case of a failure in one of the test cases
in test AIjdbc.java.

Modified:
    db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/AIjdbc.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangHarnessJavaTest.java

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java?view=diff&rev=545681&r1=545680&r2=545681
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ColumnMetaData.java Fri Jun
 8 19:01:04 2007
@@ -177,6 +177,9 @@
         {
             checkForClosedStatement();
             checkForValidColumnIndex(column);
+            if( sqlxGenerated_[column - 1] == 2) {
+                return true;
+            }
             return false;
         }
         catch ( SqlException e )

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/AIjdbc.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/AIjdbc.java?view=diff&rev=545681&r1=545680&r2=545681
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/AIjdbc.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/AIjdbc.java
Fri Jun  8 19:01:04 2007
@@ -133,7 +133,7 @@
 			if (rsmd.isAutoIncrement(2))
 				throw new SQLException("column 2 is NOT ai!");
 			if (rsmd.isAutoIncrement(3))
-				throw new SQLException("column 2 is NOT ai!");
+				throw new SQLException("column 3 is NOT ai!");
 			rs.close();
             s.close();
 		}

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangHarnessJavaTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangHarnessJavaTest.java?view=diff&rev=545681&r1=545680&r2=545681
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangHarnessJavaTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangHarnessJavaTest.java
Fri Jun  8 19:01:04 2007
@@ -22,7 +22,7 @@
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
+import org.apache.derbyTesting.junit.TestConfiguration;
 import org.apache.derbyTesting.functionTests.util.HarnessJavaTest;
 
 /**
@@ -43,6 +43,7 @@
      */
     private static final String[] LANG_TESTS_BOTH =
     {
+        "AIjdbc",
     };
     
     /**
@@ -51,7 +52,7 @@
     private static final String[] LANG_TESTS_EMEBDDED=
     {
         // old derbylang.runall suite
-        "AIjdbc",
+        //"AIjdbc",
         // "AggregateClassLoading", TODO: investigate/convert
         "CharUTF8",
         "bug4356",
@@ -103,8 +104,8 @@
         suite.addTest(baseSuite("embedded", LANG_TESTS_BOTH));
         suite.addTest(baseSuite("embedded", LANG_TESTS_EMEBDDED));
         
-        //suite.addTest(TestConfiguration.clientServerDecorator(
-        //        baseSuite("clientserver", LANG_TESTS_BOTH)));
+        suite.addTest(TestConfiguration.clientServerDecorator(
+                baseSuite("clientserver", LANG_TESTS_BOTH)));
         return suite;
     }
    



Mime
View raw message