Branch: refs/heads/master Home: https://github.com/Teiid-Designer/teiid-designer Commit: b78eb3a604f12ace2e9cb2c4d8853f57ae53e7c9 https://github.com/Teiid-Designer/teiid-designer/commit/b78eb3a604f12ace2... Author: Paul Richardson <p.g.richardson(a)redhat.com&gt; Date: 2016-02-04 (Thu, 04 Feb 2016) Changed paths: A plugins/org.teiid.designer.query.ui/src/org/teiid/query/ui/sqleditor/component/CommentDisplayNode.java M plugins/org.teiid.designer.query.ui/src/org/teiid/query/ui/sqleditor/component/DisplayNode.java M plugins/org.teiid.designer.query.ui/src/org/teiid/query/ui/sqleditor/component/DisplayNodeConstants.java M plugins/org.teiid.designer.query.ui/src/org/teiid/query/ui/sqleditor/component/DisplayNodeFactory.java M plugins/org.teiid.designer.spi/src/org/teiid/designer/query/sql/ISQLStringVisitor.java A plugins/org.teiid.designer.spi/src/org/teiid/designer/query/sql/IToken.java A plugins/org.teiid.designer.spi/src/org/teiid/designer/query/sql/lang/IComment.java M plugins/org.teiid.designer.spi/src/org/teiid/designer/query/sql/lang/ILanguageObject.java M plugins/teiid/org.teiid.runtime.client/api/org/teiid/language/SQLConstants.java M plugins/teiid/org.teiid.runtime.client/api/org/teiid/translator/CacheDirective.java M plugins/teiid/org.teiid.runtime.client/common-core/org/teiid/core/util/StringUtil.java M plugins/teiid/org.teiid.runtime.client/engine/javacc/Teiid7Parser.jjt M plugins/teiid/org.teiid.runtime.client/engine/javacc/Teiid8Parser.jjt M plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/parser/AbstractTeiidParser.java A plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/parser/AbstractToken.java A plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/parser/LimitedQueue.java M plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/parser/QueryParser.java M plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/parser/TeiidParser.java M plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/sql/lang/Command.java A plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/sql/lang/Comment.java M plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/sql/lang/LanguageObject.java R plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/sql/lang/LeadingComment.java M plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/sql/lang/SimpleNode.java M plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/sql/lang/SourceHint.java R plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/sql/lang/TrailingComment.java M plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/sql/visitor/SQLStringVisitor.java M plugins/teiid/org.teiid.runtime.client/pom.xml M tests/org.teiid.designer.query.ui.test/src/org/teiid/designer/query/ui/test/AllTests.java A tests/org.teiid.designer.query.ui.test/src/org/teiid/query/ui/sqleditor/component/TestDisplayNodeWithComments.java M tests/org.teiid.runtime.client.test/src/org/teiid/query/resolver/v7/Test7ProcedureResolving.java M tests/org.teiid.runtime.client.test/src/org/teiid/query/sql/AbstractTest.java M tests/org.teiid.runtime.client.test/src/org/teiid/query/sql/AbstractTestQueryParser.java M tests/org.teiid.runtime.client.test/src/org/teiid/query/sql/AbstractTestSQLStringVisitor.java M tests/org.teiid.runtime.client.test/src/org/teiid/query/sql/v7/TestQuery7Parser.java M tests/org.teiid.runtime.client.test/src/org/teiid/query/sql/v8/TestQuery8Parser.java M tests/org.teiid.runtime.client.test/src/org/teiid/query/sql/v810/TestQuery810Parser.java Log Message: ----------- Preserves comments when parsing SQL strings * The teiid parser handles comments by skipping them and throwing them away. Updates the teiid parser templates to store the comments in a collection in the parser object. * Parser comments accessible via each LanguageObject * SQLStringVisitor constructs the SQL string and at the conclusion attempts to reinsert the comments back into the string * DisplayNode framework also reinjects comments stored in the parser into newly constructed string representations, using similar logic to the SQLStringVisitor Commit: 226ea6cd0c3600da9cefd4086f240ff9224cae43 https://github.com/Teiid-Designer/teiid-designer/commit/226ea6cd0c3600da9... Author: Barry LaFond <blafond(a)redhat.com&gt; Date: 2016-02-04 (Thu, 04 Feb 2016) Changed paths: A plugins/org.teiid.designer.query.ui/src/org/teiid/query/ui/sqleditor/component/CommentDisplayNode.java M plugins/org.teiid.designer.query.ui/src/org/teiid/query/ui/sqleditor/component/DisplayNode.java M plugins/org.teiid.designer.query.ui/src/org/teiid/query/ui/sqleditor/component/DisplayNodeConstants.java M plugins/org.teiid.designer.query.ui/src/org/teiid/query/ui/sqleditor/component/DisplayNodeFactory.java M plugins/org.teiid.designer.spi/src/org/teiid/designer/query/sql/ISQLStringVisitor.java A plugins/org.teiid.designer.spi/src/org/teiid/designer/query/sql/IToken.java A plugins/org.teiid.designer.spi/src/org/teiid/designer/query/sql/lang/IComment.java M plugins/org.teiid.designer.spi/src/org/teiid/designer/query/sql/lang/ILanguageObject.java M plugins/teiid/org.teiid.runtime.client/api/org/teiid/language/SQLConstants.java M plugins/teiid/org.teiid.runtime.client/api/org/teiid/translator/CacheDirective.java M plugins/teiid/org.teiid.runtime.client/common-core/org/teiid/core/util/StringUtil.java M plugins/teiid/org.teiid.runtime.client/engine/javacc/Teiid7Parser.jjt M plugins/teiid/org.teiid.runtime.client/engine/javacc/Teiid8Parser.jjt M plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/parser/AbstractTeiidParser.java A plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/parser/AbstractToken.java A plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/parser/LimitedQueue.java M plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/parser/QueryParser.java M plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/parser/TeiidParser.java M plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/sql/lang/Command.java A plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/sql/lang/Comment.java M plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/sql/lang/LanguageObject.java R plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/sql/lang/LeadingComment.java M plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/sql/lang/SimpleNode.java M plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/sql/lang/SourceHint.java R plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/sql/lang/TrailingComment.java M plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/sql/visitor/SQLStringVisitor.java M plugins/teiid/org.teiid.runtime.client/pom.xml M tests/org.teiid.designer.query.ui.test/src/org/teiid/designer/query/ui/test/AllTests.java A tests/org.teiid.designer.query.ui.test/src/org/teiid/query/ui/sqleditor/component/TestDisplayNodeWithComments.java M tests/org.teiid.runtime.client.test/src/org/teiid/query/resolver/v7/Test7ProcedureResolving.java M tests/org.teiid.runtime.client.test/src/org/teiid/query/sql/AbstractTest.java M tests/org.teiid.runtime.client.test/src/org/teiid/query/sql/AbstractTestQueryParser.java M tests/org.teiid.runtime.client.test/src/org/teiid/query/sql/AbstractTestSQLStringVisitor.java M tests/org.teiid.runtime.client.test/src/org/teiid/query/sql/v7/TestQuery7Parser.java M tests/org.teiid.runtime.client.test/src/org/teiid/query/sql/v8/TestQuery8Parser.java M tests/org.teiid.runtime.client.test/src/org/teiid/query/sql/v810/TestQuery810Parser.java Log Message: ----------- Merge pull request #544 from phantomjinx/comments-in-sql Preserves comments when parsing SQL strings Compare: https://github.com/Teiid-Designer/teiid-designer/compare/c0c01f18b1c7...2...