db-derby-commits mailing list archives

Author: kahatlen
Date: Tue Mar  6 09:20:06 2012
New Revision: 1297396

URL: http://svn.apache.org/viewvc?rev=1297396&view=rev
Log:
DERBY-5635: Provide implementation for getMetaData() in VTITemplate

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/vti/StringColumnVTI.java
    db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java
    db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplateBase.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/StringArrayVTI.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SampleVTI.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/vti/StringColumnVTI.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/vti/StringColumnVTI.java?rev=1297396&r1=1297395&r2=1297396&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/vti/StringColumnVTI.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/vti/StringColumnVTI.java Tue Mar  6 09:20:06
2012
@@ -28,7 +28,6 @@ import java.math.BigDecimal;
 import java.sql.Blob;
 import java.sql.Clob;
 import java.sql.Date;
-import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Time;
 import java.sql.Timestamp;
@@ -130,9 +129,6 @@ public  abstract    class   StringColumn
     //
     ///////////////////////////////////////////////////////////////////////////////////
 
-    /** This method returns null. Derby does not look at the metadata returned by the table
function. */
-    public ResultSetMetaData getMetaData() throws SQLException { return null; }
-    
     public boolean wasNull() throws SQLException { return _lastColumnWasNull; }
     
     public int findColumn( String columnName ) throws SQLException

Modified: db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java?rev=1297396&r1=1297395&r2=1297396&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java Tue Mar  6 09:20:06
2012
@@ -21,23 +21,9 @@
 
 package org.apache.derby.vti;
 
-import java.io.InputStream;
-
-import java.sql.Connection;
-import java.sql.Statement;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
-import java.sql.SQLWarning;
 import java.math.BigDecimal;
 
-import java.net.URL;
-import java.util.Calendar;
-import java.sql.Ref;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.Array;
-
 /**
 	An abstract implementation of ResultSet that is useful
 	when writing table functions, read-only VTIs (virtual table interface), and
@@ -66,7 +52,6 @@ public abstract class VTITemplate extend
 {
     // Together with our superclass, the following overrides are a trick
     // to allow subclasses to compile on both Java 5 and Java 6
-    public abstract ResultSetMetaData getMetaData() throws SQLException;
     public abstract boolean next() throws SQLException;
     public abstract void close() throws SQLException;
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplateBase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplateBase.java?rev=1297396&r1=1297395&r2=1297396&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplateBase.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplateBase.java Tue Mar  6 09:20:06
2012
@@ -23,7 +23,6 @@ package org.apache.derby.vti;
 
 import java.io.InputStream;
 
-import java.sql.Connection;
 import java.sql.Statement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/StringArrayVTI.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/StringArrayVTI.java?rev=1297396&r1=1297395&r2=1297396&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/StringArrayVTI.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/StringArrayVTI.java
Tue Mar  6 09:20:06 2012
@@ -209,11 +209,6 @@ public    class   StringArrayVTI  extend
     public  void close() throws SQLException
     {}
 
-    public  ResultSetMetaData   getMetaData() throws SQLException
-    {
-        throw new SQLException( "Not implemented." );
-    }
-    
     ///////////////////////////////////////////////////////////////////////////////////
     //
     // MINIONS

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SampleVTI.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SampleVTI.java?rev=1297396&r1=1297395&r2=1297396&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SampleVTI.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SampleVTI.java
Tue Mar  6 09:20:06 2012
@@ -23,7 +23,6 @@ package org.apache.derbyTesting.function
 import java.io.InputStream;
 import java.io.Reader;
 import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 
 import org.apache.derby.vti.VTITemplate;
@@ -89,11 +88,6 @@ public class SampleVTI
     }
 
     //@Override
-    public ResultSetMetaData getMetaData() throws SQLException {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    //@Override
     public boolean next() throws SQLException {
         if (closed) {
             throw new SQLException("result set closed");