October 2010 - teiid-commits - Jboss List Archives

teiid SVN: r2669 - in branches/7.1.x/engine/src: test/java/org/teiid/query/resolver and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-10-21 11:33:12 -0400 (Thu, 21 Oct 2010) New Revision: 2669 Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java branches/7.1.x/engine/src/test/java/org/teiid/query/resolver/TestResolver.java Log: TEIID-1312 fix for procedure defaults in string form Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java =================================================================== --- branches/7.1.x/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java 2010-10-21 15:08:08 UTC (rev 2668) +++ branches/7.1.x/engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java 2010-10-21 15:33:12 UTC (rev 2669) @@ -908,36 +908,36 @@ append(SPACE); append(obj.getProcedureName()); append("("); //$NON-NLS-1$ - List params = obj.getInputParameters(); - if (params != null) { - Iterator iter = params.iterator(); - while (iter.hasNext()) { - SPParameter param = (SPParameter)iter.next(); + boolean first = true; + for (SPParameter param : obj.getInputParameters()) { + if (param.isUsingDefault()) { + continue; + } + if (first) { + first = false; + } else { + append(", "); //$NON-NLS-1$ + } + if (obj.displayNamedParameters()) { + append(escapeSinglePart(ElementSymbol.getShortName(param.getParameterSymbol().getOutputName()))); + append(" => "); //$NON-NLS-1$ + } - if (obj.displayNamedParameters()) { - append(escapeSinglePart(ElementSymbol.getShortName(param.getParameterSymbol().getOutputName()))); - append(" => "); //$NON-NLS-1$ - } - - if (param.getExpression() == null) { - if (param.getName() != null) { - outputDisplayName(obj.getParamFullName(param)); - } else { - append("?"); //$NON-NLS-1$ - } + if (param.getExpression() == null) { + if (param.getName() != null) { + outputDisplayName(obj.getParamFullName(param)); } else { - boolean addParens = !obj.displayNamedParameters() && param.getExpression() instanceof CompareCriteria; - if (addParens) { - append(Tokens.LPAREN); - } - visitNode(param.getExpression()); - if (addParens) { - append(Tokens.RPAREN); - } + append("?"); //$NON-NLS-1$ } - if (iter.hasNext()) { - append(", "); //$NON-NLS-1$ + } else { + boolean addParens = !obj.displayNamedParameters() && param.getExpression() instanceof CompareCriteria; + if (addParens) { + append(Tokens.LPAREN); } + visitNode(param.getExpression()); + if (addParens) { + append(Tokens.RPAREN); + } } } append(")"); //$NON-NLS-1$ Modified: branches/7.1.x/engine/src/test/java/org/teiid/query/resolver/TestResolver.java =================================================================== --- branches/7.1.x/engine/src/test/java/org/teiid/query/resolver/TestResolver.java 2010-10-21 15:08:08 UTC (rev 2668) +++ branches/7.1.x/engine/src/test/java/org/teiid/query/resolver/TestResolver.java 2010-10-21 15:33:12 UTC (rev 2669) @@ -350,7 +350,7 @@ * @param expectedParameterExpressions * @since 4.3 */ - private void helpResolveExec(String sql, Object[] expectedParameterExpressions) { + private StoredProcedure helpResolveExec(String sql, Object[] expectedParameterExpressions) { StoredProcedure proc = (StoredProcedure)helpResolve(sql); @@ -375,6 +375,8 @@ assertEquals(expectedParameterExpressions[i], param.getExpression()); } } + + return proc; } @@ -1093,7 +1095,8 @@ /** test omitting a required parameter that has a default value */ @Test public void testExecNamedParamsOmitRequiredParamWithDefaultValue() { Object[] expectedParameterExpressions = new Object[] {new Constant("xyz"), new Constant(new Integer(666)), new Constant("YYZ")};//$NON-NLS-1$ //$NON-NLS-2$ - helpResolveExec("EXEC pm1.sq3b(\"in\" = 'xyz', in2 = 666)", expectedParameterExpressions);//$NON-NLS-1$ + StoredProcedure sp = helpResolveExec("EXEC pm1.sq3b(\"in\" = 'xyz', in2 = 666)", expectedParameterExpressions);//$NON-NLS-1$ + assertEquals("EXEC pm1.sq3b(\"in\" => 'xyz', in2 => 666)", sp.toString()); } @Test public void testExecNamedParamsOptionalParamWithDefaults() {

15 years, 2 months

1
0
0 / 0

teiid SVN: r2668 - in branches/7.1.x/connectors/translator-jdbc/src: test/java/org/teiid/translator/jdbc/sybase and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-10-21 11:08:08 -0400 (Thu, 21 Oct 2010) New Revision: 2668 Modified: branches/7.1.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseExecutionFactory.java branches/7.1.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseConvertModifier.java Log: TEIID-1303 fix for sybase timestamp to string Modified: branches/7.1.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseExecutionFactory.java =================================================================== --- branches/7.1.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseExecutionFactory.java 2010-10-20 03:08:28 UTC (rev 2667) +++ branches/7.1.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseExecutionFactory.java 2010-10-21 15:08:08 UTC (rev 2668) @@ -181,7 +181,7 @@ protected List<?> convertTimestampToString(Function function) { LinkedList<Object> result = new LinkedList<Object>(); result.addAll(convertDateToString(function)); - result.add(' '); + result.add('+'); result.addAll(convertTimeToString(function)); return result; } Modified: branches/7.1.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseConvertModifier.java =================================================================== --- branches/7.1.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseConvertModifier.java 2010-10-20 03:08:28 UTC (rev 2667) +++ branches/7.1.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseConvertModifier.java 2010-10-21 15:08:08 UTC (rev 2668) @@ -185,7 +185,7 @@ LANG_FACTORY.createLiteral("string", String.class)}, //$NON-NLS-1$ String.class); - helpGetString1(func, "stuff(stuff(convert(varchar, CAST('2003-11-01 12:05:02.0' AS DATETIME), 102), 5, 1, '-'), 8, 1, '-') convert(varchar, CAST('2003-11-01 12:05:02.0' AS DATETIME), 8)"); //$NON-NLS-1$ + helpGetString1(func, "stuff(stuff(convert(varchar, CAST('2003-11-01 12:05:02.0' AS DATETIME), 102), 5, 1, '-'), 8, 1, '-')+convert(varchar, CAST('2003-11-01 12:05:02.0' AS DATETIME), 8)"); //$NON-NLS-1$ } @Test public void testDateToString() throws Exception {

15 years, 2 months

1
0
0 / 0

teiid SVN: r2667 - in trunk: adminshell and 35 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-10-19 23:08:28 -0400 (Tue, 19 Oct 2010) New Revision: 2667 Modified: trunk/adminshell/pom.xml trunk/api/pom.xml trunk/build/pom.xml trunk/cache-jbosscache/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-jdbc/pom.xml trunk/connectors/translator-ldap/pom.xml trunk/connectors/translator-loopback/pom.xml trunk/connectors/translator-salesforce/pom.xml trunk/connectors/translator-ws/pom.xml trunk/console/pom.xml trunk/documentation/admin-guide/pom.xml trunk/documentation/caching-guide/pom.xml trunk/documentation/client-developers-guide/pom.xml trunk/documentation/developer-guide/pom.xml trunk/documentation/pom.xml trunk/documentation/quick-start-example/pom.xml trunk/documentation/reference/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/adminshell/pom.xml =================================================================== --- trunk/adminshell/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/adminshell/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-adminshell</artifactId> Modified: trunk/api/pom.xml =================================================================== --- trunk/api/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/api/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-api</artifactId> Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/build/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid</artifactId> Modified: trunk/cache-jbosscache/pom.xml =================================================================== --- trunk/cache-jbosscache/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/cache-jbosscache/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-cache-jbosscache</artifactId> Modified: trunk/client/pom.xml =================================================================== --- trunk/client/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/client/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client</artifactId> Modified: trunk/common-core/pom.xml =================================================================== --- trunk/common-core/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/common-core/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</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 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/connectors/connector-file/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-file</artifactId> Modified: trunk/connectors/connector-ldap/pom.xml =================================================================== --- trunk/connectors/connector-ldap/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/connectors/connector-ldap/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ldap</artifactId> Modified: trunk/connectors/connector-salesforce/pom.xml =================================================================== --- trunk/connectors/connector-salesforce/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/connectors/connector-salesforce/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-salesforce</artifactId> Modified: trunk/connectors/connector-ws/pom.xml =================================================================== --- trunk/connectors/connector-ws/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/connectors/connector-ws/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ws</artifactId> Modified: trunk/connectors/pom.xml =================================================================== --- trunk/connectors/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/connectors/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</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 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/connectors/salesforce-api/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>salesforce-api</artifactId> Modified: trunk/connectors/sandbox/pom.xml =================================================================== --- trunk/connectors/sandbox/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/connectors/sandbox/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</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 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-yahoo</artifactId> Modified: trunk/connectors/translator-file/pom.xml =================================================================== --- trunk/connectors/translator-file/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/connectors/translator-file/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-file</artifactId> Modified: trunk/connectors/translator-jdbc/pom.xml =================================================================== --- trunk/connectors/translator-jdbc/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/connectors/translator-jdbc/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-jdbc</artifactId> Modified: trunk/connectors/translator-ldap/pom.xml =================================================================== --- trunk/connectors/translator-ldap/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/connectors/translator-ldap/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ldap</artifactId> Modified: trunk/connectors/translator-loopback/pom.xml =================================================================== --- trunk/connectors/translator-loopback/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/connectors/translator-loopback/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-loopback</artifactId> Modified: trunk/connectors/translator-salesforce/pom.xml =================================================================== --- trunk/connectors/translator-salesforce/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/connectors/translator-salesforce/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-salesforce</artifactId> Modified: trunk/connectors/translator-ws/pom.xml =================================================================== --- trunk/connectors/translator-ws/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/connectors/translator-ws/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ws</artifactId> Modified: trunk/console/pom.xml =================================================================== --- trunk/console/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/console/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/documentation/admin-guide/pom.xml =================================================================== --- trunk/documentation/admin-guide/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/documentation/admin-guide/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>admin-guide</artifactId> Modified: trunk/documentation/caching-guide/pom.xml =================================================================== --- trunk/documentation/caching-guide/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/documentation/caching-guide/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>caching-guide</artifactId> Modified: trunk/documentation/client-developers-guide/pom.xml =================================================================== --- trunk/documentation/client-developers-guide/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/documentation/client-developers-guide/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>client-developers-guide</artifactId> Modified: trunk/documentation/developer-guide/pom.xml =================================================================== --- trunk/documentation/developer-guide/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/documentation/developer-guide/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>developer-guide</artifactId> Modified: trunk/documentation/pom.xml =================================================================== --- trunk/documentation/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/documentation/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/documentation/quick-start-example/pom.xml =================================================================== --- trunk/documentation/quick-start-example/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/documentation/quick-start-example/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>quick-start-example</artifactId> Modified: trunk/documentation/reference/pom.xml =================================================================== --- trunk/documentation/reference/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/documentation/reference/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>reference</artifactId> Modified: trunk/engine/pom.xml =================================================================== --- trunk/engine/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/engine/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-engine</artifactId> Modified: trunk/hibernate-dialect/pom.xml =================================================================== --- trunk/hibernate-dialect/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/hibernate-dialect/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-hibernate-dialect</artifactId> Modified: trunk/jboss-integration/pom.xml =================================================================== --- trunk/jboss-integration/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/jboss-integration/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/metadata/pom.xml =================================================================== --- trunk/metadata/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/metadata/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-metadata</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -5,15 +5,15 @@ <artifactId>teiid-parent</artifactId> <packaging>pom</packaging> <name>Teiid</name> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> <description>Federated SQL and XML query engine.</description> <properties> <ant.version>1.7.0</ant.version> <site.url>http://www.jboss.org/teiid</site.url> </properties> <scm> - <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-7.2.0.Beta1</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-7.2.0.Beta1</developerConnection> + <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/trunk</developerConnection> </scm> <licenses> <license> Modified: trunk/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/runtime/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</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 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/test-integration/common/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</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 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/test-integration/db/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -9,7 +9,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/test-integration/pom.xml =================================================================== --- trunk/test-integration/pom.xml 2010-10-20 03:07:45 UTC (rev 2666) +++ trunk/test-integration/pom.xml 2010-10-20 03:08:28 UTC (rev 2667) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1</version> + <version>7.2.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-test-integration</artifactId>

15 years, 2 months

1
0
0 / 0

teiid SVN: r2666 - tags.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-10-19 23:07:45 -0400 (Tue, 19 Oct 2010) New Revision: 2666 Added: tags/teiid-parent-7.2.0.Beta1/ Log: [maven-release-plugin] copy for tag teiid-parent-7.2.0.Beta1 Copied: tags/teiid-parent-7.2.0.Beta1 (from rev 2665, trunk)

15 years, 2 months

1
0
0 / 0

teiid SVN: r2665 - in trunk: adminshell and 35 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-10-19 22:58:17 -0400 (Tue, 19 Oct 2010) New Revision: 2665 Modified: trunk/adminshell/pom.xml trunk/api/pom.xml trunk/build/pom.xml trunk/cache-jbosscache/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-jdbc/pom.xml trunk/connectors/translator-ldap/pom.xml trunk/connectors/translator-loopback/pom.xml trunk/connectors/translator-salesforce/pom.xml trunk/connectors/translator-ws/pom.xml trunk/console/pom.xml trunk/documentation/admin-guide/pom.xml trunk/documentation/caching-guide/pom.xml trunk/documentation/client-developers-guide/pom.xml trunk/documentation/developer-guide/pom.xml trunk/documentation/pom.xml trunk/documentation/quick-start-example/pom.xml trunk/documentation/reference/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 release teiid-parent-7.2.0.Beta1 Modified: trunk/adminshell/pom.xml =================================================================== --- trunk/adminshell/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/adminshell/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-adminshell</artifactId> Modified: trunk/api/pom.xml =================================================================== --- trunk/api/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/api/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-api</artifactId> Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/build/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid</artifactId> Modified: trunk/cache-jbosscache/pom.xml =================================================================== --- trunk/cache-jbosscache/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/cache-jbosscache/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-cache-jbosscache</artifactId> Modified: trunk/client/pom.xml =================================================================== --- trunk/client/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/client/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client</artifactId> Modified: trunk/common-core/pom.xml =================================================================== --- trunk/common-core/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/common-core/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</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 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/connectors/connector-file/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-file</artifactId> Modified: trunk/connectors/connector-ldap/pom.xml =================================================================== --- trunk/connectors/connector-ldap/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/connectors/connector-ldap/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ldap</artifactId> Modified: trunk/connectors/connector-salesforce/pom.xml =================================================================== --- trunk/connectors/connector-salesforce/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/connectors/connector-salesforce/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-salesforce</artifactId> Modified: trunk/connectors/connector-ws/pom.xml =================================================================== --- trunk/connectors/connector-ws/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/connectors/connector-ws/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ws</artifactId> Modified: trunk/connectors/pom.xml =================================================================== --- trunk/connectors/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/connectors/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</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 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/connectors/salesforce-api/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>salesforce-api</artifactId> Modified: trunk/connectors/sandbox/pom.xml =================================================================== --- trunk/connectors/sandbox/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/connectors/sandbox/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</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 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-yahoo</artifactId> Modified: trunk/connectors/translator-file/pom.xml =================================================================== --- trunk/connectors/translator-file/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/connectors/translator-file/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-file</artifactId> Modified: trunk/connectors/translator-jdbc/pom.xml =================================================================== --- trunk/connectors/translator-jdbc/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/connectors/translator-jdbc/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-jdbc</artifactId> Modified: trunk/connectors/translator-ldap/pom.xml =================================================================== --- trunk/connectors/translator-ldap/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/connectors/translator-ldap/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ldap</artifactId> Modified: trunk/connectors/translator-loopback/pom.xml =================================================================== --- trunk/connectors/translator-loopback/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/connectors/translator-loopback/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-loopback</artifactId> Modified: trunk/connectors/translator-salesforce/pom.xml =================================================================== --- trunk/connectors/translator-salesforce/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/connectors/translator-salesforce/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-salesforce</artifactId> Modified: trunk/connectors/translator-ws/pom.xml =================================================================== --- trunk/connectors/translator-ws/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/connectors/translator-ws/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ws</artifactId> Modified: trunk/console/pom.xml =================================================================== --- trunk/console/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/console/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/documentation/admin-guide/pom.xml =================================================================== --- trunk/documentation/admin-guide/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/documentation/admin-guide/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>admin-guide</artifactId> Modified: trunk/documentation/caching-guide/pom.xml =================================================================== --- trunk/documentation/caching-guide/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/documentation/caching-guide/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>caching-guide</artifactId> Modified: trunk/documentation/client-developers-guide/pom.xml =================================================================== --- trunk/documentation/client-developers-guide/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/documentation/client-developers-guide/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>client-developers-guide</artifactId> Modified: trunk/documentation/developer-guide/pom.xml =================================================================== --- trunk/documentation/developer-guide/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/documentation/developer-guide/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>developer-guide</artifactId> Modified: trunk/documentation/pom.xml =================================================================== --- trunk/documentation/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/documentation/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/documentation/quick-start-example/pom.xml =================================================================== --- trunk/documentation/quick-start-example/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/documentation/quick-start-example/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>quick-start-example</artifactId> Modified: trunk/documentation/reference/pom.xml =================================================================== --- trunk/documentation/reference/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/documentation/reference/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>reference</artifactId> Modified: trunk/engine/pom.xml =================================================================== --- trunk/engine/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/engine/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-engine</artifactId> Modified: trunk/hibernate-dialect/pom.xml =================================================================== --- trunk/hibernate-dialect/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/hibernate-dialect/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-hibernate-dialect</artifactId> Modified: trunk/jboss-integration/pom.xml =================================================================== --- trunk/jboss-integration/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/jboss-integration/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/metadata/pom.xml =================================================================== --- trunk/metadata/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/metadata/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-metadata</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -5,15 +5,15 @@ <artifactId>teiid-parent</artifactId> <packaging>pom</packaging> <name>Teiid</name> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> <description>Federated SQL and XML query engine.</description> <properties> <ant.version>1.7.0</ant.version> <site.url>http://www.jboss.org/teiid</site.url> </properties> <scm> - <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/trunk</developerConnection> + <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-7.2.0.Beta1</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-7.2.0.Beta1</developerConnection> </scm> <licenses> <license> Modified: trunk/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/runtime/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</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 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/test-integration/common/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</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 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/test-integration/db/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -9,7 +9,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/test-integration/pom.xml =================================================================== --- trunk/test-integration/pom.xml 2010-10-20 01:17:11 UTC (rev 2664) +++ trunk/test-integration/pom.xml 2010-10-20 02:58:17 UTC (rev 2665) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.2.0.Beta1-SNAPSHOT</version> + <version>7.2.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-test-integration</artifactId>

15 years, 2 months

1
0
0 / 0

teiid SVN: r2664 - in branches/7.1.x: test-integration/common/src/test/resources/TestCase3473 and 3 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-10-19 21:17:11 -0400 (Tue, 19 Oct 2010) New Revision: 2664 Modified: branches/7.1.x/metadata/src/main/resources/System.vdb branches/7.1.x/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables.expected branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableMultipleTypes.expected branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableTypes.expected branches/7.1.x/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected Log: TEIID-1310 updating vdbresources to be a system table Modified: branches/7.1.x/metadata/src/main/resources/System.vdb =================================================================== (Binary files differ) Modified: branches/7.1.x/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected =================================================================== --- branches/7.1.x/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected 2010-10-19 20:10:47 UTC (rev 2663) +++ branches/7.1.x/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected 2010-10-20 01:17:11 UTC (rev 2664) @@ -12,6 +12,7 @@ test SYS Tables SYSTEM TABLE <null> <null> <null> <null> <null> <null> true test SYS VirtualDatabases SYSTEM TABLE <null> <null> <null> <null> <null> <null> true test SYSADMIN MatViews SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +test SYSADMIN VDBResources SYSTEM TABLE <null> <null> <null> <null> <null> <null> true test pg_catalog pg_am SYSTEM TABLE <null> <null> <null> <null> <null> <null> false test pg_catalog pg_attrdef SYSTEM TABLE <null> <null> <null> <null> <null> <null> false test pg_catalog pg_attribute SYSTEM TABLE <null> <null> <null> <null> <null> <null> false @@ -23,7 +24,6 @@ test pg_catalog pg_trigger SYSTEM TABLE <null> <null> <null> <null> <null> <null> false test pg_catalog pg_type SYSTEM TABLE <null> <null> <null> <null> <null> <null> false test pg_catalog pg_user SYSTEM TABLE <null> <null> <null> <null> <null> <null> false -test SYSADMIN VDBResources TABLE <null> <null> <null> <null> <null> <null> true test test all_databases TABLE <null> <null> <null> <null> <null> <null> false test test all_models TABLE <null> <null> <null> <null> <null> <null> false test test all_tables TABLE <null> <null> <null> <null> <null> <null> false Modified: branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables.expected =================================================================== --- branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables.expected 2010-10-19 20:10:47 UTC (rev 2663) +++ branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables.expected 2010-10-20 01:17:11 UTC (rev 2664) @@ -30,6 +30,7 @@ QT_Ora9DS SYS Tables SYSTEM TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS SYS VirtualDatabases SYSTEM TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS SYSADMIN MatViews SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYSADMIN VDBResources SYSTEM TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS pg_catalog pg_am SYSTEM TABLE <null> <null> <null> <null> <null> <null> false QT_Ora9DS pg_catalog pg_attrdef SYSTEM TABLE <null> <null> <null> <null> <null> <null> false QT_Ora9DS pg_catalog pg_attribute SYSTEM TABLE <null> <null> <null> <null> <null> <null> false @@ -57,7 +58,6 @@ QT_Ora9DS BQT2 MediumB TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS BQT2 SmallA TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS BQT2 SmallB TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS SYSADMIN VDBResources TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS VQT Base.Agg1 TABLE <null> <null> <null> <null> <null> <null> false QT_Ora9DS VQT Base.Agg2 TABLE <null> <null> <null> <null> <null> <null> false QT_Ora9DS VQT Base.Agg3 TABLE <null> <null> <null> <null> <null> <null> false Modified: branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected =================================================================== --- branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected 2010-10-19 20:10:47 UTC (rev 2663) +++ branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected 2010-10-20 01:17:11 UTC (rev 2664) @@ -30,6 +30,7 @@ QT_Ora9DS SYS Tables SYSTEM TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS SYS VirtualDatabases SYSTEM TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS SYSADMIN MatViews SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +QT_Ora9DS SYSADMIN VDBResources SYSTEM TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS pg_catalog pg_am SYSTEM TABLE <null> <null> <null> <null> <null> <null> false QT_Ora9DS pg_catalog pg_attrdef SYSTEM TABLE <null> <null> <null> <null> <null> <null> false QT_Ora9DS pg_catalog pg_attribute SYSTEM TABLE <null> <null> <null> <null> <null> <null> false @@ -57,7 +58,6 @@ QT_Ora9DS BQT2 MediumB TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS BQT2 SmallA TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS BQT2 SmallB TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS SYSADMIN VDBResources TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS VQT Base.Agg1 TABLE <null> <null> <null> <null> <null> <null> false QT_Ora9DS VQT Base.Agg2 TABLE <null> <null> <null> <null> <null> <null> false QT_Ora9DS VQT Base.Agg3 TABLE <null> <null> <null> <null> <null> <null> false Modified: branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableMultipleTypes.expected =================================================================== --- branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableMultipleTypes.expected 2010-10-19 20:10:47 UTC (rev 2663) +++ branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableMultipleTypes.expected 2010-10-20 01:17:11 UTC (rev 2664) @@ -16,7 +16,6 @@ QT_Ora9DS BQT2 MediumB TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS BQT2 SmallA TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS BQT2 SmallB TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS SYSADMIN VDBResources TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS VQT Base.Agg1 TABLE <null> <null> <null> <null> <null> <null> false QT_Ora9DS VQT Base.Agg2 TABLE <null> <null> <null> <null> <null> <null> false QT_Ora9DS VQT Base.Agg3 TABLE <null> <null> <null> <null> <null> <null> false @@ -50,7 +49,7 @@ QT_Ora9DS VQT Union.U9 TABLE <null> <null> <null> <null> <null> <null> false QT_Ora9DS XQT xqtData TABLE <null> <null> <null> <null> <null> <null> false QT_Ora9DS XQT xqtFullData TABLE <null> <null> <null> <null> <null> <null> false -Row Count : 50 +Row Count : 49 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Tables 255 255 0 false true false true 1 false true true true TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Tables 255 255 0 false true false true 1 false true true true Modified: branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableTypes.expected =================================================================== --- branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableTypes.expected 2010-10-19 20:10:47 UTC (rev 2663) +++ branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableTypes.expected 2010-10-20 01:17:11 UTC (rev 2664) @@ -16,7 +16,6 @@ QT_Ora9DS BQT2 MediumB TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS BQT2 SmallA TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS BQT2 SmallB TABLE <null> <null> <null> <null> <null> <null> true -QT_Ora9DS SYSADMIN VDBResources TABLE <null> <null> <null> <null> <null> <null> true QT_Ora9DS VQT Base.Agg1 TABLE <null> <null> <null> <null> <null> <null> false QT_Ora9DS VQT Base.Agg2 TABLE <null> <null> <null> <null> <null> <null> false QT_Ora9DS VQT Base.Agg3 TABLE <null> <null> <null> <null> <null> <null> false @@ -50,7 +49,7 @@ QT_Ora9DS VQT Union.U9 TABLE <null> <null> <null> <null> <null> <null> false QT_Ora9DS XQT xqtData TABLE <null> <null> <null> <null> <null> <null> false QT_Ora9DS XQT xqtFullData TABLE <null> <null> <null> <null> <null> <null> false -Row Count : 50 +Row Count : 49 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Tables 255 255 0 false true false true 1 false true true true TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Tables 255 255 0 false true false true 1 false true true true Modified: branches/7.1.x/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected =================================================================== --- branches/7.1.x/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected 2010-10-19 20:10:47 UTC (rev 2663) +++ branches/7.1.x/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected 2010-10-20 01:17:11 UTC (rev 2664) @@ -12,6 +12,7 @@ PartsSupplier SYS Tables SYSTEM TABLE <null> <null> <null> <null> <null> <null> true PartsSupplier SYS VirtualDatabases SYSTEM TABLE <null> <null> <null> <null> <null> <null> true PartsSupplier SYSADMIN MatViews SYSTEM TABLE <null> <null> <null> <null> <null> <null> true +PartsSupplier SYSADMIN VDBResources SYSTEM TABLE <null> <null> <null> <null> <null> <null> true PartsSupplier pg_catalog pg_am SYSTEM TABLE <null> <null> <null> <null> <null> <null> false PartsSupplier pg_catalog pg_attrdef SYSTEM TABLE <null> <null> <null> <null> <null> <null> false PartsSupplier pg_catalog pg_attribute SYSTEM TABLE <null> <null> <null> <null> <null> <null> false @@ -28,7 +29,6 @@ PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS TABLE <null> <null> <null> <null> <null> <null> true PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER TABLE <null> <null> <null> <null> <null> <null> true PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS TABLE <null> <null> <null> <null> <null> <null> true -PartsSupplier SYSADMIN VDBResources TABLE <null> <null> <null> <null> <null> <null> true Row Count : 29 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable TABLE_CAT 12 PartsSupplier java.lang.String TABLE_CAT string SYS Tables 255 255 0 false true false true 1 false true true true Modified: branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected =================================================================== --- branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected 2010-10-19 20:10:47 UTC (rev 2663) +++ branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected 2010-10-20 01:17:11 UTC (rev 2664) @@ -1,7 +1,7 @@ string string string string integer string string integer integer boolean boolean boolean boolean boolean boolean boolean string string string string string string string integer integer integer string ! string integer VDBName SchemaName TableName Name Position NameInSource DataType Scale Length IsLengthFixed SupportsSelect SupportsUpdates IsCaseSensitive IsSigned IsCurrency IsAutoIncremented NullType MinRange MaxRange SearchType Format DefaultValue JavaClass Precision CharOctetLength Radix UID ! Description OID PartsSupplier SYS DataTypes BaseType 17 <null> string 0 64 true true false true true false false Nullable <null> <null> Searchable <null> <null> java.lang.String 64 64 10 mmuuid:03beb57c-968b-4821-a6ae-cb1154cfadee ! <null> 73 -PartsSupplier SYSADMIN MatViews Cardinality 9 <null> integer 0 10 false true true true true false false Nullable <null> <null> Searchable <null> <null> java.lang.Integer 10 10 10 mmuuid:abe699b0-b6bc-4413-9172-0a21ca9664d2 ! <null> 25 +PartsSupplier SYSADMIN MatViews Cardinality 9 <null> integer 0 10 false true false true true false false Nullable <null> <null> Searchable <null> <null> java.lang.Integer 10 10 10 mmuuid:abe699b0-b6bc-4413-9172-0a21ca9664d2 ! <null> 25 PartsSupplier SYS Tables Cardinality 9 <null> integer 0 10 false true false true true false false No Nulls <null> <null> All Except Like <null> <null> java.lang.Integer 10 10 10 mmuuid:24cdad3a-e8f7-4376-bb32-79f8bc8eeed2 ! <null> 154 PartsSupplier SYS Columns CharOctetLength 25 <null> integer 0 10 true true false false false false false Nullable <null> <null> Searchable <null> <null> java.lang.Integer 10 10 10 mmuuid:de5def94-2804-4c91-91ed-26d630ce8afe ! <null> 52 PartsSupplier SYS ReferenceKeyColumns DEFERRABILITY 14 <null> integer 0 10 false true true true true false false Nullable <null> <null> Searchable <null> <null> java.lang.Integer 10 10 10 mmuuid:88380f55-2cbd-4325-b9a3-9dcaa88a690e ! <null> 138 @@ -43,10 +43,10 @@ PartsSupplier SYS KeyColumns KeyName 5 <null> string 0 255 true true false false false false false Nullable <null> <null> Searchable <null> <null> java.lang.String 255 255 10 mmuuid:da4bef58-83f4-4b88-8bb0-2dc8990be539 ! <null> 80 PartsSupplier SYS KeyColumns KeyType 6 <null> string 0 20 true true false false false false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 20 20 10 mmuuid:df9e15e6-ab77-486d-bfe0-0adc378aa99d ! <null> 81 PartsSupplier SYS Columns Length 9 <null> integer 0 10 true true false false false false false No Nulls <null> <null> Searchable <null> <null> java.lang.Integer 10 10 10 mmuuid:b36ea0f6-cbff-4049-bc9c-8ec9928be048 ! <null> 36 -PartsSupplier SYSADMIN MatViews LoadState 7 <null> string 0 255 false true true true true false false Nullable <null> <null> Searchable <null> <null> java.lang.String 0 255 10 mmuuid:c67365c3-f252-40f4-aae6-8971d3b1b153 ! <null> 23 +PartsSupplier SYSADMIN MatViews LoadState 7 <null> string 0 255 false true false true true false false Nullable <null> <null> Searchable <null> <null> java.lang.String 0 255 10 mmuuid:c67365c3-f252-40f4-aae6-8971d3b1b153 ! <null> 23 PartsSupplier SYS Columns MaxRange 19 <null> string 0 50 true true false false false false false Nullable <null> <null> Searchable <null> <null> java.lang.String 50 50 10 mmuuid:0b0df4a5-7de5-4315-94f7-22c84958302e ! <null> 46 PartsSupplier SYS Columns MinRange 18 <null> string 0 50 true true false false false false false Nullable <null> <null> Searchable <null> <null> java.lang.String 50 50 10 mmuuid:dba0f97d-fab5-45f6-a1eb-3459ab3fcc74 ! <null> 45 -PartsSupplier SYSADMIN MatViews Name 3 <null> string 0 255 false true true true true false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 0 255 10 mmuuid:0f56d35c-e450-4b4f-86b0-bdb4f1015c57 ! <null> 19 +PartsSupplier SYSADMIN MatViews Name 3 <null> string 0 255 false true false true true false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 0 255 10 mmuuid:0f56d35c-e450-4b4f-86b0-bdb4f1015c57 ! <null> 19 PartsSupplier SYS Columns Name 4 <null> string 0 255 true true false false false false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 255 255 10 mmuuid:d1f44a6d-3e39-4251-b873-1280c2b035b3 ! <null> 31 PartsSupplier SYS DataTypes Name 1 <null> string 0 100 true true false true true false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 100 100 10 mmuuid:17f7de33-e6f0-4b9c-b55e-a87f6b7bb9b3 ! <null> 57 PartsSupplier SYS KeyColumns Name 4 <null> string 0 255 true true false false false false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 255 255 10 mmuuid:08bda0c7-5f66-4fed-8285-d74b63eeb0e2 ! <null> 79 @@ -114,7 +114,7 @@ PartsSupplier SYS Columns Scale 8 <null> integer 0 10 true true false false false false false No Nulls <null> <null> Searchable <null> <null> java.lang.Integer 10 10 10 mmuuid:cc6c6113-8d70-40c8-84c0-94e17c14e22e ! <null> 35 PartsSupplier SYS DataTypes Scale 6 <null> integer 0 10 true true false false false false false Nullable <null> <null> Searchable <null> (0) java.lang.Integer 10 10 10 mmuuid:e8655204-e97a-45cd-909b-1e37731e9546 ! <null> 62 PartsSupplier SYS ProcedureParams Scale 11 <null> integer 0 10 true true true false false false false No Nulls <null> <null> Searchable <null> (0) java.lang.Integer 10 10 10 mmuuid:360c8b1d-4b3d-42fd-952c-bf5763cad69e ! <null> 107 -PartsSupplier SYSADMIN MatViews SchemaName 2 <null> string 0 255 false true true true true false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 0 255 10 mmuuid:2738c484-d24d-4c40-b0b7-e734afb03450 ! <null> 18 +PartsSupplier SYSADMIN MatViews SchemaName 2 <null> string 0 255 false true false true true false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 0 255 10 mmuuid:2738c484-d24d-4c40-b0b7-e734afb03450 ! <null> 18 PartsSupplier SYS Columns SchemaName 2 <null> string 0 255 false true true true true false false Nullable <null> <null> Searchable <null> <null> java.lang.String 0 255 10 mmuuid:859288c9-cd78-4407-90fc-61b5d310e2ab ! <null> 29 PartsSupplier SYS KeyColumns SchemaName 2 <null> string 0 255 false true true true true false false Nullable <null> <null> Searchable <null> <null> java.lang.String 0 255 10 mmuuid:787be966-cf12-4956-907f-a8e6dc1009dc ! <null> 77 PartsSupplier SYS Keys SchemaName 2 <null> string 0 255 false true true true true false false Nullable <null> <null> Searchable <null> <null> java.lang.String 0 255 10 mmuuid:4a7fc059-208e-4f98-b6ef-cb7c6102a327 ! <null> 87 @@ -129,8 +129,8 @@ PartsSupplier SYS Columns TableName 3 <null> string 0 255 true true false true false false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 255 255 10 mmuuid:2c09c9d1-2f25-45de-81cf-eeb2a5157d34 ! <null> 30 PartsSupplier SYS KeyColumns TableName 3 <null> string 0 2048 true true false true false false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 2048 2048 10 mmuuid:c24fad72-0c0d-4260-96ae-f188ad77b137 ! <null> 78 PartsSupplier SYS Keys TableName 3 <null> string 0 2048 true true false true false false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 2048 2048 10 mmuuid:7d9540bd-b51f-4206-8c33-b39c5ba8bb8b ! <null> 88 -PartsSupplier SYSADMIN MatViews TargetName 5 <null> string 0 4000 false true true true true false false Nullable <null> <null> Searchable <null> <null> java.lang.String 0 4000 10 mmuuid:d2831595-d6f5-4cca-aa5d-2ff2530d0ab1 ! <null> 21 -PartsSupplier SYSADMIN MatViews TargetSchemaName 4 <null> string 0 255 false true true true true false false Nullable <null> <null> Searchable <null> <null> java.lang.String 0 255 10 mmuuid:a95dba1c-283e-4f48-9671-34cecdb7d0e3 ! <null> 20 +PartsSupplier SYSADMIN MatViews TargetName 5 <null> string 0 4000 false true false true true false false Nullable <null> <null> Searchable <null> <null> java.lang.String 0 4000 10 mmuuid:d2831595-d6f5-4cca-aa5d-2ff2530d0ab1 ! <null> 21 +PartsSupplier SYSADMIN MatViews TargetSchemaName 4 <null> string 0 255 false true false true true false false Nullable <null> <null> Searchable <null> <null> java.lang.String 0 255 10 mmuuid:a95dba1c-283e-4f48-9671-34cecdb7d0e3 ! <null> 20 PartsSupplier SYS Keys Type 7 <null> string 0 20 true true false false false false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 20 20 10 mmuuid:29e73c18-afec-43a9-81ab-7378d6daf20b ! <null> 92 PartsSupplier SYS ProcedureParams Type 7 <null> string 0 100 true true false false false false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 100 100 10 mmuuid:76a1981b-1226-4a55-9acf-82a061cc8642 ! <null> 103 PartsSupplier SYS Tables Type 4 <null> string 0 20 true true false false false false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 20 20 10 mmuuid:4814a0af-4e8f-4f55-9b25-3148d90d3d9b ! <null> 149 @@ -147,8 +147,8 @@ PartsSupplier SYS Schemas UID 4 <null> string 0 50 true true false false false false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 50 50 10 mmuuid:ad232e4d-9c01-4d0c-bc57-0459d9db918a ! <null> 142 PartsSupplier SYS Tables UID 8 <null> string 0 50 true true false false false false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 50 50 10 mmuuid:6afe3737-26f9-43a8-88db-86531b5dc66c ! <null> 153 PartsSupplier SYS ReferenceKeyColumns UPDATE_RULE 10 <null> integer 0 10 false true true true true false false Nullable <null> <null> Searchable <null> <null> java.lang.Integer 10 10 10 mmuuid:30d5ae74-b19e-4186-97e1-aeff5801e44f ! <null> 134 -PartsSupplier SYSADMIN MatViews Updated 8 <null> timestamp 0 0 false true true true true false false Nullable <null> <null> Searchable <null> <null> java.sql.Timestamp 0 0 10 mmuuid:33970a66-7ad4-411f-a6c4-545746747fe6 ! <null> 24 -PartsSupplier SYSADMIN MatViews VDBName 1 <null> string 0 255 false true true true true false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 0 255 10 mmuuid:c1ce9841-e272-4839-8c78-777a5f68d241 ! <null> 17 +PartsSupplier SYSADMIN MatViews Updated 8 <null> timestamp 0 0 false true false true true false false Nullable <null> <null> Searchable <null> <null> java.sql.Timestamp 0 0 10 mmuuid:33970a66-7ad4-411f-a6c4-545746747fe6 ! <null> 24 +PartsSupplier SYSADMIN MatViews VDBName 1 <null> string 0 255 false true false true true false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 0 255 10 mmuuid:c1ce9841-e272-4839-8c78-777a5f68d241 ! <null> 17 PartsSupplier SYS Columns VDBName 1 <null> string 0 255 true true false false false false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 255 255 10 mmuuid:83f19a81-1243-4751-8c99-daddbf37b1d7 ! <null> 28 PartsSupplier SYS KeyColumns VDBName 1 <null> string 0 255 true true false false false false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 255 255 10 mmuuid:f062eb9c-4854-47fb-b7bd-a4e23c782b62 ! <null> 76 PartsSupplier SYS Keys VDBName 1 <null> string 0 255 true true false false false false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 255 255 10 mmuuid:5785b523-7da3-42c1-8920-66daa1f7fa1d ! <null> 86 @@ -156,7 +156,7 @@ PartsSupplier SYS Procedures VDBName 1 <null> string 0 255 true true false false false false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 255 255 10 mmuuid:1d664747-4a95-4605-8b28-381bed3121f1 ! <null> 113 PartsSupplier SYS Schemas VDBName 1 <null> string 0 255 false true true true true false false Nullable <null> <null> Searchable <null> <null> java.lang.String 0 255 10 mmuuid:73dbf95b-a283-4f0a-81b9-9b98e09c2906 ! <null> 139 PartsSupplier SYS Tables VDBName 1 <null> string 0 255 false true true true true false false Nullable <null> <null> Searchable <null> <null> java.lang.String 0 255 10 mmuuid:58de905f-9d64-4831-a985-da6d082ff709 ! <null> 146 -PartsSupplier SYSADMIN MatViews Valid 6 <null> boolean 0 0 false true true true true false false Nullable <null> <null> Searchable <null> <null> java.lang.Boolean 0 0 10 mmuuid:13098912-bce2-4842-9ea9-b162fcd7383e ! <null> 22 +PartsSupplier SYSADMIN MatViews Valid 6 <null> boolean 0 0 false true false true true false false Nullable <null> <null> Searchable <null> <null> java.lang.Boolean 0 0 10 mmuuid:13098912-bce2-4842-9ea9-b162fcd7383e ! <null> 22 PartsSupplier SYS Properties Value 2 <null> string 0 255 true true false true true false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 255 255 10 mmuuid:c917257d-06b7-41dd-a6cb-44c0ff0f897e ! <null> 122 PartsSupplier SYS VirtualDatabases Version 2 <null> string 0 50 true true false true false false false No Nulls <null> <null> Searchable <null> <null> java.lang.String 50 50 10 mmuuid:c876d749-a512-4810-9910-3034ca524c45 ! <null> 160 PartsSupplier pg_catalog pg_attrdef adnum 4 <null> integer 0 0 false true false false false false false Unknown <null> <null> Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:e22c521a-e208-4181-9dbd-89f5de7014b9 ! <null> 222 @@ -172,7 +172,7 @@ PartsSupplier pg_catalog pg_attribute attrelid 2 <null> integer 0 0 false true false false false false false Unknown <null> <null> Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:3be6b5de-2287-4279-93f3-4f5064799118 ! <null> 173 PartsSupplier pg_catalog pg_attribute atttypid 4 <null> integer 0 0 false true false false false false false Unknown <null> <null> Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:99782493-1cce-4e14-9c1b-4de7ce50e2c8 ! <null> 175 PartsSupplier pg_catalog pg_attribute atttypmod 7 <null> integer 0 0 false true false false false false false Unknown <null> <null> Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:2e2bae3c-ab93-49f5-b96c-7a7b9d66782d ! <null> 178 -PartsSupplier SYSADMIN VDBResources contents 2 <null> blob 0 0 false true true true true false false Nullable <null> <null> Searchable <null> <null> org.teiid.core.types.BlobType 0 0 10 mmuuid:f9421669-3564-451d-9293-96c1e5e72c4f ! <null> 27 +PartsSupplier SYSADMIN VDBResources contents 2 <null> blob 0 0 false true false true true false false Nullable <null> <null> Searchable <null> <null> org.teiid.core.types.BlobType 0 0 10 mmuuid:f9421669-3564-451d-9293-96c1e5e72c4f ! <null> 27 PartsSupplier pg_catalog pg_database datacl 7 <null> object 0 0 false true false false false false false Unknown <null> <null> Searchable <null> <null> java.lang.Object 0 0 0 mmuid:4b5beb14-03a0-4652-9d6f-5f8cc74d470c ! <null> 229 PartsSupplier pg_catalog pg_database datallowconn 5 <null> char 0 0 false true false false false false false Unknown <null> <null> Searchable <null> <null> java.lang.Character 0 0 0 mmuid:c2bdf40c-ec58-439c-a403-7adf604ceadd ! <null> 227 PartsSupplier pg_catalog pg_database datconfig 6 <null> object 0 0 false true false false false false false Unknown <null> <null> Searchable <null> <null> java.lang.Object 0 0 0 mmuid:5c9d54b2-433f-443a-85ce-821f42ed109e ! <null> 228 @@ -217,7 +217,7 @@ PartsSupplier pg_catalog pg_class relnamespace 3 <null> integer 0 0 false true false false false false false Unknown <null> <null> Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:4591ef08-bff8-4f3b-9de7-420f9c7f9d2b ! <null> 165 PartsSupplier pg_catalog pg_class relpages 7 <null> integer 0 0 false true false false false false false Unknown <null> <null> Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:44dee7d6-b6ae-44c7-85f2-e87364d8d059 ! <null> 169 PartsSupplier pg_catalog pg_class reltuples 6 <null> float 0 0 false true false false false false false Unknown <null> <null> Searchable <null> <null> java.lang.Float 0 0 0 mmuid:b9ed4b49-5a7b-4ba4-863a-37fd95b2a34c ! <null> 168 -PartsSupplier SYSADMIN VDBResources resourcePath 1 <null> string 0 255 false true true true true false false Nullable <null> <null> Searchable <null> <null> java.lang.String 0 255 10 mmuuid:b1bc5150-3dcc-452e-9e75-4a506997f612 ! <null> 26 +PartsSupplier SYSADMIN VDBResources resourcePath 1 <null> string 0 255 false true false true true false false Nullable <null> <null> Searchable <null> <null> java.lang.String 0 255 10 mmuuid:b1bc5150-3dcc-452e-9e75-4a506997f612 ! <null> 26 PartsSupplier pg_catalog pg_trigger tgargs 4 <null> integer 0 0 false true false false false false false Unknown <null> <null> Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:250d7c06-728a-4b2a-b557-91f2a69bb184 ! <null> 213 PartsSupplier pg_catalog pg_trigger tgconstrname 8 <null> string 0 0 false true false false false false false Unknown <null> <null> Searchable <null> <null> java.lang.String 0 0 0 mmuid:da4b59ca-ebff-45a8-ad68-9777bc587813 ! <null> 217 PartsSupplier pg_catalog pg_trigger tgconstrrelid 2 <null> integer 0 0 false true false false false false false Unknown <null> <null> Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:635b6634-632c-43c9-8cc7-bcaa016133e8 ! <null> 211 Modified: branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected =================================================================== --- branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected 2010-10-19 20:10:47 UTC (rev 2663) +++ branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected 2010-10-20 01:17:11 UTC (rev 2664) @@ -5,7 +5,6 @@ PARTSSUPPLIER.STATUS PARTSSUPPLIER.SUPPLIER PARTSSUPPLIER.SUPPLIER_PARTS -VDBResources -Row Count : 6 +Row Count : 5 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable Name 12 PartsSupplier java.lang.String Name string SYS Tables 255 255 0 false true false false 0 true true false false Modified: branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected =================================================================== --- branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected 2010-10-19 20:10:47 UTC (rev 2663) +++ branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected 2010-10-20 01:17:11 UTC (rev 2664) @@ -4,7 +4,7 @@ PartsSupplier SYS DataTypes Table <null> true false mmuuid:9a8794f9-66f8-49e8-8576-89d212d0f957 0 <null> true false 8 PartsSupplier SYS KeyColumns Table <null> true false mmuuid:14946083-3bd5-42d5-8283-1c0694347c29 0 <null> true false 9 PartsSupplier SYS Keys Table <null> true false mmuuid:1e5135dc-ce5d-4b25-a8ff-63f5440b3108 0 <null> true false 10 -PartsSupplier SYSADMIN MatViews Table <null> true true mmuuid:520ba1e8-3553-460f-8d18-9b43f089e256 0 <null> true false 5 +PartsSupplier SYSADMIN MatViews Table <null> true false mmuuid:520ba1e8-3553-460f-8d18-9b43f089e256 0 <null> true false 5 PartsSupplier PartsSupplier PARTSSUPPLIER.PARTS Table PARTS true true mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590 16 <null> false false 0 PartsSupplier PartsSupplier PARTSSUPPLIER.SHIP_VIA Table SHIP_VIA true true mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590 4 <null> false false 1 PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS Table STATUS true true mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590 3 <null> false false 2 @@ -16,7 +16,7 @@ PartsSupplier SYS ReferenceKeyColumns Table <null> true false mmuuid:6a9653e8-a337-41b2-86fa-77b98f409a29 0 <null> true false 14 PartsSupplier SYS Schemas Table <null> true false mmuuid:8648a554-b2ad-4e8e-84ca-2ec618b311a9 0 <null> true false 15 PartsSupplier SYS Tables Table <null> true false mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 0 <null> true false 16 -PartsSupplier SYSADMIN VDBResources Table <null> true true mmuuid:1785804d-beaf-4831-9531-e59164fedd49 0 <null> false false 6 +PartsSupplier SYSADMIN VDBResources Table <null> true false mmuuid:1785804d-beaf-4831-9531-e59164fedd49 0 <null> true false 6 PartsSupplier SYS VirtualDatabases Table <null> true false mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 0 <null> true false 17 PartsSupplier pg_catalog pg_am Table <null> false false mmuid:1462b28e-0bab-436f-9654-013821506337 0 <null> true false 23 PartsSupplier pg_catalog pg_attrdef Table <null> false false mmuid:71091853-c65e-46a9-9947-aa024f806e2d 0 <null> true false 26 Modified: branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected =================================================================== --- branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected 2010-10-19 20:10:47 UTC (rev 2663) +++ branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected 2010-10-20 01:17:11 UTC (rev 2664) @@ -22,5 +22,5 @@ /runtime-inf/VDBS.INDEX Blob[24924] Row Count : 20 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable -resourcePath 12 PartsSupplier java.lang.String resourcePath string SYSADMIN VDBResources 255 255 0 false true false true 1 false true true true -contents 2004 PartsSupplier java.sql.Blob contents blob SYSADMIN VDBResources 2147483647 2147483647 0 false true false true 1 false true true true +resourcePath 12 PartsSupplier java.lang.String resourcePath string SYSADMIN VDBResources 255 255 0 false true false false 1 true true true false +contents 2004 PartsSupplier java.sql.Blob contents blob SYSADMIN VDBResources 2147483647 2147483647 0 false true false false 1 true true true false

15 years, 2 months

1
0
0 / 0

teiid SVN: r2663 - in trunk: documentation/reference/src/main/docbook/en-US/content and 9 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-10-19 16:10:47 -0400 (Tue, 19 Oct 2010) New Revision: 2663 Removed: trunk/engine/src/main/resources/org/teiid/dqp/ Modified: trunk/build/kits/jboss-container/teiid-releasenotes.html trunk/documentation/reference/src/main/docbook/en-US/content/procedures.xml trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java trunk/engine/src/main/java/org/teiid/query/processor/proc/CreateCursorResultSetInstruction.java trunk/engine/src/main/java/org/teiid/query/processor/proc/LoopInstruction.java trunk/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java trunk/engine/src/main/java/org/teiid/query/resolver/command/ExecResolver.java trunk/engine/src/main/resources/org/teiid/query/i18n.properties trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java trunk/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java trunk/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java Log: TEIID-1237 finishing off the update of procedure assignment logic updates. Modified: trunk/build/kits/jboss-container/teiid-releasenotes.html =================================================================== --- trunk/build/kits/jboss-container/teiid-releasenotes.html 2010-10-19 19:10:06 UTC (rev 2662) +++ trunk/build/kits/jboss-container/teiid-releasenotes.html 2010-10-19 20:10:47 UTC (rev 2663) @@ -40,7 +40,9 @@ <LI><B>Binary Web Service Calls</B> - the ws translator now provides an invokeHttp procedure to return the blob contents and string content type of an http/https call. <LI><B>Improved clustering support</B> - see the Admin Guide chapter on clustering. <LI><B>IPv6 support</B> - Teiid can started using IPv6 bind address and can be used with JDBC connection. - <LI><B>SESSION_ID</b> - A new system function "SESSION_ID" is added to the system function library. + <LI><B>SESSION_ID</B> - A new system function "SESSION_ID" is added to the system function library. + <LI><B>Assignment Syntax Improvements<B> - Teiid's procedure syntax for assignments was clarified so that the assignment value must be a proper expression. INSERT/UPDATE/DELETE update counts must be obtained from VARIABLES.ROWCOUNT, scalar values must be obtained via a scalar subquery. + The parser will continue to accept the old syntax and convert the query into the proper form. </UL> <h2><a name="Compatibility">Compatibility Issues</a></h2> Modified: trunk/documentation/reference/src/main/docbook/en-US/content/procedures.xml =================================================================== --- trunk/documentation/reference/src/main/docbook/en-US/content/procedures.xml 2010-10-19 19:10:06 UTC (rev 2662) +++ trunk/documentation/reference/src/main/docbook/en-US/content/procedures.xml 2010-10-19 20:10:47 UTC (rev 2663) @@ -27,6 +27,9 @@ <programlisting>SELECT * FROM MySchema.MyTable WHERE ColA > 100; INSERT INTO MySchema.MyTable (ColA,ColB) VALUES (50, 'hi');</programlisting> </example> + <para><link linkend="exec_command">EXECUTE</link> command statements may access IN/OUT, OUT, and RETURN parameters. To access the return value the statement will have the form <code>var = EXEC proc...</code>. + To access OUT or IN/OUT values named parameter syntax must be used. For example, <code>EXEC proc(in_param=>'1', out_param=>var)</code> will assign the value of the out parameter to the variable var. + It is expected that the datatype of parameter will be implicitly convertable to the datatype of the variable.</para> </section> <section id="dynamic_sql"> <title>Dynamic SQL Command</title> @@ -108,7 +111,7 @@ <title>Example Assignment </title> <programlisting>EXECUTE STRING <expression> AS x string INTO #temp; -DECLARE string VARIABLES.RESULT = SEELCT x FROM #temp;</programlisting> +DECLARE string VARIABLES.RESULT = (SELECT x FROM #temp);</programlisting> </example> </listitem> <listitem> @@ -178,11 +181,15 @@ <para>The VARIABLES group is always implied even if it is not specified. </para> </listitem> + <listitem> + <para>The assignment value follows the same rules as for an Assignment Statement. + </para> + </listitem> </itemizedlist> </section> <section> <title>Assignment Statement</title> - <para>An assignment statement assigns a value to a variable by either evaluating an expression or executing a SELECT command that returns a column value from a single row.</para> + <para>An assignment statement assigns a value to a variable by either evaluating an expression.</para> <para> Usage: <synopsis label="Usage" ><variable reference> = <expression>;</synopsis> @@ -194,10 +201,21 @@ </para> </listitem> <listitem> - <para>VARIABLES.x = SELECT Column1 FROM MySchema.MyTable; + <para>VARIABLES.x = (SELECT Column1 FROM MySchema.MyTable); </para> </listitem> </itemizedlist> + <section> + <title>Special Variables</title> + <para><code>VARIABLES.ROWCOUNT</code> integer variable will contain the numbers of rows affected by the last insert/update/delete command statement executed. Inserts that are processed by dynamic sql with an into clause will also update the ROWCOUNT.</para> + <example> + <title>Sample Usage</title> + <programlisting language="SQL"><![CDATA[... +UPDATE FOO SET X = 1 WHERE Y = 2; +DECLARE INTEGER UPDATED = VARIABLES.ROWCOUNT; +...]]></programlisting> + </example> + </section> </section> <section> <title>If Statement</title> @@ -282,8 +300,8 @@ the procedure. The BEGIN and END keywords are used to denote block boundaries. Within the body of the procedure, any valid <link linkend="procedure_language">statement</link> may be used. </para> - <para>The last command statement executed in the procedure will be - return as the result. The output of that statement must match the + <para>There is no explict cursoring or return statement, rather the last command statement executed in the procedure that returns a result set will be + returned as the result. The output of that statement must match the expected result set and parameters of the procedure.</para> </section> <section> @@ -374,30 +392,13 @@ or variables in the procedure.</para> <para> A virtual procedure call will return a result set just like any SELECT, so you can use this in many places you can use a SELECT. - However, within a virtual procedure itself you cannot always use an - EXEC directly. Instead, you use the following syntax:</para> - <programlisting>SELECT * FROM (EXEC ...) AS x</programlisting> - <itemizedlist> - <para>The following are some examples of how you can use the - results of a virtual procedure call within a virtual procedure - definition:</para> - <listitem> - <para>LOOP instruction - you can walk through the results and - do work on a row-by-row basis</para> - </listitem> - <listitem> - <para>Assignment instruction - you can run a command and - set the first column / first row value returned to a variable - </para> - </listitem> - <listitem> - <para><code>SELECT * INTO #temp FROM (EXEC ...) AS x</code> - you can - select the results from a virtual procedure into a temp table, - which you can then query against as if it were a physical table. - </para> - </listitem> - </itemizedlist> + Typically you'll use the following syntax:</para> + <programlisting>SELECT * FROM (EXEC ...) AS x</programlisting> </section> + <section> + <title>Limitations</title> + <para>Teiid virtual procedures can only be defined in Teiid Designer. They also cannot use IN/OUT, OUT, or RETURN paramters and may only return 1 result set.</para> + </section> </section> <section id="update_procedures"> <title>Update Procedures</title> @@ -427,7 +428,7 @@ ... END</synopsis> </para> - <para>The CREATE VIRTUAL PROCEDURE line demarcates the beginning of + <para>The CREATE PROCEDURE line demarcates the beginning of the procedure. The BEGIN and END keywords are used to denote block boundaries. Within the body of the procedure, any valid <link linkend="procedure_language">statement</link> may be used. </para> @@ -472,13 +473,20 @@ </section> <section id="rowsupdated_variable"> <title>ROWS_UPDATED Variable</title> - <para> Teiid returns the value of the VARIABLES.ROWS_UPDATED variable as a response to an update command executed against + <para> Teiid returns the value of the integer VARIABLES.ROWS_UPDATED variable as a response to an update command executed against the view. Your procedure must set the value that returns when an application executes an update command against the view, which triggers invocation of the update procedure. For example, if an UPDATE command is issued that affects 5 records, the ROWS_UPDATED should be set appropriately so that the user will receive '5' for the count of records affected.</para> + <example> + <title>Sample Usage</title> + <programlisting language="SQL"><![CDATA[... +UPDATE FOO SET X = 1 WHERE TRANSLATE CRITERIA; +VARIABLES.ROWS_UPDATED = VARIABLES.ROWCOUNT; +...]]></programlisting> + </example> </section> </section> <section> Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java 2010-10-19 19:10:06 UTC (rev 2662) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java 2010-10-19 20:10:47 UTC (rev 2663) @@ -22,6 +22,9 @@ package org.teiid.query.optimizer; +import java.util.LinkedHashMap; +import java.util.Map; + import org.teiid.api.exception.query.QueryMetadataException; import org.teiid.api.exception.query.QueryPlannerException; import org.teiid.core.TeiidComponentException; @@ -46,6 +49,8 @@ import org.teiid.query.processor.proc.WhileInstruction; import org.teiid.query.sql.lang.Command; import org.teiid.query.sql.lang.DynamicCommand; +import org.teiid.query.sql.lang.SPParameter; +import org.teiid.query.sql.lang.StoredProcedure; import org.teiid.query.sql.proc.AssignmentStatement; import org.teiid.query.sql.proc.Block; import org.teiid.query.sql.proc.CommandStatement; @@ -55,7 +60,9 @@ import org.teiid.query.sql.proc.RaiseErrorStatement; import org.teiid.query.sql.proc.Statement; import org.teiid.query.sql.proc.WhileStatement; +import org.teiid.query.sql.symbol.ElementSymbol; import org.teiid.query.sql.symbol.Expression; +import org.teiid.query.sql.symbol.Reference; import org.teiid.query.sql.visitor.CommandCollectorVisitor; import org.teiid.query.util.CommandContext; @@ -228,6 +235,29 @@ command.getType() == Command.TYPE_INSERT || command.getType() == Command.TYPE_UPDATE || command.getType() == Command.TYPE_DELETE); + //handle stored procedure calls + if (command.getType() == Command.TYPE_STORED_PROCEDURE) { + StoredProcedure sp = (StoredProcedure)command; + if (sp.isCallableStatement()) { + Map<ElementSymbol, ElementSymbol> assignments = new LinkedHashMap<ElementSymbol, ElementSymbol>(); + for (SPParameter param : sp.getParameters()) { + if (param.getParameterType() == SPParameter.RESULT_SET + || param.getParameterType() == SPParameter.IN) { + continue; + } + Expression expr = param.getExpression(); + if (expr instanceof Reference) { + expr = ((Reference)expr).getExpression(); + } + ElementSymbol symbol = null; + if (expr instanceof ElementSymbol) { + symbol = (ElementSymbol)expr; + } + assignments.put(param.getParameterSymbol(), symbol); + } + ((CreateCursorResultSetInstruction)instruction).setProcAssignments(assignments); + } + } } if(debug) { Modified: trunk/engine/src/main/java/org/teiid/query/processor/proc/CreateCursorResultSetInstruction.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/proc/CreateCursorResultSetInstruction.java 2010-10-19 19:10:06 UTC (rev 2662) +++ trunk/engine/src/main/java/org/teiid/query/processor/proc/CreateCursorResultSetInstruction.java 2010-10-19 20:10:47 UTC (rev 2663) @@ -26,11 +26,14 @@ import static org.teiid.query.analysis.AnalysisRecord.*; +import java.util.Map; + import org.teiid.client.plan.PlanNode; import org.teiid.common.buffer.BlockedException; import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidProcessingException; import org.teiid.query.processor.ProcessorPlan; +import org.teiid.query.sql.symbol.ElementSymbol; /** @@ -42,6 +45,7 @@ protected String rsName; protected ProcessorPlan plan; private boolean update; + private Map<ElementSymbol, ElementSymbol> procAssignments; public CreateCursorResultSetInstruction(String rsName, ProcessorPlan plan, boolean update){ this.rsName = rsName; @@ -49,15 +53,11 @@ this.update = update; } - /** - * If the result set named rsName does not exist yet in the {@link ProcedurePlan}, then - * this instruction will define that result set. It will then throw a BlockedException if - * this result set is selecting from other than temp groups (because those results will be - * delivered asynchronously). IF the result set named rsName does already exist, this - * instruction will just increment the program counter and do nothing else. - * @throws BlockedException if this result set is not selecting from - * only temp groups - */ + public void setProcAssignments( + Map<ElementSymbol, ElementSymbol> procAssignments) { + this.procAssignments = procAssignments; + } + public void process(ProcedurePlan procEnv) throws BlockedException, TeiidComponentException, TeiidProcessingException { @@ -65,7 +65,7 @@ procEnv.removeResults(rsName); } - procEnv.executePlan(plan, rsName); + procEnv.executePlan(plan, rsName, procAssignments, !update); if (update) { boolean hasNext = procEnv.iterateCursor(rsName); @@ -83,7 +83,9 @@ */ public CreateCursorResultSetInstruction clone(){ ProcessorPlan clonedPlan = this.plan.clone(); - return new CreateCursorResultSetInstruction(this.rsName, clonedPlan, update); + CreateCursorResultSetInstruction clone = new CreateCursorResultSetInstruction(this.rsName, clonedPlan, update); + clone.setProcAssignments(procAssignments); + return clone; } public String toString(){ Modified: trunk/engine/src/main/java/org/teiid/query/processor/proc/LoopInstruction.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/proc/LoopInstruction.java 2010-10-19 19:10:06 UTC (rev 2662) +++ trunk/engine/src/main/java/org/teiid/query/processor/proc/LoopInstruction.java 2010-10-19 20:10:47 UTC (rev 2663) @@ -91,7 +91,7 @@ public boolean testCondition(ProcedurePlan procEnv) throws TeiidComponentException, TeiidProcessingException { if(!procEnv.resultSetExists(rsName)) { - procEnv.executePlan(plan, rsName); + procEnv.executePlan(plan, rsName, null, false); } return procEnv.iterateCursor(rsName); Modified: trunk/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java 2010-10-19 19:10:06 UTC (rev 2662) +++ trunk/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java 2010-10-19 20:10:47 UTC (rev 2663) @@ -22,7 +22,7 @@ package org.teiid.query.processor.proc; -import static org.teiid.query.analysis.AnalysisRecord.PROP_OUTPUT_COLS; +import static org.teiid.query.analysis.AnalysisRecord.*; import java.util.ArrayList; import java.util.Collections; @@ -42,9 +42,13 @@ import org.teiid.common.buffer.BufferManager; import org.teiid.common.buffer.IndexedTupleSource; import org.teiid.common.buffer.TupleBatch; +import org.teiid.common.buffer.TupleBuffer; import org.teiid.common.buffer.TupleSource; +import org.teiid.common.buffer.BufferManager.TupleSourceType; import org.teiid.core.TeiidComponentException; import org.teiid.core.TeiidProcessingException; +import org.teiid.core.types.DataTypeManager; +import org.teiid.core.util.Assertion; import org.teiid.logging.LogManager; import org.teiid.query.QueryPlugin; import org.teiid.query.analysis.AnalysisRecord; @@ -73,6 +77,7 @@ QueryProcessor processor; IndexedTupleSource ts; List<?> currentRow; + TupleBuffer resultsBuffer; } private Program originalProgram; @@ -418,7 +423,7 @@ return this.currentVarContext; } - public void executePlan(ProcessorPlan command, String rsName) + public void executePlan(ProcessorPlan command, String rsName, Map<ElementSymbol, ElementSymbol> procAssignments, boolean keepRs) throws TeiidComponentException, TeiidProcessingException { CursorState state = this.cursorStates.get(rsName.toUpperCase()); @@ -433,16 +438,45 @@ state = new CursorState(); state.processor = new QueryProcessor(command, subContext, this.bufferMgr, this.dataMgr); state.ts = new BatchIterator(state.processor); - - //keep a reference to the tuple source - //it may be the last one - this.lastTupleSource = state.ts; - + if (procAssignments != null && state.processor.getOutputElements().size() - procAssignments.size() > 0) { + state.resultsBuffer = bufferMgr.createTupleBuffer(state.processor.getOutputElements().subList(0, state.processor.getOutputElements().size() - procAssignments.size()), getContext().getConnectionID(), TupleSourceType.PROCESSOR); + } this.currentState = state; } //force execution to the first batch this.currentState.ts.hasNext(); + if (procAssignments != null) { + while (this.currentState.ts.hasNext()) { + if (this.currentState.currentRow != null && this.currentState.resultsBuffer != null) { + this.currentState.resultsBuffer.addTuple(this.currentState.currentRow.subList(0, this.currentState.resultsBuffer.getSchema().size())); + this.currentState.currentRow = null; + } + this.currentState.currentRow = this.currentState.ts.nextTuple(); + } + //process assignments + Assertion.assertTrue(this.currentState.currentRow != null); + for (Map.Entry<ElementSymbol, ElementSymbol> entry : procAssignments.entrySet()) { + if (entry.getValue() == null) { + continue; + } + int index = this.currentState.processor.getOutputElements().indexOf(entry.getKey()); + getCurrentVariableContext().setValue(entry.getValue(), DataTypeManager.transformValue(this.currentState.currentRow.get(index), entry.getValue().getType())); + } + //no resultset + if (this.currentState.resultsBuffer == null) { + this.currentState.processor.closeProcessing(); + this.currentState = null; + return; + } + this.currentState.resultsBuffer.close(); + this.currentState.ts = this.currentState.resultsBuffer.createIndexedTupleSource(); + } this.cursorStates.put(rsName.toUpperCase(), this.currentState); + //keep a reference to the tuple source + //it may be the last one + if (keepRs) { + this.lastTupleSource = this.currentState.ts; + } this.currentState = null; } } @@ -542,6 +576,9 @@ CursorState state = this.cursorStates.remove(rsKey); if (state != null) { state.processor.closeProcessing(); + if (state.resultsBuffer != null) { + state.resultsBuffer.remove(); + } } } Modified: trunk/engine/src/main/java/org/teiid/query/resolver/command/ExecResolver.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/resolver/command/ExecResolver.java 2010-10-19 19:10:06 UTC (rev 2662) +++ trunk/engine/src/main/java/org/teiid/query/resolver/command/ExecResolver.java 2010-10-19 20:10:47 UTC (rev 2663) @@ -270,34 +270,41 @@ while(paramIter.hasNext()) { SPParameter param = (SPParameter) paramIter.next(); Expression expr = param.getExpression(); - if(expr != null) { - for (SubqueryContainer container : ValueIteratorProviderCollectorVisitor.getValueIteratorProviders(expr)) { - QueryResolver.setChildMetadata(container.getCommand(), command); - - QueryResolver.resolveCommand(container.getCommand(), Collections.EMPTY_MAP, metadata.getMetadata(), analysis); - } - ResolverVisitor.resolveLanguageObject(expr, null, externalGroups, metadata); - Class paramType = param.getClassType(); - - ResolverUtil.setDesiredType(expr, paramType, storedProcedureCommand); + if(expr == null) { + continue; + } + for (SubqueryContainer container : ValueIteratorProviderCollectorVisitor.getValueIteratorProviders(expr)) { + QueryResolver.setChildMetadata(container.getCommand(), command); - // Compare type of parameter expression against parameter type - // and add implicit conversion if necessary - Class exprType = expr.getType(); - if(paramType == null || exprType == null) { - throw new QueryResolverException("ERR.015.008.0061", QueryPlugin.Util.getString("ERR.015.008.0061", storedProcedureCommand.getProcedureName(), param.getName())); //$NON-NLS-1$ //$NON-NLS-2$ - } - String tgtType = DataTypeManager.getDataTypeName(paramType); - String srcType = DataTypeManager.getDataTypeName(exprType); - Expression result = null; - - try { - result = ResolverUtil.convertExpression(expr, tgtType, metadata); - } catch (QueryResolverException e) { - throw new QueryResolverException(e, QueryPlugin.Util.getString("ExecResolver.Param_convert_fail", new Object[] { srcType, tgtType})); //$NON-NLS-1$ - } - param.setExpression(result); + QueryResolver.resolveCommand(container.getCommand(), Collections.EMPTY_MAP, metadata.getMetadata(), analysis); } + ResolverVisitor.resolveLanguageObject(expr, null, externalGroups, metadata); + Class paramType = param.getClassType(); + + ResolverUtil.setDesiredType(expr, paramType, storedProcedureCommand); + + // Compare type of parameter expression against parameter type + // and add implicit conversion if necessary + Class exprType = expr.getType(); + if(paramType == null || exprType == null) { + throw new QueryResolverException("ERR.015.008.0061", QueryPlugin.Util.getString("ERR.015.008.0061", storedProcedureCommand.getProcedureName(), param.getName())); //$NON-NLS-1$ //$NON-NLS-2$ + } + String tgtType = DataTypeManager.getDataTypeName(paramType); + String srcType = DataTypeManager.getDataTypeName(exprType); + Expression result = null; + + if (param.getParameterType() == SPParameter.RETURN_VALUE || param.getParameterType() == SPParameter.OUT) { + if (!ResolverUtil.canImplicitlyConvert(tgtType, srcType)) { + throw new QueryResolverException(QueryPlugin.Util.getString("ExecResolver.out_type_mismatch", param.getParameterSymbol(), tgtType, srcType)); //$NON-NLS-1$ + } + } else { + try { + result = ResolverUtil.convertExpression(expr, tgtType, metadata); + } catch (QueryResolverException e) { + throw new QueryResolverException(e, QueryPlugin.Util.getString("ExecResolver.Param_convert_fail", new Object[] { srcType, tgtType})); //$NON-NLS-1$ + } + param.setExpression(result); + } } } } Modified: trunk/engine/src/main/resources/org/teiid/query/i18n.properties =================================================================== --- trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2010-10-19 19:10:06 UTC (rev 2662) +++ trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2010-10-19 20:10:47 UTC (rev 2663) @@ -634,6 +634,7 @@ Evaluator.xmlquery=Error evaluating XMLQuery: {0} ExecResolver.Param_convert_fail=Unable to convert procedural parameter of type {0} to expected type {1} ExecResolver.return_expected=Procedure {0} does not have a return value. +ExecResolver.out_type_mismatch=OUT/RETURN parameter {0} with type {1} cannot be converted to {2} DynamicCommandResolver.SQL_String=Expected dynamic command sql to be of type STRING instead of type {0}. UnionQueryResolver.type_conversion=The Expression {0} used in a nested UNION ORDER BY clause cannot be implicitly converted from type {1} to type {2}. ValidationVisitor.select_into_no_implicit_conversion=There is no implicit conversion between the source element type ({0}) and the target element type ({1}) at position {2} of the query: {3} Modified: trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java 2010-10-19 19:10:06 UTC (rev 2662) +++ trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java 2010-10-19 20:10:47 UTC (rev 2663) @@ -43,7 +43,7 @@ ProcessorDataManager { // sql string to data - private Map data = new HashMap(); + private Map<String, List[]> data = new HashMap<String, List[]>(); // valid models - if null, any is assumed valid private Set validModels; @@ -53,7 +53,7 @@ private boolean blockOnce; // Collect all commands run against this class - private List commandHistory = new ArrayList(); // Commands + private List<Command> commandHistory = new ArrayList<Command>(); // Commands public HardcodedDataManager() { this(true); @@ -123,7 +123,7 @@ List projectedSymbols = command.getProjectedSymbols(); - List[] rows = (List[]) data.get(command.toString()); + List[] rows = data.get(command.toString()); if(rows == null) { if (mustRegisterCommands) { throw new TeiidComponentException("Unknown command: " + command.toString()); //$NON-NLS-1$ Modified: trunk/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java 2010-10-19 19:10:06 UTC (rev 2662) +++ trunk/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java 2010-10-19 20:10:47 UTC (rev 2663) @@ -28,7 +28,6 @@ import java.util.Arrays; import java.util.List; -import org.junit.Ignore; import org.junit.Test; import org.teiid.api.exception.query.QueryMetadataException; import org.teiid.api.exception.query.QueryProcessingException; @@ -2651,14 +2650,14 @@ helpTestProcess(plan, expected, new HardcodedDataManager(), metadata); } - @Ignore - @Test public void testProcReturn() throws Exception { + @Test public void testParameterAssignments() throws Exception { TransformationMetadata metadata = RealMetadataFactory.exampleBQTCached(); String userQuery = "EXEC TEIIDSP7(1)"; //$NON-NLS-1$ HardcodedDataManager dataMgr = new HardcodedDataManager(); ProcessorPlan plan = getProcedurePlan(userQuery, metadata); dataMgr.addData("VARIABLES.x = EXEC spTest9(1)", new List[] {Arrays.asList(3)}); - List[] expected = new List[] {Arrays.asList(new Object[] {new Integer(3)})}; + dataMgr.addData("EXEC spTest11(3, null)", new List[] {Arrays.asList("1", 1, null), Arrays.asList(null, null, 4)}); + List[] expected = new List[] {Arrays.asList("34")}; helpTestProcess(plan, expected, dataMgr, metadata); } Modified: trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java 2010-10-19 19:10:06 UTC (rev 2662) +++ trunk/engine/src/test/java/org/teiid/query/resolver/TestResolver.java 2010-10-19 20:10:47 UTC (rev 2663) @@ -2883,6 +2883,10 @@ assertEquals(3, proc.getProjectedSymbols().size()); } + @Test public void testOutWithWrongType() { + helpResolveException("exec pm2.spTest8(inkey=>1, outkey=>{t '12:00:00'})", FakeMetadataFactory.exampleBQTCached()); + } + @Test public void testProcRelationalWithOutParam() { Query proc = (Query)helpResolve("select * from pm2.spTest8 where inkey = 1", FakeMetadataFactory.exampleBQTCached(), null); assertEquals(3, proc.getProjectedSymbols().size()); Modified: trunk/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java 2010-10-19 19:10:06 UTC (rev 2662) +++ trunk/engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java 2010-10-19 20:10:47 UTC (rev 2663) @@ -259,7 +259,7 @@ ColumnSet<Procedure> vsprs7 = createResultSet("TEIIDSP7.vsprs1", new String[] { "StringKey" }, new String[] { DataTypeManager.DefaultDataTypes.STRING }); //$NON-NLS-1$ //$NON-NLS-2$ ProcedureParameter vsp7p1 = createParameter("p1", ParameterInfo.IN, DataTypeManager.DefaultDataTypes.INTEGER); //$NON-NLS-1$ - QueryNode vspqn7 = new QueryNode("TEIIDSP7", "CREATE VIRTUAL PROCEDURE BEGIN declare integer x; x = exec spTest9(p1); select convert(x, string); END"); //$NON-NLS-1$ //$NON-NLS-2$ + QueryNode vspqn7 = new QueryNode("TEIIDSP7", "CREATE VIRTUAL PROCEDURE BEGIN declare integer x; x = exec spTest9(p1); declare integer y; exec spTest11(inkey=>x, outkey=>y); select convert(x, string) || y; END"); //$NON-NLS-1$ //$NON-NLS-2$ Procedure vsp7 = createVirtualProcedure("TEIIDSP7", mmspTest1, Arrays.asList(vsp7p1), vspqn7); //$NON-NLS-1$ vsp7.setResultSet(vsprs7);

15 years, 2 months

1
0
0 / 0

teiid SVN: r2662 - in branches/7.1.x: documentation/client-developers-guide/src/main/docbook/en-US/content and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2010-10-19 15:10:06 -0400 (Tue, 19 Oct 2010) New Revision: 2662 Modified: branches/7.1.x/build/kits/jboss-container/teiid-examples/jca/readme.txt branches/7.1.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml Log: TEIID-1307 Modified: branches/7.1.x/build/kits/jboss-container/teiid-examples/jca/readme.txt =================================================================== --- branches/7.1.x/build/kits/jboss-container/teiid-examples/jca/readme.txt 2010-10-19 16:58:41 UTC (rev 2661) +++ branches/7.1.x/build/kits/jboss-container/teiid-examples/jca/readme.txt 2010-10-19 19:10:06 UTC (rev 2662) @@ -1,8 +1,8 @@ -This folder contains the sample "-ds.xml" files that can be created for Teiid sources. +This directory contains examples of data source configuration files for the following types of sources: + flat files + LDAP + SalesForce + Web Services (for ws-security see Admin Guide) -JDBC: Please check "<jboss-as>/docs/examples/jca" directory for creating a -ds.xml file for any type of relational database. -Please note you can find samples for creating both "local" and "xa" data sources. - -Web Serivices with ws-security: Check out Admin guide for a sample with explanation on how to use it. - -All the others types of sources, please find a example in this directory. \ No newline at end of file +JDBC Users: Please see the examples in the "<jboss-as>/docs/examples/jca" directory for creating data source configuration +files for any type of relational database. These examples demonstrate creating both "local" and "xa" data sources. Modified: branches/7.1.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml =================================================================== --- branches/7.1.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml 2010-10-19 16:58:41 UTC (rev 2661) +++ branches/7.1.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml 2010-10-19 19:10:06 UTC (rev 2662) @@ -335,19 +335,6 @@ </entry> <entry>Name given to this data source</entry> </row> - <row> - <entry> - <code>PassthroughAuthentication</code> - </entry> - <entry> - <code>boolean</code> - </entry> - <entry>Only applies to "local" connections. When this option is set to "true", then Teiid looks for - already authenticated security context on the calling thread. If one found it uses that users credentials - to create session. Teiid also verifies that the same user is using this connection during the life of the connection. - if it finds a different security context on the calling thread, it switches the identity on the connection, - if the new user is also eligible to log in to Teiid otherwise connection fails to execute.</entry> - </row> </tbody> </tgroup>

15 years, 2 months

1
0
0 / 0

teiid SVN: r2661 - branches/7.1.x/documentation/reference/src/main/docbook/en-US/content.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-10-19 12:58:41 -0400 (Tue, 19 Oct 2010) New Revision: 2661 Modified: branches/7.1.x/documentation/reference/src/main/docbook/en-US/content/procedures.xml Log: TEIID-1294 doc updates for procedure validation changes Modified: branches/7.1.x/documentation/reference/src/main/docbook/en-US/content/procedures.xml =================================================================== --- branches/7.1.x/documentation/reference/src/main/docbook/en-US/content/procedures.xml 2010-10-19 15:47:14 UTC (rev 2660) +++ branches/7.1.x/documentation/reference/src/main/docbook/en-US/content/procedures.xml 2010-10-19 16:58:41 UTC (rev 2661) @@ -108,7 +108,7 @@ <title>Example Assignment </title> <programlisting>EXECUTE STRING <expression> AS x string INTO #temp; -DECLARE string VARIABLES.RESULT = SEELCT x FROM #temp;</programlisting> +DECLARE string VARIABLES.RESULT = (SELECT x FROM #temp);</programlisting> </example> </listitem> <listitem> @@ -178,11 +178,15 @@ <para>The VARIABLES group is always implied even if it is not specified. </para> </listitem> + <listitem> + <para>The assignment value follows the same rules as for an Assignment Statement. + </para> + </listitem> </itemizedlist> </section> <section> <title>Assignment Statement</title> - <para>An assignment statement assigns a value to a variable by either evaluating an expression or executing a SELECT command that returns a column value from a single row.</para> + <para>An assignment statement assigns a value to a variable by either evaluating an expression.</para> <para> Usage: <synopsis label="Usage" ><variable reference> = <expression>;</synopsis> @@ -194,10 +198,21 @@ </para> </listitem> <listitem> - <para>VARIABLES.x = SELECT Column1 FROM MySchema.MyTable; + <para>VARIABLES.x = (SELECT Column1 FROM MySchema.MyTable); </para> </listitem> + <listitem> + <para>VARIABLES.ROWS_UPDATED = INSERT INTO X (COL) VALUES (1); + </para> + </listitem> + <listitem> + <para>VARIABLES.x = EXEC proc(); + </para> + </listitem> </itemizedlist> + <note><para>Teiid will accept assignments in the form of "var = command", such is shown above with the INSERT and the EXEC. + However these are truly not expression values and will have alternative syntax in subsequent releases. + An assignment directly using a EXEC is only valid if the procedure has a return value.</para></note> </section> <section> <title>If Statement</title> @@ -282,8 +297,8 @@ the procedure. The BEGIN and END keywords are used to denote block boundaries. Within the body of the procedure, any valid <link linkend="procedure_language">statement</link> may be used. </para> - <para>The last command statement executed in the procedure will be - return as the result. The output of that statement must match the + <para>There is no explict cursoring or return statement, rather the last command statement executed in the procedure that returns a result set will be + returned as the result. The output of that statement must match the expected result set and parameters of the procedure.</para> </section> <section> @@ -374,30 +389,13 @@ or variables in the procedure.</para> <para> A virtual procedure call will return a result set just like any SELECT, so you can use this in many places you can use a SELECT. - However, within a virtual procedure itself you cannot always use an - EXEC directly. Instead, you use the following syntax:</para> - <programlisting>SELECT * FROM (EXEC ...) AS x</programlisting> - <itemizedlist> - <para>The following are some examples of how you can use the - results of a virtual procedure call within a virtual procedure - definition:</para> - <listitem> - <para>LOOP instruction - you can walk through the results and - do work on a row-by-row basis</para> - </listitem> - <listitem> - <para>Assignment instruction - you can run a command and - set the first column / first row value returned to a variable - </para> - </listitem> - <listitem> - <para><code>SELECT * INTO #temp FROM (EXEC ...) AS x</code> - you can - select the results from a virtual procedure into a temp table, - which you can then query against as if it were a physical table. - </para> - </listitem> - </itemizedlist> + Typically you'll use the following syntax:</para> + <programlisting>SELECT * FROM (EXEC ...) AS x</programlisting> </section> + <section> + <title>Limitations</title> + <para>Teiid virtual procedures can only be defined in Teiid Designer. They also cannot use IN/OUT, OUT, or RETURN paramters and may only return 1 result set.</para> + </section> </section> <section id="update_procedures"> <title>Update Procedures</title> @@ -427,7 +425,7 @@ ... END</synopsis> </para> - <para>The CREATE VIRTUAL PROCEDURE line demarcates the beginning of + <para>The CREATE PROCEDURE line demarcates the beginning of the procedure. The BEGIN and END keywords are used to denote block boundaries. Within the body of the procedure, any valid <link linkend="procedure_language">statement</link> may be used. </para> @@ -472,13 +470,19 @@ </section> <section id="rowsupdated_variable"> <title>ROWS_UPDATED Variable</title> - <para> Teiid returns the value of the VARIABLES.ROWS_UPDATED variable as a response to an update command executed against + <para> Teiid returns the value of the integer VARIABLES.ROWS_UPDATED variable as a response to an update command executed against the view. Your procedure must set the value that returns when an application executes an update command against the view, which triggers invocation of the update procedure. For example, if an UPDATE command is issued that affects 5 records, the ROWS_UPDATED should be set appropriately so that the user will receive '5' for the count of records affected.</para> + <example> + <title>Sample Usage</title> + <programlisting language="SQL"><![CDATA[... +VARIABLES.ROWS_UPDATED = UPDATE FOO SET X = 1 WHERE TRANSLATE CRITERIA; +...]]></programlisting> + </example> </section> </section> <section>

15 years, 2 months

1
0
0 / 0

teiid SVN: r2660 - branches/7.1.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/modeshape.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2010-10-19 11:47:14 -0400 (Tue, 19 Oct 2010) New Revision: 2660 Removed: branches/7.1.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/modeshape/functions/ Log: removing unneeded udf classes

15 years, 2 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

teiid-commits October 2010