[teiid/teiid] f4b1e3: TEIID-2933 fix for skip token
by Steve Hawkins
Branch: refs/heads/master
Home: https://github.com/teiid/teiid
Commit: f4b1e35c1cb4a4a741d9afce93fd35a4de2aa78a
https://github.com/teiid/teiid/commit/f4b1e35c1cb4a4a741d9afce93fd35a4de2...
Author: shawkins <shawkins(a)redhat.com>
Date: 2014-04-23 (Wed, 23 Apr 2014)
Changed paths:
M odata/src/main/java/org/teiid/odata/EntityList.java
M odata/src/test/java/org/teiid/odata/TestODataIntegration.java
Log Message:
-----------
TEIID-2933 fix for skip token
Commit: 8bd30f9df746f7ea77744a534311680b2a4969f2
https://github.com/teiid/teiid/commit/8bd30f9df746f7ea77744a534311680b2a4...
Author: shawkins <shawkins(a)redhat.com>
Date: 2014-04-25 (Fri, 25 Apr 2014)
Changed paths:
M odata/src/main/java/org/teiid/odata/Client.java
M odata/src/main/java/org/teiid/odata/EntityList.java
M odata/src/main/java/org/teiid/odata/LocalClient.java
M odata/src/main/java/org/teiid/odata/ODataSQLBuilder.java
M odata/src/main/java/org/teiid/odata/TeiidProducer.java
M odata/src/test/java/org/teiid/odata/TestODataIntegration.java
M odata/src/test/java/org/teiid/odata/TestODataSQLStringVisitor.java
Log Message:
-----------
TEIID-2934 TEIID-2935 improving odata performance and ensuring the
correct inline count is returned
Commit: 58d30748acb17a094cd4a1b00e34fa8fb1185883
https://github.com/teiid/teiid/commit/58d30748acb17a094cd4a1b00e34fa8fb11...
Author: Steve Hawkins <shawkins(a)redhat.com>
Date: 2014-04-25 (Fri, 25 Apr 2014)
Changed paths:
M odata/src/main/java/org/teiid/odata/Client.java
M odata/src/main/java/org/teiid/odata/EntityList.java
M odata/src/main/java/org/teiid/odata/LocalClient.java
M odata/src/main/java/org/teiid/odata/ODataSQLBuilder.java
M odata/src/main/java/org/teiid/odata/TeiidProducer.java
M odata/src/test/java/org/teiid/odata/TestODataIntegration.java
M odata/src/test/java/org/teiid/odata/TestODataSQLStringVisitor.java
Log Message:
-----------
Merge branch '8.7.x'
Compare: https://github.com/teiid/teiid/compare/50109d2ac176...58d30748acb1
10 years, 8 months
teiid SVN: r4637 - branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport.
by teiid-commits＠lists.jboss.org
Author: jolee
Date: 2014-04-24 08:09:46 -0400 (Thu, 24 Apr 2014)
New Revision: 4637
Modified:
branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
Log:
BZ1054940 - Roll up patch EDS_5.3.1_1_2014 (import statement correction)
Modified: branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
===================================================================
--- branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2014-04-23 18:18:25 UTC (rev 4636)
+++ branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2014-04-24 12:09:46 UTC (rev 4637)
@@ -50,7 +50,7 @@
import org.mockito.Mockito;
import org.postgresql.Driver;
import org.teiid.client.security.ILogon;
-import org.postgresql.core.v3.ExtendedQueryExectutorImpl;
+//import org.postgresql.core.v3.ExtendedQueryExectutorImpl;
import org.teiid.common.buffer.BufferManagerFactory;
import org.teiid.core.util.UnitTestUtil;
import org.teiid.jdbc.FakeServer;
10 years, 8 months
teiid SVN: r4636 - in branches/7.7.x: adminshell and 46 other directories.
by teiid-commits＠lists.jboss.org
Author: jolee
Date: 2014-04-23 14:18:25 -0400 (Wed, 23 Apr 2014)
New Revision: 4636
Modified:
branches/7.7.x/adminshell/pom.xml
branches/7.7.x/api/pom.xml
branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html
branches/7.7.x/build/pom.xml
branches/7.7.x/cache-jbosscache/pom.xml
branches/7.7.x/client-jdk15/pom.xml
branches/7.7.x/client/pom.xml
branches/7.7.x/common-core/pom.xml
branches/7.7.x/connectors/connector-file/pom.xml
branches/7.7.x/connectors/connector-infinispan/pom.xml
branches/7.7.x/connectors/connector-ldap/pom.xml
branches/7.7.x/connectors/connector-salesforce/pom.xml
branches/7.7.x/connectors/connector-ws/pom.xml
branches/7.7.x/connectors/pom.xml
branches/7.7.x/connectors/salesforce-api/pom.xml
branches/7.7.x/connectors/sandbox/connector-coherence/pom.xml
branches/7.7.x/connectors/sandbox/connector-template/pom.xml
branches/7.7.x/connectors/sandbox/pom.xml
branches/7.7.x/connectors/sandbox/translator-coherence/pom.xml
branches/7.7.x/connectors/sandbox/translator-yahoo/pom.xml
branches/7.7.x/connectors/translator-file/pom.xml
branches/7.7.x/connectors/translator-hive/pom.xml
branches/7.7.x/connectors/translator-jdbc/pom.xml
branches/7.7.x/connectors/translator-ldap/pom.xml
branches/7.7.x/connectors/translator-loopback/pom.xml
branches/7.7.x/connectors/translator-object/pom.xml
branches/7.7.x/connectors/translator-olap/pom.xml
branches/7.7.x/connectors/translator-salesforce/pom.xml
branches/7.7.x/connectors/translator-ws/pom.xml
branches/7.7.x/console/pom.xml
branches/7.7.x/documentation/admin-guide/pom.xml
branches/7.7.x/documentation/caching-guide/pom.xml
branches/7.7.x/documentation/client-developers-guide/pom.xml
branches/7.7.x/documentation/developer-guide/pom.xml
branches/7.7.x/documentation/javadocs/pom.xml
branches/7.7.x/documentation/pom.xml
branches/7.7.x/documentation/quick-start-example/pom.xml
branches/7.7.x/documentation/reference/pom.xml
branches/7.7.x/engine/pom.xml
branches/7.7.x/hibernate-dialect/pom.xml
branches/7.7.x/jboss-integration/pom.xml
branches/7.7.x/metadata/pom.xml
branches/7.7.x/pom.xml
branches/7.7.x/runtime/pom.xml
branches/7.7.x/test-integration/common/pom.xml
branches/7.7.x/test-integration/db/pom.xml
branches/7.7.x/test-integration/perf/pom.xml
branches/7.7.x/test-integration/pom.xml
Log:
BZ1054940 - Roll up patch EDS_5.3.1_1_2014
Modified: branches/7.7.x/adminshell/pom.xml
===================================================================
--- branches/7.7.x/adminshell/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/adminshell/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: branches/7.7.x/api/pom.xml
===================================================================
--- branches/7.7.x/api/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/api/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-api</artifactId>
Modified: branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/build/kits/jboss-container/teiid-releasenotes.html 2014-04-23 18:18:25 UTC (rev 4636)
@@ -242,6 +242,23 @@
</h2>
<h4>From ${project.version}</h4>
<ul>
+<li>[<a href='https://bugzilla.redhat.com/show_bug.cgi?id=1084108'>BZ1084108</a>] - SQL_TSI_SECOND always returns zero with new implementation of calendar for TIMESTAMPDIFF function
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1896'>TEIID-1896</a>] - fix for nested json array xml conversion
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2477'>TEIID-2477/a>] - Standardize and correct jdbc database version comparisons
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2636'>TEIID-2636</a>] - Stream corruption errors when doing big query, logging changes only
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2921'>TEIID-2921</a>] - Allow the projection raising (or order pushing) logic to work with non-simple ordering expressions
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2930'>TEIID-2930</a>] - SCROLL keyword for DECLARE CURSOR not being parsed correctly
+</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-2931'>TEIID-2931</a>] - Perform equi-join full outer joins in a streaming manner
+</li>
+</ul>
+<h4>From 7.7.9</h4>
+<ul>
<li>[<a href='https://bugzilla.redhat.com/show_bug.cgi?id=1029532'>BZ1029532</a>] - determine if transitive condition is needed
</li>
<li>[<a href='https://issues.jboss.org/browse/TEIID-1560'>TEIID-1560</a>] - (partial) modified instanceof check in FrameUtil
Modified: branches/7.7.x/build/pom.xml
===================================================================
--- branches/7.7.x/build/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/build/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid</artifactId>
Modified: branches/7.7.x/cache-jbosscache/pom.xml
===================================================================
--- branches/7.7.x/cache-jbosscache/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/cache-jbosscache/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-cache-jbosscache</artifactId>
Modified: branches/7.7.x/client/pom.xml
===================================================================
--- branches/7.7.x/client/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/client/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: branches/7.7.x/client-jdk15/pom.xml
===================================================================
--- branches/7.7.x/client-jdk15/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/client-jdk15/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client-jdk15</artifactId>
Modified: branches/7.7.x/common-core/pom.xml
===================================================================
--- branches/7.7.x/common-core/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/common-core/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-common-core</artifactId>
Modified: branches/7.7.x/connectors/connector-file/pom.xml
===================================================================
--- branches/7.7.x/connectors/connector-file/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/connector-file/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-file</artifactId>
Modified: branches/7.7.x/connectors/connector-infinispan/pom.xml
===================================================================
--- branches/7.7.x/connectors/connector-infinispan/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/connector-infinispan/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -4,7 +4,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-infinispan</artifactId>
Modified: branches/7.7.x/connectors/connector-ldap/pom.xml
===================================================================
--- branches/7.7.x/connectors/connector-ldap/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/connector-ldap/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ldap</artifactId>
Modified: branches/7.7.x/connectors/connector-salesforce/pom.xml
===================================================================
--- branches/7.7.x/connectors/connector-salesforce/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/connector-salesforce/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-salesforce</artifactId>
Modified: branches/7.7.x/connectors/connector-ws/pom.xml
===================================================================
--- branches/7.7.x/connectors/connector-ws/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/connector-ws/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ws</artifactId>
Modified: branches/7.7.x/connectors/pom.xml
===================================================================
--- branches/7.7.x/connectors/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.7.x/connectors/salesforce-api/pom.xml
===================================================================
--- branches/7.7.x/connectors/salesforce-api/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/salesforce-api/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: branches/7.7.x/connectors/sandbox/connector-coherence/pom.xml
===================================================================
--- branches/7.7.x/connectors/sandbox/connector-coherence/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/sandbox/connector-coherence/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-coherence</artifactId>
Modified: branches/7.7.x/connectors/sandbox/connector-template/pom.xml
===================================================================
--- branches/7.7.x/connectors/sandbox/connector-template/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/sandbox/connector-template/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -6,7 +6,7 @@
<name>${connector-name}</name>
<description>${connector-name}</description>
<packaging>rar</packaging>
- <version>7.7.9</version>
+ <version>7.7.10</version>
<properties>
<teiid.version>${teiid-version}</teiid.version>
</properties>
Modified: branches/7.7.x/connectors/sandbox/pom.xml
===================================================================
--- branches/7.7.x/connectors/sandbox/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/sandbox/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
Modified: branches/7.7.x/connectors/sandbox/translator-coherence/pom.xml
===================================================================
--- branches/7.7.x/connectors/sandbox/translator-coherence/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/sandbox/translator-coherence/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -8,7 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-coherence</artifactId>
<groupId>org.jboss.teiid.connectors.sandbox</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
<name>Coherence Translator</name>
<description>This is the tranlator for a Coherence connector</description>
Modified: branches/7.7.x/connectors/sandbox/translator-yahoo/pom.xml
===================================================================
--- branches/7.7.x/connectors/sandbox/translator-yahoo/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/sandbox/translator-yahoo/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-yahoo</artifactId>
Modified: branches/7.7.x/connectors/translator-file/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-file/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/translator-file/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-file</artifactId>
Modified: branches/7.7.x/connectors/translator-hive/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-hive/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/translator-hive/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-hive</artifactId>
Modified: branches/7.7.x/connectors/translator-jdbc/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-jdbc/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/translator-jdbc/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jdbc</artifactId>
Modified: branches/7.7.x/connectors/translator-ldap/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-ldap/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/translator-ldap/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ldap</artifactId>
Modified: branches/7.7.x/connectors/translator-loopback/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-loopback/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/translator-loopback/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-loopback</artifactId>
Modified: branches/7.7.x/connectors/translator-object/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-object/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/translator-object/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-object</artifactId>
Modified: branches/7.7.x/connectors/translator-olap/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-olap/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/translator-olap/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-olap</artifactId>
Modified: branches/7.7.x/connectors/translator-salesforce/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-salesforce/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/translator-salesforce/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-salesforce</artifactId>
Modified: branches/7.7.x/connectors/translator-ws/pom.xml
===================================================================
--- branches/7.7.x/connectors/translator-ws/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/connectors/translator-ws/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
Modified: branches/7.7.x/console/pom.xml
===================================================================
--- branches/7.7.x/console/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/console/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/7.7.x/documentation/admin-guide/pom.xml
===================================================================
--- branches/7.7.x/documentation/admin-guide/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/documentation/admin-guide/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>admin-guide</artifactId>
Modified: branches/7.7.x/documentation/caching-guide/pom.xml
===================================================================
--- branches/7.7.x/documentation/caching-guide/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/documentation/caching-guide/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>caching-guide</artifactId>
Modified: branches/7.7.x/documentation/client-developers-guide/pom.xml
===================================================================
--- branches/7.7.x/documentation/client-developers-guide/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/documentation/client-developers-guide/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>client-developers-guide</artifactId>
Modified: branches/7.7.x/documentation/developer-guide/pom.xml
===================================================================
--- branches/7.7.x/documentation/developer-guide/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/documentation/developer-guide/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>developer-guide</artifactId>
Modified: branches/7.7.x/documentation/javadocs/pom.xml
===================================================================
--- branches/7.7.x/documentation/javadocs/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/documentation/javadocs/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>javadocs</artifactId>
Modified: branches/7.7.x/documentation/pom.xml
===================================================================
--- branches/7.7.x/documentation/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/documentation/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.7.x/documentation/quick-start-example/pom.xml
===================================================================
--- branches/7.7.x/documentation/quick-start-example/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/documentation/quick-start-example/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>quick-start-example</artifactId>
Modified: branches/7.7.x/documentation/reference/pom.xml
===================================================================
--- branches/7.7.x/documentation/reference/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/documentation/reference/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>reference</artifactId>
Modified: branches/7.7.x/engine/pom.xml
===================================================================
--- branches/7.7.x/engine/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/engine/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: branches/7.7.x/hibernate-dialect/pom.xml
===================================================================
--- branches/7.7.x/hibernate-dialect/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/hibernate-dialect/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-hibernate-dialect</artifactId>
Modified: branches/7.7.x/jboss-integration/pom.xml
===================================================================
--- branches/7.7.x/jboss-integration/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/jboss-integration/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.7.x/metadata/pom.xml
===================================================================
--- branches/7.7.x/metadata/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/metadata/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: branches/7.7.x/pom.xml
===================================================================
--- branches/7.7.x/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -5,7 +5,7 @@
<artifactId>teiid-parent</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>7.7.9</version>
+ <version>7.7.10</version>
<description>Federated SQL and XML query engine.</description>
<properties>
<ant.version>1.7.0</ant.version>
Modified: branches/7.7.x/runtime/pom.xml
===================================================================
--- branches/7.7.x/runtime/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/runtime/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.7.x/test-integration/common/pom.xml
===================================================================
--- branches/7.7.x/test-integration/common/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/test-integration/common/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration-common</artifactId>
Modified: branches/7.7.x/test-integration/db/pom.xml
===================================================================
--- branches/7.7.x/test-integration/db/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/test-integration/db/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -9,7 +9,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/7.7.x/test-integration/perf/pom.xml
===================================================================
--- branches/7.7.x/test-integration/perf/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/test-integration/perf/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration-perf</artifactId>
Modified: branches/7.7.x/test-integration/pom.xml
===================================================================
--- branches/7.7.x/test-integration/pom.xml 2014-04-23 17:49:06 UTC (rev 4635)
+++ branches/7.7.x/test-integration/pom.xml 2014-04-23 18:18:25 UTC (rev 4636)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.7.9</version>
+ <version>7.7.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
10 years, 8 months
teiid SVN: r4635 - branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport.
by teiid-commits＠lists.jboss.org
Author: jolee
Date: 2014-04-23 13:49:06 -0400 (Wed, 23 Apr 2014)
New Revision: 4635
Modified:
branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
Log:
TEIID-2931: Perform equi-join full outer joins in a streaming manner
Modified: branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
===================================================================
--- branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2014-04-23 17:48:59 UTC (rev 4634)
+++ branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2014-04-23 17:49:06 UTC (rev 4635)
@@ -318,27 +318,28 @@
ResultSet rs = stmt.executeQuery("begin;declare \"foo\" cursor for select * from pg_proc;fetch 10 in \"foo\"; close \"foo\"");
rs.next();
}
+
+// Introduces too many upstream dependencies, manual test against patched server needed.
+// @Test public void testScrollCursor() throws Exception {
+// Statement stmt = conn.createStatement();
+// //ExtendedQueryExectutorImpl.simplePortal = "foo";
+// try {
+// assertFalse(stmt.execute("declare \"foo\" insensitive scroll cursor for select * from pg_proc;"));
+// assertFalse(stmt.execute("move 5 in \"foo\""));
+// stmt.execute("fetch 10 in \"foo\"");
+// ResultSet rs = stmt.getResultSet();
+// int rowCount = 0;
+// while (rs.next()) {
+// rowCount++;
+// }
+// assertEquals(6, rowCount);
+// stmt.execute("close \"foo\"");
+// } finally {
+// // ExtendedQueryExectutorImpl.simplePortal = null;
+// }
+//
+// }
- @Test public void testScrollCursor() throws Exception {
- Statement stmt = conn.createStatement();
- ExtendedQueryExectutorImpl.simplePortal = "foo";
- try {
- assertFalse(stmt.execute("declare \"foo\" insensitive scroll cursor for select * from pg_proc;"));
- assertFalse(stmt.execute("move 5 in \"foo\""));
- stmt.execute("fetch 10 in \"foo\"");
- ResultSet rs = stmt.getResultSet();
- int rowCount = 0;
- while (rs.next()) {
- rowCount++;
- }
- assertEquals(6, rowCount);
- stmt.execute("close \"foo\"");
- } finally {
- ExtendedQueryExectutorImpl.simplePortal = null;
- }
-
- }
-
@Test public void testPgProcedure() throws Exception {
Statement stmt = conn.createStatement();
ResultSet rs = stmt.executeQuery("select has_function_privilege(100, 'foo')");
10 years, 8 months
teiid SVN: r4634 - in branches/7.7.x: test-integration/common/src/test/java/org/teiid/transport and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: jolee
Date: 2014-04-23 13:48:59 -0400 (Wed, 23 Apr 2014)
New Revision: 4634
Modified:
branches/7.7.x/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
Log:
TEIID-2930: SCROLL keyword for DECLARE CURSOR not being parsed correctly
Modified: branches/7.7.x/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
===================================================================
--- branches/7.7.x/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2014-04-22 14:11:47 UTC (rev 4633)
+++ branches/7.7.x/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2014-04-23 17:48:59 UTC (rev 4634)
@@ -149,8 +149,8 @@
private static Pattern preparedAutoIncrement = Pattern.compile("select 1 \\s*from pg_catalog.pg_attrdef \\s*where adrelid = \\$1 AND adnum = \\$2 " + //$NON-NLS-1$
"\\s*and pg_catalog.pg_get_expr\\(adbin, adrelid\\) \\s*like '%nextval\\(%'", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
-
- private static Pattern cursorSelectPattern = Pattern.compile("DECLARE \"(\\w+)\" CURSOR(\\s(WITH HOLD|SCROLL))? FOR (.*)", Pattern.CASE_INSENSITIVE|Pattern.DOTALL); //$NON-NLS-1$
+
+ private static Pattern cursorSelectPattern = Pattern.compile("DECLARE\\s+\"(\\w+)\"(?:\\s+INSENSITIVE)?(\\s+(NO\\s+)?SCROLL)?\\s+CURSOR\\s+FOR\\s+(.*)", Pattern.CASE_INSENSITIVE|Pattern.DOTALL); //$NON-NLS-1$
private static Pattern fetchPattern = Pattern.compile("FETCH (\\d+) IN \"(\\w+)\".*", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
private static Pattern movePattern = Pattern.compile("MOVE (\\d+) IN \"(\\w+)\".*", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
private static Pattern closePattern = Pattern.compile("CLOSE \"(\\w+)\"", Pattern.DOTALL|Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
@@ -250,38 +250,46 @@
}
}
- private void cursorExecute(final String cursorName, final String sql, final ResultsFuture<Integer> completion) {
- if (sql != null) {
- try {
- // close if the name is already used or the unnamed prepare; otherwise
- // stmt is alive until session ends.
- Prepared previous = this.preparedMap.remove(cursorName);
- if (previous != null) {
- previous.stmt.close();
- }
-
- final PreparedStatementImpl stmt = this.connection.prepareStatement(sql);
- this.executionFuture = stmt.submitExecute(ResultsMode.RESULTSET);
- this.executionFuture.addCompletionListener(new ResultsFuture.CompletionListener<Boolean>() {
- @Override
- public void onCompletion(ResultsFuture<Boolean> future) {
- executionFuture = null;
- try {
- if (future.get()) {
- List<PgColInfo> cols = getPgColInfo(stmt.getResultSet().getMetaData());
- cursorMap.put(cursorName, new Cursor(cursorName, sql, stmt, null, stmt.getResultSet(), cols));
- client.sendCommandComplete("DECLARE CURSOR", null); //$NON-NLS-1$
- completion.getResultsReceiver().receiveResults(0);
- }
- } catch (Throwable e) {
- completion.getResultsReceiver().exceptionOccurred(e);
- }
- }
- });
- } catch (SQLException e) {
- completion.getResultsReceiver().exceptionOccurred(e);
- }
- }
+ private void cursorExecute(String cursorName, final String sql, final ResultsFuture<Integer> completion, boolean scroll) {
+ try {
+ // close if the name is already used or the unnamed prepare; otherwise
+ // stmt is alive until session ends.
+ this.preparedMap.remove(UNNAMED);
+ Portal p = this.portalMap.remove(UNNAMED);
+ if (p != null) {
+ closePortal(p);
+ }
+ if (cursorName == null || cursorName.length() == 0) {
+ cursorName = UNNAMED;
+ }
+ Cursor cursor = cursorMap.get(cursorName);
+ if (cursor != null) {
+ errorOccurred("Cannot use the portal name " + cursorName + " until the exiting instance is closed.");
+ return;
+ }
+
+ final PreparedStatementImpl stmt = this.connection.prepareStatement(sql, scroll?ResultSet.TYPE_SCROLL_INSENSITIVE:ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
+ this.executionFuture = stmt.submitExecute(ResultsMode.RESULTSET);
+ final String name = cursorName;
+ this.executionFuture.addCompletionListener(new ResultsFuture.CompletionListener<Boolean>() {
+ @Override
+ public void onCompletion(ResultsFuture<Boolean> future) {
+ executionFuture = null;
+ try {
+ if (future.get()) {
+ List<PgColInfo> cols = getPgColInfo(stmt.getResultSet().getMetaData());
+ cursorMap.put(name, new Cursor(name, sql, stmt, null, stmt.getResultSet(), cols));
+ client.sendCommandComplete("DECLARE CURSOR", null); //$NON-NLS-1$
+ completion.getResultsReceiver().receiveResults(0);
+ }
+ } catch (Throwable e) {
+ completion.getResultsReceiver().exceptionOccurred(e);
+ }
+ }
+ });
+ } catch (SQLException e) {
+ completion.getResultsReceiver().exceptionOccurred(e);
+ }
}
private void cursorFetch(String cursorName, int rows, final ResultsFuture<Integer> completion) throws SQLException {
@@ -788,6 +796,23 @@
}
}
}
+
+ private void closePortal(Portal query) {
+ ResultSet rs = query.rs;
+ if (rs != null) {
+ try {
+ rs.close();
+ } catch (SQLException e) {
+ LogManager.logDetail(LogConstants.CTX_ODBC, e, "Did not successfully close portal", query.name); //$NON-NLS-1$
+ }
+ query.rs = null;
+ }
+ try {
+ query.stmt.close();
+ } catch (SQLException e) {
+ LogManager.logDetail(LogConstants.CTX_ODBC, e, "Did not successfully close portal", query.name); //$NON-NLS-1$
+ }
+ }
@Override
public void closePreparedStatement(String preparedName) {
@@ -930,7 +955,11 @@
Matcher m = null;
if ((m = cursorSelectPattern.matcher(sql)).matches()){
- cursorExecute(m.group(1), fixSQL(m.group(4)), results);
+ boolean scroll = false;
+ if (m.group(2) != null && m.group(3) == null ) {
+ scroll = true;
+ }
+ cursorExecute(m.group(1), fixSQL(m.group(4)), results, scroll);
}
else if ((m = fetchPattern.matcher(sql)).matches()){
cursorFetch(m.group(2), Integer.parseInt(m.group(1)), results);
@@ -1064,6 +1093,8 @@
* The format used in the result set columns (if set).
*/
int[] resultColumnFormat;
+
+ volatile ResultSetImpl rs;
/**
* The prepared statement.
Modified: branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
===================================================================
--- branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2014-04-22 14:11:47 UTC (rev 4633)
+++ branches/7.7.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2014-04-23 17:48:59 UTC (rev 4634)
@@ -50,6 +50,7 @@
import org.mockito.Mockito;
import org.postgresql.Driver;
import org.teiid.client.security.ILogon;
+import org.postgresql.core.v3.ExtendedQueryExectutorImpl;
import org.teiid.common.buffer.BufferManagerFactory;
import org.teiid.core.util.UnitTestUtil;
import org.teiid.jdbc.FakeServer;
@@ -318,6 +319,26 @@
rs.next();
}
+ @Test public void testScrollCursor() throws Exception {
+ Statement stmt = conn.createStatement();
+ ExtendedQueryExectutorImpl.simplePortal = "foo";
+ try {
+ assertFalse(stmt.execute("declare \"foo\" insensitive scroll cursor for select * from pg_proc;"));
+ assertFalse(stmt.execute("move 5 in \"foo\""));
+ stmt.execute("fetch 10 in \"foo\"");
+ ResultSet rs = stmt.getResultSet();
+ int rowCount = 0;
+ while (rs.next()) {
+ rowCount++;
+ }
+ assertEquals(6, rowCount);
+ stmt.execute("close \"foo\"");
+ } finally {
+ ExtendedQueryExectutorImpl.simplePortal = null;
+ }
+
+ }
+
@Test public void testPgProcedure() throws Exception {
Statement stmt = conn.createStatement();
ResultSet rs = stmt.executeQuery("select has_function_privilege(100, 'foo')");
10 years, 8 months
