Skip to content

Unknown element inside <choose> should throw exception #3456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 23, 2025
Merged

Unknown element inside <choose> should throw exception #3456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3fca99
Unknown element inside `<choose>` should throw exception
harawata Apr 22, 2025
8564026
Merge master into 3455-unknown-elem-in-choose
harawata Apr 23, 2025
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: 2 additions & 0 deletions src/main/java/org/apache/ibatis/scripting/xmltags/XMLScriptBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,8 @@ private void handleWhenOtherwiseNodes(XNode chooseSqlNode, List<SqlNode> ifSqlNo
handler.handleNode(child, ifSqlNodes);
} else if (handler instanceof OtherwiseHandler) {
handler.handleNode(child, defaultSqlNodes);
} else {
throw new BuilderException("Unknown element <" + nodeName + "> in SQL statement.");
}
}
}
Expand Down
17 changes: 17 additions & 0 deletions src/test/java/org/apache/ibatis/scripting/xmltags/XMLScriptBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
package org.apache.ibatis.scripting.xmltags;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

import org.apache.ibatis.builder.BuilderException;
import org.apache.ibatis.mapping.SqlSource;
import org.apache.ibatis.parsing.XPathParser;
import org.apache.ibatis.session.Configuration;
Expand All @@ -42,4 +44,19 @@ void shouldWhereInsertWhitespace() throws Exception {
.containsPattern("(?m)^\\s*select \\* from user\\s+WHERE\\s+id = 1\\s+and id > 0\\s*$");
}

@Test
void shouldThrowIfUnknownElementFound() {
String xml = """
<script>
select * from user
<choose>
<when test="1==1">and id = 1</when>
<otherwize>and id > 0</otherwize>
</choose>
</script>
""";
XMLScriptBuilder parser = new XMLScriptBuilder(new Configuration(), new XPathParser(xml).evalNode("/script"));
assertThatThrownBy(parser::parseScriptNode).isInstanceOf(BuilderException.class)
.hasMessage("Unknown element <otherwize> in SQL statement.");
}
}