Skip to content

M
mybatis-generator-plugin
Commit 535ca8a4 authored by hewei's avatar hewei
Browse files
Options

bug:upsert插件对于没有Selective支持的upsert、upsertByExample、upsertWithBLOBs、upsertByExa... 

bug:upsert插件对于没有Selective支持的upsert、upsertByExample、upsertWithBLOBs、upsertByExampleWithBLOBs对于自增主键的不支持
parent d8438373
Hide whitespace changes
Inline Side-by-side
Showing with 392 additions and 267 deletions
src/main/java/com/itfsw/mybatis/generator/plugins/UpsertPlugin.java
View file @ 535ca8a4
......@@ -19,11 +19,14 @@ package com.itfsw.mybatis.generator.plugins;
import com.itfsw.mybatis.generator.plugins.utils.*;
import org.mybatis.generator.api.IntrospectedColumn;
import org.mybatis.generator.api.IntrospectedTable;
import org.mybatis.generator.api.dom.OutputUtilities;
import org.mybatis.generator.api.dom.java.*;
import org.mybatis.generator.api.dom.xml.*;
import org.mybatis.generator.codegen.mybatis3.ListUtilities;
import org.mybatis.generator.codegen.mybatis3.MyBatis3FormattingUtilities;
import org.mybatis.generator.internal.util.StringUtility;
import java.util.Arrays;
import java.util.List;
import java.util.Properties;
......@@ -195,9 +198,12 @@ public class UpsertPlugin extends BasePlugin {
*/
@Override
public boolean sqlMapDocumentGenerated(Document document, IntrospectedTable introspectedTable) {
this.generateXmlElementWithoutBLOBs(document, introspectedTable);
this.generateXmlElementWithSelective(document, introspectedTable);
this.generateXmlElementWithBLOBs(document, introspectedTable);
this.generateXmlElement(document, introspectedTable, false);
if (introspectedTable.hasBLOBColumns()) {
this.generateXmlElement(document, introspectedTable, true);
}
return super.sqlMapDocumentGenerated(document, introspectedTable);
}
......@@ -208,7 +214,6 @@ public class UpsertPlugin extends BasePlugin {
*/
private void generateXmlElementWithSelective(Document document, IntrospectedTable introspectedTable) {
List<IntrospectedColumn> columns = ListUtilities.removeGeneratedAlwaysColumns(introspectedTable.getAllColumns());
IncrementsPluginTools incTools = IncrementsPluginTools.getTools(context, introspectedTable, warnings);
if (withSelectiveEnhancedPlugin) {
// ====================================== upsertSelective ======================================
......@@ -243,10 +248,7 @@ public class UpsertPlugin extends BasePlugin {
insertWhenEle.addElement(insertForeachEle);
XmlElement insertOtherwiseEle = new XmlElement("otherwise");
insertOtherwiseEle.addElement(XmlElementGeneratorTools.generateKeysSelective(
ListUtilities.removeIdentityAndGeneratedAlwaysColumns(introspectedTable.getAllColumns()),
"record."
));
insertOtherwiseEle.addElement(XmlElementGeneratorTools.generateKeysSelective(columns, "record."));
insertChooseEle.addElement(insertOtherwiseEle);
XmlElement insertTrimElement = new XmlElement("trim");
......@@ -273,10 +275,7 @@ public class UpsertPlugin extends BasePlugin {
valuesWhenEle.addElement(valuesForeachEle);
XmlElement valuesOtherwiseEle = new XmlElement("otherwise");
valuesOtherwiseEle.addElement(XmlElementGeneratorTools.generateValuesSelective(
ListUtilities.removeIdentityAndGeneratedAlwaysColumns(introspectedTable.getAllColumns()),
"record."
));
valuesOtherwiseEle.addElement(XmlElementGeneratorTools.generateValuesSelective(columns, "record."));
valuesChooseEle.addElement(valuesOtherwiseEle);
XmlElement valuesTrimElement = new XmlElement("trim");
......@@ -304,19 +303,7 @@ public class UpsertPlugin extends BasePlugin {
XmlElement setOtherwiseEle = new XmlElement("otherwise");
// set 操作增加增量插件支持
if (incTools.support()) {
setOtherwiseEle.addElement(incTools.generateSetsSelective(
ListUtilities.removeIdentityAndGeneratedAlwaysColumns(introspectedTable.getAllColumns()),
"record.",
false
));
} else {
setOtherwiseEle.addElement(XmlElementGeneratorTools.generateSetsSelective(
ListUtilities.removeIdentityAndGeneratedAlwaysColumns(introspectedTable.getAllColumns()),
"record.",
false
));
}
this.setsSupportIncrementsPlugin(setOtherwiseEle, "record.", true, columns, introspectedTable);
setChooseEle.addElement(setOtherwiseEle);
......@@ -356,19 +343,7 @@ public class UpsertPlugin extends BasePlugin {
setOtherwiseEle = new XmlElement("otherwise");
// set 操作增加增量插件支持
if (incTools.support()) {
setOtherwiseEle.addElement(incTools.generateSetsSelective(
ListUtilities.removeIdentityAndGeneratedAlwaysColumns(introspectedTable.getAllColumns()),
"record.",
false
));
} else {
setOtherwiseEle.addElement(XmlElementGeneratorTools.generateSetsSelective(
ListUtilities.removeIdentityAndGeneratedAlwaysColumns(introspectedTable.getAllColumns()),
"record.",
false
));
}
this.setsSupportIncrementsPlugin(setOtherwiseEle, "record.", true, columns, introspectedTable);
setChooseEle.addElement(setOtherwiseEle);
// update where
......@@ -399,10 +374,7 @@ public class UpsertPlugin extends BasePlugin {
insertWhenEle.addElement(insertForeachEle);
insertOtherwiseEle = new XmlElement("otherwise");
insertOtherwiseEle.addElement(XmlElementGeneratorTools.generateKeysSelective(
ListUtilities.removeIdentityAndGeneratedAlwaysColumns(introspectedTable.getAllColumns()),
"record."
));
insertOtherwiseEle.addElement(XmlElementGeneratorTools.generateKeysSelective(columns, "record."));
insertChooseEle.addElement(insertOtherwiseEle);
insertTrimElement = new XmlElement("trim");
......@@ -411,7 +383,7 @@ public class UpsertPlugin extends BasePlugin {
insertTrimElement.addAttribute(new Attribute("suffixOverrides", ","));
insertOtherwiseEle.addElement(insertTrimElement);
this.generateExistsClause(introspectedTable, eleUpsertByExampleSelective, true, columns);
this.generateExistsClause(introspectedTable, eleUpsertByExampleSelective, true, null);
document.getRootElement().addElement(eleUpsertByExampleSelective);
logger.debug("itfsw(存在即更新插件):" + introspectedTable.getMyBatis3XmlMapperFileName() + "增加upsertSelective实现方法。");
......@@ -436,19 +408,7 @@ public class UpsertPlugin extends BasePlugin {
eleUpsertSelective.addElement(XmlElementGeneratorTools.generateValuesSelective(columns));
eleUpsertSelective.addElement(new TextElement("on duplicate key update "));
// set 操作增加增量插件支持
if (incTools.support()) {
eleUpsertSelective.addElement(incTools.generateSetsSelective(
ListUtilities.removeIdentityAndGeneratedAlwaysColumns(introspectedTable.getAllColumns()),
null,
false
));
} else {
eleUpsertSelective.addElement(XmlElementGeneratorTools.generateSetsSelective(
ListUtilities.removeIdentityAndGeneratedAlwaysColumns(introspectedTable.getAllColumns()),
null,
false
));
}
this.setsSupportIncrementsPlugin(eleUpsertSelective, null, true, columns, introspectedTable);
document.getRootElement().addElement(eleUpsertSelective);
logger.debug("itfsw(存在即更新插件):" + introspectedTable.getMyBatis3XmlMapperFileName() + "增加upsertSelective实现方法。");
......@@ -468,19 +428,7 @@ public class UpsertPlugin extends BasePlugin {
eleUpsertByExampleSelective.addElement(new TextElement("update " + introspectedTable.getAliasedFullyQualifiedTableNameAtRuntime()));
eleUpsertByExampleSelective.addElement(new TextElement("set"));
// set 操作增加增量插件支持
if (incTools.support()) {
eleUpsertByExampleSelective.addElement(incTools.generateSetsSelective(
ListUtilities.removeIdentityAndGeneratedAlwaysColumns(introspectedTable.getAllColumns()),
"record.",
false
));
} else {
eleUpsertByExampleSelective.addElement(XmlElementGeneratorTools.generateSetsSelective(
ListUtilities.removeIdentityAndGeneratedAlwaysColumns(introspectedTable.getAllColumns()),
"record.",
false
));
}
this.setsSupportIncrementsPlugin(eleUpsertByExampleSelective, "record.", true, columns, introspectedTable);
// update where
eleUpsertByExampleSelective.addElement(XmlElementGeneratorTools.getUpdateByExampleIncludeElement(introspectedTable));
......@@ -500,182 +448,105 @@ public class UpsertPlugin extends BasePlugin {
}
/**
* 当Model有生成WithBLOBs类时的情况
* 生成xml
* @param document
* @param introspectedTable
* @param withBLOBs
*/
private void generateXmlElementWithBLOBs(Document document, IntrospectedTable introspectedTable) {
IncrementsPluginTools incTools = IncrementsPluginTools.getTools(context, introspectedTable, warnings);
if (introspectedTable.hasBLOBColumns()) {
List<IntrospectedColumn> columns = ListUtilities.removeGeneratedAlwaysColumns(introspectedTable.getAllColumns());
// ====================================== upsertWithBLOBs ======================================
XmlElement eleUpsertWithBLOBs = new XmlElement("insert");
eleUpsertWithBLOBs.addAttribute(new Attribute("id", METHOD_UPSERT_WITH_BLOBS));
// 添加注释(!!!必须添加注释，overwrite覆盖生成时，@see XmlFileMergerJaxp.isGeneratedNode会去判断注释中是否存在OLD_ELEMENT_TAGS中的一点，例子：@mbg.generated)
commentGenerator.addComment(eleUpsertWithBLOBs);
// 参数类型
eleUpsertWithBLOBs.addAttribute(new Attribute("parameterType", JavaElementGeneratorTools.getModelTypeWithBLOBs(introspectedTable).getFullyQualifiedName()));
// 使用JDBC的getGenereatedKeys方法获取主键并赋值到keyProperty设置的领域模型属性中。所以只支持MYSQL和SQLServer
XmlElementGeneratorTools.useGeneratedKeys(eleUpsertWithBLOBs, introspectedTable);
// insert
eleUpsertWithBLOBs.addElement(new TextElement("insert into " + introspectedTable.getFullyQualifiedTableNameAtRuntime()));
for (Element element : XmlElementGeneratorTools.generateKeys(columns)) {
eleUpsertWithBLOBs.addElement(element);
}
eleUpsertWithBLOBs.addElement(new TextElement("values"));
for (Element element : XmlElementGeneratorTools.generateValues(columns)) {
eleUpsertWithBLOBs.addElement(element);
}
eleUpsertWithBLOBs.addElement(new TextElement("on duplicate key update "));
// set 操作增加增量插件支持
if (incTools.support()) {
for (Element ele : incTools.generateSets(columns, null, false)) {
eleUpsertWithBLOBs.addElement(ele);
}
} else {
for (Element ele : XmlElementGeneratorTools.generateSets(columns)) {
eleUpsertWithBLOBs.addElement(ele);
}
}
document.getRootElement().addElement(eleUpsertWithBLOBs);
logger.debug("itfsw(存在即更新插件):" + introspectedTable.getMyBatis3XmlMapperFileName() + "增加upsert实现方法。");
if (this.allowMultiQueries) {
// ====================================== upsertByExampleWithBLOBs ======================================
XmlElement eleUpsertByExampleWithBLOBs = new XmlElement("insert");
eleUpsertByExampleWithBLOBs.addAttribute(new Attribute("id", METHOD_UPSERT_BY_EXAMPLE_WITH_BLOBS));
// 参数类型
eleUpsertByExampleWithBLOBs.addAttribute(new Attribute("parameterType", "map"));
// 添加注释(!!!必须添加注释，overwrite覆盖生成时，@see XmlFileMergerJaxp.isGeneratedNode会去判断注释中是否存在OLD_ELEMENT_TAGS中的一点，例子：@mbg.generated)
commentGenerator.addComment(eleUpsertByExampleWithBLOBs);
// 使用JDBC的getGenereatedKeys方法获取主键并赋值到keyProperty设置的领域模型属性中。所以只支持MYSQL和SQLServer
XmlElementGeneratorTools.useGeneratedKeys(eleUpsertByExampleWithBLOBs, introspectedTable, "record.");
// update
eleUpsertByExampleWithBLOBs.addElement(new TextElement("update " + introspectedTable.getAliasedFullyQualifiedTableNameAtRuntime()));
eleUpsertByExampleWithBLOBs.addElement(new TextElement("set"));
// set 操作增加增量插件支持
if (incTools.support()) {
for (Element ele : incTools.generateSets(columns, "record.", false)) {
eleUpsertByExampleWithBLOBs.addElement(ele);
}
} else {
for (Element ele : XmlElementGeneratorTools.generateSets(columns, "record.")) {
eleUpsertByExampleWithBLOBs.addElement(ele);
}
}
// update where
eleUpsertByExampleWithBLOBs.addElement(XmlElementGeneratorTools.getUpdateByExampleIncludeElement(introspectedTable));
// multiQueries
eleUpsertByExampleWithBLOBs.addElement(new TextElement(";"));
// insert
eleUpsertByExampleWithBLOBs.addElement(new TextElement("insert into " + introspectedTable.getFullyQualifiedTableNameAtRuntime()));
for (Element element : XmlElementGeneratorTools.generateKeys(columns)) {
eleUpsertByExampleWithBLOBs.addElement(element);
}
this.generateExistsClause(introspectedTable, eleUpsertByExampleWithBLOBs, false, columns);
document.getRootElement().addElement(eleUpsertByExampleWithBLOBs);
logger.debug("itfsw(存在即更新插件):" + introspectedTable.getMyBatis3XmlMapperFileName() + "增加upsertSelective实现方法。");
}
}
}
/**
* 当Model没有生成WithBLOBs类时的情况
* @param document
* @param introspectedTable
*/
private void generateXmlElementWithoutBLOBs(Document document, IntrospectedTable introspectedTable) {
List<IntrospectedColumn> columns = ListUtilities.removeGeneratedAlwaysColumns(introspectedTable.getNonBLOBColumns());
IncrementsPluginTools incTools = IncrementsPluginTools.getTools(context, introspectedTable, warnings);
private void generateXmlElement(Document document, IntrospectedTable introspectedTable, boolean withBLOBs) {
List<IntrospectedColumn> columns = ListUtilities.removeGeneratedAlwaysColumns(introspectedTable.getAllColumns());
// ====================================== upsert ======================================
XmlElement eleUpsert = new XmlElement("insert");
eleUpsert.addAttribute(new Attribute("id", METHOD_UPSERT));
XmlElement insertEle = new XmlElement("insert");
insertEle.addAttribute(new Attribute("id", withBLOBs ? METHOD_UPSERT_WITH_BLOBS : METHOD_UPSERT));
// 添加注释(!!!必须添加注释，overwrite覆盖生成时，@see XmlFileMergerJaxp.isGeneratedNode会去判断注释中是否存在OLD_ELEMENT_TAGS中的一点，例子：@mbg.generated)
commentGenerator.addComment(eleUpsert);
commentGenerator.addComment(insertEle);
// 参数类型
eleUpsert.addAttribute(new Attribute("parameterType", JavaElementGeneratorTools.getModelTypeWithoutBLOBs(introspectedTable).getFullyQualifiedName()));
insertEle.addAttribute(new Attribute("parameterType",
withBLOBs ? JavaElementGeneratorTools.getModelTypeWithBLOBs(introspectedTable).getFullyQualifiedName() : JavaElementGeneratorTools.getModelTypeWithoutBLOBs(introspectedTable).getFullyQualifiedName()
));
// 使用JDBC的getGenereatedKeys方法获取主键并赋值到keyProperty设置的领域模型属性中。所以只支持MYSQL和SQLServer
XmlElementGeneratorTools.useGeneratedKeys(eleUpsert, introspectedTable);
XmlElementGeneratorTools.useGeneratedKeys(insertEle, introspectedTable);
// insert
eleUpsert.addElement(new TextElement("insert into " + introspectedTable.getFullyQualifiedTableNameAtRuntime()));
for (Element element : XmlElementGeneratorTools.generateKeys(columns)) {
eleUpsert.addElement(element);
insertEle.addElement(new TextElement("insert into " + introspectedTable.getFullyQualifiedTableNameAtRuntime()));
for (Element element : this.generateKeys(columns)) {
insertEle.addElement(element);
}
eleUpsert.addElement(new TextElement("values"));
for (Element element : XmlElementGeneratorTools.generateValues(columns)) {
eleUpsert.addElement(element);
insertEle.addElement(new TextElement("values"));
for (Element element : this.generateValues(columns)) {
insertEle.addElement(element);
}
eleUpsert.addElement(new TextElement("on duplicate key update "));
insertEle.addElement(new TextElement("on duplicate key update "));
// set 操作增加增量插件支持
if (incTools.support()) {
for (Element ele : incTools.generateSets(columns, null, false)) {
eleUpsert.addElement(ele);
}
} else {
for (Element ele : XmlElementGeneratorTools.generateSets(columns)) {
eleUpsert.addElement(ele);
}
}
this.setsSupportIncrementsPlugin(insertEle, null, false, columns, introspectedTable);
document.getRootElement().addElement(eleUpsert);
document.getRootElement().addElement(insertEle);
logger.debug("itfsw(存在即更新插件):" + introspectedTable.getMyBatis3XmlMapperFileName() + "增加upsert实现方法。");
if (this.allowMultiQueries) {
// ====================================== upsertByExample ======================================
XmlElement eleUpsertByExample = new XmlElement("insert");
eleUpsertByExample.addAttribute(new Attribute("id", METHOD_UPSERT_BY_EXAMPLE));
insertEle = new XmlElement("insert");
insertEle.addAttribute(new Attribute("id", withBLOBs ? METHOD_UPSERT_BY_EXAMPLE_WITH_BLOBS : METHOD_UPSERT_BY_EXAMPLE));
// 参数类型
eleUpsertByExample.addAttribute(new Attribute("parameterType", "map"));
insertEle.addAttribute(new Attribute("parameterType", "map"));
// 添加注释(!!!必须添加注释，overwrite覆盖生成时，@see XmlFileMergerJaxp.isGeneratedNode会去判断注释中是否存在OLD_ELEMENT_TAGS中的一点，例子：@mbg.generated)
commentGenerator.addComment(eleUpsertByExample);
commentGenerator.addComment(insertEle);
// 使用JDBC的getGenereatedKeys方法获取主键并赋值到keyProperty设置的领域模型属性中。所以只支持MYSQL和SQLServer
XmlElementGeneratorTools.useGeneratedKeys(eleUpsertByExample, introspectedTable, "record.");
XmlElementGeneratorTools.useGeneratedKeys(insertEle, introspectedTable, "record.");
// update
eleUpsertByExample.addElement(new TextElement("update " + introspectedTable.getAliasedFullyQualifiedTableNameAtRuntime()));
eleUpsertByExample.addElement(new TextElement("set"));
insertEle.addElement(new TextElement("update " + introspectedTable.getAliasedFullyQualifiedTableNameAtRuntime()));
insertEle.addElement(new TextElement("set"));
// set 操作增加增量插件支持
if (incTools.support()) {
for (Element ele : incTools.generateSets(ListUtilities.removeIdentityAndGeneratedAlwaysColumns(columns), "record.", false)) {
eleUpsertByExample.addElement(ele);
}
} else {
for (Element ele : XmlElementGeneratorTools.generateSets(ListUtilities.removeIdentityAndGeneratedAlwaysColumns(columns), "record.")) {
eleUpsertByExample.addElement(ele);
}
}
this.setsSupportIncrementsPlugin(insertEle, "record.", false, columns, introspectedTable);
// update where
eleUpsertByExample.addElement(XmlElementGeneratorTools.getUpdateByExampleIncludeElement(introspectedTable));
insertEle.addElement(XmlElementGeneratorTools.getUpdateByExampleIncludeElement(introspectedTable));
// multiQueries
eleUpsertByExample.addElement(new TextElement(";"));
insertEle.addElement(new TextElement(";"));
// insert
eleUpsertByExample.addElement(new TextElement("insert into " + introspectedTable.getFullyQualifiedTableNameAtRuntime()));
for (Element element : XmlElementGeneratorTools.generateKeys(columns)) {
eleUpsertByExample.addElement(element);
insertEle.addElement(new TextElement("insert into " + introspectedTable.getFullyQualifiedTableNameAtRuntime()));
for (Element element : this.generateKeys(columns)) {
insertEle.addElement(element);
}
this.generateExistsClause(introspectedTable, eleUpsertByExample, false, columns);
this.generateExistsClause(introspectedTable, insertEle, false, columns);
document.getRootElement().addElement(eleUpsertByExample);
logger.debug("itfsw(存在即更新插件):" + introspectedTable.getMyBatis3XmlMapperFileName() + "增加upsertSelective实现方法。");
document.getRootElement().addElement(insertEle);
logger.debug("itfsw(存在即更新插件):" + introspectedTable.getMyBatis3XmlMapperFileName() + "增加upsertByExample实现方法。");
}
}
/**
* sets 节点整合 IncrementsPlugin
* @param element
* @param prefix
* @param selective
* @param columns
* @param introspectedTable
*/
private void setsSupportIncrementsPlugin(XmlElement element, String prefix, boolean selective, List<IntrospectedColumn> columns, IntrospectedTable introspectedTable) {
IncrementsPluginTools incTools = IncrementsPluginTools.getTools(context, introspectedTable, warnings);
if (incTools.support()) {
if (selective) {
element.addElement(incTools.generateSetsSelective(columns, prefix));
} else {
for (Element ele : this.generateCommColumns(columns, prefix, false, 4)) {
element.addElement(ele);
}
}
} else {
if (selective) {
element.addElement(XmlElementGeneratorTools.generateSetsSelective(columns, prefix));
} else {
for (Element ele : this.generateSets(columns, prefix)) {
element.addElement(ele);
}
}
}
}
......@@ -707,10 +578,7 @@ public class UpsertPlugin extends BasePlugin {
selectWhenEle.addElement(valuesForeachEle);
XmlElement selectOtherwiseEle = new XmlElement("otherwise");
selectOtherwiseEle.addElement(XmlElementGeneratorTools.generateValuesSelective(
ListUtilities.removeIdentityAndGeneratedAlwaysColumns(introspectedTable.getAllColumns()),
"record."
));
selectOtherwiseEle.addElement(XmlElementGeneratorTools.generateValuesSelective(columns, "record."));
chooseEle.addElement(selectOtherwiseEle);
XmlElement valuesTrimElement = new XmlElement("trim");
......@@ -719,10 +587,10 @@ public class UpsertPlugin extends BasePlugin {
valuesTrimElement.addAttribute(new Attribute("suffixOverrides", ","));
selectOtherwiseEle.addElement(valuesTrimElement);
} else {
element.addElement(XmlElementGeneratorTools.generateValuesSelective(columns, "record.", false));
element.addElement(XmlElementGeneratorTools.generateValuesSelective(columns, "record."));
}
} else {
for (Element element1 : XmlElementGeneratorTools.generateValues(columns, "record.", false)) {
for (Element element1 : this.generateValues(columns, "record.")) {
element.addElement(element1);
}
}
......@@ -735,4 +603,196 @@ public class UpsertPlugin extends BasePlugin {
element.addElement(new TextElement(")"));
}
/**
* 生成values Ele
* @param columns
* @return
*/
private List<Element> generateValues(List<IntrospectedColumn> columns) {
return generateValues(columns, null);
}
/**
* 生成values Ele
* @param columns
* @param prefix
* @return
*/
private List<Element> generateValues(List<IntrospectedColumn> columns, String prefix) {
return generateCommColumns(columns, prefix, true, 2);
}
/**
* 生成keys Ele
* @param columns
* @return
*/
private List<Element> generateKeys(List<IntrospectedColumn> columns) {
return generateKeys(columns, null);
}
/**
* 生成keys Ele
* @param columns
* @param prefix
* @return
*/
private List<Element> generateKeys(List<IntrospectedColumn> columns, String prefix) {
return generateCommColumns(columns, prefix, true, 1);
}
/**
* 生成sets Ele
* @param columns
* @param prefix
* @return
*/
private List<Element> generateSets(List<IntrospectedColumn> columns, String prefix) {
return generateCommColumns(columns, prefix, false, 3);
}
/**
* 通用遍历columns
* @param columns
* @param bracket
* @param prefix
* @param type 1:key,2:value,3:set
* @return
*/
private List<Element> generateCommColumns(List<IntrospectedColumn> columns, String prefix, boolean bracket, int type) {
return this.generateCommColumns(columns, prefix, bracket, type, null);
}
/**
* 通用遍历columns
* @param columns
* @param bracket
* @param prefix
* @param type 1:key,2:value,3:set,4:set(withIncrementsPlugin)
* @param introspectedTable
* @return
*/
private List<Element> generateCommColumns(List<IntrospectedColumn> columns, String prefix, boolean bracket, int type, IntrospectedTable introspectedTable) {
IncrementsPluginTools incTools = null;
if (type == 4) {
incTools = IncrementsPluginTools.getTools(context, introspectedTable, warnings);
}
if (hasIdentityAndGeneratedAlwaysColumns(columns)) {
XmlElement eleTrim = new XmlElement("trim");
if (bracket) {
eleTrim.addAttribute(new Attribute("prefix", "("));
eleTrim.addAttribute(new Attribute("suffix", ")"));
eleTrim.addAttribute(new Attribute("suffixOverrides", ","));
} else {
eleTrim.addAttribute(new Attribute("suffixOverrides", ","));
}
StringBuilder sb = new StringBuilder();
for (IntrospectedColumn introspectedColumn : columns) {
if (introspectedColumn.isGeneratedAlways() || introspectedColumn.isIdentity()) {
if (sb.length() > 0) {
eleTrim.addElement(new TextElement(sb.toString()));
sb.setLength(0);
}
// if 节点
XmlElement eleIf = new XmlElement("if");
eleIf.addAttribute(new Attribute("test", introspectedColumn.getJavaProperty(prefix) + " != null"));
switch (type) {
case 4:
if (incTools.supportColumn(introspectedColumn)) {
for (Element ele : incTools.generatedIncrementsElement(introspectedColumn, prefix, true)) {
eleIf.addElement(ele);
}
} else {
eleIf.addElement(new TextElement(MyBatis3FormattingUtilities.getEscapedColumnName(introspectedColumn) + " = " + MyBatis3FormattingUtilities.getParameterClause(introspectedColumn, prefix) + ","));
}
break;
case 3:
eleIf.addElement(new TextElement(MyBatis3FormattingUtilities.getEscapedColumnName(introspectedColumn) + " = " + MyBatis3FormattingUtilities.getParameterClause(introspectedColumn, prefix) + ","));
break;
case 2:
eleIf.addElement(new TextElement(MyBatis3FormattingUtilities.getParameterClause(introspectedColumn, prefix) + ","));
break;
case 1:
eleIf.addElement(new TextElement(MyBatis3FormattingUtilities.getEscapedColumnName(introspectedColumn) + ","));
break;
}
eleTrim.addElement(eleIf);
} else {
switch (type) {
case 4:
if (incTools.supportColumn(introspectedColumn)) {
if (sb.length() > 0) {
eleTrim.addElement(new TextElement(sb.toString()));
sb.setLength(0);
}
for (Element ele : incTools.generatedIncrementsElement(introspectedColumn, prefix, true)) {
eleTrim.addElement(ele);
}
} else {
sb.append(MyBatis3FormattingUtilities.getEscapedColumnName(introspectedColumn));
sb.append(" = ");
sb.append(MyBatis3FormattingUtilities.getParameterClause(introspectedColumn, prefix));
}
break;
case 3:
sb.append(MyBatis3FormattingUtilities.getEscapedColumnName(introspectedColumn));
sb.append(" = ");
sb.append(MyBatis3FormattingUtilities.getParameterClause(introspectedColumn, prefix));
break;
case 2:
sb.append(MyBatis3FormattingUtilities.getParameterClause(introspectedColumn, prefix));
break;
case 1:
sb.append(MyBatis3FormattingUtilities.getEscapedColumnName(introspectedColumn));
break;
}
sb.append(", ");
}
// 保持和官方一致 80 进行换行
if (type == 1 || type == 2) {
if (sb.length() > 80) {
eleTrim.addElement(new TextElement(sb.toString()));
sb.setLength(0);
OutputUtilities.xmlIndent(sb, 1);
}
} else {
eleTrim.addElement(new TextElement(sb.toString()));
sb.setLength(0);
}
}
if (sb.length() > 0) {
eleTrim.addElement(new TextElement(sb.toString()));
}
return Arrays.asList(eleTrim);
} else if (type == 4) {
return incTools.generateSets(columns, prefix, bracket);
} else {
return XmlElementGeneratorTools.generateCommColumns(columns, prefix, bracket, type);
}
}
/**
* 是否存在自增或者生成的column
* @param columns
* @return
*/
private boolean hasIdentityAndGeneratedAlwaysColumns(List<IntrospectedColumn> columns) {
for (IntrospectedColumn ic : columns) {
if (ic.isGeneratedAlways() || ic.isIdentity()) {
return true;
}
}
return false;
}
}
\ No newline at end of file
src/main/java/com/itfsw/mybatis/generator/plugins/utils/IncrementsPluginTools.java
View file @ 535ca8a4
......@@ -126,6 +126,16 @@ public class IncrementsPluginTools {
return false;
}
/**
* 生成sets Selective Ele
* @param columns
* @param prefix
* @return
*/
public XmlElement generateSetsSelective(List<IntrospectedColumn> columns, String prefix) {
return generateSetsSelective(columns, prefix, false);
}
/**
* 生成sets Selective Ele
* @param columns
......@@ -159,6 +169,16 @@ public class IncrementsPluginTools {
return eleTrim;
}
/**
* 生成sets Ele
* @param columns
* @param prefix
* @return
*/
public List<Element> generateSets(List<IntrospectedColumn> columns, String prefix) {
return generateSets(columns, prefix, false);
}
/**
* 生成sets Ele
* @param columns
......
src/main/java/com/itfsw/mybatis/generator/plugins/utils/XmlElementGeneratorTools.java
View file @ 535ca8a4
......@@ -137,7 +137,7 @@ public class XmlElementGeneratorTools {
* @param columns
* @return
*/
public static List<TextElement> generateKeys(List<IntrospectedColumn> columns) {
public static List<Element> generateKeys(List<IntrospectedColumn> columns) {
return generateKeys(columns, true);
}
......@@ -147,7 +147,7 @@ public class XmlElementGeneratorTools {
* @param bracket
* @return
*/
public static List<TextElement> generateKeys(List<IntrospectedColumn> columns, boolean bracket) {
public static List<Element> generateKeys(List<IntrospectedColumn> columns, boolean bracket) {
return generateCommColumns(columns, null, bracket, 1);
}
......@@ -186,7 +186,7 @@ public class XmlElementGeneratorTools {
* @param columns
* @return
*/
public static List<TextElement> generateValues(List<IntrospectedColumn> columns) {
public static List<Element> generateValues(List<IntrospectedColumn> columns) {
return generateValues(columns, null);
}
......@@ -196,7 +196,7 @@ public class XmlElementGeneratorTools {
* @param prefix
* @return
*/
public static List<TextElement> generateValues(List<IntrospectedColumn> columns, String prefix) {
public static List<Element> generateValues(List<IntrospectedColumn> columns, String prefix) {
return generateValues(columns, prefix, true);
}
......@@ -207,7 +207,7 @@ public class XmlElementGeneratorTools {
* @param bracket
* @return
*/
public static List<TextElement> generateValues(List<IntrospectedColumn> columns, String prefix, boolean bracket) {
public static List<Element> generateValues(List<IntrospectedColumn> columns, String prefix, boolean bracket) {
return generateCommColumns(columns, prefix, bracket, 2);
}
......@@ -246,8 +246,8 @@ public class XmlElementGeneratorTools {
* @param columns
* @return
*/
public static List<TextElement> generateSets(List<IntrospectedColumn> columns) {
return generateSets(columns, null, false);
public static List<Element> generateSets(List<IntrospectedColumn> columns) {
return generateSets(columns, null);
}
/**
......@@ -256,7 +256,7 @@ public class XmlElementGeneratorTools {
* @param prefix
* @return
*/
public static List<TextElement> generateSets(List<IntrospectedColumn> columns, String prefix) {
public static List<Element> generateSets(List<IntrospectedColumn> columns, String prefix) {
return generateSets(columns, prefix, false);
}
......@@ -267,7 +267,7 @@ public class XmlElementGeneratorTools {
* @param bracket
* @return
*/
public static List<TextElement> generateSets(List<IntrospectedColumn> columns, String prefix, boolean bracket) {
public static List<Element> generateSets(List<IntrospectedColumn> columns, String prefix, boolean bracket) {
return generateCommColumns(columns, prefix, bracket, 3);
}
......@@ -309,8 +309,8 @@ public class XmlElementGeneratorTools {
* @param type 1:key,2:value,3:set
* @return
*/
private static List<TextElement> generateCommColumns(List<IntrospectedColumn> columns, String prefix, boolean bracket, int type) {
List<TextElement> list = new ArrayList<>();
public static List<Element> generateCommColumns(List<IntrospectedColumn> columns, String prefix, boolean bracket, int type) {
List<Element> list = new ArrayList<>();
StringBuilder sb = new StringBuilder(bracket ? "(" : "");
Iterator<IntrospectedColumn> columnIterator = columns.iterator();
while (columnIterator.hasNext()) {
......
src/test/java/com/itfsw/mybatis/generator/plugins/IncrementsPluginTest.java
View file @ 535ca8a4
......@@ -347,7 +347,7 @@ public class IncrementsPluginTest {
// sql
sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExample", tbBuilder.invoke("build"), tbExample.getObject());
Assert.assertEquals(sql, "update tb set field1 = 'ts2', inc_f1 = inc_f1 + 10 , inc_f2 = 1, inc_f3 = 1 WHERE ( field1 = 'ts2' ) ; insert into tb (id, field1, inc_f1, inc_f2, inc_f3) select 20, 'ts2', 10, 1, 1 from dual where not exists ( select 1 from tb WHERE ( field1 = 'ts2' ) )");
Assert.assertEquals(sql, "update tb set id = 20, field1 = 'ts2', inc_f1 = inc_f1 + 10 , inc_f2 = 1, inc_f3 = 1 WHERE ( field1 = 'ts2' ) ; insert into tb (id, field1, inc_f1, inc_f2, inc_f3) select 20, 'ts2', 10, 1, 1 from dual where not exists ( select 1 from tb WHERE ( field1 = 'ts2' ) )");
tbMapper.invoke("upsertByExample", tbBuilder.invoke("build"), tbExample.getObject());
// 再次执行触发update
......@@ -363,7 +363,7 @@ public class IncrementsPluginTest {
// sql
sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertSelective", tbBuilder.invoke("build"));
Assert.assertEquals(sql, "insert into tb ( id, field1, inc_f1, inc_f2 ) values ( 30, 'ts2', 10, 1 ) on duplicate key update field1 = 'ts2', inc_f1 = inc_f1 + 10 , inc_f2 = 1");
Assert.assertEquals(sql, "insert into tb ( id, field1, inc_f1, inc_f2 ) values ( 30, 'ts2', 10, 1 ) on duplicate key update id = 30, field1 = 'ts2', inc_f1 = inc_f1 + 10 , inc_f2 = 1");
result = tbMapper.invoke("upsert", tbBuilder.invoke("build"));
Assert.assertEquals(result, 1);
// 再次执行触发update
......@@ -382,7 +382,7 @@ public class IncrementsPluginTest {
// sql
sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExampleSelective", tbBuilder.invoke("build"), tbExample.getObject());
Assert.assertEquals(sql, "update tb set field1 = 'ts3', inc_f1 = inc_f1 + 10 , inc_f2 = 1 WHERE ( field1 = 'ts3' ) ; insert into tb ( id, field1, inc_f1, inc_f2 ) select 40, 'ts3', 10, 1 from dual where not exists ( select 1 from tb WHERE ( field1 = 'ts3' ) )");
Assert.assertEquals(sql, "update tb set id = 40, field1 = 'ts3', inc_f1 = inc_f1 + 10 , inc_f2 = 1 WHERE ( field1 = 'ts3' ) ; insert into tb ( id, field1, inc_f1, inc_f2 ) select 40, 'ts3', 10, 1 from dual where not exists ( select 1 from tb WHERE ( field1 = 'ts3' ) )");
result = tbMapper.invoke("upsert", tbBuilder.invoke("build"));
Assert.assertEquals(result, 1);
// 再次执行触发update
......
src/test/java/com/itfsw/mybatis/generator/plugins/OldSelectiveEnhancedPluginTest.java
View file @ 535ca8a4
......@@ -99,19 +99,22 @@ public class OldSelectiveEnhancedPluginTest {
ObjectUtil tbMapper = new ObjectUtil(sqlSession.getMapper(loader.loadClass(packagz + ".TbMapper")));
ObjectUtil tb = new ObjectUtil(loader, packagz + ".Tb");
tb.set("id", 111L);
tb.set("incF3", 10l);
tb.set("tsIncF2", 5l);
// selective
ObjectUtil TbColumnId = new ObjectUtil(loader, packagz + ".Tb$Column#id");
ObjectUtil TbColumnField1 = new ObjectUtil(loader, packagz + ".Tb$Column#field1");
ObjectUtil TbColumnTsIncF2 = new ObjectUtil(loader, packagz + ".Tb$Column#tsIncF2");
Object columns = Array.newInstance(TbColumnField1.getCls(), 2);
Array.set(columns, 0, TbColumnField1.getObject());
Array.set(columns, 1, TbColumnTsIncF2.getObject());
Object columns = Array.newInstance(TbColumnField1.getCls(), 3);
Array.set(columns, 0, TbColumnId.getObject());
Array.set(columns, 1, TbColumnField1.getObject());
Array.set(columns, 2, TbColumnTsIncF2.getObject());
tb.invoke("selective", columns);
// sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "insertSelective", tb.getObject());
Assert.assertEquals(sql, "insert into tb ( field_1, inc_f2 ) values ( 'null', 5 )");
Assert.assertEquals(sql, "insert into tb ( id, field_1, inc_f2 ) values ( 111, 'null', 5 )");
Object result = tbMapper.invoke("insertSelective", tb.getObject());
Assert.assertEquals(result, 1);
}
......@@ -212,7 +215,7 @@ public class OldSelectiveEnhancedPluginTest {
// sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertSelective", tb.getObject());
Assert.assertEquals(sql, "insert into tb ( id, field_1, inc_f2 ) values ( 10, 'null', 5 ) on duplicate key update field_1 = 'null', inc_f2 = 5");
Assert.assertEquals(sql, "insert into tb ( id, field_1, inc_f2 ) values ( 10, 'null', 5 ) on duplicate key update id = 10, field_1 = 'null', inc_f2 = 5");
Object result = tbMapper.invoke("upsertSelective", tb.getObject());
Assert.assertEquals(result, 1);
}
......@@ -250,7 +253,7 @@ public class OldSelectiveEnhancedPluginTest {
// sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExampleSelective", tb.getObject(), TbExample.getObject());
Assert.assertEquals(sql, "update tb set inc_f2 = 5, inc_f3 = 10 WHERE ( id = '99' ) ; insert into tb ( id, field_1, inc_f2 ) select 99, 'null', 5 from dual where not exists ( select 1 from tb WHERE ( id = '99' ) )");
Assert.assertEquals(sql, "update tb set id = 99, inc_f2 = 5, inc_f3 = 10 WHERE ( id = '99' ) ; insert into tb ( id, field_1, inc_f2 ) select 99, 'null', 5 from dual where not exists ( select 1 from tb WHERE ( id = '99' ) )");
Object result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject());
Assert.assertEquals(result, 0);
result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject());
......
src/test/java/com/itfsw/mybatis/generator/plugins/SelectiveEnhancedPluginTest.java
View file @ 535ca8a4
......@@ -73,18 +73,21 @@ public class SelectiveEnhancedPluginTest {
ObjectUtil tbMapper = new ObjectUtil(sqlSession.getMapper(loader.loadClass(packagz + ".TbMapper")));
ObjectUtil tb = new ObjectUtil(loader, packagz + ".Tb");
tb.set("incF3", 10l);
tb.set("tsIncF2", 5l);
tb.set("id", 121L);
tb.set("incF3", 10L);
tb.set("tsIncF2", 5L);
// selective
ObjectUtil TbColumnId = new ObjectUtil(loader, packagz + ".Tb$Column#id");
ObjectUtil TbColumnField1 = new ObjectUtil(loader, packagz + ".Tb$Column#field1");
ObjectUtil TbColumnTsIncF2 = new ObjectUtil(loader, packagz + ".Tb$Column#tsIncF2");
Object columns = Array.newInstance(TbColumnField1.getCls(), 2);
Array.set(columns, 0, TbColumnField1.getObject());
Array.set(columns, 1, TbColumnTsIncF2.getObject());
Object columns = Array.newInstance(TbColumnField1.getCls(), 3);
Array.set(columns, 0, TbColumnId.getObject());
Array.set(columns, 1, TbColumnField1.getObject());
Array.set(columns, 2, TbColumnTsIncF2.getObject());
// sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "insertSelective", tb.getObject(), columns);
Assert.assertEquals(sql, "insert into tb ( field_1 , inc_f2 ) values ( 'null' , 5 )");
Assert.assertEquals(sql, "insert into tb ( id , field_1 , inc_f2 ) values ( 121 , 'null' , 5 )");
Object result = tbMapper.invoke("insertSelective", tb.getObject(), columns);
Assert.assertEquals(result, 1);
}
......
src/test/java/com/itfsw/mybatis/generator/plugins/UpsertPluginTest.java
View file @ 535ca8a4
......@@ -165,7 +165,7 @@ public class UpsertPluginTest {
// sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertSelective", tb.getObject());
Assert.assertEquals(sql, "insert into tb ( id, field1 ) values ( 20, 'ts1' ) on duplicate key update field1 = 'ts1'");
Assert.assertEquals(sql, "insert into tb ( id, field1 ) values ( 20, 'ts1' ) on duplicate key update id = 20, field1 = 'ts1'");
Object result = tbMapper.invoke("upsertSelective", tb.getObject());
Assert.assertEquals(result, 1);
......@@ -179,7 +179,7 @@ public class UpsertPluginTest {
// sql
sql = SqlHelper.getFormatMapperSql(TbBlobsMapper.getObject(), "upsertSelective", TbBlobsWithBLOBs.getObject());
Assert.assertEquals(sql, "insert into tb_blobs ( id, field1, field2 ) values ( 500, 'ts1', 'ts2' ) on duplicate key update field1 = 'ts1', field2 = 'ts2'");
Assert.assertEquals(sql, "insert into tb_blobs ( id, field1, field2 ) values ( 500, 'ts1', 'ts2' ) on duplicate key update id = 500, field1 = 'ts1', field2 = 'ts2'");
result = TbBlobsMapper.invoke("upsertSelective", TbBlobsWithBLOBs.getObject());
Assert.assertEquals(result, 1);
}
......@@ -208,7 +208,7 @@ public class UpsertPluginTest {
// sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExample", tb.getObject(), TbExample.getObject());
Assert.assertEquals(sql, "update tb set field1 = 'ts1', field2 = 5 WHERE ( id = '50' ) ; insert into tb (id, field1, field2) select 50, 'ts1', 5 from dual where not exists ( select 1 from tb WHERE ( id = '50' ) )");
Assert.assertEquals(sql, "update tb set id = 50, field1 = 'ts1', field2 = 5 WHERE ( id = '50' ) ; insert into tb (id, field1, field2) select 50, 'ts1', 5 from dual where not exists ( select 1 from tb WHERE ( id = '50' ) )");
tbMapper.invoke("upsertByExample", tb.getObject(), TbExample.getObject());
......@@ -305,7 +305,7 @@ public class UpsertPluginTest {
// sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExampleSelective", tb.getObject(), TbExample.getObject());
Assert.assertEquals(sql, "update tb set field1 = 'ts1' WHERE ( id = '100' ) ; insert into tb ( id, field1 ) select 100, 'ts1' from dual where not exists ( select 1 from tb WHERE ( id = '100' ) )");
Assert.assertEquals(sql, "update tb set id = 100, field1 = 'ts1' WHERE ( id = '100' ) ; insert into tb ( id, field1 ) select 100, 'ts1' from dual where not exists ( select 1 from tb WHERE ( id = '100' ) )");
tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject());
// 2. blobs
......@@ -322,9 +322,41 @@ public class UpsertPluginTest {
// sql
sql = SqlHelper.getFormatMapperSql(TbBlobsMapper.getObject(), "upsertByExampleSelective", TbBlobsWithBLOBs.getObject(), TbBlobsExample.getObject());
Assert.assertEquals(sql, "update tb_blobs set field1 = 'ts1', field2 = 'ts2' WHERE ( id = '60' ) ; insert into tb_blobs ( id, field1, field2 ) select 200, 'ts1', 'ts2' from dual where not exists ( select 1 from tb_blobs WHERE ( id = '60' ) )");
Assert.assertEquals(sql, "update tb_blobs set id = 200, field1 = 'ts1', field2 = 'ts2' WHERE ( id = '60' ) ; insert into tb_blobs ( id, field1, field2 ) select 200, 'ts1', 'ts2' from dual where not exists ( select 1 from tb_blobs WHERE ( id = '60' ) )");
TbBlobsMapper.invoke("upsertByExampleSelective", TbBlobsWithBLOBs.getObject(), TbBlobsExample.getObject());
}
});
}
/**
* 测试 存在自增主键的情况
*/
@Test
public void testWithIdentityAndGeneratedAlwaysColumns() throws IOException, XMLParserException, InvalidConfigurationException, InterruptedException, SQLException {
MyBatisGeneratorTool tool = MyBatisGeneratorTool.create("scripts/UpsertPlugin/mybatis-generator.xml");
tool.generate(new AbstractShellCallback() {
@Override
public void reloadProject(SqlSession sqlSession, ClassLoader loader, String packagz) throws Exception {
ObjectUtil tbMapper = new ObjectUtil(sqlSession.getMapper(loader.loadClass(packagz + ".TbWithIncIdMapper")));
ObjectUtil tb = new ObjectUtil(loader, packagz + ".TbWithIncId");
tb.set("field1", "ts1");
tb.set("field2", 5);
// sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsert", tb.getObject());
Assert.assertEquals(sql, "insert into tb_with_inc_id ( field1, field2 ) values ( 'ts1', 5 ) on duplicate key update field1 = 'ts1', field2 = 5");
tbMapper.invoke("upsert", tb.getObject());
// 获取ID
Long id = (Long) tb.get("id");
tb.set("field2", 20);
tbMapper.invoke("upsert", tb.getObject());
ResultSet rs = DBHelper.execute(sqlSession, "select * from tb_with_inc_id where id = " + id);
rs.first();
Assert.assertEquals(rs.getInt("field2"), 20);
}
});
}
}
src/test/resources/scripts/IncrementsPlugin/init.sql
View file @ 535ca8a4
......@@ -20,7 +20,7 @@ SET FOREIGN_KEY_CHECKS=0;
-- ----------------------------
DROP TABLE IF EXISTS `tb`;
CREATE TABLE `tb` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '注释1',
`id` bigint(20) NOT NULL COMMENT '注释1',
`field1` varchar(255) DEFAULT NULL COMMENT '注释2',
`inc_f1` bigint(20) NOT NULL DEFAULT '0',
`inc_f2` bigint(20) NOT NULL DEFAULT '0',
......
src/test/resources/scripts/IncrementsPlugin/mybatis-generator-with-upsert-plugin.xml
View file @ 535ca8a4
......@@ -53,8 +53,6 @@
<!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 要自动生成的表 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
<table tableName="tb">
<property name="incrementsColumns" value="inc_f1"/>
<generatedKey column="id" sqlStatement="MySql" identity="true"/>
</table>
<table tableName="tb_keys">
<property name="incrementsColumns" value="inc_f1,inc_f2,inc_f3"/>
......
src/test/resources/scripts/OldSelectiveEnhancedPlugin/init.sql
View file @ 535ca8a4
......@@ -20,7 +20,7 @@ SET FOREIGN_KEY_CHECKS=0;
-- ----------------------------
DROP TABLE IF EXISTS `tb`;
CREATE TABLE `tb` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '注释1',
`id` bigint(20) NOT NULL COMMENT '注释1',
`field_1` varchar(255) DEFAULT NULL COMMENT '注释2',
`inc_f1` bigint(20) NOT NULL DEFAULT '0',
`inc_f2` bigint(20) NOT NULL DEFAULT '0',
......
src/test/resources/scripts/OldSelectiveEnhancedPlugin/mybatis-generator.xml
View file @ 535ca8a4
......@@ -46,8 +46,6 @@
<!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 要自动生成的表 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
<table tableName="tb">
<generatedKey column="id" sqlStatement="MySql" identity="true"/>
<columnOverride column="inc_f2" property="tsIncF2"/>
</table>
</context>
......
src/test/resources/scripts/UpsertPlugin/init.sql
View file @ 535ca8a4
......@@ -20,7 +20,7 @@ SET FOREIGN_KEY_CHECKS=0;
-- ----------------------------
DROP TABLE IF EXISTS `tb`;
CREATE TABLE `tb` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '注释1',
`id` bigint(20) NOT NULL COMMENT '注释1',
`field1` varchar(255) DEFAULT NULL COMMENT '注释2',
`field2` int(11) DEFAULT NULL,
PRIMARY KEY (`id`)
......@@ -38,7 +38,7 @@ INSERT INTO `tb` VALUES ('3', 'fd3', '3');
-- ----------------------------
DROP TABLE IF EXISTS `tb_blobs`;
CREATE TABLE `tb_blobs` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '注释1',
`id` bigint(20) NOT NULL COMMENT '注释1',
`field1` varchar(255) DEFAULT NULL,
`field2` longtext COMMENT '注释2',
`field3` longtext,
......@@ -54,7 +54,7 @@ CREATE TABLE `tb_blobs` (
-- ----------------------------
DROP TABLE IF EXISTS `tb_keys`;
CREATE TABLE `tb_keys` (
`key1` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '注释1',
`key1` bigint(20) NOT NULL COMMENT '注释1',
`key2` varchar(255) NOT NULL,
`field1` varchar(255) DEFAULT NULL COMMENT '注释2',
`field2` int(11) DEFAULT NULL,
......@@ -73,7 +73,7 @@ INSERT INTO `tb_keys` VALUES ('3', '4', 'fd2', '3');
-- ----------------------------
DROP TABLE IF EXISTS `tb_single_blob`;
CREATE TABLE `tb_single_blob` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '注释1',
`id` bigint(20) NOT NULL COMMENT '注释1',
`field1` longtext COMMENT '注释2',
`field2` int(11) DEFAULT NULL,
PRIMARY KEY (`id`)
......@@ -82,3 +82,17 @@ CREATE TABLE `tb_single_blob` (
-- ----------------------------
-- Records of tb_single_blob
-- ----------------------------
-- ----------------------------
-- Table structure for tb_with_inc_id
-- ----------------------------
DROP TABLE IF EXISTS `tb_with_inc_id`;
CREATE TABLE `tb_with_inc_id` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '注释1',
`field1` varchar(255) DEFAULT NULL COMMENT '注释2',
`field2` int(11) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
-- ----------------------------
-- Table structure for tb_with_inc_id
-- ----------------------------
\ No newline at end of file
src/test/resources/scripts/UpsertPlugin/mybatis-generator.xml
View file @ 535ca8a4
......@@ -28,13 +28,13 @@
</plugin>
<!--jdbc的数据库连接 -->
<jdbcConnection driverClass="${driver}" connectionURL="${url}" userId="${username}" password="${password}" />
<jdbcConnection driverClass="${driver}" connectionURL="${url}" userId="${username}" password="${password}"/>
<!-- Model模型生成器,用来生成含有主键key的类，记录类 以及查询Example类
targetPackage 指定生成的model生成所在的包名
targetProject 指定在该项目下所在的路径 -->
<javaModelGenerator targetPackage="" targetProject=""/>
<!--Mapper映射文件生成所在的目录 为每一个数据库的表生成对应的SqlMap文件 -->
<sqlMapGenerator targetPackage="" targetProject="" />
<sqlMapGenerator targetPackage="" targetProject=""/>
<!-- 客户端代码，生成易于使用的针对Model对象和XML配置文件 的代码
type="ANNOTATEDMAPPER",生成Java Model 和基于注解的Mapper对象
type="MIXEDMAPPER",生成基于注解的Java Model 和相应的Mapper对象
......@@ -42,14 +42,11 @@
<javaClientGenerator targetPackage="" targetProject="" type="XMLMAPPER"/>
<!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 要自动生成的表 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
<table tableName="tb">
<generatedKey column="id" sqlStatement="MySql" identity="true"/>
</table>
<table tableName="tb_keys" />
<table tableName="tb_single_blob">
<generatedKey column="id" sqlStatement="MySql" identity="true"/>
</table>
<table tableName="tb_blobs">
<table tableName="tb"/>
<table tableName="tb_keys"/>
<table tableName="tb_single_blob"/>
<table tableName="tb_blobs"/>
<table tableName="tb_with_inc_id">
<generatedKey column="id" sqlStatement="MySql" identity="true"/>
</table>
</context>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment