db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1205378 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/jdbc/BrokeredCallableStatement40.java iapi/jdbc/EngineCallableStatement40.java iapi/jdbc/build.xml impl/jdbc/EmbedCallableStatement40.java
Date Wed, 23 Nov 2011 12:18:13 GMT
Author: kahatlen
Date: Wed Nov 23 12:18:12 2011
New Revision: 1205378

URL: http://svn.apache.org/viewvc?rev=1205378&view=rev
Log:
DERBY-4845: Improve the dependency tracking for our build targets

Remove dependency on EmbedCallableStatement40 from
BrokeredCallableStatement40.

Added:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EngineCallableStatement40.java
  (with props)
Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement40.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement40.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement40.java?rev=1205378&r1=1205377&r2=1205378&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement40.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement40.java
Wed Nov 23 12:18:12 2011
@@ -31,9 +31,9 @@ import java.sql.SQLException;
 import java.sql.SQLXML;
 import org.apache.derby.iapi.reference.SQLState;
 import org.apache.derby.impl.jdbc.Util;
-import org.apache.derby.impl.jdbc.EmbedCallableStatement40;
 
-public class BrokeredCallableStatement40 extends  BrokeredCallableStatement30{
+public class BrokeredCallableStatement40 extends BrokeredCallableStatement30
+        implements EngineCallableStatement40 {
     
     public BrokeredCallableStatement40(BrokeredStatementControl control, String sql) throws
SQLException{
         super(control, sql);
@@ -441,12 +441,14 @@ public class BrokeredCallableStatement40
     public <T> T getObject( int parameterIndex, Class<T> type )
         throws SQLException
     {
-        return ((EmbedCallableStatement40) getCallableStatement()).getObject( parameterIndex,
type );
+        return ((EngineCallableStatement40) getCallableStatement())
+                .getObject(parameterIndex, type);
     }
     
     public <T> T getObject(String parameterName, Class<T> type)
         throws SQLException
     {
-        return ((EmbedCallableStatement40) getCallableStatement()).getObject( parameterName,
type );
+        return ((EngineCallableStatement40) getCallableStatement())
+                .getObject(parameterName, type);
     }
 }

Added: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EngineCallableStatement40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EngineCallableStatement40.java?rev=1205378&view=auto
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EngineCallableStatement40.java
(added)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EngineCallableStatement40.java
Wed Nov 23 12:18:12 2011
@@ -0,0 +1,35 @@
+/*
+
+   Derby - Class org.apache.derby.iapi.jdbc.EngineCallableStatement40
+
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ */
+package org.apache.derby.iapi.jdbc;
+
+import java.sql.CallableStatement;
+import java.sql.SQLException;
+
+/**
+ * Additional methods the engine exposes on its CallableStatement object
+ * implementations, whose signatures are not compatible with older platforms.
+ */
+public interface EngineCallableStatement40
+        extends EngineStatement, CallableStatement {
+    // JDBC 4.1 methods that use generics and won't compile on CDC.
+    <T> T getObject(int parameterIndex, Class<T> type) throws SQLException;
+    <T> T getObject(String parameterName, Class<T> type) throws SQLException;
+}

Propchange: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EngineCallableStatement40.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml?rev=1205378&r1=1205377&r2=1205378&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml Wed Nov 23 12:18:12
2011
@@ -68,6 +68,7 @@
 	  <exclude name="${derby.dir}/${cur.dir}/BrokeredCallableStatement40.java"/>
 	  <exclude name="${derby.dir}/${cur.dir}/BrokeredStatement.java"/>
       <exclude name="${derby.dir}/${cur.dir}/BrokeredStatement40.java"/>
+      <exclude name="${derby.dir}/${cur.dir}/EngineCallableStatement40.java"/>
       <exclude name="${derby.dir}/${cur.dir}/EngineConnection40.java"/>
       <exclude name="${derby.dir}/${cur.dir}/FailedProperties40.java"/>
       <exclude name="${derby.dir}/${cur.dir}/ResourceAdapter.java"/>
@@ -164,6 +165,7 @@
           <include name="${derby.dir}/${cur.dir}/BrokeredStatement40.java"/>
           <include name="${derby.dir}/${cur.dir}/BrokeredPreparedStatement40.java"/>
           <include name="${derby.dir}/${cur.dir}/BrokeredCallableStatement40.java"/>
+          <include name="${derby.dir}/${cur.dir}/EngineCallableStatement40.java"/>
           <include name="${derby.dir}/${cur.dir}/EngineConnection40.java"/>
           <include name="${derby.dir}/${cur.dir}/FailedProperties40.java"/>
       </javac>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement40.java?rev=1205378&r1=1205377&r2=1205378&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement40.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement40.java
Wed Nov 23 12:18:12 2011
@@ -35,10 +35,12 @@ import java.sql.SQLXML;
 import java.sql.Time;
 import java.sql.Timestamp;
 
+import org.apache.derby.iapi.jdbc.EngineCallableStatement40;
 import org.apache.derby.iapi.reference.SQLState;
 
-public class EmbedCallableStatement40 extends EmbedCallableStatement30 {
-    
+public class EmbedCallableStatement40
+        extends EmbedCallableStatement30
+        implements EngineCallableStatement40 {
         
     /** Creates a new instance of EmbedCallableStatement40 */
     public EmbedCallableStatement40(EmbedConnection conn, String sql,



Mime
View raw message