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 2005/04/12 08:19:59 UTC
svn commit: r161021 - in
incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests:
derbynet/callable.java derbynet/csPrepStmt.java derbynet/prepStmt.java
jdbcapi/dbMetaDataJdbc30_sed.properties
jdbcapi/metadataJdbc20_sed.properties jdbcapi/metadata_sed.properties
jdbcapi/odbc_metadata_sed.properties lang/procedure.java
Author: kmarsden
Date: Mon Apr 11 23:19:57 2005
New Revision: 161021
URL: http://svn.apache.org/viewcvs?view=rev&rev=161021
Log:
Checkin test changes and master updates for Army Brown
Modified:
incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/callable.java
incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/csPrepStmt.java
incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/prepStmt.java
incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dbMetaDataJdbc30_sed.properties
incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataJdbc20_sed.properties
incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_sed.properties
incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata_sed.properties
incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java
Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/callable.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/callable.java?view=diff&r1=161020&r2=161021
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/callable.java (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/callable.java Mon Apr 11 23:19:57 2005
@@ -687,7 +687,6 @@
System.out.println("cstmt.getBigDecimal(3): " + retVal3);
cstmt.close();
ps.close();
- conn.commit();
}catch (SQLException e) {
System.out.println(e.getMessage());
Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/csPrepStmt.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/csPrepStmt.java?view=diff&r1=161020&r2=161021
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/csPrepStmt.java (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/csPrepStmt.java Mon Apr 11 23:19:57 2005
@@ -369,7 +369,6 @@
System.out.println("SQLState: " + e.getSQLState() + " message: " + e.getMessage());
}
- conn.rollback();
}
Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/prepStmt.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/prepStmt.java?view=diff&r1=161020&r2=161021
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/prepStmt.java (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/prepStmt.java Mon Apr 11 23:19:57 2005
@@ -365,7 +365,6 @@
System.out.println("SQLState: " + e.getSQLState() + " message: " + e.getMessage());
}
- conn.rollback();
}
Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dbMetaDataJdbc30_sed.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dbMetaDataJdbc30_sed.properties?view=diff&r1=161020&r2=161021
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dbMetaDataJdbc30_sed.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dbMetaDataJdbc30_sed.properties Mon Apr 11 23:19:57 2005
@@ -6,4 +6,4 @@
# Multiple patterns for SUBSTITUTE: comma separated <pattern;substitute> pair
# substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substituten
# No commas or semicolons can be allowed in the patterns/subsitutes.
-substitute=version [0-9].[0-9]..[0-9].[0-9].[0-9][0-9]?.$;version (EXPECTED VERSION),version [0-9].[0-9]..[0-9].[0-9].[0-9][0-9]? Test Build.$;version (EXPECTED VERSION)
+substitute=version [0-9].[0-9]..[0-9].[0-9].[0-9][0-9]?[0-9]?.[A-Za-z]*.$;version (EXPECTED VERSION),version [0-9].[0-9]..[0-9].[0-9].[0-9][0-9]? Test Build.$;version (EXPECTED VERSION)
Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataJdbc20_sed.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataJdbc20_sed.properties?view=diff&r1=161020&r2=161021
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataJdbc20_sed.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataJdbc20_sed.properties Mon Apr 11 23:19:57 2005
@@ -6,4 +6,4 @@
# Multiple patterns for SUBSTITUTE: comma separated <pattern;substitute> pair
# substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substituten
# No commas or semicolons can be allowed in the patterns/subsitutes.
-substitute=version [0-9].[0-9]..[0-9].[0-9].[0-9][0-9]?.$;version (EXPECTED VERSION),version [0-9].[0-9]..[0-9].[0-9].[0-9][0-9]? Test Build.$;version (EXPECTED VERSION)
+substitute=version [0-9].[0-9]..[0-9].[0-9].[0-9][0-9]?[0-9]?.[A-Za-z]*.$;version (EXPECTED VERSION),version [0-9].[0-9]..[0-9].[0-9].[0-9][0-9]? Test Build.$;version (EXPECTED VERSION)
Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_sed.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_sed.properties?view=diff&r1=161020&r2=161021
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_sed.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_sed.properties Mon Apr 11 23:19:57 2005
@@ -6,4 +6,4 @@
# Multiple patterns for SUBSTITUTE: comma separated <pattern;substitute> pair
# substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substituten
# No commas or semicolons can be allowed in the patterns/subsitutes.
-substitute=version [0-9][.][0-9]..[0-9][.][0-9][.][0-9][0-9]?.$;version (EXPECTED VERSION),version [0-9][.][0-9]..[0-9].[0-9].[0-9][0-9]? Test Build.$;version (EXPECTED VERSION),getDriverVersion....2.*$;getDriverVersion(): EXPECTED VERSION
+substitute=version [0-9][.][0-9]..[0-9][.][0-9][.][0-9][0-9]?[0-9]?.[A-Za-z]*.$;version (EXPECTED VERSION),version [0-9][.][0-9]..[0-9].[0-9].[0-9][0-9]? Test Build.$;version (EXPECTED VERSION),getDriverVersion....[2-3].*$;getDriverVersion(): EXPECTED VERSION
Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata_sed.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata_sed.properties?view=diff&r1=161020&r2=161021
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata_sed.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata_sed.properties Mon Apr 11 23:19:57 2005
@@ -6,22 +6,4 @@
# Multiple patterns for SUBSTITUTE: comma separated <pattern;substitute> pair
# substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substituten
# No commas or semicolons can be allowed in the patterns/subsitutes.
-substitute=version [0-9][.][0-9]..[0-9][.][0-9][.][0-9][0-9]?.$;version (EXPECTED VERSION),version [0-9][.][0-9]..[0-9].[0-9].[0-9][0-9]? Test Build.$;version (EXPECTED VERSION),getDriverVersion....2.*$;getDriverVersion(): EXPECTED VERSION
-# Filters and substitutes for SED
-# Multiple patterns for DELETE: comma separated
-# delete=pattern1,pattern2,...,patternn
-# No commas can be allowed in the patterns.
-#
-# Multiple patterns for SUBSTITUTE: comma separated <pattern;substitute> pair
-# substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substituten
-# No commas or semicolons can be allowed in the patterns/subsitutes.
-substitute=version [0-9][.][0-9]..[0-9][.][0-9][.][0-9][0-9]?.$;version (EXPECTED VERSION),version [0-9][.][0-9]..[0-9].[0-9].[0-9][0-9]? Test Build.$;version (EXPECTED VERSION),getDriverVersion....2.*$;getDriverVersion(): EXPECTED VERSION
-# Filters and substitutes for SED
-# Multiple patterns for DELETE: comma separated
-# delete=pattern1,pattern2,...,patternn
-# No commas can be allowed in the patterns.
-#
-# Multiple patterns for SUBSTITUTE: comma separated <pattern;substitute> pair
-# substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substituten
-# No commas or semicolons can be allowed in the patterns/subsitutes.
-substitute=version [0-9][.][0-9]..[0-9][.][0-9][.][0-9][0-9]?.$;version (EXPECTED VERSION),version [0-9][.][0-9]..[0-9].[0-9].[0-9][0-9]? Test Build.$;version (EXPECTED VERSION),getDriverVersion....2.*$;getDriverVersion(): EXPECTED VERSION
+substitute=version [0-9][.][0-9]..[0-9][.][0-9][.][0-9][0-9]?[0-9]?.[A-Za-z]*.$;version (EXPECTED VERSION),version [0-9][.][0-9]..[0-9].[0-9].[0-9][0-9]? Test Build.$;version (EXPECTED VERSION),getDriverVersion....[2-3].*$;getDriverVersion(): EXPECTED VERSION
Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java?view=diff&r1=161020&r2=161021
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java Mon Apr 11 23:19:57 2005
@@ -343,14 +343,16 @@
ir1.close();
ir2.close();
- conn.commit();
+ if (!conn.getAutoCommit())
+ conn.commit();
ResultSet rs = s.executeQuery("select * from t1");
org.apache.derby.tools.JDBCDisplayUtil.DisplayResults(System.out, rs, conn);
- conn.commit();
+ if (!conn.getAutoCommit())
+ conn.commit();
callExceptionExpected(conn, "CALL IR2(2, 'no way')");
callExceptionExpected(conn, "CALL IR2(?, 'no way')");
@@ -1278,7 +1280,9 @@
showMatchingProcedures(conn, "SQLCONTROL2_%");
showMatchingProcedures(conn, "SQLCONTROL3_%");
showMatchingProcedures(conn, "SQLCONTROL4_%");
- conn.commit();
+
+ if (!conn.getAutoCommit())
+ conn.commit();
for (int i = 0; i < control.length; i++) {
String type = control[i];