[teiid-commits] [teiid/teiid] efc9c8: TEIID-4112 preventing the use of a specific common...
Branch: refs/heads/63-8.12.x
Home: https://github.com/teiid/teiid
Commit: efc9c8feff81baa4c397ffb5e6ef7b76fbe32dff
https://github.com/teiid/teiid/commit/efc9c8feff81baa4c397ffb5e6ef7b76fbe...
Author: shawkins <shawkins(a)redhat.com>
Date: 2016-04-22 (Fri, 22 Apr 2016)
Changed paths:
M api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java
M api/src/main/java/org/teiid/translator/ExecutionFactory.java
M api/src/test/java/org/teiid/translator/TestBaseDelegatingExecutionFactory.java
M engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesConverter.java
M engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
M engine/src/main/java/org/teiid/dqp/internal/datamgr/LanguageBridgeFactory.java
M engine/src/main/java/org/teiid/query/optimizer/capabilities/SourceCapabilities.java
M runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java
M runtime/src/test/java/org/teiid/runtime/TestEmbeddedServerAdmin.java
M
test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDeployment.java
Log Message:
-----------
TEIID-4112 preventing the use of a specific common table expression name
Conflicts:
api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java
api/src/main/java/org/teiid/translator/ExecutionFactory.java
api/src/test/java/org/teiid/translator/TestBaseDelegatingExecutionFactory.java
engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesConverter.java
runtime/src/test/java/org/teiid/runtime/TestEmbeddedServerAdmin.java
test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDeployment.java
Commit: 14664be0b0416c754d1b200cca30b0aa41a0a3b7
https://github.com/teiid/teiid/commit/14664be0b0416c754d1b200cca30b0aa41a...
Author: Steven Hawkins <shawkins(a)redhat.com>
Date: 2016-04-22 (Fri, 22 Apr 2016)
Changed paths:
M
build/kits/jboss-as7/overlay/docs/teiid/datasources/infinispan/infinispan-materialization-ds.xml
Log Message:
-----------
Merge branch '63-8.12.x' of github.com:teiid/teiid into 63-8.12.x
Compare: https://github.com/teiid/teiid/compare/7cd9f12253ad...14664be0b041