db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davi...@apache.org
Subject svn commit: r421497 - in /db/derby/code/trunk/java: drda/org/apache/derby/impl/drda/DRDAResultSet.java engine/org/apache/derby/iapi/jdbc/EngineResultSet.java engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
Date Thu, 13 Jul 2006 04:21:11 GMT
Author: davidvc
Date: Wed Jul 12 21:21:11 2006
New Revision: 421497

URL: http://svn.apache.org/viewvc?rev=421497&view=rev
Log:
DERBY-1015: Define interface between network server and engine through 
Java interfaces.  This revision commits the ResultSet interfaces.  
Contributed by Sunitha Khambhampati.

Added:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EngineResultSet.java   (with
props)
Modified:
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java?rev=421497&r1=421496&r2=421497&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java Wed Jul 12
21:21:11 2006
@@ -26,7 +26,7 @@
 import java.sql.Types;
 import java.util.ArrayList;
 
-import org.apache.derby.impl.jdbc.EmbedResultSet;
+import org.apache.derby.iapi.jdbc.EngineResultSet;
 
 /**
 	DRDAResultSet holds result set information
@@ -470,7 +470,7 @@
 		if (!gotPrctyp && qryprctyp == CodePoint.LMTBLKPRC)
 		{
 			gotPrctyp = true;
-			if (rs == null || ((EmbedResultSet) rs).isForUpdate() ||
+			if (rs == null || ((EngineResultSet)rs).isForUpdate() ||
 				/* for now we are not supporting LOB under LMTBLKPRC.  drda spec only
 				 * disallows LOB under LMTBLKPRC if OUTOVR is also for ANY CNTQRY reply.
 				 * To support LOB, QRYDTA protocols for LOB will need to be changed.

Added: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EngineResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EngineResultSet.java?rev=421497&view=auto
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EngineResultSet.java (added)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/EngineResultSet.java Wed Jul
12 21:21:11 2006
@@ -0,0 +1,34 @@
+/*
+ 
+ Derby - Class org.apache.derby.iapi.jdbc.EngineResultSet
+ 
+ Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+ 
+ Licensed 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.ResultSet;
+/**
+ * Additional methods the embedded engine exposes on its ResultSet object
+ * implementations. An internal api only, mainly for the network
+ * server
+ */
+public interface EngineResultSet extends ResultSet {
+    
+    /**
+     * Is this result set from a select for update statement?
+     */
+    public boolean isForUpdate();
+}

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

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java?rev=421497&r1=421496&r2=421497&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java Wed Jul
12 21:21:11 2006
@@ -24,6 +24,7 @@
 
 import org.apache.derby.iapi.error.StandardException;
 
+import org.apache.derby.iapi.jdbc.EngineResultSet;
 import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
 import org.apache.derby.iapi.sql.conn.StatementContext;
 
@@ -87,7 +88,7 @@
  */
 
 public abstract class EmbedResultSet extends ConnectionChild 
-    implements java.sql.ResultSet, Comparable {
+    implements EngineResultSet, Comparable {
 
 	// cursor movement
 	protected static final int FIRST = 1;



Mime
View raw message