teiid SVN: r3937 - in branches/7.4.x: adminshell and 38 other directories.
by teiid-commits＠lists.jboss.org
Author: jolee
Date: 2012-03-14 09:16:48 -0400 (Wed, 14 Mar 2012)
New Revision: 3937
Modified:
branches/7.4.x/adminshell/pom.xml
branches/7.4.x/api/pom.xml
branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html
branches/7.4.x/build/pom.xml
branches/7.4.x/cache-jbosscache/pom.xml
branches/7.4.x/client-jdk15/pom.xml
branches/7.4.x/client/pom.xml
branches/7.4.x/common-core/pom.xml
branches/7.4.x/connectors/connector-file/pom.xml
branches/7.4.x/connectors/connector-ldap/pom.xml
branches/7.4.x/connectors/connector-salesforce/pom.xml
branches/7.4.x/connectors/connector-ws/pom.xml
branches/7.4.x/connectors/pom.xml
branches/7.4.x/connectors/salesforce-api/pom.xml
branches/7.4.x/connectors/sandbox/pom.xml
branches/7.4.x/connectors/sandbox/translator-yahoo/pom.xml
branches/7.4.x/connectors/translator-file/pom.xml
branches/7.4.x/connectors/translator-jdbc/pom.xml
branches/7.4.x/connectors/translator-ldap/pom.xml
branches/7.4.x/connectors/translator-loopback/pom.xml
branches/7.4.x/connectors/translator-olap/pom.xml
branches/7.4.x/connectors/translator-salesforce/pom.xml
branches/7.4.x/connectors/translator-ws/pom.xml
branches/7.4.x/console/pom.xml
branches/7.4.x/documentation/admin-guide/pom.xml
branches/7.4.x/documentation/caching-guide/pom.xml
branches/7.4.x/documentation/client-developers-guide/pom.xml
branches/7.4.x/documentation/developer-guide/pom.xml
branches/7.4.x/documentation/pom.xml
branches/7.4.x/documentation/quick-start-example/pom.xml
branches/7.4.x/documentation/reference/pom.xml
branches/7.4.x/engine/pom.xml
branches/7.4.x/hibernate-dialect/pom.xml
branches/7.4.x/jboss-integration/pom.xml
branches/7.4.x/metadata/pom.xml
branches/7.4.x/pom.xml
branches/7.4.x/runtime/pom.xml
branches/7.4.x/test-integration/common/pom.xml
branches/7.4.x/test-integration/db/pom.xml
branches/7.4.x/test-integration/pom.xml
Log:
BZ-786561 Update of teiid-releasenotes.html and poms to 7.4.3
Modified: branches/7.4.x/adminshell/pom.xml
===================================================================
--- branches/7.4.x/adminshell/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/adminshell/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: branches/7.4.x/api/pom.xml
===================================================================
--- branches/7.4.x/api/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/api/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-api</artifactId>
Modified: branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/build/kits/jboss-container/teiid-releasenotes.html 2012-03-14 13:16:48 UTC (rev 3937)
@@ -255,6 +255,13 @@
</h2>
<h4>From ${project.version}</h4>
<ul>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1920'>TEIID-1920</a>] - fixing issues with dynamic sql</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1925'>TEIID-1925</a>] - Corrected method name to getExecutionId. Also removed getProcessingTime method since that has been removed</li>
+<li>[<a href='https://issues.jboss.org/browse/TEIID-1954'>TEIID-1954</a>] - correcting associating index records from index metadata</li>
+</ul>
+
+<h4>From 7.4.2</h4>
+<ul>
<li>[<a href='https://issues.jboss.org/browse/TEIID-1803'>TEIID-1803</a>] - VDB deployment in EDS can be extremely slow based upon indexing needs</li>
<li>[<a href='https://issues.jboss.org/browse/TEIID-1828'>TEIID-1828</a>] - Dependent critiera in query plan but missing in actual query and additional information is provided</li>
<li>[<a href='https://issues.jboss.org/browse/TEIID-1849'>TEIID-1849</a>] - enabledCipherSuites property gives error on startup of server</li>
Modified: branches/7.4.x/build/pom.xml
===================================================================
--- branches/7.4.x/build/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/build/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid</artifactId>
Modified: branches/7.4.x/cache-jbosscache/pom.xml
===================================================================
--- branches/7.4.x/cache-jbosscache/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/cache-jbosscache/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-cache-jbosscache</artifactId>
Modified: branches/7.4.x/client/pom.xml
===================================================================
--- branches/7.4.x/client/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/client/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: branches/7.4.x/client-jdk15/pom.xml
===================================================================
--- branches/7.4.x/client-jdk15/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/client-jdk15/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client-jdk15</artifactId>
Modified: branches/7.4.x/common-core/pom.xml
===================================================================
--- branches/7.4.x/common-core/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/common-core/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-common-core</artifactId>
Modified: branches/7.4.x/connectors/connector-file/pom.xml
===================================================================
--- branches/7.4.x/connectors/connector-file/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/connectors/connector-file/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-file</artifactId>
Modified: branches/7.4.x/connectors/connector-ldap/pom.xml
===================================================================
--- branches/7.4.x/connectors/connector-ldap/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/connectors/connector-ldap/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ldap</artifactId>
Modified: branches/7.4.x/connectors/connector-salesforce/pom.xml
===================================================================
--- branches/7.4.x/connectors/connector-salesforce/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/connectors/connector-salesforce/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-salesforce</artifactId>
Modified: branches/7.4.x/connectors/connector-ws/pom.xml
===================================================================
--- branches/7.4.x/connectors/connector-ws/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/connectors/connector-ws/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ws</artifactId>
Modified: branches/7.4.x/connectors/pom.xml
===================================================================
--- branches/7.4.x/connectors/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/connectors/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.4.x/connectors/salesforce-api/pom.xml
===================================================================
--- branches/7.4.x/connectors/salesforce-api/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/connectors/salesforce-api/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: branches/7.4.x/connectors/sandbox/pom.xml
===================================================================
--- branches/7.4.x/connectors/sandbox/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/connectors/sandbox/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
Modified: branches/7.4.x/connectors/sandbox/translator-yahoo/pom.xml
===================================================================
--- branches/7.4.x/connectors/sandbox/translator-yahoo/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/connectors/sandbox/translator-yahoo/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-yahoo</artifactId>
Modified: branches/7.4.x/connectors/translator-file/pom.xml
===================================================================
--- branches/7.4.x/connectors/translator-file/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/connectors/translator-file/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-file</artifactId>
Modified: branches/7.4.x/connectors/translator-jdbc/pom.xml
===================================================================
--- branches/7.4.x/connectors/translator-jdbc/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/connectors/translator-jdbc/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jdbc</artifactId>
Modified: branches/7.4.x/connectors/translator-ldap/pom.xml
===================================================================
--- branches/7.4.x/connectors/translator-ldap/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/connectors/translator-ldap/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ldap</artifactId>
Modified: branches/7.4.x/connectors/translator-loopback/pom.xml
===================================================================
--- branches/7.4.x/connectors/translator-loopback/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/connectors/translator-loopback/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-loopback</artifactId>
Modified: branches/7.4.x/connectors/translator-olap/pom.xml
===================================================================
--- branches/7.4.x/connectors/translator-olap/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/connectors/translator-olap/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-olap</artifactId>
Modified: branches/7.4.x/connectors/translator-salesforce/pom.xml
===================================================================
--- branches/7.4.x/connectors/translator-salesforce/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/connectors/translator-salesforce/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-salesforce</artifactId>
Modified: branches/7.4.x/connectors/translator-ws/pom.xml
===================================================================
--- branches/7.4.x/connectors/translator-ws/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/connectors/translator-ws/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
Modified: branches/7.4.x/console/pom.xml
===================================================================
--- branches/7.4.x/console/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/console/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/7.4.x/documentation/admin-guide/pom.xml
===================================================================
--- branches/7.4.x/documentation/admin-guide/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/documentation/admin-guide/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>admin-guide</artifactId>
Modified: branches/7.4.x/documentation/caching-guide/pom.xml
===================================================================
--- branches/7.4.x/documentation/caching-guide/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/documentation/caching-guide/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>caching-guide</artifactId>
Modified: branches/7.4.x/documentation/client-developers-guide/pom.xml
===================================================================
--- branches/7.4.x/documentation/client-developers-guide/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/documentation/client-developers-guide/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>client-developers-guide</artifactId>
Modified: branches/7.4.x/documentation/developer-guide/pom.xml
===================================================================
--- branches/7.4.x/documentation/developer-guide/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/documentation/developer-guide/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>developer-guide</artifactId>
Modified: branches/7.4.x/documentation/pom.xml
===================================================================
--- branches/7.4.x/documentation/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/documentation/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.4.x/documentation/quick-start-example/pom.xml
===================================================================
--- branches/7.4.x/documentation/quick-start-example/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/documentation/quick-start-example/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>quick-start-example</artifactId>
Modified: branches/7.4.x/documentation/reference/pom.xml
===================================================================
--- branches/7.4.x/documentation/reference/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/documentation/reference/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.jboss.teiid</groupId>
<artifactId>documentation</artifactId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>reference</artifactId>
Modified: branches/7.4.x/engine/pom.xml
===================================================================
--- branches/7.4.x/engine/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/engine/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: branches/7.4.x/hibernate-dialect/pom.xml
===================================================================
--- branches/7.4.x/hibernate-dialect/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/hibernate-dialect/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-hibernate-dialect</artifactId>
Modified: branches/7.4.x/jboss-integration/pom.xml
===================================================================
--- branches/7.4.x/jboss-integration/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/jboss-integration/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.4.x/metadata/pom.xml
===================================================================
--- branches/7.4.x/metadata/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/metadata/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: branches/7.4.x/pom.xml
===================================================================
--- branches/7.4.x/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -5,7 +5,7 @@
<artifactId>teiid-parent</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>7.4.2</version>
+ <version>7.4.3</version>
<description>Federated SQL and XML query engine.</description>
<properties>
<ant.version>1.7.0</ant.version>
Modified: branches/7.4.x/runtime/pom.xml
===================================================================
--- branches/7.4.x/runtime/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/runtime/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: branches/7.4.x/test-integration/common/pom.xml
===================================================================
--- branches/7.4.x/test-integration/common/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/test-integration/common/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration-common</artifactId>
Modified: branches/7.4.x/test-integration/db/pom.xml
===================================================================
--- branches/7.4.x/test-integration/db/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/test-integration/db/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -9,7 +9,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/7.4.x/test-integration/pom.xml
===================================================================
--- branches/7.4.x/test-integration/pom.xml 2012-03-13 19:55:06 UTC (rev 3936)
+++ branches/7.4.x/test-integration/pom.xml 2012-03-14 13:16:48 UTC (rev 3937)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>7.4.2</version>
+ <version>7.4.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
12 years, 1 month
- 1
- 0
teiid SVN: r3936 - in trunk/build/kits/jboss-as7/docs/teiid/examples: dynamicvdb-twitter and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2012-03-13 15:55:06 -0400 (Tue, 13 Mar 2012)
New Revision: 3936
Added:
trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-twitter/
trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-twitter/README.txt
trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-twitter/twitter-ds.xml
trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-twitter/twitter-vdb.xml
Removed:
trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-ws-weather/
Modified:
trunk/build/kits/jboss-as7/docs/teiid/examples/simpleclient/run.bat
trunk/build/kits/jboss-as7/docs/teiid/examples/simpleclient/run.sh
Log:
TEIID-1839: replacing weather with twitter web service example.
Added: trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-twitter/README.txt
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-twitter/README.txt (rev 0)
+++ trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-twitter/README.txt 2012-03-13 19:55:06 UTC (rev 3936)
@@ -0,0 +1,30 @@
+Demonstrates how to use the WS Translator to call web services. This example also shows
+how to define view tables in dynamic vdbs.
+
+See https://dev.twitter.com/docs/api for information on the Twitter's SOAP/REST services.
+
+Copy the following files to the <jboss.home>/standalone/deployments directory.
+ - twitter-vdb.xml
+
+Edit the "standalone-teiid.xml" file in the "<jboss.home>/standalone/configuration" add "weather-ds.xml" file's
+contents in resource adapter subsystem. This connection also can be created using JBoss CLI as
+./jboss-cli.sh (to do this first you need to start the JBoss AS)
+
+connect
+/subsystem=resource-adapters/resource-adapter=twitterDS:add(archive=teiid-connector-ws.rar, transaction-support=NoTransaction)
+/subsystem=resource-adapters/resource-adapter=twitterDS/connection-definitions=twitterDS:add(jndi-name=java:/twitterDS, class-name=org.teiid.resource.adapter.ws.WSManagedConnectionFactory, enabled=true, use-java-context=true)
+/subsystem=resource-adapters/resource-adapter=twitterDS/connection-definitions=twitterDS/config-properties=EndPoint:add(value=http://search.twitter.com/search.json)
+/subsystem=resource-adapters/resource-adapter=twitterDS:activate
+
+Start the JBoss AS
+
+Mkae sure the "twitter" vdb is deployed in "active" state.
+
+Use the simple client (located one directory above) example run script, e.g.
+
+$./run.sh localhost 31000 twitter "select * from tweet where query= 'jboss'"
+
+NOTE - depending on your OS/Shell the quoting/escaping required to run the example can be
+complicated. It would be better to install a Java client, such as SQuirreL, to run the
+queries below.
+
Property changes on: trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-twitter/README.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-twitter/twitter-ds.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-twitter/twitter-ds.xml (rev 0)
+++ trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-twitter/twitter-ds.xml 2012-03-13 19:55:06 UTC (rev 3936)
@@ -0,0 +1,14 @@
+<subsystem xmlns="urn:jboss:domain:resource-adapters:1.0">
+ <resource-adapters>
+ <resource-adapter>
+ <archive>teiid-connector-ws.rar</archive>
+ <transaction-support>NoTransaction</transaction-support>
+ <connection-definitions>
+ <connection-definition class-name="org.teiid.resource.adapter.ws.WSManagedConnectionFactory" jndi-name="java:/twitterDS" enabled="true" use-java-context="true" pool-name="twitter-ds">
+ <config-property name="EndPoint">http://search.twitter.com/search.json</config-property>
+ </connection-definition>
+ </connection-definitions>
+ </resource-adapter>
+ </resource-adapters>
+</subsystem>
+
Property changes on: trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-twitter/twitter-ds.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-twitter/twitter-vdb.xml
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-twitter/twitter-vdb.xml (rev 0)
+++ trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-twitter/twitter-vdb.xml 2012-03-13 19:55:06 UTC (rev 3936)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<vdb name="twitter" version="1">
+
+ <description>Shows how to call Web Services</description>
+
+ <property name="UseConnectorMetadata" value="cached" />
+
+ <model name="twitter">
+ <source name="twitter" translator-name="rest" connection-jndi-name="java:/twitterDS"/>
+ </model>
+ <model name="twitterview" type="VIRTUAL">
+ <metadata type="DDL"><![CDATA[
+ CREATE VIRTUAL PROCEDURE getTweets(query varchar) RETURNS (created_on varchar(25), from_user varchar(25), to_user varchar(25),
+ profile_image_url varchar(25), source varchar(25), text varchar(140)) AS
+ select tweet.* from
+ (call twitter.invokeHTTP(action => 'GET', endpoint =>querystring('',query as "q"))) w,
+ XMLTABLE('results' passing JSONTOXML('myxml', w.result) columns
+ created_on string PATH 'created_at',
+ from_user string PATH 'from_user',
+ to_user string PATH 'to_user',
+ profile_image_url string PATH 'profile_image_url',
+ source string PATH 'source',
+ text string PATH 'text') tweet;
+ CREATE VIEW Tweet AS select * FROM twitterview.getTweets;
+ ]]> </metadata>
+ </model>
+
+ <translator name="rest" type="ws">
+ <property name="DefaultBinding" value="HTTP"/>
+ <property name="DefaultServiceMode" value="MESSAGE"/>
+ </translator>
+</vdb>
\ No newline at end of file
Property changes on: trunk/build/kits/jboss-as7/docs/teiid/examples/dynamicvdb-twitter/twitter-vdb.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/build/kits/jboss-as7/docs/teiid/examples/simpleclient/run.bat
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/examples/simpleclient/run.bat 2012-03-13 16:05:28 UTC (rev 3935)
+++ trunk/build/kits/jboss-as7/docs/teiid/examples/simpleclient/run.bat 2012-03-13 19:55:06 UTC (rev 3936)
@@ -2,7 +2,7 @@
set CLIENT_PATH=.
rem Second one adds the Teiid client
-set TEIID_PATH=../../../modules/org/jboss/teiid/common-core/main/teiid-common-core-${pom.version}.jar;../../../modules/org/jboss/teiid/client/main/teiid-client-${pom.version}.jar
+set TEIID_PATH=../../../../modules/org/jboss/teiid/common-core/main/teiid-common-core-${pom.version}.jar;../../../../modules/org/jboss/teiid/client/main/teiid-client-${pom.version}.jar
java -cp %CLIENT_PATH%;%TEIID_PATH% JDBCClient %*
Modified: trunk/build/kits/jboss-as7/docs/teiid/examples/simpleclient/run.sh
===================================================================
--- trunk/build/kits/jboss-as7/docs/teiid/examples/simpleclient/run.sh 2012-03-13 16:05:28 UTC (rev 3935)
+++ trunk/build/kits/jboss-as7/docs/teiid/examples/simpleclient/run.sh 2012-03-13 19:55:06 UTC (rev 3936)
@@ -4,6 +4,6 @@
CLIENT_PATH=.
#Second one for the Teiid client jar
-TEIID_PATH=../../../modules/org/jboss/teiid/common-core/main/teiid-common-core-${pom.version}.jar:../../../modules/org/jboss/teiid/client/main/teiid-client-${pom.version}.jar
+TEIID_PATH=../../../../modules/org/jboss/teiid/common-core/main/teiid-common-core-${pom.version}.jar:../../../../modules/org/jboss/teiid/client/main/teiid-client-${pom.version}.jar
java -cp ${CLIENT_PATH}:${TEIID_PATH} JDBCClient "$@"
12 years, 1 month
- 1
- 0
teiid SVN: r3935 - in branches/7.4.x: engine/src/main/java/org/teiid/query/sql/visitor and 3 other directories.
by teiid-commits＠lists.jboss.org
Author: jolee
Date: 2012-03-13 12:05:28 -0400 (Tue, 13 Mar 2012)
New Revision: 3935
Modified:
branches/7.4.x/documentation/reference/src/main/docbook/en-US/content/procedures.xml
branches/7.4.x/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java
branches/7.4.x/engine/src/test/java/org/teiid/query/parser/TestParser.java
branches/7.4.x/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java
branches/7.4.x/engine/src/test/java/org/teiid/query/sql/visitor/TestSQLStringVisitor.java
Log:
TEIID-1920 fixing issues with dynamic sql
Modified: branches/7.4.x/documentation/reference/src/main/docbook/en-US/content/procedures.xml
===================================================================
--- branches/7.4.x/documentation/reference/src/main/docbook/en-US/content/procedures.xml 2012-03-12 18:52:17 UTC (rev 3934)
+++ branches/7.4.x/documentation/reference/src/main/docbook/en-US/content/procedures.xml 2012-03-13 16:05:28 UTC (rev 3935)
@@ -37,7 +37,7 @@
</para>
<para>
Usage:
- <synopsis>EXECUTE STRING <expression> <optional>AS <variable> <type> [, <variable> <type>]* [INTO <variable>]</optional>
+ <synopsis>EXECUTE IMMEDIATE <expression> <optional>AS <variable> <type> [, <variable> <type>]* [INTO <variable>]</optional>
[USING <variable>=<expression> [,<variable>=<expression>]*] [UPDATE <literal>]
</synopsis>
</para>
@@ -52,7 +52,7 @@
</para>
</listitem>
<listitem>
- <para>The "USING" clause allows the dynamic SQL string to contain variable references that are bound at runtime to specified values. This allows for some independence of the SQL string from the surrounding procedure variable names and input names. In the dynamic command "USING" clause, each variable is specified by short name only. However in the dynamic SQL the "USING" variable must be fully qualified to "UVAR.". The "USING" clause is only for values that will be used in the dynamic SQL as legal expressions. It is not possible to use the "USING" clause to replace table names, keywords, etc. This makes using symbols equivalent in power to normal bind (?) expressions in prepared statements. The "USING" clause helps reduce the amount of string manipulation needed. If a reference is made to a USING symbol in the SQL string that is not bound to a value in the "USING" clause, an exception will occur.
+ <para>The "USING" clause allows the dynamic SQL string to contain variable references that are bound at runtime to specified values. This allows for some independence of the SQL string from the surrounding procedure variable names and input names. In the dynamic command "USING" clause, each variable is specified by short name only. However in the dynamic SQL the "USING" variable must be fully qualified to "DVAR.". The "USING" clause is only for values that will be used in the dynamic SQL as legal expressions. It is not possible to use the "USING" clause to replace table names, keywords, etc. This makes using symbols equivalent in power to normal bind (?) expressions in prepared statements. The "USING" clause helps reduce the amount of string manipulation needed. If a reference is made to a USING symbol in the SQL string that is not bound to a value in the "USING" clause, an exception will occur.
</para>
</listitem>
<listitem>
@@ -71,7 +71,7 @@
DECLARE string sql_string = 'SELECT ID, First || ‘‘ ‘‘ || Last AS Name, Birthdate FROM Customer.Accounts WHERE ' || criteria;
/* The execution of the SQL string will create the #temp table with the columns (ID, Name, Birthdate).
Note that we also have the USING clause to bind a value to LastName, which is referenced in the criteria. */
-EXECUTE STRING sql_string AS ID integer, Name string, Birthdate date INTO #temp USING LastName='some name';
+EXECUTE IMMEDIATE sql_string AS ID integer, Name string, Birthdate date INTO #temp USING LastName='some name';
/* The temp table can now be used with the values from the Dynamic SQL */
loop on (SELCT ID from #temp) as myCursor
...</programlisting>
@@ -98,7 +98,7 @@
END
ELSE
ERROR "ID or LastName must be specified.";
-EXECUTE STRING ‘SELECT ID, First || ‘‘ ‘‘ || Last AS Name, Birthdate FROM Customer.Accounts WHERE ’ || crit USING ID=AccountAccess.GetAccounts.ID, LastName=AccountAccess.GetAccounts.LastName, BirthDay=AccountAccess.GetAccounts.Bday;
+EXECUTE IMMEDIATE ‘SELECT ID, First || ‘‘ ‘‘ || Last AS Name, Birthdate FROM Customer.Accounts WHERE ’ || crit USING ID=AccountAccess.GetAccounts.ID, LastName=AccountAccess.GetAccounts.LastName, BirthDay=AccountAccess.GetAccounts.Bday;
...</programlisting>
</example>
<itemizedlist>
@@ -110,7 +110,7 @@
<example>
<title>Example Assignment
</title>
- <programlisting>EXECUTE STRING <expression> AS x string INTO #temp;
+ <programlisting>EXECUTE IMMEDIATE <expression> AS x string INTO #temp;
DECLARE string VARIABLES.RESULT = (SELECT x FROM #temp);</programlisting>
</example>
</listitem>
@@ -138,7 +138,7 @@
<example>
<title>Example with AS and INTO clauses</title>
<programlisting>/* This name does not need to match the expected update command symbol "count". */
-EXECUTE STRING <expression> AS x integer INTO #temp;</programlisting>
+EXECUTE IMMEDIATE <expression> AS x integer INTO #temp;</programlisting>
</example>
</listitem>
<listitem>
Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java
===================================================================
--- branches/7.4.x/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java 2012-03-12 18:52:17 UTC (rev 3934)
+++ branches/7.4.x/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java 2012-03-13 16:05:28 UTC (rev 3935)
@@ -679,6 +679,8 @@
public void visit( DynamicCommand obj ) {
append(EXECUTE);
append(SPACE);
+ append(IMMEDIATE);
+ append(SPACE);
visitNode(obj.getSql());
if (obj.isAsClauseSet()) {
Modified: branches/7.4.x/engine/src/test/java/org/teiid/query/parser/TestParser.java
===================================================================
--- branches/7.4.x/engine/src/test/java/org/teiid/query/parser/TestParser.java 2012-03-12 18:52:17 UTC (rev 3934)
+++ branches/7.4.x/engine/src/test/java/org/teiid/query/parser/TestParser.java 2012-03-13 16:05:28 UTC (rev 3935)
@@ -41,90 +41,11 @@
import org.teiid.language.SQLConstants.NonReserved;
import org.teiid.language.SQLConstants.Reserved;
import org.teiid.language.SortSpecification.NullOrdering;
-import org.teiid.query.sql.lang.ArrayTable;
-import org.teiid.query.sql.lang.BetweenCriteria;
-import org.teiid.query.sql.lang.Command;
-import org.teiid.query.sql.lang.CompareCriteria;
-import org.teiid.query.sql.lang.CompoundCriteria;
-import org.teiid.query.sql.lang.Create;
-import org.teiid.query.sql.lang.Criteria;
-import org.teiid.query.sql.lang.Delete;
-import org.teiid.query.sql.lang.Drop;
-import org.teiid.query.sql.lang.DynamicCommand;
-import org.teiid.query.sql.lang.ExistsCriteria;
-import org.teiid.query.sql.lang.ExpressionCriteria;
-import org.teiid.query.sql.lang.From;
-import org.teiid.query.sql.lang.FromClause;
-import org.teiid.query.sql.lang.GroupBy;
-import org.teiid.query.sql.lang.Insert;
-import org.teiid.query.sql.lang.Into;
-import org.teiid.query.sql.lang.IsNullCriteria;
-import org.teiid.query.sql.lang.JoinPredicate;
-import org.teiid.query.sql.lang.JoinType;
-import org.teiid.query.sql.lang.Limit;
-import org.teiid.query.sql.lang.MatchCriteria;
-import org.teiid.query.sql.lang.NotCriteria;
-import org.teiid.query.sql.lang.OrderBy;
-import org.teiid.query.sql.lang.OrderByItem;
-import org.teiid.query.sql.lang.PredicateCriteria;
-import org.teiid.query.sql.lang.Query;
-import org.teiid.query.sql.lang.SPParameter;
-import org.teiid.query.sql.lang.Select;
-import org.teiid.query.sql.lang.SetClauseList;
-import org.teiid.query.sql.lang.SetCriteria;
-import org.teiid.query.sql.lang.SetQuery;
-import org.teiid.query.sql.lang.StoredProcedure;
-import org.teiid.query.sql.lang.SubqueryCompareCriteria;
-import org.teiid.query.sql.lang.SubqueryFromClause;
-import org.teiid.query.sql.lang.SubquerySetCriteria;
-import org.teiid.query.sql.lang.TableFunctionReference;
-import org.teiid.query.sql.lang.TextTable;
-import org.teiid.query.sql.lang.UnaryFromClause;
-import org.teiid.query.sql.lang.Update;
-import org.teiid.query.sql.lang.WithQueryCommand;
-import org.teiid.query.sql.lang.XMLTable;
+import org.teiid.query.sql.lang.*;
import org.teiid.query.sql.lang.SetQuery.Operation;
import org.teiid.query.sql.lang.TextTable.TextColumn;
-import org.teiid.query.sql.proc.AssignmentStatement;
-import org.teiid.query.sql.proc.Block;
-import org.teiid.query.sql.proc.BreakStatement;
-import org.teiid.query.sql.proc.CommandStatement;
-import org.teiid.query.sql.proc.ContinueStatement;
-import org.teiid.query.sql.proc.CreateUpdateProcedureCommand;
-import org.teiid.query.sql.proc.CriteriaSelector;
-import org.teiid.query.sql.proc.DeclareStatement;
-import org.teiid.query.sql.proc.HasCriteria;
-import org.teiid.query.sql.proc.IfStatement;
-import org.teiid.query.sql.proc.LoopStatement;
-import org.teiid.query.sql.proc.RaiseErrorStatement;
-import org.teiid.query.sql.proc.Statement;
-import org.teiid.query.sql.proc.TranslateCriteria;
-import org.teiid.query.sql.proc.WhileStatement;
-import org.teiid.query.sql.symbol.AggregateSymbol;
-import org.teiid.query.sql.symbol.AliasSymbol;
-import org.teiid.query.sql.symbol.AllInGroupSymbol;
-import org.teiid.query.sql.symbol.AllSymbol;
-import org.teiid.query.sql.symbol.CaseExpression;
-import org.teiid.query.sql.symbol.Constant;
-import org.teiid.query.sql.symbol.DerivedColumn;
-import org.teiid.query.sql.symbol.ElementSymbol;
-import org.teiid.query.sql.symbol.Expression;
-import org.teiid.query.sql.symbol.ExpressionSymbol;
-import org.teiid.query.sql.symbol.Function;
-import org.teiid.query.sql.symbol.GroupSymbol;
-import org.teiid.query.sql.symbol.Reference;
-import org.teiid.query.sql.symbol.ScalarSubquery;
-import org.teiid.query.sql.symbol.SearchedCaseExpression;
-import org.teiid.query.sql.symbol.TestCaseExpression;
-import org.teiid.query.sql.symbol.TestSearchedCaseExpression;
-import org.teiid.query.sql.symbol.TextLine;
-import org.teiid.query.sql.symbol.XMLAttributes;
-import org.teiid.query.sql.symbol.XMLElement;
-import org.teiid.query.sql.symbol.XMLForest;
-import org.teiid.query.sql.symbol.XMLNamespaces;
-import org.teiid.query.sql.symbol.XMLParse;
-import org.teiid.query.sql.symbol.XMLQuery;
-import org.teiid.query.sql.symbol.XMLSerialize;
+import org.teiid.query.sql.proc.*;
+import org.teiid.query.sql.symbol.*;
@SuppressWarnings("nls")
public class TestParser {
@@ -3655,7 +3576,7 @@
CommandStatement cmdStmt = new CommandStatement(sqlCmd);
- helpStmtTest("exec string 'SELECT a1 FROM g WHERE a2 = 5' as a1 string into #g;", "EXECUTE 'SELECT a1 FROM g WHERE a2 = 5' AS a1 string INTO #g;", //$NON-NLS-1$ //$NON-NLS-2$
+ helpStmtTest("exec string 'SELECT a1 FROM g WHERE a2 = 5' as a1 string into #g;", "EXECUTE IMMEDIATE 'SELECT a1 FROM g WHERE a2 = 5' AS a1 string INTO #g;", //$NON-NLS-1$ //$NON-NLS-2$
cmdStmt);
}
@@ -3684,7 +3605,7 @@
CommandStatement cmdStmt = new CommandStatement(sqlCmd);
- helpStmtTest("execute string z as a1 string, a2 integer into #g update 1;", "EXECUTE z AS a1 string, a2 integer INTO #g UPDATE 1;", //$NON-NLS-1$ //$NON-NLS-2$
+ helpStmtTest("execute IMMEDIATE z as a1 string, a2 integer into #g update 1;", "EXECUTE IMMEDIATE z AS a1 string, a2 integer INTO #g UPDATE 1;", //$NON-NLS-1$ //$NON-NLS-2$
cmdStmt);
}
@@ -3702,7 +3623,7 @@
CommandStatement cmdStmt = new CommandStatement(sqlCmd);
- helpStmtTest("execute immediate z using a=b;", "EXECUTE z USING a = b;", //$NON-NLS-1$ //$NON-NLS-2$
+ helpStmtTest("execute immediate z using a=b;", "EXECUTE IMMEDIATE z USING a = b;", //$NON-NLS-1$ //$NON-NLS-2$
cmdStmt);
}
Modified: branches/7.4.x/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java
===================================================================
--- branches/7.4.x/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java 2012-03-12 18:52:17 UTC (rev 3934)
+++ branches/7.4.x/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java 2012-03-13 16:05:28 UTC (rev 3935)
@@ -1378,7 +1378,7 @@
helpTestProcessFailure(plan,
dataMgr,
- "Couldn't execute the dynamic SQL command \"EXECUTE 'EXEC pm1.sq2(''First'')' AS e1 string, e2 integer\" with the SQL statement \"'EXEC pm1.sq2(''First'')'\" due to: There is a recursive invocation of group 'PM1.SQ2'. Please correct the SQL.", metadata); //$NON-NLS-1$
+ "Couldn't execute the dynamic SQL command \"EXECUTE IMMEDIATE 'EXEC pm1.sq2(''First'')' AS e1 string, e2 integer\" with the SQL statement \"'EXEC pm1.sq2(''First'')'\" due to: There is a recursive invocation of group 'PM1.SQ2'. Please correct the SQL.", metadata); //$NON-NLS-1$
}
@Test public void testDynamicCommandIncorrectProjectSymbolCount() throws Exception {
@@ -1399,7 +1399,7 @@
ProcessorPlan plan = getProcedurePlan(userUpdateStr, metadata);
- helpTestProcessFailure(plan, dataMgr, "Couldn't execute the dynamic SQL command \"EXECUTE 'EXEC pm1.sq1(''First'')' AS e1 string, e2 integer\" with the SQL statement \"'EXEC pm1.sq1(''First'')'\" due to: The dynamic sql string contains an incorrect number of elements.", metadata); //$NON-NLS-1$
+ helpTestProcessFailure(plan, dataMgr, "Couldn't execute the dynamic SQL command \"EXECUTE IMMEDIATE 'EXEC pm1.sq1(''First'')' AS e1 string, e2 integer\" with the SQL statement \"'EXEC pm1.sq1(''First'')'\" due to: The dynamic sql string contains an incorrect number of elements.", metadata); //$NON-NLS-1$
}
@Test public void testDynamicCommandPositional() throws Exception {
@@ -1432,7 +1432,7 @@
ProcessorPlan plan = getProcedurePlan(userUpdateStr, metadata);
- helpTestProcessFailure(plan, dataMgr, "Couldn't execute the dynamic SQL command \"EXECUTE 'select e1 from pm1.g1'\" with the SQL statement \"'select e1 from pm1.g1'\" due to: The datatype 'string' for element 'e1' in the dynamic SQL cannot be implicitly converted to 'integer'.", metadata); //$NON-NLS-1$
+ helpTestProcessFailure(plan, dataMgr, "Couldn't execute the dynamic SQL command \"EXECUTE IMMEDIATE 'select e1 from pm1.g1'\" with the SQL statement \"'select e1 from pm1.g1'\" due to: The datatype 'string' for element 'e1' in the dynamic SQL cannot be implicitly converted to 'integer'.", metadata); //$NON-NLS-1$
}
@Test public void testDynamicCommandWithTwoDynamicStatements() throws Exception {
Modified: branches/7.4.x/engine/src/test/java/org/teiid/query/sql/visitor/TestSQLStringVisitor.java
===================================================================
--- branches/7.4.x/engine/src/test/java/org/teiid/query/sql/visitor/TestSQLStringVisitor.java 2012-03-12 18:52:17 UTC (rev 3934)
+++ branches/7.4.x/engine/src/test/java/org/teiid/query/sql/visitor/TestSQLStringVisitor.java 2012-03-13 16:05:28 UTC (rev 3935)
@@ -35,36 +35,7 @@
import org.teiid.query.parser.QueryParser;
import org.teiid.query.resolver.QueryResolver;
import org.teiid.query.sql.LanguageObject;
-import org.teiid.query.sql.lang.BetweenCriteria;
-import org.teiid.query.sql.lang.Command;
-import org.teiid.query.sql.lang.CompareCriteria;
-import org.teiid.query.sql.lang.CompoundCriteria;
-import org.teiid.query.sql.lang.Criteria;
-import org.teiid.query.sql.lang.Delete;
-import org.teiid.query.sql.lang.DynamicCommand;
-import org.teiid.query.sql.lang.ExistsCriteria;
-import org.teiid.query.sql.lang.From;
-import org.teiid.query.sql.lang.GroupBy;
-import org.teiid.query.sql.lang.Insert;
-import org.teiid.query.sql.lang.IsNullCriteria;
-import org.teiid.query.sql.lang.JoinPredicate;
-import org.teiid.query.sql.lang.JoinType;
-import org.teiid.query.sql.lang.Limit;
-import org.teiid.query.sql.lang.MatchCriteria;
-import org.teiid.query.sql.lang.NotCriteria;
-import org.teiid.query.sql.lang.Option;
-import org.teiid.query.sql.lang.OrderBy;
-import org.teiid.query.sql.lang.Query;
-import org.teiid.query.sql.lang.SPParameter;
-import org.teiid.query.sql.lang.Select;
-import org.teiid.query.sql.lang.SetCriteria;
-import org.teiid.query.sql.lang.SetQuery;
-import org.teiid.query.sql.lang.StoredProcedure;
-import org.teiid.query.sql.lang.SubqueryCompareCriteria;
-import org.teiid.query.sql.lang.SubqueryFromClause;
-import org.teiid.query.sql.lang.SubquerySetCriteria;
-import org.teiid.query.sql.lang.UnaryFromClause;
-import org.teiid.query.sql.lang.Update;
+import org.teiid.query.sql.lang.*;
import org.teiid.query.sql.lang.SetQuery.Operation;
import org.teiid.query.sql.proc.AssignmentStatement;
import org.teiid.query.sql.proc.Block;
@@ -75,22 +46,7 @@
import org.teiid.query.sql.proc.HasCriteria;
import org.teiid.query.sql.proc.IfStatement;
import org.teiid.query.sql.proc.RaiseErrorStatement;
-import org.teiid.query.sql.symbol.AggregateSymbol;
-import org.teiid.query.sql.symbol.AliasSymbol;
-import org.teiid.query.sql.symbol.AllInGroupSymbol;
-import org.teiid.query.sql.symbol.AllSymbol;
-import org.teiid.query.sql.symbol.CaseExpression;
-import org.teiid.query.sql.symbol.Constant;
-import org.teiid.query.sql.symbol.ElementSymbol;
-import org.teiid.query.sql.symbol.Expression;
-import org.teiid.query.sql.symbol.ExpressionSymbol;
-import org.teiid.query.sql.symbol.Function;
-import org.teiid.query.sql.symbol.GroupSymbol;
-import org.teiid.query.sql.symbol.Reference;
-import org.teiid.query.sql.symbol.ScalarSubquery;
-import org.teiid.query.sql.symbol.SearchedCaseExpression;
-import org.teiid.query.sql.symbol.TestCaseExpression;
-import org.teiid.query.sql.symbol.TestSearchedCaseExpression;
+import org.teiid.query.sql.symbol.*;
import org.teiid.query.unittest.RealMetadataFactory;
@@ -1721,7 +1677,7 @@
obj.setAsClauseSet(true);
obj.setIntoGroup(new GroupSymbol("#g")); //$NON-NLS-1$
- helpTest(obj, "EXECUTE 'SELECT a1 FROM g WHERE a2 = 5' AS a1 string INTO #g"); //$NON-NLS-1$
+ helpTest(obj, "EXECUTE IMMEDIATE 'SELECT a1 FROM g WHERE a2 = 5' AS a1 string INTO #g"); //$NON-NLS-1$
}
public void testScalarSubquery() {
12 years, 1 month
- 1
- 0
teiid SVN: r3934 - in trunk/connectors/translator-jdbc/src/main: resources/org/teiid/translator/jdbc and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-03-12 14:52:17 -0400 (Mon, 12 Mar 2012)
New Revision: 3934
Modified:
trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionException.java
trunk/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties
Log:
TEIID-1969 fixing error message
Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionException.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionException.java 2012-03-12 17:53:35 UTC (rev 3933)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionException.java 2012-03-12 18:52:17 UTC (rev 3934)
@@ -34,7 +34,7 @@
private static final long serialVersionUID = 1758087499488916573L;
public JDBCExecutionException(BundleUtil.Event event, SQLException error,TranslatedCommand... commands) {
- super(error, commands == null || commands.length == 0 ? event.toString()+":"+error.getMessage() : event.toString()+":"+JDBCPlugin.Util.getString("JDBCQueryExecution.Error_executing_query__1", error.getMessage(), Arrays.toString(commands))); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ super(error, commands == null || commands.length == 0 ? event.toString()+":"+error.getMessage() : event.toString()+":"+JDBCPlugin.Util.gs(JDBCPlugin.Event.TEIID11004, Arrays.toString(commands))); //$NON-NLS-1$ //$NON-NLS-2$
setCode(String.valueOf(error.getErrorCode()));
}
}
Modified: trunk/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties
===================================================================
--- trunk/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties 2012-03-12 17:53:35 UTC (rev 3933)
+++ trunk/connectors/translator-jdbc/src/main/resources/org/teiid/translator/jdbc/i18n.properties 2012-03-12 18:52:17 UTC (rev 3934)
@@ -25,7 +25,7 @@
-TEIID11004=''{0}'' error executing statement(s): {1}
+TEIID11004=Error executing statement(s): {0}
SQLConversionVisitor.invalid_parameter=Invalid parameter {0}. Must be between 1 and {1}.
SQLConversionVisitor.not_in_parameter=Invalid parameter {0}. Native query procedures cannot use non IN parameters.
TEIID11003=Not using oracle execution payload {0} as hint, since it apprears to contain more than just a single comment.
12 years, 1 month
- 1
- 0
teiid SVN: r3933 - in branches/7.7.x/engine/src: main/java/org/teiid/query/rewriter and 4 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-03-12 13:53:35 -0400 (Mon, 12 Mar 2012)
New Revision: 3933
Modified:
branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java
branches/7.7.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
branches/7.7.x/engine/src/main/java/org/teiid/query/sql/symbol/Reference.java
branches/7.7.x/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java
branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java
branches/7.7.x/engine/src/test/java/org/teiid/query/validator/TestValidator.java
Log:
TEIID-1968 fix for NPE in grouping initialization
Modified: branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2012-03-09 20:18:08 UTC (rev 3932)
+++ branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2012-03-12 17:53:35 UTC (rev 3933)
@@ -22,17 +22,7 @@
package org.teiid.query.optimizer.relational;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.api.exception.query.QueryPlannerException;
@@ -81,51 +71,11 @@
import org.teiid.query.sql.LanguageObject;
import org.teiid.query.sql.LanguageVisitor;
import org.teiid.query.sql.LanguageObject.Util;
-import org.teiid.query.sql.lang.CacheHint;
-import org.teiid.query.sql.lang.Command;
-import org.teiid.query.sql.lang.Criteria;
-import org.teiid.query.sql.lang.Delete;
-import org.teiid.query.sql.lang.ExistsCriteria;
-import org.teiid.query.sql.lang.From;
-import org.teiid.query.sql.lang.FromClause;
-import org.teiid.query.sql.lang.GroupBy;
-import org.teiid.query.sql.lang.Insert;
-import org.teiid.query.sql.lang.JoinPredicate;
-import org.teiid.query.sql.lang.JoinType;
-import org.teiid.query.sql.lang.Limit;
-import org.teiid.query.sql.lang.Option;
-import org.teiid.query.sql.lang.OrderBy;
-import org.teiid.query.sql.lang.ProcedureContainer;
-import org.teiid.query.sql.lang.Query;
-import org.teiid.query.sql.lang.QueryCommand;
-import org.teiid.query.sql.lang.Select;
-import org.teiid.query.sql.lang.SetQuery;
-import org.teiid.query.sql.lang.SourceHint;
-import org.teiid.query.sql.lang.StoredProcedure;
-import org.teiid.query.sql.lang.SubqueryContainer;
-import org.teiid.query.sql.lang.SubqueryFromClause;
-import org.teiid.query.sql.lang.TableFunctionReference;
-import org.teiid.query.sql.lang.TargetedCommand;
-import org.teiid.query.sql.lang.TranslatableProcedureContainer;
-import org.teiid.query.sql.lang.UnaryFromClause;
-import org.teiid.query.sql.lang.Update;
-import org.teiid.query.sql.lang.WithQueryCommand;
+import org.teiid.query.sql.lang.*;
import org.teiid.query.sql.navigator.PreOrPostOrderNavigator;
import org.teiid.query.sql.proc.CreateUpdateProcedureCommand;
import org.teiid.query.sql.proc.TriggerAction;
-import org.teiid.query.sql.symbol.AggregateSymbol;
-import org.teiid.query.sql.symbol.AliasSymbol;
-import org.teiid.query.sql.symbol.Constant;
-import org.teiid.query.sql.symbol.ElementSymbol;
-import org.teiid.query.sql.symbol.Expression;
-import org.teiid.query.sql.symbol.ExpressionSymbol;
-import org.teiid.query.sql.symbol.GroupSymbol;
-import org.teiid.query.sql.symbol.MultipleElementSymbol;
-import org.teiid.query.sql.symbol.Reference;
-import org.teiid.query.sql.symbol.ScalarSubquery;
-import org.teiid.query.sql.symbol.SelectSymbol;
-import org.teiid.query.sql.symbol.SingleElementSymbol;
-import org.teiid.query.sql.symbol.WindowFunction;
+import org.teiid.query.sql.symbol.*;
import org.teiid.query.sql.util.SymbolMap;
import org.teiid.query.sql.visitor.AggregateSymbolCollectorVisitor;
import org.teiid.query.sql.visitor.CorrelatedReferenceCollectorVisitor;
@@ -317,6 +267,22 @@
Command subCommand = (Command)container.getCommand().clone();
ArrayList<Reference> correlatedReferences = new ArrayList<Reference>();
CorrelatedReferenceCollectorVisitor.collectReferences(subCommand, localGroupSymbols, correlatedReferences);
+ if (node.getType() != NodeConstants.Types.JOIN) {
+ PlanNode grouping = NodeEditor.findNodePreOrder(node, NodeConstants.Types.GROUP, NodeConstants.Types.SOURCE | NodeConstants.Types.JOIN);
+ if (grouping != null && !correlatedReferences.isEmpty()) {
+ SymbolMap map = (SymbolMap) grouping.getProperty(Info.SYMBOL_MAP);
+ Map<Expression, ElementSymbol> reverseMap = new HashMap<Expression, ElementSymbol>();
+ for (Map.Entry<ElementSymbol, Expression> entry : map.asMap().entrySet()) {
+ reverseMap.put(entry.getValue(), entry.getKey());
+ }
+ for (Reference reference : correlatedReferences) {
+ ElementSymbol correlatedGroupingCol = reverseMap.get(reference.getExpression());
+ if (correlatedGroupingCol != null) {
+ reference.setExpression(correlatedGroupingCol);
+ }
+ }
+ }
+ }
ProcessorPlan procPlan = QueryOptimizer.optimizePlan(subCommand, metadata, idGenerator, capFinder, analysisRecord, context);
container.getCommand().setProcessorPlan(procPlan);
setCorrelatedReferences(container, correlatedReferences);
Modified: branches/7.7.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2012-03-09 20:18:08 UTC (rev 3932)
+++ branches/7.7.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2012-03-12 17:53:35 UTC (rev 3933)
@@ -1485,7 +1485,7 @@
* @return CompareCriteria
*/
private CompareCriteria simplifyMathematicalCriteria(CompareCriteria criteria)
- throws TeiidComponentException, TeiidProcessingException{
+ throws TeiidProcessingException{
Expression leftExpr = criteria.getLeftExpression();
Expression rightExpr = criteria.getRightExpression();
Modified: branches/7.7.x/engine/src/main/java/org/teiid/query/sql/symbol/Reference.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/query/sql/symbol/Reference.java 2012-03-09 20:18:08 UTC (rev 3932)
+++ branches/7.7.x/engine/src/main/java/org/teiid/query/sql/symbol/Reference.java 2012-03-12 17:53:35 UTC (rev 3933)
@@ -78,7 +78,7 @@
this.positional = ref.positional;
this.type = ref.type;
if (ref.expression != null) {
- this.expression = (ElementSymbol)ref.expression.clone();
+ this.expression = ref.expression.clone();
}
this.constraint = ref.constraint;
}
@@ -191,4 +191,9 @@
return this.positional;
}
+ public void setExpression(ElementSymbol expression) {
+ assert this.expression != null && !this.positional;
+ this.expression = expression;
+ }
+
}
Modified: branches/7.7.x/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java 2012-03-09 20:18:08 UTC (rev 3932)
+++ branches/7.7.x/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java 2012-03-12 17:53:35 UTC (rev 3933)
@@ -57,83 +57,15 @@
import org.teiid.query.sql.LanguageObject;
import org.teiid.query.sql.LanguageVisitor;
import org.teiid.query.sql.ProcedureReservedWords;
-import org.teiid.query.sql.lang.AlterProcedure;
-import org.teiid.query.sql.lang.AlterTrigger;
-import org.teiid.query.sql.lang.AlterView;
-import org.teiid.query.sql.lang.BatchedUpdateCommand;
-import org.teiid.query.sql.lang.BetweenCriteria;
-import org.teiid.query.sql.lang.Command;
-import org.teiid.query.sql.lang.CompareCriteria;
-import org.teiid.query.sql.lang.CompoundCriteria;
-import org.teiid.query.sql.lang.Create;
-import org.teiid.query.sql.lang.Criteria;
-import org.teiid.query.sql.lang.Delete;
-import org.teiid.query.sql.lang.DependentSetCriteria;
-import org.teiid.query.sql.lang.Drop;
-import org.teiid.query.sql.lang.DynamicCommand;
-import org.teiid.query.sql.lang.ExistsCriteria;
-import org.teiid.query.sql.lang.GroupBy;
-import org.teiid.query.sql.lang.Insert;
-import org.teiid.query.sql.lang.Into;
-import org.teiid.query.sql.lang.IsNullCriteria;
-import org.teiid.query.sql.lang.Limit;
-import org.teiid.query.sql.lang.MatchCriteria;
-import org.teiid.query.sql.lang.NotCriteria;
-import org.teiid.query.sql.lang.Option;
-import org.teiid.query.sql.lang.OrderBy;
-import org.teiid.query.sql.lang.OrderByItem;
-import org.teiid.query.sql.lang.Query;
-import org.teiid.query.sql.lang.QueryCommand;
-import org.teiid.query.sql.lang.SPParameter;
-import org.teiid.query.sql.lang.Select;
-import org.teiid.query.sql.lang.SetClause;
-import org.teiid.query.sql.lang.SetClauseList;
-import org.teiid.query.sql.lang.SetCriteria;
-import org.teiid.query.sql.lang.SetQuery;
-import org.teiid.query.sql.lang.StoredProcedure;
-import org.teiid.query.sql.lang.SubqueryCompareCriteria;
-import org.teiid.query.sql.lang.SubqueryContainer;
-import org.teiid.query.sql.lang.SubqueryFromClause;
-import org.teiid.query.sql.lang.SubquerySetCriteria;
-import org.teiid.query.sql.lang.TextTable;
-import org.teiid.query.sql.lang.Update;
-import org.teiid.query.sql.lang.WithQueryCommand;
-import org.teiid.query.sql.lang.XMLTable;
+import org.teiid.query.sql.lang.*;
import org.teiid.query.sql.lang.SetQuery.Operation;
import org.teiid.query.sql.lang.XMLTable.XMLColumn;
+import org.teiid.query.sql.navigator.PreOrPostOrderNavigator;
import org.teiid.query.sql.navigator.PreOrderNavigator;
-import org.teiid.query.sql.proc.AssignmentStatement;
-import org.teiid.query.sql.proc.Block;
-import org.teiid.query.sql.proc.BranchingStatement;
-import org.teiid.query.sql.proc.CommandStatement;
-import org.teiid.query.sql.proc.CreateUpdateProcedureCommand;
-import org.teiid.query.sql.proc.CriteriaSelector;
-import org.teiid.query.sql.proc.DeclareStatement;
-import org.teiid.query.sql.proc.HasCriteria;
-import org.teiid.query.sql.proc.LoopStatement;
-import org.teiid.query.sql.proc.TranslateCriteria;
-import org.teiid.query.sql.proc.WhileStatement;
+import org.teiid.query.sql.proc.*;
import org.teiid.query.sql.proc.BranchingStatement.BranchingMode;
import org.teiid.query.sql.proc.Statement.Labeled;
-import org.teiid.query.sql.symbol.AggregateSymbol;
-import org.teiid.query.sql.symbol.Constant;
-import org.teiid.query.sql.symbol.DerivedColumn;
-import org.teiid.query.sql.symbol.ElementSymbol;
-import org.teiid.query.sql.symbol.Expression;
-import org.teiid.query.sql.symbol.Function;
-import org.teiid.query.sql.symbol.GroupSymbol;
-import org.teiid.query.sql.symbol.QueryString;
-import org.teiid.query.sql.symbol.Reference;
-import org.teiid.query.sql.symbol.ScalarSubquery;
-import org.teiid.query.sql.symbol.SingleElementSymbol;
-import org.teiid.query.sql.symbol.TextLine;
-import org.teiid.query.sql.symbol.WindowFunction;
-import org.teiid.query.sql.symbol.XMLAttributes;
-import org.teiid.query.sql.symbol.XMLElement;
-import org.teiid.query.sql.symbol.XMLForest;
-import org.teiid.query.sql.symbol.XMLNamespaces;
-import org.teiid.query.sql.symbol.XMLParse;
-import org.teiid.query.sql.symbol.XMLQuery;
+import org.teiid.query.sql.symbol.*;
import org.teiid.query.sql.symbol.AggregateSymbol.Type;
import org.teiid.query.sql.visitor.AggregateSymbolCollectorVisitor;
import org.teiid.query.sql.visitor.ElementCollectorVisitor;
@@ -761,12 +693,14 @@
GroupBy groupBy = query.getGroupBy();
Criteria having = query.getHaving();
validateNoAggsInClause(groupBy);
+ List<GroupSymbol> correlationGroups = null;
validateNoAggsInClause(query.getCriteria());
if (query.getFrom() == null) {
validateNoAggsInClause(select);
validateNoAggsInClause(query.getOrderBy());
} else {
validateNoAggsInClause(query.getFrom());
+ correlationGroups = query.getFrom().getGroups();
}
Set<Expression> groupSymbols = null;
@@ -779,10 +713,14 @@
LinkedHashSet<Expression> invalidWindowFunctions = new LinkedHashSet<Expression>();
LinkedList<AggregateSymbol> aggs = new LinkedList<AggregateSymbol>();
if (having != null) {
+ validateCorrelatedReferences(query, correlationGroups, groupSymbols, having, invalid);
AggregateSymbolCollectorVisitor.getAggregates(having, aggs, invalid, null, invalidWindowFunctions, groupSymbols);
hasAgg = true;
}
for (SingleElementSymbol symbol : select.getProjectedSymbols()) {
+ if (hasAgg || !aggs.isEmpty()) {
+ validateCorrelatedReferences(query, correlationGroups, groupSymbols, symbol, invalid);
+ }
AggregateSymbolCollectorVisitor.getAggregates(symbol, aggs, invalid, null, null, groupSymbols);
}
if ((!aggs.isEmpty() || hasAgg) && !invalid.isEmpty()) {
@@ -793,6 +731,26 @@
}
}
+ /**
+ * This validation is more convoluted than needed since it is being run before rewrite/planning.
+ * Ideally we would already have correlated references set on the subqueries.
+ */
+ private void validateCorrelatedReferences(Query query,
+ final List<GroupSymbol> correlationGroups, final Set<Expression> groupingSymbols, LanguageObject object, LinkedHashSet<Expression> invalid) {
+ if (query.getFrom() == null) {
+ return;
+ }
+ ElementCollectorVisitor ecv = new ElementCollectorVisitor(invalid) {
+ public void visit(ElementSymbol obj) {
+ if (obj.isExternalReference() && correlationGroups.contains(obj.getGroupSymbol())
+ && (groupingSymbols == null || !groupingSymbols.contains(obj))) {
+ super.visit(obj);
+ }
+ }
+ };
+ PreOrPostOrderNavigator.doVisit(object, ecv, PreOrPostOrderNavigator.PRE_ORDER, true);
+ }
+
private void validateNoAggsInClause(LanguageObject clause) {
if (clause == null) {
return;
Modified: branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java
===================================================================
--- branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java 2012-03-09 20:18:08 UTC (rev 3932)
+++ branches/7.7.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java 2012-03-12 17:53:35 UTC (rev 3933)
@@ -504,6 +504,15 @@
process(sql, expected);
}
+
+ @Test public void testXmlAggNested() throws Exception {
+ String sql = "SELECT XMLELEMENT(NAME metadata, XMLFOREST(e1), (SELECT XMLAGG(XMLELEMENT(NAME subTypes, XMLFOREST(e1))) FROM pm1.g2 AS b WHERE b.e1 = a.e1)) FROM pm1.g1 AS a where e1 = 'a' GROUP BY e1"; //$NON-NLS-1$
+
+ List<?>[] expected = new List<?>[] {
+ Arrays.asList("<metadata><gcol0>a</gcol0><subTypes><e1>a</e1></subTypes><subTypes><e1>a</e1></subTypes><subTypes><e1>a</e1></subTypes></metadata>"),
+ };
+
+ process(sql, expected);
+ }
-
}
Modified: branches/7.7.x/engine/src/test/java/org/teiid/query/validator/TestValidator.java
===================================================================
--- branches/7.7.x/engine/src/test/java/org/teiid/query/validator/TestValidator.java 2012-03-09 20:18:08 UTC (rev 3932)
+++ branches/7.7.x/engine/src/test/java/org/teiid/query/validator/TestValidator.java 2012-03-12 17:53:35 UTC (rev 3933)
@@ -1957,4 +1957,8 @@
helpValidate("select count(distinct e1) over (order by e2) as y from pm1.g1", new String[] {"COUNT(DISTINCT e1) OVER (ORDER BY e2)"}, RealMetadataFactory.example1Cached());
}
+ @Test public void testInvalidCorrelation() {
+ helpValidate("SELECT XMLELEMENT(NAME metadata, XMLFOREST(e1 AS objectName), (SELECT XMLAGG(XMLELEMENT(NAME subTypes, XMLFOREST(e1))) FROM pm1.g2 AS b WHERE b.e2 = a.e2)) FROM pm1.g1 AS a GROUP BY e1", new String[] {"a.e2"}, RealMetadataFactory.example1Cached());
+ }
+
}
12 years, 1 month
- 1
- 0
Teiid-WeeklyBuild - Build # 16 - Failure!
by jboss-qa-internal＠redhat.com
Teiid-WeeklyBuild - Build # 16 - Failure:
Check console output at http://hudson.qa.jboss.com/hudson/job/Teiid-WeeklyBuild/16/ to view the results.
12 years, 1 month
- 1
- 0
Teiid-NightlyBuild - Build # 1459 - Failure!
by jboss-qa-internal＠redhat.com
Teiid-NightlyBuild - Build # 1459 - Failure:
Check console output at http://hudson.qa.jboss.com/hudson/job/Teiid-NightlyBuild/1459/ to view the results.
12 years, 1 month
- 1
- 0
teiid SVN: r3932 - in trunk: engine/src/main/java/org/teiid/dqp/internal/datamgr and 3 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2012-03-09 15:18:08 -0500 (Fri, 09 Mar 2012)
New Revision: 3932
Modified:
trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java
trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesConverter.java
trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/BasicSourceCapabilities.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CapabilitiesUtil.java
trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java
Log:
TEIID-3 making the behavior of supportsConvert consistent with supportsLiteralFormat
Modified: trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java
===================================================================
--- trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012-03-09 19:38:02 UTC (rev 3931)
+++ trunk/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2012-03-09 20:18:08 UTC (rev 3932)
@@ -46,6 +46,7 @@
import org.teiid.metadata.FunctionParameter;
import org.teiid.metadata.MetadataFactory;
import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.translator.TypeFacility.RUNTIME_CODES;
@@ -928,18 +929,23 @@
}
/**
- * Used for fine grained control of convert/cast pushdown. If {@link #getSupportedFunctions()} contains
- * {@link SourceSystemFunctions#CONVERT}, then all of the default Teiid pushdown conversions are supported.
- * So typically this method will be implemented when {@link #getSupportedFunctions()} does not contain
- * {@link SourceSystemFunctions#CONVERT}. The engine will does not care about an unnecessary conversion
+ * Used for fine grained control of convert/cast pushdown. The {@link #getSupportedFunctions()} should
+ * contain {@link SourceSystemFunctions#CONVERT}. This method can then return false to indicate
+ * a lack of specific support. The engine will does not care about an unnecessary conversion
* where fromType == toType.
+ *
+ * By default lob conversion is disabled.
+ *
* @param fromType @see RUNTIME_CODES
* @param toType @see RUNTIME_CODES
* @return true if the given conversion is supported.
* @since 8.0
*/
public boolean supportsConvert(int fromType, int toType) {
- return false;
+ if (fromType == RUNTIME_CODES.OBJECT || fromType == RUNTIME_CODES.CLOB || fromType == RUNTIME_CODES.XML || fromType == RUNTIME_CODES.BLOB || toType == RUNTIME_CODES.CLOB || toType == RUNTIME_CODES.XML || toType == RUNTIME_CODES.BLOB) {
+ return false;
+ }
+ return true;
}
/**
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesConverter.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesConverter.java 2012-03-09 19:38:02 UTC (rev 3931)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesConverter.java 2012-03-09 20:18:08 UTC (rev 3932)
@@ -25,7 +25,6 @@
import java.util.Iterator;
import java.util.List;
-import org.teiid.core.types.DataTypeManager;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
import org.teiid.metadata.FunctionMethod;
@@ -115,15 +114,6 @@
tgtCaps.setCapabilitySupport(Capability.CRITERIA_ONLY_LITERAL_COMPARE, srcCaps.supportsOnlyLiteralComparison());
tgtCaps.setCapabilitySupport(Capability.DEPENDENT_JOIN, srcCaps.supportsDependentJoins());
- //TODO: as more types are added it may make more sense to just delegate calls to the executionfactory
- for (int i = 0; i <= DataTypeManager.MAX_TYPE_CODE; i++) {
- for (int j = 0; j <= DataTypeManager.MAX_TYPE_CODE; j++) {
- if (i != j) {
- tgtCaps.setSupportsConvert(i, j, srcCaps.supportsConvert(i, j));
- }
- }
- }
-
List<String> functions = srcCaps.getSupportedFunctions();
if(functions != null && functions.size() > 0) {
Iterator<String> iter = functions.iterator();
@@ -132,6 +122,7 @@
tgtCaps.setFunctionSupport(func.toLowerCase(), true);
}
}
+
List<FunctionMethod> pushDowns = srcCaps.getPushDownFunctions();
if(pushDowns != null && pushDowns.size() > 0) {
for(FunctionMethod func:pushDowns) {
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/BasicSourceCapabilities.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/BasicSourceCapabilities.java 2012-03-09 19:38:02 UTC (rev 3931)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/BasicSourceCapabilities.java 2012-03-09 20:18:08 UTC (rev 3932)
@@ -27,10 +27,7 @@
import java.util.Map;
import java.util.TreeMap;
-import org.teiid.core.types.DataTypeManager;
-import org.teiid.core.types.DataTypeManager.DefaultTypeCodes;
import org.teiid.translator.ExecutionFactory;
-import org.teiid.translator.SourceSystemFunctions;
import org.teiid.translator.ExecutionFactory.Format;
/**
@@ -42,7 +39,6 @@
private Map<Capability, Boolean> capabilityMap = new HashMap<Capability, Boolean>();
private Map<String, Boolean> functionMap = new TreeMap<String, Boolean>(String.CASE_INSENSITIVE_ORDER);
private Map<Capability, Object> propertyMap = new HashMap<Capability, Object>();
- private boolean[][] converts = new boolean[DataTypeManager.MAX_TYPE_CODE + 1][DataTypeManager.MAX_TYPE_CODE + 1];
private ExecutionFactory<?, ?> translator;
/**
@@ -71,16 +67,6 @@
}
public void setFunctionSupport(String function, boolean supports) {
- if (SourceSystemFunctions.CONVERT.equalsIgnoreCase(function)) {
- for (int i = 0; i < converts.length; i++) {
- if (i == DefaultTypeCodes.OBJECT || i == DefaultTypeCodes.CLOB || i == DefaultTypeCodes.XML) {
- continue;
- }
- for (int j = 0; j < converts.length; j++) {
- converts[i][j] = j != DefaultTypeCodes.CLOB && j != DefaultTypeCodes.XML;
- }
- }
- }
functionMap.put(function, Boolean.valueOf(supports));
}
@@ -108,13 +94,12 @@
@Override
public boolean supportsConvert(int sourceType, int targetType) {
- return converts[sourceType][targetType];
+ if (this.translator == null) {
+ return true;
+ }
+ return this.translator.supportsConvert(sourceType, targetType);
}
- public void setSupportsConvert(int sourceType, int targetType, boolean value) {
- this.converts[sourceType][targetType] = value;
- }
-
public void setTranslator(ExecutionFactory<?, ?> translator) {
this.translator = translator;
}
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CapabilitiesUtil.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CapabilitiesUtil.java 2012-03-09 19:38:02 UTC (rev 3931)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CapabilitiesUtil.java 2012-03-09 20:18:08 UTC (rev 3932)
@@ -226,14 +226,6 @@
SourceCapabilities caps = getCapabilities(modelID, metadata, capFinder);
- if (FunctionLibrary.isConvert(function)) {
- Class<?> fromType = function.getArg(0).getType();
- Class<?> targetType = function.getType();
- if (fromType == targetType) {
- return true; //this should be removed in rewrite
- }
- return caps.supportsConvert(DataTypeManager.getTypeCode(fromType), DataTypeManager.getTypeCode(targetType));
- }
//capabilities check is only valid for non-schema scoped functions
//technically the other functions are scoped to SYS or their function model, but that's
//not formally part of their metadata yet
@@ -243,6 +235,14 @@
if (!caps.supportsFunction(function.getFunctionDescriptor().getName())) {
return false;
}
+ if (FunctionLibrary.isConvert(function)) {
+ Class<?> fromType = function.getArg(0).getType();
+ Class<?> targetType = function.getType();
+ if (fromType == targetType) {
+ return true; //this should be removed in rewrite
+ }
+ return caps.supportsConvert(DataTypeManager.getTypeCode(fromType), DataTypeManager.getTypeCode(targetType));
+ }
} else if (!isSameConnector(modelID, schema, metadata, capFinder)) {
return false; //not the right schema
}
Modified: trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java 2012-03-09 19:38:02 UTC (rev 3931)
+++ trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java 2012-03-09 20:18:08 UTC (rev 3932)
@@ -6566,7 +6566,13 @@
@Test public void testConvertSignature() throws Exception {
BasicSourceCapabilities caps = new BasicSourceCapabilities();
caps.setCapabilitySupport(Capability.CRITERIA_COMPARE_EQ, true);
- caps.setSupportsConvert(DefaultTypeCodes.INTEGER, DefaultTypeCodes.STRING, true);
+ caps.setFunctionSupport(SourceSystemFunctions.CONVERT, true);
+ caps.setTranslator(new ExecutionFactory<Object, Object>() {
+ @Override
+ public boolean supportsConvert(int fromType, int toType) {
+ return (fromType == DefaultTypeCodes.INTEGER && toType == DefaultTypeCodes.STRING);
+ }
+ });
ProcessorPlan plan = TestOptimizer.helpPlan("SELECT e1 from pm1.g1 where e1 = e2 and e1 = e3", //$NON-NLS-1$
RealMetadataFactory.example1Cached(), null, new DefaultCapabilitiesFinder(caps),
new String[] {
12 years, 1 month
- 1
- 0
teiid SVN: r3931 - in trunk: admin and 30 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2012-03-09 14:38:02 -0500 (Fri, 09 Mar 2012)
New Revision: 3931
Modified:
trunk/admin/pom.xml
trunk/adminshell/pom.xml
trunk/api/pom.xml
trunk/build/pom.xml
trunk/client-jdk15/pom.xml
trunk/client/pom.xml
trunk/common-core/pom.xml
trunk/connectors/connector-file/pom.xml
trunk/connectors/connector-ldap/pom.xml
trunk/connectors/connector-salesforce/pom.xml
trunk/connectors/connector-ws/pom.xml
trunk/connectors/pom.xml
trunk/connectors/salesforce-api/pom.xml
trunk/connectors/sandbox/pom.xml
trunk/connectors/sandbox/translator-yahoo/pom.xml
trunk/connectors/translator-file/pom.xml
trunk/connectors/translator-hive/pom.xml
trunk/connectors/translator-jdbc/pom.xml
trunk/connectors/translator-ldap/pom.xml
trunk/connectors/translator-loopback/pom.xml
trunk/connectors/translator-olap/pom.xml
trunk/connectors/translator-salesforce/pom.xml
trunk/connectors/translator-ws/pom.xml
trunk/engine/pom.xml
trunk/hibernate-dialect/pom.xml
trunk/jboss-integration/pom.xml
trunk/metadata/pom.xml
trunk/pom.xml
trunk/runtime/pom.xml
trunk/test-integration/common/pom.xml
trunk/test-integration/db/pom.xml
trunk/test-integration/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: trunk/admin/pom.xml
===================================================================
--- trunk/admin/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/admin/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-admin</artifactId>
Modified: trunk/adminshell/pom.xml
===================================================================
--- trunk/adminshell/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/adminshell/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-adminshell</artifactId>
Modified: trunk/api/pom.xml
===================================================================
--- trunk/api/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/api/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-api</artifactId>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/build/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid</artifactId>
Modified: trunk/client/pom.xml
===================================================================
--- trunk/client/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/client/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client</artifactId>
Modified: trunk/client-jdk15/pom.xml
===================================================================
--- trunk/client-jdk15/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/client-jdk15/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-client-jdk15</artifactId>
Modified: trunk/common-core/pom.xml
===================================================================
--- trunk/common-core/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/common-core/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-common-core</artifactId>
Modified: trunk/connectors/connector-file/pom.xml
===================================================================
--- trunk/connectors/connector-file/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/connectors/connector-file/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-file</artifactId>
Modified: trunk/connectors/connector-ldap/pom.xml
===================================================================
--- trunk/connectors/connector-ldap/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/connectors/connector-ldap/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ldap</artifactId>
Modified: trunk/connectors/connector-salesforce/pom.xml
===================================================================
--- trunk/connectors/connector-salesforce/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/connectors/connector-salesforce/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-salesforce</artifactId>
Modified: trunk/connectors/connector-ws/pom.xml
===================================================================
--- trunk/connectors/connector-ws/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/connectors/connector-ws/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connector-ws</artifactId>
Modified: trunk/connectors/pom.xml
===================================================================
--- trunk/connectors/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/connectors/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/connectors/salesforce-api/pom.xml
===================================================================
--- trunk/connectors/salesforce-api/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/connectors/salesforce-api/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>salesforce-api</artifactId>
Modified: trunk/connectors/sandbox/pom.xml
===================================================================
--- trunk/connectors/sandbox/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/connectors/sandbox/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid.connectors</groupId>
Modified: trunk/connectors/sandbox/translator-yahoo/pom.xml
===================================================================
--- trunk/connectors/sandbox/translator-yahoo/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>sandbox</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-yahoo</artifactId>
Modified: trunk/connectors/translator-file/pom.xml
===================================================================
--- trunk/connectors/translator-file/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/connectors/translator-file/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-file</artifactId>
Modified: trunk/connectors/translator-hive/pom.xml
===================================================================
--- trunk/connectors/translator-hive/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/connectors/translator-hive/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-hive</artifactId>
Modified: trunk/connectors/translator-jdbc/pom.xml
===================================================================
--- trunk/connectors/translator-jdbc/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/connectors/translator-jdbc/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-jdbc</artifactId>
Modified: trunk/connectors/translator-ldap/pom.xml
===================================================================
--- trunk/connectors/translator-ldap/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/connectors/translator-ldap/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -2,7 +2,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ldap</artifactId>
Modified: trunk/connectors/translator-loopback/pom.xml
===================================================================
--- trunk/connectors/translator-loopback/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/connectors/translator-loopback/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-loopback</artifactId>
Modified: trunk/connectors/translator-olap/pom.xml
===================================================================
--- trunk/connectors/translator-olap/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/connectors/translator-olap/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-olap</artifactId>
Modified: trunk/connectors/translator-salesforce/pom.xml
===================================================================
--- trunk/connectors/translator-salesforce/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/connectors/translator-salesforce/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-salesforce</artifactId>
Modified: trunk/connectors/translator-ws/pom.xml
===================================================================
--- trunk/connectors/translator-ws/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/connectors/translator-ws/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-ws</artifactId>
Modified: trunk/engine/pom.xml
===================================================================
--- trunk/engine/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/engine/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-engine</artifactId>
Modified: trunk/hibernate-dialect/pom.xml
===================================================================
--- trunk/hibernate-dialect/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/hibernate-dialect/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-hibernate-dialect</artifactId>
Modified: trunk/jboss-integration/pom.xml
===================================================================
--- trunk/jboss-integration/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/jboss-integration/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -2,7 +2,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/metadata/pom.xml
===================================================================
--- trunk/metadata/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/metadata/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-metadata</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -10,7 +10,7 @@
<artifactId>teiid-parent</artifactId>
<packaging>pom</packaging>
<name>Teiid</name>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
<description>Federated SQL and XML query engine.</description>
<properties>
<ant.version>1.7.0</ant.version>
@@ -37,9 +37,9 @@
<version.junit>4.10</version.junit>
</properties>
<scm>
- <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-8.0.0.Beta1</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-8.0.0.Beta1</developerConnection>
- <url>http://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-8.0.0.Beta1</url>
+ <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/trunk</developerConnection>
+ <url>http://anonsvn.jboss.org/repos/teiid/trunk</url>
</scm>
<licenses>
<license>
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/runtime/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.teiid</groupId>
Modified: trunk/test-integration/common/pom.xml
===================================================================
--- trunk/test-integration/common/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/test-integration/common/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-integration-common</artifactId>
Modified: trunk/test-integration/db/pom.xml
===================================================================
--- trunk/test-integration/db/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/test-integration/db/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -9,7 +9,7 @@
<parent>
<artifactId>teiid-test-integration</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/test-integration/pom.xml
===================================================================
--- trunk/test-integration/pom.xml 2012-03-09 19:37:41 UTC (rev 3930)
+++ trunk/test-integration/pom.xml 2012-03-09 19:38:02 UTC (rev 3931)
@@ -3,7 +3,7 @@
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>8.0.0.Beta1</version>
+ <version>8.0.0.Beta2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-test-integration</artifactId>
12 years, 1 month
- 1
- 0
teiid SVN: r3930 - tags.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2012-03-09 14:37:41 -0500 (Fri, 09 Mar 2012)
New Revision: 3930
Added:
tags/teiid-parent-8.0.0.Beta1/
Log:
[maven-release-plugin] copy for tag teiid-parent-8.0.0.Beta1
12 years, 1 month
- 1
- 0