Skip to content
This repository was archived by the owner on Mar 19, 2021. It is now read-only.

HQLPARSER-43 Incorrect handling of string literals containing single quo... #24

Merged
merged 1 commit into from
Jun 30, 2014
Merged

HQLPARSER-43 Incorrect handling of string literals containing single quo... #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion parser/src/main/antlr/org/hibernate/hql/ast/origin/hql/parse/HQLLexer.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ CHARACTER_LITERAL

STRING_LITERAL
: '"' ( ESCAPE_SEQUENCE | ~('\\'|'"') )* '"' {setText(getText().substring(1, getText().length()-1));}
| ('\'' ( ESCAPE_SEQUENCE | ~('\\'|'\'') )* '\'')+ {setText(getText().substring(1, getText().length()-1));}
| ('\'' ( ESCAPE_SEQUENCE | ~('\\'|'\'') )* '\'')+ {setText(getText().substring(1, getText().length()-1).replace("''", "'"));}
;

fragment
Expand Down
7 changes: 7 additions & 0 deletions parser/src/test/java/org/hibernate/hql/test/tree/ParsingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,13 @@ public void testOneCriteriaQuery() {
"(QUERY (QUERY_SPEC (SELECT_FROM (from (PERSISTER_SPACE (ENTITY_PERSISTER_REF com.acme.EntityName e))) (SELECT (SELECT_LIST (SELECT_ITEM e)))) (where (= (PATH (. e name)) (CONST_STRING_VALUE same)))))");
}

@Test
public void testStringLiteralSingleQuoteEscape() {
//generated alias:
assertTreeParsed( null, "from com.acme.EntityName e where e.name = 'Jack Daniel''s Old No. 7'",
"(QUERY (QUERY_SPEC (SELECT_FROM (from (PERSISTER_SPACE (ENTITY_PERSISTER_REF com.acme.EntityName e))) (SELECT (SELECT_LIST (SELECT_ITEM e)))) (where (= (PATH (. e name)) (CONST_STRING_VALUE Jack Daniel's Old No. 7)))))");
}

private void assertTreeParsed(ParserContext context, String input, String treeExpectation) {
HQLLexer lexed = new HQLLexer( new ANTLRStringStream( input ) );
CommonTokenStream tokens = new CommonTokenStream( lexed );
Expand Down