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 rh...@apache.org on 2013/05/07 21:53:09 UTC
svn commit: r1480052 - in
/db/derby/code/trunk/java/engine/org/apache/derby/vti: ForeignTableVTI.java
VTITemplate.java
Author: rhillegas
Date: Tue May 7 19:53:08 2013
New Revision: 1480052
URL: http://svn.apache.org/r1480052
Log:
DERBY-6213: Fix some compilation problems in the vti package when compiling on Java 7.
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/vti/ForeignTableVTI.java
db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/vti/ForeignTableVTI.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/vti/ForeignTableVTI.java?rev=1480052&r1=1480051&r2=1480052&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/vti/ForeignTableVTI.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/vti/ForeignTableVTI.java Tue May 7 19:53:08 2013
@@ -120,6 +120,7 @@ import org.apache.derby.iapi.util.IdUtil
* select lastName from foreignEmployee where employeeID = 2;
* </pre>
*/
+@SuppressWarnings("deprecation")
public class ForeignTableVTI extends VTITemplate implements RestrictedVTI
{
////////////////////////////////////////////////////////////////////////
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=1480052&r1=1480051&r2=1480052&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 May 7 19:53:08 2013
@@ -67,6 +67,7 @@ import java.util.Map;
For table functions and virtual tables, the database engine only calls methods defined
in the JDBC 2.0 definition of java.sql.ResultSet.
*/
+@SuppressWarnings("deprecation")
public abstract class VTITemplate implements ResultSet
{
public boolean isWrapperFor(Class<?> iface) throws SQLException { throw notImplemented( "isWrapperFor" ); }
@@ -91,6 +92,7 @@ public abstract class VTITemplate impl
public java.sql.Time getTime(String columnName) throws SQLException { return getTime(findColumn(columnName)); }
public java.sql.Timestamp getTimestamp(String columnName) throws SQLException { return getTimestamp(findColumn(columnName)); }
public Object getObject(String columnName) throws SQLException { return getObject(findColumn(columnName)); }
+ public <T> T getObject(String columnName, Class<T> type) throws SQLException { return getObject(findColumn(columnName), type); }
public BigDecimal getBigDecimal(String columnName) throws SQLException { return getBigDecimal(findColumn(columnName)); }
//
@@ -121,6 +123,7 @@ public abstract class VTITemplate impl
public void clearWarnings() throws SQLException { throw notImplemented( "clearWarnings" ); }
public String getCursorName() throws SQLException { throw notImplemented( "getCursorName" ); }
public Object getObject(int columnIndex) throws SQLException { throw notImplemented( "getObject" ); }
+ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException { throw notImplemented( "getObject" ); }
public int findColumn(String columnName) throws SQLException { throw notImplemented( "findColumn" ); }
public java.io.Reader getCharacterStream(int columnIndex) throws SQLException { throw notImplemented( "io.Reader getCharacterStream" ); }
public java.io.Reader getCharacterStream(String columnName) throws SQLException { throw notImplemented( "io.Reader getCharacterStream" ); }