Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ element of the <a href="table.html">&lt;table&gt;</a> element.</p>
<td>A user defined type handler that should be used for this column.
This should be the fully
qualified name of a class that implements MyBatis'
<code>TypeHandler</code>
<code>TypeHandler</code>
interface.
If unspecified, or blank,
then MyBatis will use the default type facility for handling types.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ specified with the <a href="property.html">&lt;property&gt;</a> child element:</
<tr>
<td valign="top">dateFormat</td>
<td>A date format string to use when writing the date into the generated comment. This string
will be used to construct a <code>java.text.SimpleDateFormat</code> object. Any
will be used to construct a <code>java.text.SimpleDateFormat</code> object. Any
valid format string for that object can be specified here. By default, the date string
will be from the <code>toString()</code> method on <code>java.util.Date</code>.
<p>Since 1.3.4</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ databases, or with different generation parameters, in the same run of MyBatis G
with MyBatis versions 3.4.2 and higher, and Java 8 and higher (e.g. the
Java model and mapper interfaces will use generic types and other Java 8
features like default methods in interfaces).
<p><b>Important:</b> The Java code generated with this target runtime is dependent on the
<p><b>Important:</b> The Java code generated with this target runtime is dependent on the
"MyBatis Dynamic SQL" support library version 1.1.3 or higher.</p>
<p>Other important information:</p>
<ul>
Expand All @@ -119,7 +119,7 @@ databases, or with different generation parameters, in the same run of MyBatis G
<td>
With the value, MBG will generate Kotlin objects that are compatible
with MyBatis versions 3.4.2 and higher.
<p><b>Important:</b> The Kotlin code generated with this target runtime is dependent on the
<p><b>Important:</b> The Kotlin code generated with this target runtime is dependent on the
"MyBatis Dynamic SQL" support library version 1.1.4 or higher.</p>
<p>Other important information:</p>
<ul>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
<body>
<h1>The &lt;except&gt; Element</h1>
<p>The &lt;except&gt; element is used to specify an exception to a set of columns
that are ignored by a regular expression in a
that are ignored by a regular expression in a
<a href="ignoreColumnsByRegex.html">&lt;ignoreColumnsByRegex&gt;</a> element.
This allows you to specify a very general
regular expression to ignore a large set of columns, then add columns back into
the set of columns used for code generation.</p>
<p>For example, if you specify a regular
expression like "<code>.*</code>" then MBG will ignore every column in a table.
expression like "<code>.*</code>" then MBG will ignore every column in a table.
But if you add exceptions, you can add a few columns back.
This element is an optional child
element of the <a href="ignoreColumnsByRegex.html">&lt;ignoreColumnsByRegex&gt;</a> element.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<body>
<h1>The &lt;ignoreColumnsByRegex&gt; Element</h1>
<p>The &lt;ignoreColumnsByRegex&gt; element is used to tell MyBatis Generator (MBG) to ignore a
set of columns in an introspected table - the set is determined by matching against a regular
set of columns in an introspected table - the set is determined by matching against a regular
expression specified in this element. No generated SQL will refer to the ignored columns, and no
properties will be generated for the ignored columns in the model objects.
This element is an optional child
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ specified with the <a href="property.html">&lt;property&gt;</a> child element:</
the white space from character fields returned from the database.
This can be useful if your database stores data in CHAR fields rather than
VARCHAR fields. When true, MyBatis Generator will insert code to trim character fields.
Can be overridden with the <code>trimStrings</code> property in a
<a href="table.html">&lt;table&gt;</a> or
Can be overridden with the <code>trimStrings</code> property in a
<a href="table.html">&lt;table&gt;</a> or
<a href="columnOverride.html">&lt;columnOverride&gt;</a> element.
<p><i>The default value is false.</i></p>
<p><i>This property is ignored if the target runtime is "MyBatis3Kotlin"</i></p></td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -461,12 +461,12 @@ specified with the <a href="property.html">&lt;property&gt;</a> child element:</
the white space from character fields returned from the database.
This can be useful if your database stores data in CHAR fields rather than
VARCHAR fields. When true, MyBatis Generator will insert code to trim character fields.
Can be overridden with the <code>trimStrings</code> property in a &lt;columnOverride&gt;
configuration. This property value overrides the property if specified at the
Can be overridden with the <code>trimStrings</code> property in a &lt;columnOverride&gt;
configuration. This property value overrides the property if specified at the
<a href="javaModelGenerator.html">&lt;javaModelGenerator&gt;</a> level
and can be overridden for fields/columns using the property in a
and can be overridden for fields/columns using the property in a
<a href="columnOverride.html">&lt;columnOverride&gt;</a> element.</p>
<p><i>The default value is inherited from the
<p><i>The default value is inherited from the
<a href="javaModelGenerator.html">&lt;javaModelGenerator&gt;</a>, otherwise false.</i></p></td>
</tr>
<tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ public class SomeService {
List&lt;TableCode&gt; records = mapper.select(c -&gt;
c.where(id, isLessThan(10), and(description, isEqualTo("foo")))
.or(description, isLike("b%"))
.orderBy(id.descending()));
.orderBy(id.descending()));
...
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
These classes
are dependent on the <a href="http://www.mybatis.org/mybatis-dynamic-sql/docs/introduction.html">MyBatis Dynamic SQL</a>
library version 1.1.4 or higher. Please refer to that site for full information
about how the library works. In particular, see the
about how the library works. In particular, see the
<a href="https://mybatis.org/mybatis-dynamic-sql/docs/kotlinMyBatis3.html">Kotlin Usage Page</a> for full details.</p>

<h2>Generated Files</h2>
Expand Down Expand Up @@ -128,7 +128,7 @@ That code looks like this:</p>
val allRecords = mapper.select { allRows() }
</pre>

<p>It is far more interesting to add WHERE clauses to these methods. To add support for WHERE clauses, you should import the
<p>It is far more interesting to add WHERE clauses to these methods. To add support for WHERE clauses, you should import the
elements from the support class as shown above, and you should also import the SqlBuilder support. Then you can code arbitrarily
complex where clauses, and "ORDER BY" phrases as shown below:</p>

Expand Down Expand Up @@ -168,7 +168,7 @@ class SomeService {
}
or { description isLike "b%" }
orderBy(id.descending())
}
}
...
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<li>As a <a href="runningWithMaven.html">Maven Plugin</a></li>
<li>From another <a href="runningWithJava.html">Java program</a> with an XML configuration</li>
<li>From another <a href="runningWithJava.html">Java program</a> with a Java based configuration</li>
<li>As an <a href="runningWithEclipse.html">Eclipse Feature</a></li>
<li>As an <a href="runningWithEclipse.html">Eclipse Feature</a></li>
</ul>
<p>Each method is described in detail on the linked pages.</p>
<p><b>Note:</b> there is also an Eclipse
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ syntax <code>${dao.target.dir}</code>.</p>

<h2>Classpath Issues</h2>
<p>Initially, the plugin classpath is very limited - it only contains MyBatis generator itself.
If you need to add something to the plugin's classpath (for example, a JDBC driver), you can do it
If you need to add something to the plugin's classpath (for example, a JDBC driver), you can do it
by adding dependencies to the plugin configuration like this:</p>
<pre>
&lt;project ...&gt;
Expand Down Expand Up @@ -316,15 +316,15 @@ use one of the configuration parameters related to the plugin classpath - "inclu
<td valign="top">includeCompileDependencies</td>
<td valign="top">${mybatis.generator.includeCompileDependencies}</td>
<td valign="top">boolean</td>
<td valign="top">If true, then dependencies with scope "compile", "provided", and "system" will be
<td valign="top">If true, then dependencies with scope "compile", "provided", and "system" will be
added to the generator's classpath.
</td>
</tr>
<tr>
<td valign="top">includeAllDependencies</td>
<td valign="top">${mybatis.generator.includeAllDependencies}</td>
<td valign="top">boolean</td>
<td valign="top">If true, then dependencies with any scope will be
<td valign="top">If true, then dependencies with any scope will be
added to the generator's classpath.
</td>
</tr>
Expand Down
20 changes: 10 additions & 10 deletions core/mybatis-generator-core/src/site/xhtml/whatsNew.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
recommended for JDK 9+. If you prefer to use the "javax" annotations, there is a new property on the
&lt;commentGenerator&gt; element that will override this behavior.
</li>
<li>The Maven plugin now includes an integration with Eclipse Maven support. If you import a Maven project with the
<li>The Maven plugin now includes an integration with Eclipse Maven support. If you import a Maven project with the
generator configured into an Eclipse workspace, the code generator will run automatically.
</li>
<li>Added an "info" logging level to the log abstraction. Also removed the broken Maven logging implementation.
Expand Down Expand Up @@ -192,15 +192,15 @@ changes will be required:</p>
<li>Move to Java 8</li>
<li>Remove support for iBatis2</li>
<li>General code cleanup</li>
<li>Several minor enhancements and bug fixes. See the GitHub page for milestone 1.4.0 for details.
<li>Several minor enhancements and bug fixes. See the GitHub page for milestone 1.4.0 for details.
<a target="_blank" href="https://github.com/mybatis/generator/issues?q=milestone%3A1.4.0">Milestone 1.4.0</a></li>
</ul>

<h3>New Runtime for Kotlin Using MyBatis Dynamic SQL</h3>
<p>MyBatis generator supports Kotlin! There is a new simple DOM for generating Kotlin. There is also a new runtime that will
generate Kotlin code that uses the MyBatis Dynamic SQL library. It has functionality that matches the new Java runtime
for MyBatis Dynamic SQL (see below) - but it uses a more idiomatic Kotlin style with receiver functions rather than the
method chaining style of the Java runtime.
method chaining style of the Java runtime.
</p>

<p>To use the new runtime, set <code>targetRuntime=MyBatis3Kotlin</code> on a <code>&lt;context&gt;</code>.</p>
Expand Down Expand Up @@ -253,7 +253,7 @@ deprecated and will be removed in a future version</b> - so please switch to the
<li>In the Java DOM, removed the default constructors for <code>Method</code> and <code>Field</code></li>
<li>Removed several methods from <code>CompilationUnit</code> including <code>isJavaInterface</code>,
<code>isJavaEnumeration</code>, <code>getSuperClass</code>, and <code>getSuperInterfaceTypes</code>.</li>
<li>In the XML DOM, element nodes no longer extend the abstract Element class which is removed.</li>
<li>In the XML DOM, element nodes no longer extend the abstract Element class which is removed.</li>
<li>Changed return types to Optionals in the DOM methods where appropriate.</li>
<li>Removed the <code>getFormattedContent</code> method from all Java and XML DOM classes. These methods
are replaced by a new set of renderer classes. Note that the new renderer classes will produce
Expand All @@ -275,7 +275,7 @@ deprecated and will be removed in a future version</b> - so please switch to the
<h2>Version 1.3.7</h2>
<p>This version contains several minor fixes and enhancements - mostly related to the MyBatis3DynamicSql runtime.</p>

<p>Please reference the GitHub page for milestone 1.3.7 for details.
<p>Please reference the GitHub page for milestone 1.3.7 for details.
<a target="_blank" href="https://github.com/mybatis/generator/issues?q=milestone%3A1.3.7">Milestone 1.3.7</a>
</p>

Expand All @@ -287,7 +287,7 @@ From the first release of MyBatis Generator, the generator has created code that
has been limited and difficult to use. The new style of generated code supports a more natural SQL-like syntax for WHERE clauses.
Additionally, WHERE clauses can be created with any combination of ANDs and ORs. This is a significant improvement to the generated
code. It comes at the cost of dependency on MyBatis Dynamic SQL, and loss of compatibility with previously generated code, but we
think it will be worth the change. One other benefit is that the generated code is significantly smaller and easier to understand.
think it will be worth the change. One other benefit is that the generated code is significantly smaller and easier to understand.
</p>
<p>Don't worry - unless you enable this change, then generator will create code exactly as it has in the past.</p>
<p>To enable the change, use the new "MyBatis3DynamicSQL" runtime on the
Expand All @@ -304,14 +304,14 @@ think it will be worth the change. One other benefit is that the generated code

<h3>Other Fixes/Enhancements</h3>
<p>Please reference the GitHub page for milestone 1.3.6 for details on what else
has changed in this release.
has changed in this release.
<a target="_blank" href="https://github.com/mybatis/generator/issues?q=milestone%3A1.3.6+is%3Aclosed">Milestone 1.3.6</a>
</p>

<h2>Version 1.3.5</h2>
<h3>Fixes/Enhancements</h3>
<p>Please reference the GitHub page for milestone 1.3.5 for details on what
has changed in this release.
has changed in this release.
<a target="_blank" href="https://github.com/mybatis/generator/issues?q=milestone%3A1.3.5+is%3Aclosed">Milestone 1.3.5</a>
</p>

Expand All @@ -324,7 +324,7 @@ menu item.</p>

<h3>Fixes/Enhancements</h3>
<p>Please reference the GitHub page for milestone 1.3.4 for details on what
has changed in this release.
has changed in this release.
<a target="_blank" href="https://github.com/mybatis/generator/issues?q=milestone%3A1.3.4+is%3Aclosed">Milestone 1.3.4</a>
</p>

Expand All @@ -335,7 +335,7 @@ has changed in this release.
</ul>
<h3>Fixes/Enhancements</h3>
<p>Please reference the GitHub page for milestone 1.3.3 for details on what
has changed in this release.
has changed in this release.
<a target="_blank" href="https://github.com/mybatis/generator/issues?q=milestone%3A1.3.3+is%3Aclosed">Milestone 1.3.3</a>
</p>

Expand Down