[teiid-commits] teiid SVN: r3557 - in trunk: adminshell/src/main/java/groovy and 236 other directories.

Author: shawkins Date: 2011-10-18 06:52:08 -0400 (Tue, 18 Oct 2011) New Revision: 3557 Added: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java Modified: trunk/ trunk/adminshell/src/main/java/groovy/ trunk/adminshell/src/main/java/groovy/sql/ trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java trunk/adminshell/src/main/java/org/teiid/adminshell/ trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java trunk/adminshell/src/main/resources/org/ trunk/adminshell/src/main/resources/org/codehaus/ trunk/adminshell/src/main/resources/org/codehaus/groovy/ trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/ trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/ trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml trunk/adminshell/src/main/resources/org/teiid/ trunk/adminshell/src/main/resources/org/teiid/adminshell/ trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties trunk/adminshell/src/test/java/org/ trunk/adminshell/src/test/java/org/teiid/ trunk/adminshell/src/test/java/org/teiid/adminshell/ trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java trunk/adminshell/src/test/resources/foo/ trunk/adminshell/src/test/resources/foo/bar.txt trunk/api/src/main/java/org/teiid/connector/DataPlugin.java trunk/api/src/main/java/org/teiid/events/ trunk/api/src/main/java/org/teiid/events/EventDistributor.java trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java trunk/api/src/main/java/org/teiid/language/visitor/ trunk/api/src/main/java/org/teiid/logging/JavaLogger.java trunk/api/src/main/java/org/teiid/metadata/ trunk/api/src/main/java/org/teiid/metadata/AbstractMetadataRecord.java trunk/api/src/main/java/org/teiid/metadata/Column.java trunk/api/src/main/java/org/teiid/metadata/ColumnSet.java trunk/api/src/main/java/org/teiid/metadata/Datatype.java trunk/api/src/main/java/org/teiid/metadata/ForeignKey.java trunk/api/src/main/java/org/teiid/metadata/ProcedureParameter.java trunk/api/src/main/java/org/teiid/metadata/Schema.java trunk/api/src/main/java/org/teiid/translator/TranslatorException.java trunk/api/src/main/resources/org/ trunk/api/src/main/resources/org/teiid/ trunk/api/src/main/resources/org/teiid/connector/ trunk/api/src/test/java/org/ trunk/api/src/test/java/org/teiid/ trunk/api/src/test/java/org/teiid/connector/ trunk/build/kits/ trunk/build/kits/adminshell/ trunk/build/kits/jboss-container/ trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/ trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml trunk/cache-jbosscache/src/main/java/org/ trunk/cache-jbosscache/src/main/java/org/teiid/ trunk/cache-jbosscache/src/main/java/org/teiid/cache/ trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss/ trunk/cache-jbosscache/src/main/java/org/teiid/events/ trunk/cache-jbosscache/src/main/java/org/teiid/replication/ trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/ trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java trunk/cache-jbosscache/src/test/java/ trunk/client/src/main/java/org/teiid/client/SourceWarning.java trunk/client/src/main/java/org/teiid/client/util/ trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java trunk/client/src/main/java/org/teiid/jdbc/ trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java trunk/client/src/main/java/org/teiid/jdbc/TeiidStatement.java trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java trunk/client/src/main/java/org/teiid/net/socket/ trunk/client/src/main/java/org/teiid/net/socket/Handshake.java trunk/client/src/main/java/org/teiid/net/socket/Message.java trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization/ trunk/client/src/main/resources/org/ trunk/client/src/main/resources/org/teiid/ trunk/client/src/main/resources/org/teiid/jdbc/ trunk/client/src/main/resources/org/teiid/net/ trunk/client/src/test/java/org/teiid/client/TestRequestMessage.java trunk/client/src/test/java/org/teiid/client/plan/ trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java trunk/client/src/test/java/org/teiid/client/util/ trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java trunk/client/src/test/java/org/teiid/jdbc/ trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java trunk/client/src/test/java/org/teiid/jdbc/util/ trunk/client/src/test/java/org/teiid/net/ trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java trunk/client/src/test/java/org/teiid/net/socket/ trunk/client/src/test/resources/metamatrix.keystore trunk/client/src/test/resources/metamatrix.truststore trunk/common-core/src/main/java/org/ trunk/common-core/src/main/java/org/teiid/ trunk/common-core/src/main/java/org/teiid/core/ trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.java trunk/common-core/src/main/java/org/teiid/core/TeiidException.java trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java trunk/common-core/src/main/java/org/teiid/core/crypto/ trunk/common-core/src/main/java/org/teiid/core/types/ trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java trunk/common-core/src/main/java/org/teiid/core/types/NullType.java trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java trunk/common-core/src/main/java/org/teiid/core/types/Transform.java trunk/common-core/src/main/java/org/teiid/core/types/TransformationException.java trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java trunk/common-core/src/main/java/org/teiid/core/types/basic/ trunk/common-core/src/main/java/org/teiid/core/util/ trunk/common-core/src/main/java/org/teiid/core/util/ApplicationInfo.java trunk/common-core/src/test/java/org/ trunk/common-core/src/test/java/org/teiid/ trunk/common-core/src/test/java/org/teiid/core/ trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java trunk/common-core/src/test/java/org/teiid/core/crypto/ trunk/common-core/src/test/java/org/teiid/core/types/ trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java trunk/common-core/src/test/java/org/teiid/core/types/basic/ trunk/common-core/src/test/java/org/teiid/core/util/ trunk/common-core/src/test/java/org/teiid/query/ trunk/common-core/src/test/java/org/teiid/query/unittest/ trunk/common-core/src/test/java/org/teiid/query/unittest/TimestampUtil.java trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/ trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file/ trunk/connectors/connector-file/src/main/resources/org/ trunk/connectors/connector-file/src/main/resources/org/teiid/ trunk/connectors/connector-file/src/main/resources/org/teiid/resource/ trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/ trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/ trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties trunk/connectors/connector-file/src/test/java/org/ trunk/connectors/connector-file/src/test/java/org/teiid/ trunk/connectors/connector-file/src/test/java/org/teiid/resource/ trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/ trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/ trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/ trunk/connectors/connector-ws/src/main/resources/org/ trunk/connectors/connector-ws/src/main/resources/org/teiid/ trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/ trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/ trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/AliasModifier.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/EscapeSyntaxModifier.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCBaseExecution.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCPlugin.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCProcedureExecution.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCQueryExecution.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCUpdateExecution.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ModFunctionModifier.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SimpleJDBCExecutionFactory.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/TranslatedCommand.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/IngresExecutionFactory.java trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/LocateFunctionModifier.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/FakeConnection.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/access/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/mysql/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/postgresql/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sqlserver/ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/ trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/ trunk/documentation/reference/src/main/docbook/en-US/Reference.xml trunk/documentation/reference/src/main/docbook/en-US/content/translators.xml trunk/engine/src/main/java/org/teiid/api/ trunk/engine/src/main/java/org/teiid/api/exception/ trunk/engine/src/main/java/org/teiid/api/exception/query/ trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java trunk/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java trunk/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java trunk/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java trunk/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java trunk/engine/src/main/java/org/teiid/common/ trunk/engine/src/main/java/org/teiid/common/buffer/ trunk/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java trunk/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java trunk/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java trunk/engine/src/main/java/org/teiid/common/buffer/BatchManager.java trunk/engine/src/main/java/org/teiid/common/buffer/BlockedException.java trunk/engine/src/main/java/org/teiid/common/buffer/BufferManager.java trunk/engine/src/main/java/org/teiid/common/buffer/Cache.java trunk/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java trunk/engine/src/main/java/org/teiid/common/buffer/CacheKey.java trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java trunk/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java trunk/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java trunk/engine/src/main/java/org/teiid/common/buffer/SPage.java trunk/engine/src/main/java/org/teiid/common/buffer/STree.java trunk/engine/src/main/java/org/teiid/common/buffer/Serializer.java trunk/engine/src/main/java/org/teiid/common/buffer/StorageManager.java trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java trunk/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java trunk/engine/src/main/java/org/teiid/common/buffer/TupleSource.java trunk/engine/src/main/java/org/teiid/common/buffer/impl/ trunk/engine/src/main/java/org/teiid/core/ trunk/engine/src/main/java/org/teiid/core/id/ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesConverter.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/LobWorkItem.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/MetaDataProcessor.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/ trunk/engine/src/main/java/org/teiid/query/ trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java trunk/engine/src/main/java/org/teiid/query/analysis/ trunk/engine/src/main/java/org/teiid/query/eval/ trunk/engine/src/main/java/org/teiid/query/function/ trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java trunk/engine/src/main/java/org/teiid/query/function/aggregate/ trunk/engine/src/main/java/org/teiid/query/function/metadata/ trunk/engine/src/main/java/org/teiid/query/function/source/ trunk/engine/src/main/java/org/teiid/query/mapping/ trunk/engine/src/main/java/org/teiid/query/mapping/relational/ trunk/engine/src/main/java/org/teiid/query/mapping/xml/ trunk/engine/src/main/java/org/teiid/query/metadata/ trunk/engine/src/main/java/org/teiid/query/optimizer/ trunk/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java trunk/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities/ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree/ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanProcedures.java trunk/engine/src/main/java/org/teiid/query/optimizer/xml/ trunk/engine/src/main/java/org/teiid/query/parser/ trunk/engine/src/main/java/org/teiid/query/processor/ trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java trunk/engine/src/main/java/org/teiid/query/processor/proc/ trunk/engine/src/main/java/org/teiid/query/processor/relational/ trunk/engine/src/main/java/org/teiid/query/processor/relational/AccessNode.java trunk/engine/src/main/java/org/teiid/query/processor/relational/SubqueryAwareEvaluator.java trunk/engine/src/main/java/org/teiid/query/processor/xml/ trunk/engine/src/main/java/org/teiid/query/report/ trunk/engine/src/main/java/org/teiid/query/resolver/ trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java trunk/engine/src/main/java/org/teiid/query/resolver/command/ trunk/engine/src/main/java/org/teiid/query/resolver/util/ trunk/engine/src/main/java/org/teiid/query/rewriter/ trunk/engine/src/main/java/org/teiid/query/sql/ trunk/engine/src/main/java/org/teiid/query/sql/LanguageObject.java trunk/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java trunk/engine/src/main/java/org/teiid/query/sql/lang/ trunk/engine/src/main/java/org/teiid/query/sql/navigator/ trunk/engine/src/main/java/org/teiid/query/sql/proc/ trunk/engine/src/main/java/org/teiid/query/sql/symbol/ trunk/engine/src/main/java/org/teiid/query/sql/util/ trunk/engine/src/main/java/org/teiid/query/sql/visitor/ trunk/engine/src/main/java/org/teiid/query/tempdata/ trunk/engine/src/main/java/org/teiid/query/util/ trunk/engine/src/main/java/org/teiid/query/validator/ trunk/engine/src/main/java/org/teiid/query/xquery/ trunk/engine/src/main/java/org/teiid/query/xquery/saxon/ trunk/engine/src/main/java/org/teiid/vdb/ trunk/engine/src/main/java/org/teiid/vdb/runtime/ trunk/engine/src/test/java/org/teiid/cache/ trunk/engine/src/test/java/org/teiid/cache/TestDefaultCache.java trunk/engine/src/test/java/org/teiid/common/ trunk/engine/src/test/java/org/teiid/common/buffer/ trunk/engine/src/test/java/org/teiid/common/queue/ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCoreRequestHandling.java trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPWorkContext.java trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestMetaDataProcessor.java trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedPlanCache.java trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/ trunk/engine/src/test/java/org/teiid/query/ trunk/engine/src/test/java/org/teiid/query/analysis/ trunk/engine/src/test/java/org/teiid/query/function/ trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java trunk/engine/src/test/java/org/teiid/query/function/metadata/ trunk/engine/src/test/java/org/teiid/query/function/source/ trunk/engine/src/test/java/org/teiid/query/mapping/ trunk/engine/src/test/java/org/teiid/query/mapping/xml/ trunk/engine/src/test/java/org/teiid/query/metadata/ trunk/engine/src/test/java/org/teiid/query/optimizer/ trunk/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java trunk/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java trunk/engine/src/test/java/org/teiid/query/optimizer/capabilities/ trunk/engine/src/test/java/org/teiid/query/optimizer/proc/ trunk/engine/src/test/java/org/teiid/query/optimizer/relational/ trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java trunk/engine/src/test/java/org/teiid/query/optimizer/relational/plantree/ trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules/ trunk/engine/src/test/java/org/teiid/query/optimizer/xml/ trunk/engine/src/test/java/org/teiid/query/parser/ trunk/engine/src/test/java/org/teiid/query/processor/ trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java trunk/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java trunk/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java trunk/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java trunk/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java trunk/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java trunk/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java trunk/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java trunk/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java trunk/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java trunk/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java trunk/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java trunk/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java trunk/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java trunk/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java trunk/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java trunk/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java trunk/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java trunk/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java trunk/engine/src/test/java/org/teiid/query/processor/eval/ trunk/engine/src/test/java/org/teiid/query/processor/proc/ trunk/engine/src/test/java/org/teiid/query/processor/relational/ trunk/engine/src/test/java/org/teiid/query/processor/xml/ trunk/engine/src/test/java/org/teiid/query/resolver/ trunk/engine/src/test/java/org/teiid/query/rewriter/ trunk/engine/src/test/java/org/teiid/query/sql/ trunk/engine/src/test/java/org/teiid/query/sql/lang/ trunk/engine/src/test/java/org/teiid/query/sql/proc/ trunk/engine/src/test/java/org/teiid/query/sql/symbol/ trunk/engine/src/test/java/org/teiid/query/sql/util/ trunk/engine/src/test/java/org/teiid/query/sql/visitor/ trunk/engine/src/test/java/org/teiid/query/unittest/ trunk/engine/src/test/java/org/teiid/query/util/ trunk/engine/src/test/java/org/teiid/query/validator/ trunk/engine/src/test/java/org/teiid/vdb/ trunk/engine/src/test/java/org/teiid/vdb/runtime/ trunk/engine/src/test/resources/text/ trunk/engine/src/test/resources/text/TextParts_HeaderRow2.csv trunk/engine/src/test/resources/text/cdm_dos.txt trunk/engine/src/test/resources/text/cdm_dos_win.txt trunk/engine/src/test/resources/text/test-file.txt.csv trunk/metadata/src/main/resources/org/ trunk/metadata/src/main/resources/org/teiid/ trunk/metadata/src/main/resources/org/teiid/metadata/i18n.properties trunk/metadata/src/test/java/org/teiid/cdk/ trunk/metadata/src/test/java/org/teiid/cdk/api/ trunk/metadata/src/test/java/org/teiid/cdk/unittest/ trunk/metadata/src/test/java/org/teiid/core/ trunk/metadata/src/test/java/org/teiid/core/util/ trunk/metadata/src/test/java/org/teiid/internal/ trunk/metadata/src/test/java/org/teiid/internal/core/ trunk/metadata/src/test/java/org/teiid/internal/core/index/ trunk/runtime/src/main/java/org/teiid/deployers/VirtualDatabaseException.java trunk/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java trunk/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java trunk/runtime/src/main/java/org/teiid/transport/pg/ trunk/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java trunk/runtime/src/main/resources/org/teiid/transport/ trunk/runtime/src/test/java/org/teiid/dqp/ trunk/runtime/src/test/java/org/teiid/dqp/service/ trunk/runtime/src/test/java/org/teiid/dqp/service/buffer/ trunk/runtime/src/test/resources/dqp/config/ trunk/runtime/src/test/resources/groups.properties trunk/runtime/src/test/resources/permissions.xml trunk/runtime/src/test/resources/permissions2.xml trunk/runtime/src/test/resources/users.properties trunk/test-integration/common/src/test/java/org/teiid/cdk/ trunk/test-integration/common/src/test/java/org/teiid/cdk/api/ trunk/test-integration/common/src/test/java/org/teiid/connector/language/ trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/ trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestMetadataObject.java trunk/test-integration/common/src/test/java/org/teiid/connector/visitor/util/ trunk/test-integration/common/src/test/java/org/teiid/dqp/ trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/ trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process/ trunk/test-integration/common/src/test/java/org/teiid/transport/ trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/ trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/ trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected trunk/test-integration/db/src/main/java/org/teiid/internal/ trunk/test-integration/db/src/main/java/org/teiid/internal/core/ trunk/test-integration/db/src/main/java/org/teiid/internal/core/xml/ trunk/test-integration/db/src/test/java/com/ trunk/test-integration/db/src/test/java/org/teiid/internal/ trunk/test-integration/db/src/test/java/org/teiid/internal/core/ Log: forward merging 7.4.1 Property changes on: trunk ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x:3535-3555 Property changes on: trunk/adminshell/src/main/java/groovy ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/groovy:3535-3555* Property changes on: trunk/adminshell/src/main/java/groovy/sql ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/groovy/sql:3535-3555* Property changes on: trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3535-3555 Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell:3535-3555* Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3535-3555 Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:2901-2940 + /branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:2901-2940 /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3535-3555 Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3535-3555 Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3535-3555 Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3535-3555 Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:3535-3555 Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3535-3555 Property changes on: trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3535-3555 Property changes on: trunk/adminshell/src/main/resources/org ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/resources/org:3535-3555* Property changes on: trunk/adminshell/src/main/resources/org/codehaus ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/resources/org/codehaus:3535-3555* Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groovy ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy:3535-3555* Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groovy/tools ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools:3535-3555* Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3535-3555* Property changes on: trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3535-3555 Property changes on: trunk/adminshell/src/main/resources/org/teiid ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/resources/org/teiid:3535-3555* Property changes on: trunk/adminshell/src/main/resources/org/teiid/adminshell ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell:3535-3555* Property changes on: trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3535-3555 Property changes on: trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3535-3555 Property changes on: trunk/adminshell/src/test/java/org ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/test/java/org:3535-3555* Property changes on: trunk/adminshell/src/test/java/org/teiid ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/test/java/org/teiid:3535-3555* Property changes on: trunk/adminshell/src/test/java/org/teiid/adminshell ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell:3535-3555* Property changes on: trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3535-3555 Property changes on: trunk/adminshell/src/test/resources/foo ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/test/resources/foo:3535-3555* Property changes on: trunk/adminshell/src/test/resources/foo/bar.txt ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/test/resources/foo/bar.txt:3535-3555 Property changes on: trunk/api/src/main/java/org/teiid/connector/DataPlugin.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/api/src/main/java/org/teiid/events ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/api/src/main/java/org/teiid/events:3535-3555* Property changes on: trunk/api/src/main/java/org/teiid/events/EventDistributor.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributor.java:3340-3349 + /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributor.java:3340-3349,3535-3555 Property changes on: trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3535-3555 Property changes on: trunk/api/src/main/java/org/teiid/language/visitor ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/api/src/main/java/org/teiid/logging/JavaLogger.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/api/src/main/java/org/teiid/metadata ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/api/src/main/java/org/teiid/metadata/AbstractMetadataRecord.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/api/src/main/java/org/teiid/metadata/Column.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/api/src/main/java/org/teiid/metadata/ColumnSet.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/api/src/main/java/org/teiid/metadata/Datatype.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/api/src/main/java/org/teiid/metadata/ForeignKey.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/api/src/main/java/org/teiid/metadata/ProcedureParameter.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/api/src/main/java/org/teiid/metadata/Schema.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/api/src/main/java/org/teiid/translator/TranslatorException.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/api/src/main/resources/org ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/api/src/main/resources/org/teiid ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/api/src/main/resources/org/teiid/connector ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/api/src/test/java/org ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/api/src/test/java/org/teiid ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/api/src/test/java/org/teiid/connector ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/build/kits ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/build/kits:3535-3555* Property changes on: trunk/build/kits/adminshell ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/build/kits/adminshell:3535-3555 Property changes on: trunk/build/kits/jboss-container ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/build/kits/jboss-container:3535-3555 Property changes on: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather:3535-3555* Property changes on: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/README.txt:3535-3555 Property changes on: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-ds.xml:3535-3555 Property changes on: trunk/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/build/kits/jboss-container/teiid-examples/dynamicvdb-ws-weather/weather-vdb.xml:3535-3555 Property changes on: trunk/cache-jbosscache/src/main/java/org ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/main/java/org:3535-3555* Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid:3535-3555* Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/cache ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/cache:3535-3555* Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/cache/jboss:3535-3555 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/events ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/events:3535-3555* Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication:3535-3555* Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss:3535-3555* Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3535-3555 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3535-3555 Property changes on: trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3535-3555 Property changes on: trunk/cache-jbosscache/src/test/java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/test/java:3535-3555* Property changes on: trunk/client/src/main/java/org/teiid/client/SourceWarning.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/client/src/main/java/org/teiid/client/util ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/client/util:3535-3555* Property changes on: trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc:3535-3555* Property changes on: trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3149-3217 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3149-3217,3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3281-3325 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3281-3325,3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3149-3217 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3149-3217,3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3149-3217,3281-3325 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3149-3217,3281-3325,3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3281-3325 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3281-3325,3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3220-3275 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3220-3275,3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3149-3217,3220-3275,3281-3325,3355-3365 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3149-3217,3220-3275,3281-3325,3355-3365,3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3220-3275 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3220-3275,3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidStatement.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/net/socket ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket:3535-3555* Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Handshake.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Handshake.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/Message.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Message.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3149-3217 + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3149-3217,3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3535-3555 Property changes on: trunk/client/src/main/java/org/teiid/netty/handler/codec/serialization ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/client/src/main/resources/org ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/resources/org:3535-3555* Property changes on: trunk/client/src/main/resources/org/teiid ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/resources/org/teiid:3535-3555* Property changes on: trunk/client/src/main/resources/org/teiid/jdbc ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/resources/org/teiid/jdbc:3535-3555 Property changes on: trunk/client/src/main/resources/org/teiid/net ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/resources/org/teiid/net:3535-3555* Property changes on: trunk/client/src/test/java/org/teiid/client/TestRequestMessage.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/client/src/test/java/org/teiid/client/plan ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/client/plan:3535-3555* Property changes on: trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/client/util ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/client/util:3535-3555* Property changes on: trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/jdbc ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc:3535-3555* Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:3281-3325 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:3281-3325,3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3220-3275 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3220-3275,3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3149-3217,3220-3275 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3149-3217,3220-3275,3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3149-3217,3281-3325 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3149-3217,3281-3325,3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/jdbc/util ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/util:3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/net ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/net:3535-3555* Property changes on: trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3535-3555 Property changes on: trunk/client/src/test/java/org/teiid/net/socket ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/net/socket:3535-3555 Property changes on: trunk/client/src/test/resources/metamatrix.keystore ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/client/src/test/resources/metamatrix.truststore ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/common-core/src/main/java/org ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org:3535-3555* Property changes on: trunk/common-core/src/main/java/org/teiid ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid:3535-3555* Property changes on: trunk/common-core/src/main/java/org/teiid/core ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core:3535-3555* Property changes on: trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidException.java:3220-3275 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidException.java:3220-3275,3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3220-3275 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3220-3275,3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/crypto ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/crypto:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types:3535-3555* Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/NullType.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/NullType.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/Transform.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Transform.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/TransformationException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/types/basic ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/basic:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/util ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/util:3535-3555 Property changes on: trunk/common-core/src/main/java/org/teiid/core/util/ApplicationInfo.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/common-core/src/test/java/org ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org:3535-3555* Property changes on: trunk/common-core/src/test/java/org/teiid ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid:3535-3555* Property changes on: trunk/common-core/src/test/java/org/teiid/core ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core:3535-3555* Property changes on: trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3535-3555 Property changes on: trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3220-3275 + /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3220-3275,3535-3555 Property changes on: trunk/common-core/src/test/java/org/teiid/core/crypto ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/crypto:3535-3555 Property changes on: trunk/common-core/src/test/java/org/teiid/core/types ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types:3535-3555* Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3535-3555 Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3535-3555 Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3535-3555 Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3535-3555 Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3535-3555 Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3535-3555 Property changes on: trunk/common-core/src/test/java/org/teiid/core/types/basic ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/basic:3535-3555 Property changes on: trunk/common-core/src/test/java/org/teiid/core/util ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/util:3535-3555 Property changes on: trunk/common-core/src/test/java/org/teiid/query ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/query:3535-3555* Property changes on: trunk/common-core/src/test/java/org/teiid/query/unittest ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/query/unittest:3535-3555 Property changes on: trunk/common-core/src/test/java/org/teiid/query/unittest/TimestampUtil.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3535-3555* Property changes on: trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3535-3555 Property changes on: trunk/connectors/connector-file/src/main/resources/org ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/main/resources/org:3535-3555* Property changes on: trunk/connectors/connector-file/src/main/resources/org/teiid ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid:3535-3555* Property changes on: trunk/connectors/connector-file/src/main/resources/org/teiid/resource ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource:3535-3555* Property changes on: trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3535-3555* Property changes on: trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3535-3555* Property changes on: trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3535-3555 Property changes on: trunk/connectors/connector-file/src/test/java/org ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/test/java/org:3535-3555* Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid:3535-3555* Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid/resource ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource:3535-3555* Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3535-3555* Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3535-3555* Property changes on: trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3535-3555 Property changes on: trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3535-3555* Property changes on: trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3535-3555 Property changes on: trunk/connectors/connector-ws/src/main/resources/org ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-ws/src/main/resources/org:3535-3555* Property changes on: trunk/connectors/connector-ws/src/main/resources/org/teiid ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid:3535-3555* Property changes on: trunk/connectors/connector-ws/src/main/resources/org/teiid/resource ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource:3535-3555* Property changes on: trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3535-3555* Property changes on: trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3535-3555* Property changes on: trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3535-3555 Property changes on: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/AliasModifier.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/EscapeSyntaxModifier.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java ___________________________________________________________________ Modified: svn:mergeinfo - + /branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3535-3555 Property changes on: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCBaseExecution.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCPlugin.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCProcedureExecution.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCQueryExecution.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCUpdateExecution.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ModFunctionModifier.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SimpleJDBCExecutionFactory.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/TranslatedCommand.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/IngresExecutionFactory.java =================================================================== --- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/IngresExecutionFactory.java 2011-10-18 10:45:34 UTC (rev 3556) +++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/IngresExecutionFactory.java 2011-10-18 10:52:08 UTC (rev 3557) @@ -77,7 +77,7 @@ registerFunctionModifier(SourceSystemFunctions.RAND, new AliasModifier("random")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.UCASE, new AliasModifier("uppercase")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.DAYOFMONTH, new AliasModifier("day")); //$NON-NLS-1$ - registerFunctionModifier(SourceSystemFunctions.LOCATE, new LocateFunctionModifier(getLanguageFactory())); + registerFunctionModifier(SourceSystemFunctions.LOCATE, new LocateFunctionModifier()); addPushDownFunction(INGRES, "bit_add", INTEGER, INTEGER, INTEGER); //$NON-NLS-1$ addPushDownFunction(INGRES, "bit_length", INTEGER, INTEGER); //$NON-NLS-1$ Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/LocateFunctionModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/LocateFunctionModifier.java 2011-10-18 10:45:34 UTC (rev 3556) +++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/LocateFunctionModifier.java 2011-10-18 10:52:08 UTC (rev 3557) @@ -21,28 +21,24 @@ */ package org.teiid.translator.jdbc.ingres; -import java.util.Arrays; import java.util.List; import org.teiid.language.Expression; import org.teiid.language.Function; -import org.teiid.language.LanguageFactory; -import org.teiid.translator.TypeFacility; import org.teiid.translator.jdbc.FunctionModifier; public class LocateFunctionModifier extends FunctionModifier { - private LanguageFactory languageFactory; - - public LocateFunctionModifier(LanguageFactory languageFactory) { - this.languageFactory = languageFactory; + public LocateFunctionModifier() { } + @Override public List<?> translate(Function function) { Expression a = function.getParameters().get(0); Expression b = function.getParameters().get(1); - - return Arrays.asList(languageFactory.createFunction("locate", new Expression[] {b, a}, TypeFacility.RUNTIME_TYPES.INTEGER)); //$NON-NLS-1$ + function.getParameters().set(0, b); + function.getParameters().set(1, a); + return null; } } Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/FakeConnection.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/access ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/db2 ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/derby ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3535-3555* Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3535-3555 Copied: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java (from rev 3555, branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java) =================================================================== --- trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java (rev 0) +++ trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java 2011-10-18 10:52:08 UTC (rev 3557) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.translator.jdbc.ingres; + +import org.junit.BeforeClass; +import org.junit.Test; +import org.teiid.translator.TranslatorException; +import org.teiid.translator.jdbc.TranslationHelper; + +public class TestIngresExecutionFactory { + + private static IngresExecutionFactory TRANSLATOR; + + @BeforeClass + public static void setUp() throws TranslatorException { + TRANSLATOR = new IngresExecutionFactory(); + TRANSLATOR.start(); + } + + @Test public void testLocate() throws Exception { + String input = "SELECT INTKEY FROM BQT1.SmallA WHERE LOCATE(1, INTKEY) = 1 ORDER BY INTKEY"; //$NON-NLS-1$ + String output = "SELECT SmallA.IntKey FROM SmallA WHERE locate(cast(SmallA.IntKey AS varchar(4000)), '1') = 1 ORDER BY SmallA.IntKey"; //$NON-NLS-1$ + + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); + } + +} Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:mergeinfo + /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3535-3555 Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/mysql ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/postgresql ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sqlserver ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/connectors/translator-ldap/src/main/java/org/teiid/translator ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/translator:3535-3555* Property changes on: trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3535-3555 Property changes on: trunk/documentation/reference/src/main/docbook/en-US/Reference.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/documentation/reference/src/main/docbook/en-US/content/translators.xml =================================================================== --- trunk/documentation/reference/src/main/docbook/en-US/content/translators.xml 2011-10-18 10:45:34 UTC (rev 3556) +++ trunk/documentation/reference/src/main/docbook/en-US/content/translators.xml 2011-10-18 10:52:08 UTC (rev 3557) @@ -239,6 +239,11 @@ </listitem> <listitem> <para> + <emphasis>access</emphasis> - for use with Microsoft Access 2003 or later. + </para> + </listitem> + <listitem> + <para> <emphasis>db2</emphasis> - for use with DB2 8 or later. </para> </listitem> Property changes on: trunk/engine/src/main/java/org/teiid/api ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/api:3535-3555* Property changes on: trunk/engine/src/main/java/org/teiid/api/exception ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception:3535-3555* Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query:3535-3555* Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common:3535-3555* Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer:3535-3555* Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/BatchManager.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BatchManager.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/BlockedException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3149-3217 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BlockedException.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/BufferManager.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3220-3275 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/BufferManager.java:3220-3275,3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Cache.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Cache.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/CacheKey.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/CacheKey.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/FileStore.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStore.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/SPage.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/SPage.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/STree.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/STree.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/Serializer.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/Serializer.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/StorageManager.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/StorageManager.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3220-3275 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java:3220-3275,3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3149-3217,3220-3275,3340-3349 + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java:3149-3217,3220-3275,3340-3349,3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/TupleSource.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/TupleSource.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/common/buffer/impl ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/common/buffer/impl:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/core ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/core:3535-3555* Property changes on: trunk/engine/src/main/java/org/teiid/core/id ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/core/id:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesConverter.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java 2011-10-18 10:45:34 UTC (rev 3556) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java 2011-10-18 10:52:08 UTC (rev 3557) @@ -29,7 +29,9 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; +import java.util.Map; import java.util.Set; +import java.util.TreeMap; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; @@ -48,6 +50,39 @@ private static final long serialVersionUID = -6389893410233192977L; + public enum Version { + SEVEN_1("7.1"), //$NON-NLS-1$ + SEVEN_2("7.2"), //$NON-NLS-1$ + SEVEN_3("7.3"), //$NON-NLS-1$ + SEVEN_4("7.4"); //$NON-NLS-1$ + + private String string; + + private Version(String string) { + this.string = string; + } + + @Override + public String toString() { + return string; + } + + private static TreeMap<String, Version> versionMap = new TreeMap<String, Version>(); + static { + for (Version v : Version.values()) { + versionMap.put(v.toString(), v); + } + } + + public static Version getVersion(String version) { + Map.Entry<String, Version> v = versionMap.floorEntry(version); + if (v == null) { + return SEVEN_1; + } + return v.getValue(); + } + } + private static ThreadLocal<DQPWorkContext> CONTEXTS = new ThreadLocal<DQPWorkContext>() { protected DQPWorkContext initialValue() { return new DQPWorkContext(); @@ -72,6 +107,7 @@ private SecurityHelper securityHelper; private HashMap<String, DataPolicy> policies; private boolean useCallingThread; + private Version clientVersion = Version.SEVEN_4; public DQPWorkContext() { } @@ -257,5 +293,13 @@ } } return roles; - } + } + + public Version getClientVersion() { + return clientVersion; + } + + public void setClientVersion(Version clientVersion) { + this.clientVersion = clientVersion; + } } Property changes on: trunk/engine/src/main/java/org/teiid/dqp/internal/process/LobWorkItem.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/MetaDataProcessor.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/MetaDataProcessor.java 2011-10-18 10:45:34 UTC (rev 3556) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/MetaDataProcessor.java 2011-10-18 10:52:08 UTC (rev 3557) @@ -39,6 +39,7 @@ import org.teiid.core.types.DataTypeManager; import org.teiid.core.types.XMLType; import org.teiid.dqp.internal.process.DQPCore.ClientState; +import org.teiid.dqp.internal.process.DQPWorkContext.Version; import org.teiid.dqp.internal.process.SessionAwareCache.CacheID; import org.teiid.dqp.internal.process.multisource.MultiSourceMetadataWrapper; import org.teiid.dqp.message.RequestID; @@ -78,6 +79,8 @@ private int vdbVersion; private RequestID requestID; + private boolean labelAsName; + public MetaDataProcessor(DQPCore requestManager, SessionAwareCache<PreparedPlan> planCache, String vdbName, int vdbVersion) { this.requestManager = requestManager; this.planCache = planCache; @@ -98,6 +101,7 @@ this.requestID = requestId; this.metadata = workContext.getVDB().getAttachment(QueryMetadataInterface.class); + this.labelAsName = workContext.getClientVersion().compareTo(Version.SEVEN_3) <= 0; // If multi-source, use the multi-source wrapper as well Set<String> multiModels = workContext.getVDB().getMultiSourceModelNames(); @@ -246,7 +250,7 @@ Class<?> type = symbol.getType(); column.put(ResultsMetadataConstants.DATA_TYPE, DataTypeManager.getDataTypeName(type)); column.put(ResultsMetadataConstants.ELEMENT_LABEL, label); - column.put(ResultsMetadataConstants.ELEMENT_NAME, metadata.getName(elementID)); + column.put(ResultsMetadataConstants.ELEMENT_NAME, labelAsName?label:metadata.getName(elementID)); GroupSymbol group = symbol.getGroupSymbol(); if(group == null || group.getMetadataID() == null) { @@ -399,7 +403,7 @@ column.put(ResultsMetadataConstants.VIRTUAL_DATABASE_NAME, vdbName); column.put(ResultsMetadataConstants.VIRTUAL_DATABASE_VERSION, vdbVersion); column.put(ResultsMetadataConstants.GROUP_NAME, tableName); - column.put(ResultsMetadataConstants.ELEMENT_NAME, columnName); + column.put(ResultsMetadataConstants.ELEMENT_NAME, labelAsName?columnLabel:columnName); column.put(ResultsMetadataConstants.ELEMENT_LABEL, columnLabel); column.put(ResultsMetadataConstants.AUTO_INCREMENTING, Boolean.FALSE); column.put(ResultsMetadataConstants.CASE_SENSITIVE, Boolean.FALSE); Property changes on: trunk/engine/src/main/java/org/teiid/dqp/internal/process/MetaDataProcessor.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/engine/src/main/java/org/teiid/query ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query:3535-3555* Property changes on: trunk/engine/src/main/java/org/teiid/query/ObjectReplicator.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/ObjectReplicator.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/QueryPlugin.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/QueryPlugin.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/ReplicatedObject.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/ReplicatedObject.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/analysis ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/analysis:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/eval ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/eval:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/function ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/function:3535-3555* Property changes on: trunk/engine/src/main/java/org/teiid/query/function/CharsetUtils.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/CharsetUtils.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3149-3171 + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java:3149-3171,3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionForm.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionForm.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionMethods.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionMethods.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/FunctionTree.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3149-3171 + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/FunctionTree.java:3149-3171,3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/UDFSource.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/UDFSource.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/aggregate ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/aggregate:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/metadata ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/metadata:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/function/source ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/function/source:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/mapping ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping:3535-3555* Property changes on: trunk/engine/src/main/java/org/teiid/query/mapping/relational ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/relational:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/mapping/xml ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/mapping/xml:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/metadata ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/metadata:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer:3535-3555* Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/capabilities ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/capabilities:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational:3535-3555* Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3149-3217 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3149-3217 + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules:3535-3555 Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanProcedures.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanProcedures.java 2011-10-18 10:45:34 UTC (rev 3556) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanProcedures.java 2011-10-18 10:52:08 UTC (rev 3557) @@ -134,10 +134,12 @@ Criteria crit = Criteria.combineCriteria(conjuncts); - accessNode.setProperty(NodeConstants.Info.PROCEDURE_CRITERIA, crit); - accessNode.setProperty(NodeConstants.Info.PROCEDURE_INPUTS, inputReferences); - accessNode.setProperty(NodeConstants.Info.PROCEDURE_DEFAULTS, defaults); - accessNode.setProperty(NodeConstants.Info.IS_DEPENDENT_SET, Boolean.TRUE); + if (crit != null) { + accessNode.setProperty(NodeConstants.Info.PROCEDURE_CRITERIA, crit); + accessNode.setProperty(NodeConstants.Info.PROCEDURE_INPUTS, inputReferences); + accessNode.setProperty(NodeConstants.Info.PROCEDURE_DEFAULTS, defaults); + accessNode.setProperty(NodeConstants.Info.IS_DEPENDENT_SET, Boolean.TRUE); + } } return plan; Property changes on: trunk/engine/src/main/java/org/teiid/query/optimizer/xml ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/parser ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/parser:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor:3535-3555* Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/BatchCollector.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchCollector.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/BatchIterator.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchIterator.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/DdlPlan.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/DdlPlan.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3220-3275,3340-3349 + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java:3220-3275,3340-3349,3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/proc ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/proc:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/relational ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational:3535-3555 Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/AccessNode.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/relational/AccessNode.java 2011-10-18 10:45:34 UTC (rev 3556) +++ trunk/engine/src/main/java/org/teiid/query/processor/relational/AccessNode.java 2011-10-18 10:52:08 UTC (rev 3557) @@ -328,6 +328,15 @@ terminateBatches(); return pullBatch(); } + + @Override + protected void addBatchRow(List row) { + if (this.getOutputElements().isEmpty()) { + //a dummy column was added to the query, just remove it now + row = Collections.emptyList(); + } + super.addBatchRow(row); + } private void registerNext() throws TeiidComponentException, TeiidProcessingException { Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/relational/SubqueryAwareEvaluator.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/engine/src/main/java/org/teiid/query/processor/xml ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/processor/xml:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/report ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/report:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver:3535-3555* Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/command ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/command:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/resolver/util ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/resolver/util:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/rewriter ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/rewriter:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/sql ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql:3535-3555* Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/LanguageObject.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3149-3217 + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageObject.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/lang ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/lang:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/navigator ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/navigator:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/proc ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/proc:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/symbol ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/symbol:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/util ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/util:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/sql/visitor ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/sql/visitor:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/tempdata ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/tempdata:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/util ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/util:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/validator ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/validator:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/query/xquery ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery:3535-3555* Property changes on: trunk/engine/src/main/java/org/teiid/query/xquery/saxon ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/query/xquery/saxon:3535-3555 Property changes on: trunk/engine/src/main/java/org/teiid/vdb ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/vdb:3535-3555* Property changes on: trunk/engine/src/main/java/org/teiid/vdb/runtime ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/main/java/org/teiid/vdb/runtime:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/cache ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/cache:3535-3555* Property changes on: trunk/engine/src/test/java/org/teiid/cache/TestDefaultCache.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/cache/TestDefaultCache.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/common ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/common:3535-3555* Property changes on: trunk/engine/src/test/java/org/teiid/common/buffer ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/common/buffer:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/common/queue ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/common/queue:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCoreRequestHandling.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPWorkContext.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestMetaDataProcessor.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestMetaDataProcessor.java 2011-10-18 10:45:34 UTC (rev 3556) +++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestMetaDataProcessor.java 2011-10-18 10:52:08 UTC (rev 3557) @@ -28,6 +28,7 @@ import java.util.Map; import java.util.Set; +import org.junit.Before; import org.junit.Test; import org.teiid.adminapi.impl.ModelMetaData; import org.teiid.adminapi.impl.VDBMetaData; @@ -36,6 +37,7 @@ import org.teiid.client.metadata.ResultsMetadataConstants; import org.teiid.core.types.DataTypeManager; import org.teiid.dqp.internal.datamgr.FakeTransactionService; +import org.teiid.dqp.internal.process.DQPWorkContext.Version; import org.teiid.dqp.message.RequestID; import org.teiid.metadata.Column; import org.teiid.metadata.MetadataStore; @@ -54,6 +56,12 @@ */ @SuppressWarnings({"nls", "unchecked"}) public class TestMetaDataProcessor { + + private boolean asLegacyClient; + + @Before public void setup() { + asLegacyClient = false; + } public Map[] helpGetMetadata(String sql, QueryMetadataInterface metadata, VDBMetaData vdb) throws Exception { // Prepare sql @@ -66,6 +74,9 @@ requestMgr.setTransactionService(new FakeTransactionService()); DQPWorkContext workContext = RealMetadataFactory.buildWorkContext(metadata, vdb); + if (asLegacyClient) { + workContext.setClientVersion(Version.SEVEN_3); + } // Initialize components RequestID requestID = workContext.getRequestID(1); @@ -81,7 +92,18 @@ Map[] metadata = helpGetMetadata("SELECT e1 FROM pm1.g1", RealMetadataFactory.example1Cached(), RealMetadataFactory.example1VDB()); //$NON-NLS-1$ assertNotNull(metadata); assertEquals(1, metadata.length); + assertEquals("e1", metadata[0].get(ResultsMetadataConstants.ELEMENT_NAME)); //$NON-NLS-1$ + assertEquals("e1", metadata[0].get(ResultsMetadataConstants.ELEMENT_LABEL)); //$NON-NLS-1$ } + + @Test public void testLegacyClient() throws Exception { + asLegacyClient = true; + Map[] metadata = helpGetMetadata("SELECT e1 as e2 FROM pm1.g1", RealMetadataFactory.example1Cached(), RealMetadataFactory.example1VDB()); //$NON-NLS-1$ + assertNotNull(metadata); + assertEquals(1, metadata.length); + assertEquals("e2", metadata[0].get(ResultsMetadataConstants.ELEMENT_NAME)); //$NON-NLS-1$ + assertEquals("e2", metadata[0].get(ResultsMetadataConstants.ELEMENT_LABEL)); //$NON-NLS-1$ + } @Test public void testSimpleUpdate() throws Exception { Map[] metadata = helpGetMetadata("INSERT INTO pm1.g1 (e1) VALUES ('x')", RealMetadataFactory.example1Cached(), RealMetadataFactory.example1VDB()); //$NON-NLS-1$ Property changes on: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedPlanCache.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/engine/src/test/java/org/teiid/query ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query:3535-3555* Property changes on: trunk/engine/src/test/java/org/teiid/query/analysis ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/analysis:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/function ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/function:3535-3555* Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestFunction.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:3281-3325 + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunction.java:3281-3325,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/function/metadata ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/metadata:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/function/source ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/function/source:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/mapping ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping:3535-3555* Property changes on: trunk/engine/src/test/java/org/teiid/query/mapping/xml ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/mapping/xml:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/metadata ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/metadata:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer:3535-3555* Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3149-3217,3220-3275 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java:3149-3217,3220-3275,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3149-3217,3220-3275 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java:3149-3217,3220-3275,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3149-3217,3220-3275 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java:3149-3217,3220-3275,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3149-3217,3220-3275 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java:3149-3217,3220-3275,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3149-3217,3281-3325 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java:3149-3217,3281-3325,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/capabilities ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/capabilities:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/proc ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/proc:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational:3535-3555* Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/plantree ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/plantree:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/relational/rules ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/relational/rules:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/optimizer/xml ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/optimizer/xml:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/parser ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/parser:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor:3535-3555* Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3149-3217,3220-3275 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java:3149-3217,3220-3275,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java:3149-3217,3535-3555 Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java 2011-10-18 10:45:34 UTC (rev 3556) +++ trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java 2011-10-18 10:52:08 UTC (rev 3557) @@ -753,4 +753,16 @@ TestProcessor.helpProcess(plan, dataManager, expected); } + @Test public void testProcRelationalWithNoInputs1() { + String sql = "select e1 from pm1.sp1"; //$NON-NLS-1$ + + List<?>[] expected = new List[] { + Arrays.asList("c") //$NON-NLS-1$ + }; + HardcodedDataManager dataManager = new HardcodedDataManager(); + dataManager.addData("EXEC pm1.sp1()", expected); + ProcessorPlan plan = TestProcessor.helpGetPlan(sql, RealMetadataFactory.createTransformationMetadata(RealMetadataFactory.example1Store(), "e1")); + TestProcessor.helpProcess(plan, dataManager, expected); + } + } Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java:3149-3217,3535-3555 Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2011-10-18 10:45:34 UTC (rev 3556) +++ trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2011-10-18 10:52:08 UTC (rev 3557) @@ -7608,5 +7608,17 @@ helpProcess(plan, dataManager, expected); } + @Test public void testCrossJoinReduction() throws Exception { + String sql = "select x.e2 from pm1.g2 y, pm1.g1 x where x.e1 = y.e1 and x.e1 = 'a'"; //$NON-NLS-1$ + + HardcodedDataManager dataManager = new HardcodedDataManager(); + dataManager.addData("SELECT g_0.e2 FROM pm1.g1 AS g_0 WHERE g_0.e1 = 'a'", new List[] {Arrays.asList(3)}); + dataManager.addData("SELECT 1 FROM pm1.g2 AS g_0 WHERE g_0.e1 = 'a'", new List[] {Arrays.asList(1)}); + ProcessorPlan plan = helpGetPlan(sql, RealMetadataFactory.example1Cached(), TestOptimizer.getGenericFinder(false)); + + helpProcess(plan, dataManager, new List[] { + Arrays.asList(3)}); + } + private static final boolean DEBUG = false; } Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestProcessor.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3149-3217,3220-3275 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java:3149-3217,3220-3275,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3149-3217,3220-3275,3281-3325,3340-3349 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java:3149-3217,3220-3275,3281-3325,3340-3349,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestTextTable.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTextTable.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3149-3217 + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/eval ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/eval:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/proc ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/proc:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/relational ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/relational:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/processor/xml ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/processor/xml:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/resolver ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/resolver:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/rewriter ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/rewriter:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/sql ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/sql:3535-3555* Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/lang ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/lang:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/proc ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/proc:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/symbol ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/symbol:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/util ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/util:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/sql/visitor ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/sql/visitor:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/unittest ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/unittest:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/util ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/util:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/query/validator ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/query/validator:3535-3555 Property changes on: trunk/engine/src/test/java/org/teiid/vdb ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/vdb:3535-3555* Property changes on: trunk/engine/src/test/java/org/teiid/vdb/runtime ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/java/org/teiid/vdb/runtime:3535-3555 Property changes on: trunk/engine/src/test/resources/text ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/resources/text:3535-3555* Property changes on: trunk/engine/src/test/resources/text/TextParts_HeaderRow2.csv ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/resources/text/TextParts_HeaderRow2.csv:3535-3555 Property changes on: trunk/engine/src/test/resources/text/cdm_dos.txt ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/resources/text/cdm_dos.txt:3535-3555 Property changes on: trunk/engine/src/test/resources/text/cdm_dos_win.txt ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/engine/src/test/resources/text/cdm_dos_win.txt:3149-3217 + /branches/7.4.x/engine/src/test/resources/text/cdm_dos_win.txt:3149-3217,3535-3555 Property changes on: trunk/engine/src/test/resources/text/test-file.txt.csv ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/engine/src/test/resources/text/test-file.txt.csv:3535-3555 Property changes on: trunk/metadata/src/main/resources/org ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/metadata/src/main/resources/org/teiid ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/metadata/src/main/resources/org/teiid/metadata/i18n.properties ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/metadata/src/test/java/org/teiid/cdk ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/metadata/src/test/java/org/teiid/cdk:3535-3555* Property changes on: trunk/metadata/src/test/java/org/teiid/cdk/api ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/api:3535-3555 Property changes on: trunk/metadata/src/test/java/org/teiid/cdk/unittest ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/metadata/src/test/java/org/teiid/cdk/unittest:3535-3555 Property changes on: trunk/metadata/src/test/java/org/teiid/core ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/metadata/src/test/java/org/teiid/core:3535-3555* Property changes on: trunk/metadata/src/test/java/org/teiid/core/util ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/metadata/src/test/java/org/teiid/core/util:3535-3555 Property changes on: trunk/metadata/src/test/java/org/teiid/internal ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/metadata/src/test/java/org/teiid/internal:3535-3555* Property changes on: trunk/metadata/src/test/java/org/teiid/internal/core ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core:3535-3555* Property changes on: trunk/metadata/src/test/java/org/teiid/internal/core/index ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/metadata/src/test/java/org/teiid/internal/core/index:3535-3555 Property changes on: trunk/runtime/src/main/java/org/teiid/deployers/VirtualDatabaseException.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java ___________________________________________________________________ Modified: svn:mergeinfo - + /branches/7.4.x/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java:3535-3555 Modified: trunk/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java 2011-10-18 10:45:34 UTC (rev 3556) +++ trunk/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java 2011-10-18 10:52:08 UTC (rev 3557) @@ -33,6 +33,7 @@ import org.teiid.core.crypto.DhKeyGenerator; import org.teiid.core.crypto.NullCryptor; import org.teiid.dqp.internal.process.DQPWorkContext; +import org.teiid.dqp.internal.process.DQPWorkContext.Version; import org.teiid.logging.LogConstants; import org.teiid.logging.LogManager; import org.teiid.logging.MessageLevel; @@ -125,6 +126,8 @@ } private void receivedHahdshake(Handshake handshake) throws CommunicationException { + String clientVersion = handshake.getVersion(); + this.workContext.setClientVersion(Version.getVersion(clientVersion)); if (usingEncryption) { byte[] returnedPublicKey = handshake.getPublicKey(); Property changes on: trunk/runtime/src/main/java/org/teiid/transport/pg ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg:3535-3555* Property changes on: trunk/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java:3535-3555 Property changes on: trunk/runtime/src/main/resources/org/teiid/transport ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/runtime/src/main/resources/org/teiid/transport:3535-3555* Property changes on: trunk/runtime/src/test/java/org/teiid/dqp ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/runtime/src/test/java/org/teiid/dqp:3535-3555* Property changes on: trunk/runtime/src/test/java/org/teiid/dqp/service ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service:3535-3555* Property changes on: trunk/runtime/src/test/java/org/teiid/dqp/service/buffer ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/runtime/src/test/java/org/teiid/dqp/service/buffer:3535-3555 Property changes on: trunk/runtime/src/test/resources/dqp/config ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/runtime/src/test/resources/groups.properties ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/runtime/src/test/resources/permissions.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/runtime/src/test/resources/permissions2.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/runtime/src/test/resources/users.properties ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/test-integration/common/src/test/java/org/teiid/cdk ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk:3535-3555* Property changes on: trunk/test-integration/common/src/test/java/org/teiid/cdk/api ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/cdk/api:3535-3555 Property changes on: trunk/test-integration/common/src/test/java/org/teiid/connector/language ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/test-integration/common/src/test/java/org/teiid/connector/metadata/runtime/TestMetadataObject.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/test-integration/common/src/test/java/org/teiid/connector/visitor/util ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/test-integration/common/src/test/java/org/teiid/dqp ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp:3535-3555* Property changes on: trunk/test-integration/common/src/test/java/org/teiid/dqp/internal ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/internal:3535-3555* Property changes on: trunk/test-integration/common/src/test/java/org/teiid/dqp/internal/process ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/dqp/internal/process:3535-3555 Property changes on: trunk/test-integration/common/src/test/java/org/teiid/transport ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport:3535-3555* Property changes on: trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3455-3509 + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java:3455-3509,3535-3555 Property changes on: trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3149-3217,3281-3325 + /branches/7.4.x/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java:3149-3217,3281-3325,3535-3555 Property changes on: trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSocketTransport:3535-3555* Property changes on: trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected:3535-3555 Property changes on: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport:3535-3555* Property changes on: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected:3535-3555 Property changes on: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3281-3325 + /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected:3281-3325,3535-3555 Property changes on: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3281-3325 + /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected:3281-3325,3535-3555 Property changes on: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected:3535-3555 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel:3535-3555* Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected:3535-3555 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected:3535-3555 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected:3535-3555 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected:3535-3555 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3220-3275 + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected:3220-3275,3535-3555 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3220-3275 + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected:3220-3275,3535-3555 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected:3535-3555 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected:3535-3555 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected:3535-3555 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected:3535-3555 Property changes on: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected:3535-3555 Property changes on: trunk/test-integration/db/src/main/java/org/teiid/internal ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal:3535-3555* Property changes on: trunk/test-integration/db/src/main/java/org/teiid/internal/core ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/core:3535-3555* Property changes on: trunk/test-integration/db/src/main/java/org/teiid/internal/core/xml ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/db/src/main/java/org/teiid/internal/core/xml:3535-3555 Property changes on: trunk/test-integration/db/src/test/java/com ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/db/src/test/java/com:3535-3555* Property changes on: trunk/test-integration/db/src/test/java/org/teiid/internal ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal:3535-3555* Property changes on: trunk/test-integration/db/src/test/java/org/teiid/internal/core ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/test-integration/db/src/test/java/org/teiid/internal/core:3535-3555*