db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r399063 - in /db/derby/code/trunk/java: client/org/apache/derby/client/am/ client/org/apache/derby/client/net/ engine/org/apache/derby/iapi/jdbc/ engine/org/apache/derby/impl/jdbc/ testing/org/apache/derbyTesting/functionTests/suites/ testi...
Date Tue, 02 May 2006 21:52:24 GMT
Author: rhillegas
Date: Tue May  2 14:52:22 2006
New Revision: 399063

URL: http://svn.apache.org/viewcvs?rev=399063&view=rev
Log:
DERBY-1238: Kristian's derby-1238-1a.diff patch, adding createStruct() and createArray().
I also wired Knut Anders' VerifySignatures test into the jdbc40 suite because now it passes
cleanly.

Modified:
    db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection40.java
    db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection40.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbc40.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection40.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection40.java?rev=399063&r1=399062&r2=399063&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/LogicalConnection40.java Tue
May  2 14:52:22 2006
@@ -20,6 +20,7 @@
 
 package org.apache.derby.client.am;
 
+import java.sql.Array;
 import java.sql.BaseQuery;
 import java.sql.Blob;
 import java.sql.ClientInfoException;
@@ -27,6 +28,7 @@
 import java.sql.NClob;
 import java.sql.SQLXML;
 import java.sql.SQLException;
+import java.sql.Struct;
 import java.sql.Wrapper;
 import java.util.Properties;
 
@@ -49,6 +51,11 @@
         super(physicalConnection, pooledConnection);
     }
 
+    public Array createArray(String typeName, Object[] elements)
+        throws SQLException {
+        throw SQLExceptionFactory.notImplemented("createArray(String,Object[])");
+    }
+    
     public Blob createBlob()
         throws SQLException {
         throw SQLExceptionFactory.notImplemented("createBlob()");
@@ -72,6 +79,11 @@
     public SQLXML createSQLXML()
         throws SQLException {
         throw SQLExceptionFactory.notImplemented("createSQLXML()");
+    }
+
+    public Struct createStruct(String typeName, Object[] attributes)
+        throws SQLException {
+        throw SQLExceptionFactory.notImplemented("createStruct(String,Object[])");
     }
 
     public Properties getClientInfo()

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java?rev=399063&r1=399062&r2=399063&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java Tue May
 2 14:52:22 2006
@@ -20,6 +20,7 @@
 
 package org.apache.derby.client.net;
 
+import java.sql.Array;
 import java.sql.BaseQuery;
 import java.sql.QueryObjectFactory;
 import org.apache.derby.client.am.SQLExceptionFactory;
@@ -32,6 +33,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLXML;
+import java.sql.Struct;
 import java.util.Properties;
 import org.apache.derby.impl.jdbc.Util;
 import org.apache.derby.jdbc.InternalDriver;
@@ -89,6 +91,11 @@
     
 
     
+    public Array createArray(String typeName, Object[] elements)
+        throws SQLException {
+        throw SQLExceptionFactory.notImplemented ("createArray(String,Object[])");
+    }
+
     /**
      * Constructs an object that implements the Clob interface. The object
      * returned initially contains no data.
@@ -123,6 +130,11 @@
 
     public SQLXML createSQLXML() throws SQLException {
         throw SQLExceptionFactory.notImplemented ("createSQLXML ()");
+    }
+
+    public Struct createStruct(String typeName, Object[] attributes)
+        throws SQLException {
+        throw SQLExceptionFactory.notImplemented ("createStruct(String,Object[])");
     }
 
     /**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection40.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection40.java?rev=399063&r1=399062&r2=399063&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection40.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection40.java Tue
May  2 14:52:22 2006
@@ -20,6 +20,7 @@
 
 package org.apache.derby.iapi.jdbc;
 
+import java.sql.Array;
 import java.sql.BaseQuery;
 import java.sql.Blob;
 import java.sql.Clob;
@@ -27,6 +28,7 @@
 import java.sql.NClob;
 import java.sql.SQLException;
 import java.sql.SQLXML;
+import java.sql.Struct;
 import java.util.Properties;
 import org.apache.derby.impl.jdbc.Util;
 import org.apache.derby.iapi.reference.SQLState;
@@ -39,6 +41,11 @@
         super(control);
     }
     
+    public Array createArray(String typeName, Object[] elements)
+        throws SQLException {
+        throw Util.notImplemented();
+    }
+    
     public Blob createBlob() throws SQLException {
         throw Util.notImplemented();
     }
@@ -56,7 +63,11 @@
         throw Util.notImplemented();
     }
     
-    
+    public Struct createStruct(String typeName, Object[] attributes)
+        throws SQLException {
+        throw Util.notImplemented();
+    }
+
     public boolean isValid(int timeout) throws SQLException{
         throw Util.notImplemented();
     }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java?rev=399063&r1=399062&r2=399063&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java Tue
May  2 14:52:22 2006
@@ -20,6 +20,7 @@
 
 package org.apache.derby.impl.jdbc;
 
+import java.sql.Array;
 import java.sql.BaseQuery;
 import java.sql.Blob;
 import java.sql.ClientInfoException;
@@ -28,6 +29,7 @@
 import java.sql.QueryObjectFactory;
 import java.sql.SQLException;
 import java.sql.SQLXML;
+import java.sql.Struct;
 import java.util.Properties;
 import org.apache.derby.jdbc.InternalDriver;
 import org.apache.derby.iapi.reference.SQLState;
@@ -53,6 +55,10 @@
      *-------------------------------------------------------
      */
     
+    public Array createArray(String typeName, Object[] elements)
+        throws SQLException {
+        throw Util.notImplemented();
+    }
     
     public Clob createClob() throws SQLException {
         throw Util.notImplemented();
@@ -67,6 +73,11 @@
     }
     
     public SQLXML createSQLXML() throws SQLException {
+        throw Util.notImplemented();
+    }
+    
+    public Struct createStruct(String typeName, Object[] attributes)
+        throws SQLException {
         throw Util.notImplemented();
     }
     

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbc40.runall
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbc40.runall?rev=399063&r1=399062&r2=399063&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbc40.runall
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbc40.runall
Tue May  2 14:52:22 2006
@@ -18,4 +18,5 @@
 jdbc4/RowIdNotImplementedTest.junit
 jdbc4/StatementEventsTest.junit
 jdbc4/StatementTest.junit
+jdbc4/VerifySignatures.junit
 jdbc4/XA40Test.junit

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java?rev=399063&r1=399062&r2=399063&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java
Tue May  2 14:52:22 2006
@@ -101,6 +101,16 @@
         }
     }
 
+    public void testCreateArrayNotImplemented()
+        throws SQLException {
+        try {
+            con.createArray(null, null);
+            fail("createArray(String,Object[]) should not be implemented");
+        } catch (SQLFeatureNotSupportedException sfnse) {
+            // Do nothing, we are fine
+        }
+    }
+
     public void testCreateNClobNotImplemented()
         throws SQLException {
         try {
@@ -131,6 +141,16 @@
         }
     }
 
+    public void testCreateStructNotImplemented()
+        throws SQLException {
+        try {
+            con.createStruct(null, null);
+            fail("createStruct(String,Object[]) should not be implemented");
+        } catch (SQLFeatureNotSupportedException sfnse) {
+            // Do nothing, we are fine
+        }
+    }
+    
     public void testGetClientInfoNotImplemented()
         throws SQLException {
         try {
@@ -224,6 +244,14 @@
     
     /**
      * Create a test suite containing tests for various connection types.
+     * Three subsuites are created:
+     * <ol><li>ConnectionTest suite</li>
+     *     <li>PooledConnectionTest suite</li>
+     *     <li>XAConnectionTest suite</li>
+     *  </ol>
+     *
+     *  In addition, separate suites for embedded- and client-only are added
+     *  to the subsuites when appropriate.
      */
     public static Test suite() {
         TestSuite topSuite = new TestSuite("ConnectionTest top suite");



Mime
View raw message