Skip to content

Constructor id arguments don't need to be listed first #2548

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
May 14, 2022
Merged

Constructor id arguments don't need to be listed first #2548

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
0f63b25
https://github.com/mybatis/mybatis-3/issues/2541
May 5, 2022
b891b5b
At least one idArg or arg is required
harawata May 14, 2022
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 src/main/java/org/apache/ibatis/builder/xml/mybatis-3-mapper.dtd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ extends CDATA #IMPLIED
autoMapping (true|false) #IMPLIED
>

<!ELEMENT constructor (idArg*,arg*)>
<!ELEMENT constructor ((idArg|arg)*)>

<!ELEMENT id EMPTY>
<!ATTLIST id
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/apache/ibatis/builder/xml/mybatis-mapper.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2009-2021 the original author or authors.
Copyright 2009-2022 the original author or authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -108,10 +108,10 @@
</xs:element>
<xs:element name="constructor">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="idArg"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="arg"/>
</xs:sequence>
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="idArg"/>
<xs:element ref="arg"/>
</xs:choice>
</xs:complexType>
</xs:element>
<xs:element name="id">
Expand Down