Skip to content

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

重写 SelectiveEnhanced 插件

parent 75509542
Hide whitespace changes
Inline Side-by-side
Showing with 832 additions and 393 deletions
src/main/java/com/itfsw/mybatis/generator/plugins/IncrementsPlugin.java
View file @ a8c0a38a
...@@ -99,7 +99,12 @@ public class IncrementsPlugin extends BasePlugin { ...@@ -99,7 +99,12 @@ public class IncrementsPlugin extends BasePlugin {
*/ */
@Override @Override
public boolean sqlMapUpdateByExampleSelectiveElementGenerated(XmlElement element, IntrospectedTable introspectedTable) { public boolean sqlMapUpdateByExampleSelectiveElementGenerated(XmlElement element, IntrospectedTable introspectedTable) {
generatedWithSelective(element, introspectedTable, true); if (PluginTools.checkDependencyPlugin(context, SelectiveEnhancedPlugin.class)) {
// TODO SelectiveEnhancedPlugin.sqlMapUpdateByExampleSelectiveElementGenerated
} else {
generatedWithSelective(element, introspectedTable, true);
}
return true; return true;
} }
...@@ -135,7 +140,12 @@ public class IncrementsPlugin extends BasePlugin { ...@@ -135,7 +140,12 @@ public class IncrementsPlugin extends BasePlugin {
*/ */
@Override @Override
public boolean sqlMapUpdateByPrimaryKeySelectiveElementGenerated(XmlElement element, IntrospectedTable introspectedTable) { public boolean sqlMapUpdateByPrimaryKeySelectiveElementGenerated(XmlElement element, IntrospectedTable introspectedTable) {
generatedWithSelective(element, introspectedTable, false); if (PluginTools.checkDependencyPlugin(context, SelectiveEnhancedPlugin.class)) {
// TODO SelectiveEnhancedPlugin.sqlMapUpdateByPrimaryKeySelectiveElementGenerated
} else {
generatedWithSelective(element, introspectedTable, false);
}
return true; return true;
} }
......
src/main/java/com/itfsw/mybatis/generator/plugins/LogicalDeletePlugin.java
View file @ a8c0a38a
...@@ -339,21 +339,7 @@ public class LogicalDeletePlugin extends BasePlugin { ...@@ -339,21 +339,7 @@ public class LogicalDeletePlugin extends BasePlugin {
logicalDeleteByPrimaryKey.addElement(new TextElement(sb1.toString())); logicalDeleteByPrimaryKey.addElement(new TextElement(sb1.toString()));
boolean and = false; XmlElementGeneratorTools.generateWhereByPrimaryKeyTo(logicalDeleteByPrimaryKey, introspectedTable.getPrimaryKeyColumns());
for (IntrospectedColumn introspectedColumn : introspectedTable.getPrimaryKeyColumns()) {
sb.setLength(0);
if (and) {
sb.append(" and ");
} else {
sb.append("where ");
and = true;
}
sb.append(MyBatis3FormattingUtilities.getEscapedColumnName(introspectedColumn));
sb.append(" = ");
sb.append(MyBatis3FormattingUtilities.getParameterClause(introspectedColumn));
logicalDeleteByPrimaryKey.addElement(new TextElement(sb.toString()));
}
document.getRootElement().addElement(logicalDeleteByPrimaryKey); document.getRootElement().addElement(logicalDeleteByPrimaryKey);
logger.debug("itfsw(逻辑删除插件):" + introspectedTable.getMyBatis3XmlMapperFileName() + "增加方法logicalDeleteByPrimaryKey的实现。"); logger.debug("itfsw(逻辑删除插件):" + introspectedTable.getMyBatis3XmlMapperFileName() + "增加方法logicalDeleteByPrimaryKey的实现。");
...@@ -394,21 +380,7 @@ public class LogicalDeletePlugin extends BasePlugin { ...@@ -394,21 +380,7 @@ public class LogicalDeletePlugin extends BasePlugin {
sb.append(introspectedTable.getAliasedFullyQualifiedTableNameAtRuntime()); sb.append(introspectedTable.getAliasedFullyQualifiedTableNameAtRuntime());
selectByPrimaryKey.addElement(new TextElement(sb.toString())); selectByPrimaryKey.addElement(new TextElement(sb.toString()));
and = false; XmlElementGeneratorTools.generateWhereByPrimaryKeyTo(selectByPrimaryKey, introspectedTable.getPrimaryKeyColumns());
for (IntrospectedColumn introspectedColumn : introspectedTable.getPrimaryKeyColumns()) {
sb.setLength(0);
if (and) {
sb.append(" and ");
} else {
sb.append("where ");
and = true;
}
sb.append(MyBatis3FormattingUtilities.getAliasedEscapedColumnName(introspectedColumn));
sb.append(" = ");
sb.append(MyBatis3FormattingUtilities.getParameterClause(introspectedColumn));
selectByPrimaryKey.addElement(new TextElement(sb.toString()));
}
// 逻辑删除的判断 // 逻辑删除的判断
sb.setLength(0); sb.setLength(0);
......
src/main/java/com/itfsw/mybatis/generator/plugins/ModelColumnPlugin.java
View file @ a8c0a38a
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package com.itfsw.mybatis.generator.plugins; package com.itfsw.mybatis.generator.plugins;
import com.itfsw.mybatis.generator.plugins.utils.BasePlugin; import com.itfsw.mybatis.generator.plugins.utils.BasePlugin;
import com.itfsw.mybatis.generator.plugins.utils.JavaElementGeneratorTools;
import org.mybatis.generator.api.IntrospectedColumn; import org.mybatis.generator.api.IntrospectedColumn;
import org.mybatis.generator.api.IntrospectedTable; import org.mybatis.generator.api.IntrospectedTable;
import org.mybatis.generator.api.dom.java.*; import org.mybatis.generator.api.dom.java.*;
...@@ -73,12 +74,11 @@ public class ModelColumnPlugin extends BasePlugin { ...@@ -73,12 +74,11 @@ public class ModelColumnPlugin extends BasePlugin {
/** /**
* 生成Column字段枚举 * 生成Column字段枚举
*
* @param topLevelClass * @param topLevelClass
* @param introspectedTable * @param introspectedTable
* @return * @return
*/ */
private InnerEnum generateColumnEnum(TopLevelClass topLevelClass, IntrospectedTable introspectedTable){ private InnerEnum generateColumnEnum(TopLevelClass topLevelClass, IntrospectedTable introspectedTable) {
// 生成内部枚举 // 生成内部枚举
InnerEnum innerEnum = new InnerEnum(new FullyQualifiedJavaType(ENUM_NAME)); InnerEnum innerEnum = new InnerEnum(new FullyQualifiedJavaType(ENUM_NAME));
innerEnum.setVisibility(JavaVisibility.PUBLIC); innerEnum.setVisibility(JavaVisibility.PUBLIC);
...@@ -93,6 +93,18 @@ public class ModelColumnPlugin extends BasePlugin { ...@@ -93,6 +93,18 @@ public class ModelColumnPlugin extends BasePlugin {
commentGenerator.addFieldComment(columnField, introspectedTable); commentGenerator.addFieldComment(columnField, introspectedTable);
innerEnum.addField(columnField); innerEnum.addField(columnField);
Field javaPropertyField = new Field("javaProperty", FullyQualifiedJavaType.getStringInstance());
javaPropertyField.setVisibility(JavaVisibility.PRIVATE);
javaPropertyField.setFinal(true);
commentGenerator.addFieldComment(javaPropertyField, introspectedTable);
innerEnum.addField(javaPropertyField);
Field jdbcTypeField = new Field("jdbcType", FullyQualifiedJavaType.getStringInstance());
jdbcTypeField.setVisibility(JavaVisibility.PRIVATE);
jdbcTypeField.setFinal(true);
commentGenerator.addFieldComment(jdbcTypeField, introspectedTable);
innerEnum.addField(jdbcTypeField);
Method mValue = new Method("value"); Method mValue = new Method("value");
mValue.setVisibility(JavaVisibility.PUBLIC); mValue.setVisibility(JavaVisibility.PUBLIC);
mValue.setReturnType(FullyQualifiedJavaType.getStringInstance()); mValue.setReturnType(FullyQualifiedJavaType.getStringInstance());
...@@ -107,10 +119,22 @@ public class ModelColumnPlugin extends BasePlugin { ...@@ -107,10 +119,22 @@ public class ModelColumnPlugin extends BasePlugin {
commentGenerator.addGeneralMethodComment(mGetValue, introspectedTable); commentGenerator.addGeneralMethodComment(mGetValue, introspectedTable);
innerEnum.addMethod(mGetValue); innerEnum.addMethod(mGetValue);
Method mGetJavaProperty = JavaElementGeneratorTools.generateGetterMethod(javaPropertyField);
commentGenerator.addGeneralMethodComment(mGetJavaProperty, introspectedTable);
innerEnum.addMethod(mGetJavaProperty);
Method mGetJdbcType = JavaElementGeneratorTools.generateGetterMethod(jdbcTypeField);
commentGenerator.addGeneralMethodComment(mGetJdbcType, introspectedTable);
innerEnum.addMethod(mGetJdbcType);
Method constructor = new Method(ENUM_NAME); Method constructor = new Method(ENUM_NAME);
constructor.setConstructor(true); constructor.setConstructor(true);
constructor.addBodyLine("this.column = column;"); constructor.addBodyLine("this.column = column;");
constructor.addBodyLine("this.javaProperty = javaProperty;");
constructor.addBodyLine("this.jdbcType = jdbcType;");
constructor.addParameter(new Parameter(FullyQualifiedJavaType.getStringInstance(), "column")); constructor.addParameter(new Parameter(FullyQualifiedJavaType.getStringInstance(), "column"));
constructor.addParameter(new Parameter(FullyQualifiedJavaType.getStringInstance(), "javaProperty"));
constructor.addParameter(new Parameter(FullyQualifiedJavaType.getStringInstance(), "jdbcType"));
commentGenerator.addGeneralMethodComment(constructor, introspectedTable); commentGenerator.addGeneralMethodComment(constructor, introspectedTable);
innerEnum.addMethod(constructor); innerEnum.addMethod(constructor);
logger.debug("itfsw(数据Model属性对应Column获取插件):" + topLevelClass.getType().getShortName() + ".Column增加构造方法和column属性。"); logger.debug("itfsw(数据Model属性对应Column获取插件):" + topLevelClass.getType().getShortName() + ".Column增加构造方法和column属性。");
...@@ -123,6 +147,10 @@ public class ModelColumnPlugin extends BasePlugin { ...@@ -123,6 +147,10 @@ public class ModelColumnPlugin extends BasePlugin {
sb.append(field.getName()); sb.append(field.getName());
sb.append("(\""); sb.append("(\"");
sb.append(introspectedColumn.getActualColumnName()); sb.append(introspectedColumn.getActualColumnName());
sb.append("\", \"");
sb.append(introspectedColumn.getJavaProperty());
sb.append("\", \"");
sb.append(introspectedColumn.getJdbcTypeName());
sb.append("\")"); sb.append("\")");
innerEnum.addEnumConstant(sb.toString()); innerEnum.addEnumConstant(sb.toString());
......
src/main/java/com/itfsw/mybatis/generator/plugins/SelectiveEnhancedPlugin.java
View file @ a8c0a38a
/* /*
* Copyright (c) 2017. * Copyright (c) 2018.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -17,30 +17,31 @@ ...@@ -17,30 +17,31 @@
package com.itfsw.mybatis.generator.plugins; package com.itfsw.mybatis.generator.plugins;
import com.itfsw.mybatis.generator.plugins.utils.BasePlugin; import com.itfsw.mybatis.generator.plugins.utils.BasePlugin;
import com.itfsw.mybatis.generator.plugins.utils.IntrospectedTableTools;
import com.itfsw.mybatis.generator.plugins.utils.PluginTools; import com.itfsw.mybatis.generator.plugins.utils.PluginTools;
import com.itfsw.mybatis.generator.plugins.utils.XmlElementGeneratorTools; import com.itfsw.mybatis.generator.plugins.utils.XmlElementGeneratorTools;
import org.mybatis.generator.api.IntrospectedColumn; import org.mybatis.generator.api.IntrospectedColumn;
import org.mybatis.generator.api.IntrospectedTable; import org.mybatis.generator.api.IntrospectedTable;
import org.mybatis.generator.api.dom.java.*; import org.mybatis.generator.api.dom.java.FullyQualifiedJavaType;
import org.mybatis.generator.api.dom.xml.*; import org.mybatis.generator.api.dom.java.Interface;
import org.mybatis.generator.codegen.mybatis3.MyBatis3FormattingUtilities; import org.mybatis.generator.api.dom.java.Method;
import org.mybatis.generator.api.dom.java.Parameter;
import org.mybatis.generator.api.dom.xml.Attribute;
import org.mybatis.generator.api.dom.xml.TextElement;
import org.mybatis.generator.api.dom.xml.XmlElement;
import org.mybatis.generator.codegen.mybatis3.ListUtilities;
import org.mybatis.generator.config.GeneratedKey;
import java.util.List; import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/** /**
* --------------------------------------------------------------------------- * ---------------------------------------------------------------------------
* Selective 增强插件 * Selective 增强插件
* --------------------------------------------------------------------------- * ---------------------------------------------------------------------------
*
* @author: hewei * @author: hewei
* @time:2017/4/20 15:39 * @time:2018/4/20 15:39
* --------------------------------------------------------------------------- * ---------------------------------------------------------------------------
*/ */
public class SelectiveEnhancedPlugin extends BasePlugin { public class SelectiveEnhancedPlugin extends BasePlugin {
public static final String METHOD_HAS_SELECTIVE = "hasSelective"; // 方法名
/** /**
* {@inheritDoc} * {@inheritDoc}
...@@ -50,246 +51,315 @@ public class SelectiveEnhancedPlugin extends BasePlugin { ...@@ -50,246 +51,315 @@ public class SelectiveEnhancedPlugin extends BasePlugin {
// 插件使用前提是使用了ModelColumnPlugin插件 // 插件使用前提是使用了ModelColumnPlugin插件
if (!PluginTools.checkDependencyPlugin(getContext(), ModelColumnPlugin.class)) { if (!PluginTools.checkDependencyPlugin(getContext(), ModelColumnPlugin.class)) {
warnings.add("itfsw:插件" + this.getClass().getTypeName() + "插件需配合com.itfsw.mybatis.generator.plugins.ModelColumnPlugin插件使用！"); warnings.add("itfsw:插件" + this.getClass().getTypeName() + "插件需配合" + ModelColumnPlugin.class.getTypeName() + "插件使用！");
return false; return false;
} }
// 插件位置 // 和 OldSelectiveEnhancedPlugin 不能同时使用
PluginTools.shouldAfterPlugins(getContext(), this.getClass(), warnings, UpsertPlugin.class); if (PluginTools.checkDependencyPlugin(getContext(), OldSelectiveEnhancedPlugin.class)) {
warnings.add("itfsw:插件" + this.getClass().getTypeName() + "不能和" + OldSelectiveEnhancedPlugin.class.getTypeName() + "插件同时使用！");
return false;
}
return super.validate(warnings); return super.validate(warnings);
} }
/** /**
* Model Methods 生成 * insertSelective 方法生成
* 具体执行顺序 http://www.mybatis.org/generator/reference/pluggingIn.html * 具体执行顺序 http://www.mybatis.org/generator/reference/pluggingIn.html
* * @param method
* @param topLevelClass * @param interfaze
* @param introspectedTable * @param introspectedTable
* @return * @return
*/ */
@Override @Override
public boolean modelBaseRecordClassGenerated(TopLevelClass topLevelClass, IntrospectedTable introspectedTable) { public boolean clientInsertSelectiveMethodGenerated(Method method, Interface interfaze, IntrospectedTable introspectedTable) {
// import method.getParameters().clear();
topLevelClass.addImportedType(FullyQualifiedJavaType.getNewMapInstance());
topLevelClass.addImportedType(FullyQualifiedJavaType.getNewHashMapInstance()); FullyQualifiedJavaType parameterType = introspectedTable.getRules().calculateAllFieldsClass();
method.addParameter(new Parameter(parameterType, "record", "@Param(\"record\")"));
// field
Field selectiveColumnsField = new Field("selectiveColumns", new FullyQualifiedJavaType("Map<String, Boolean>")); // 找出全字段对应的Model
commentGenerator.addFieldComment(selectiveColumnsField, introspectedTable); FullyQualifiedJavaType fullFieldModel = introspectedTable.getRules().calculateAllFieldsClass();
selectiveColumnsField.setVisibility(JavaVisibility.PRIVATE); // column枚举
selectiveColumnsField.setInitializationString("new HashMap<String, Boolean>()"); FullyQualifiedJavaType selectiveType = new FullyQualifiedJavaType(fullFieldModel.getShortName() + "." + ModelColumnPlugin.ENUM_NAME);
topLevelClass.addField(selectiveColumnsField); method.addParameter(new Parameter(selectiveType, "selective", "@Param(\"selective\")", true));
// Method hasSelective method.getJavaDocLines().clear();
Method mHasSelective = new Method(METHOD_HAS_SELECTIVE); commentGenerator.addGeneralMethodComment(method, introspectedTable);
commentGenerator.addGeneralMethodComment(mHasSelective, introspectedTable);
mHasSelective.setVisibility(JavaVisibility.PUBLIC); return super.clientInsertSelectiveMethodGenerated(method, interfaze, introspectedTable);
mHasSelective.setReturnType(FullyQualifiedJavaType.getBooleanPrimitiveInstance());
mHasSelective.addBodyLine("return this.selectiveColumns.size() > 0;");
topLevelClass.addMethod(mHasSelective);
// Method hasSelective
Method mHasSelective1 = new Method(METHOD_HAS_SELECTIVE);
commentGenerator.addGeneralMethodComment(mHasSelective1, introspectedTable);
mHasSelective1.setVisibility(JavaVisibility.PUBLIC);
mHasSelective1.setReturnType(FullyQualifiedJavaType.getBooleanPrimitiveInstance());
mHasSelective1.addParameter(new Parameter(FullyQualifiedJavaType.getStringInstance(), "column"));
mHasSelective1.addBodyLine("return this.selectiveColumns.get(column) != null;");
topLevelClass.addMethod(mHasSelective1);
// Method selective
Method mSelective = new Method("selective");
commentGenerator.addGeneralMethodComment(mSelective, introspectedTable);
mSelective.setVisibility(JavaVisibility.PUBLIC);
mSelective.setReturnType(topLevelClass.getType());
mSelective.addParameter(new Parameter(new FullyQualifiedJavaType(ModelColumnPlugin.ENUM_NAME), "columns", true));
mSelective.addBodyLine("this.selectiveColumns.clear();");
mSelective.addBodyLine("if (columns != null) {");
mSelective.addBodyLine("for (" + ModelColumnPlugin.ENUM_NAME + " column : columns) {");
mSelective.addBodyLine("this.selectiveColumns.put(column.value(), true);");
mSelective.addBodyLine("}");
mSelective.addBodyLine("}");
mSelective.addBodyLine("return this;");
topLevelClass.addMethod(mSelective);
return true;
} }
/** /**
* SQL Map Methods 生成 * updateByExampleSelective
* 具体执行顺序 http://www.mybatis.org/generator/reference/pluggingIn.html * 具体执行顺序 http://www.mybatis.org/generator/reference/pluggingIn.html
* * @param method
* @param document * @param interfaze
* @param introspectedTable * @param introspectedTable
* @return * @return
*/ */
@Override @Override
public boolean sqlMapDocumentGenerated(Document document, IntrospectedTable introspectedTable) { public boolean clientUpdateByExampleSelectiveMethodGenerated(Method method, Interface interfaze, IntrospectedTable introspectedTable) {
List<Element> rootElements = document.getRootElement().getElements(); method.getParameters().clear();
for (Element rootElement : rootElements) {
if (rootElement instanceof XmlElement) {
XmlElement xmlElement = (XmlElement) rootElement;
List<Attribute> attributes = xmlElement.getAttributes();
// 查找ID
String id = "";
for (Attribute attribute : attributes) {
if (attribute.getName().equals("id")) {
id = attribute.getValue();
}
}
// ====================================== 1. insertSelective ====================================== FullyQualifiedJavaType parameterType = introspectedTable.getRules().calculateAllFieldsClass();
if ("insertSelective".equals(id)) { method.addParameter(new Parameter(parameterType, "record", "@Param(\"record\")"));
List<XmlElement> eles = XmlElementGeneratorTools.findXmlElements(xmlElement, "trim");
for (XmlElement ele : eles) { FullyQualifiedJavaType exampleType = new FullyQualifiedJavaType(introspectedTable.getExampleType());
this.replaceEle(ele, "_parameter.", introspectedTable); method.addParameter(new Parameter(exampleType, "example", "@Param(\"example\")"));
}
} // 找出全字段对应的Model
// ====================================== 2. updateByExampleSelective ====================================== FullyQualifiedJavaType fullFieldModel = introspectedTable.getRules().calculateAllFieldsClass();
if ("updateByExampleSelective".equals(id)) { // column枚举
List<XmlElement> eles = XmlElementGeneratorTools.findXmlElements(xmlElement, "set"); FullyQualifiedJavaType selectiveType = new FullyQualifiedJavaType(fullFieldModel.getShortName() + "." + ModelColumnPlugin.ENUM_NAME);
for (XmlElement ele : eles) { method.addParameter(new Parameter(selectiveType, "selective", "@Param(\"selective\")", true));
this.replaceEle(ele, "record.", introspectedTable);
} method.getJavaDocLines().clear();
} commentGenerator.addGeneralMethodComment(method, introspectedTable);
// ====================================== 3. updateByPrimaryKeySelective ====================================== return super.clientUpdateByExampleSelectiveMethodGenerated(method, interfaze, introspectedTable);
if ("updateByPrimaryKeySelective".equals(id)) { }
List<XmlElement> eles = XmlElementGeneratorTools.findXmlElements(xmlElement, "set");
for (XmlElement ele : eles) { /**
this.replaceEle(ele, "_parameter.", introspectedTable); * updateByPrimaryKeySelective
} * 具体执行顺序 http://www.mybatis.org/generator/reference/pluggingIn.html
} * @param method
// ====================================== 4. upsertSelective ====================================== * @param interfaze
if ("upsertSelective".equals(id)) { * @param introspectedTable
List<XmlElement> eles = XmlElementGeneratorTools.findXmlElements(xmlElement, "trim"); * @return
for (XmlElement ele : eles) { */
this.replaceEle(ele, "_parameter.", introspectedTable); @Override
} public boolean clientUpdateByPrimaryKeySelectiveMethodGenerated(Method method, Interface interfaze, IntrospectedTable introspectedTable) {
} method.getParameters().clear();
// ====================================== 5. upsertByExampleSelective ======================================
if ("upsertByExampleSelective".equals(id)) { FullyQualifiedJavaType parameterType;
List<XmlElement> eles = XmlElementGeneratorTools.findXmlElements(xmlElement, "trim"); if (introspectedTable.getRules().generateRecordWithBLOBsClass()) {
this.replaceEle(eles.get(0), "record.", introspectedTable); parameterType = new FullyQualifiedJavaType(introspectedTable.getRecordWithBLOBsType());
// upsertByExampleSelective的第二个trim比较特殊，需另行处理 } else {
this.replaceEleForUpsertByExampleSelective(eles.get(1), "record.", introspectedTable, !introspectedTable.getRules().generateRecordWithBLOBsClass()); parameterType = new FullyQualifiedJavaType(introspectedTable.getBaseRecordType());
List<XmlElement> eles1 = XmlElementGeneratorTools.findXmlElements(xmlElement, "set");
for (XmlElement ele : eles1) {
this.replaceEle(ele, "record.", introspectedTable);
}
}
}
} }
return true;
method.addParameter(new Parameter(parameterType, "record", "@Param(\"record\")"));
// 找出全字段对应的Model
FullyQualifiedJavaType fullFieldModel = introspectedTable.getRules().calculateAllFieldsClass();
// column枚举
FullyQualifiedJavaType selectiveType = new FullyQualifiedJavaType(fullFieldModel.getShortName() + "." + ModelColumnPlugin.ENUM_NAME);
method.addParameter(new Parameter(selectiveType, "selective", "@Param(\"selective\")", true));
method.getJavaDocLines().clear();
commentGenerator.addGeneralMethodComment(method, introspectedTable);
return super.clientUpdateByPrimaryKeySelectiveMethodGenerated(method, interfaze, introspectedTable);
} }
/** /**
* 替换节点if信息 * insertSelective
* * 具体执行顺序 http://www.mybatis.org/generator/reference/pluggingIn.html
* @param element * @param element
* @param prefix
* @param introspectedTable * @param introspectedTable
* @return
*/ */
private void replaceEle(XmlElement element, String prefix, IntrospectedTable introspectedTable) { @Override
// choose public boolean sqlMapInsertSelectiveElementGenerated(XmlElement element, IntrospectedTable introspectedTable) {
XmlElement chooseEle = new XmlElement("choose"); // 清空
// when XmlElement answer = element;
XmlElement whenEle = new XmlElement("when"); answer.getElements().clear();
whenEle.addAttribute(new Attribute("test", prefix + METHOD_HAS_SELECTIVE + "()")); answer.getAttributes().clear();
for (Element ele : element.getElements()) {
// 对于字符串主键，是没有if判断节点的
if (ele instanceof XmlElement) {
// if的text节点
XmlElement xmlElement = (XmlElement) ele;
// 找出field 名称
String text = ((TextElement) xmlElement.getElements().get(0)).getContent();
String columnName = "";
if (text.matches("#\\{.*\\},?")) {
Pattern pattern = Pattern.compile("#\\{(.*?),.*\\},?");
Matcher matcher = pattern.matcher(text);
if (matcher.find()) {
String field = matcher.group(1);
// 查找对应column
for (IntrospectedColumn column : introspectedTable.getAllColumns()) {
if (column.getJavaProperty().equals(field)) {
columnName = column.getActualColumnName();
}
}
}
} else {
if (text.matches(".*=.*")) {
columnName = text.split("=")[0];
} else {
columnName = text.replaceAll(",", "");
}
// bug fixed: 修正使用autoDelimitKeywords过滤关键词造成的field前后加了特殊字符的问题
// columnName = columnName.trim().replaceAll("`", "").replaceAll("\"", "").replaceAll("'", "");
}
IntrospectedColumn column = IntrospectedTableTools.safeGetColumn(introspectedTable, columnName); answer.addAttribute(new Attribute("id", introspectedTable.getInsertSelectiveStatementId()));
XmlElement ifEle = new XmlElement("if"); answer.addAttribute(new Attribute("parameterType", "map"));
ifEle.addAttribute(new Attribute("test", prefix + METHOD_HAS_SELECTIVE + "(\'" + column.getActualColumnName() + "\')")); commentGenerator.addComment(answer);
for (Element ifChild : xmlElement.getElements()) {
ifEle.addElement(ifChild); GeneratedKey gk = introspectedTable.getGeneratedKey();
if (gk != null) {
IntrospectedColumn introspectedColumn = introspectedTable.getColumn(gk.getColumn());
// if the column is null, then it's a configuration error. The
// warning has already been reported
if (introspectedColumn != null) {
if (gk.isJdbcStandard()) {
answer.addAttribute(new Attribute("useGeneratedKeys", "true"));
answer.addAttribute(new Attribute("keyProperty", introspectedColumn.getJavaProperty()));
answer.addAttribute(new Attribute("keyColumn", introspectedColumn.getActualColumnName()));
} else {
answer.addElement(XmlElementGeneratorTools.getSelectKey(introspectedColumn, gk));
} }
whenEle.addElement(ifEle);
} else {
whenEle.addElement(ele);
} }
} }
// otherwise StringBuilder sb = new StringBuilder();
XmlElement otherwiseEle = new XmlElement("otherwise");
for (Element ele : element.getElements()) { sb.append("insert into ");
otherwiseEle.addElement(ele); sb.append(introspectedTable.getFullyQualifiedTableNameAtRuntime());
} answer.addElement(new TextElement(sb.toString()));
// selective
XmlElement insertChooseEle = new XmlElement("choose");
answer.addElement(insertChooseEle);
chooseEle.addElement(whenEle); XmlElement insertWhenEle = new XmlElement("when");
chooseEle.addElement(otherwiseEle); insertWhenEle.addAttribute(new Attribute("test", "selective.length > 0"));
insertChooseEle.addElement(insertWhenEle);
// 清空原始节点，新增choose节点 XmlElement insertForeachEle = new XmlElement("foreach");
element.getElements().clear(); insertForeachEle.addAttribute(new Attribute("collection", "selective"));
element.addElement(chooseEle); insertForeachEle.addAttribute(new Attribute("item", "column"));
insertForeachEle.addAttribute(new Attribute("open", "("));
insertForeachEle.addAttribute(new Attribute("separator", ","));
insertForeachEle.addAttribute(new Attribute("close", ")"));
insertForeachEle.addElement(new TextElement("${column.value}"));
insertWhenEle.addElement(insertForeachEle);
XmlElement insertOtherwiseEle = new XmlElement("otherwise");
insertOtherwiseEle.addElement(XmlElementGeneratorTools.generateKeysSelective(
ListUtilities.removeIdentityAndGeneratedAlwaysColumns(introspectedTable.getAllColumns()),
"record."
));
insertChooseEle.addElement(insertOtherwiseEle);
XmlElement insertTrimElement = new XmlElement("trim");
insertTrimElement.addAttribute(new Attribute("prefix", "("));
insertTrimElement.addAttribute(new Attribute("suffix", ")"));
insertTrimElement.addAttribute(new Attribute("suffixOverrides", ","));
insertOtherwiseEle.addElement(insertTrimElement);
XmlElement valuesChooseEle = new XmlElement("choose");
answer.addElement(valuesChooseEle);
XmlElement valuesWhenEle = new XmlElement("when");
valuesWhenEle.addAttribute(new Attribute("test", "selective.length > 0"));
valuesChooseEle.addElement(valuesWhenEle);
XmlElement valuesForeachEle = new XmlElement("foreach");
valuesForeachEle.addAttribute(new Attribute("collection", "selective"));
valuesForeachEle.addAttribute(new Attribute("item", "column"));
valuesForeachEle.addAttribute(new Attribute("open", "values ("));
valuesForeachEle.addAttribute(new Attribute("separator", ","));
valuesForeachEle.addAttribute(new Attribute("close", ")"));
valuesForeachEle.addElement(new TextElement("#{record.${column.javaProperty},jdbcType=${column.jdbcType}}"));
valuesWhenEle.addElement(valuesForeachEle);
XmlElement valuesOtherwiseEle = new XmlElement("otherwise");
valuesOtherwiseEle.addElement(XmlElementGeneratorTools.generateValuesSelective(
ListUtilities.removeIdentityAndGeneratedAlwaysColumns(introspectedTable.getAllColumns()),
"record."
));
valuesChooseEle.addElement(valuesOtherwiseEle);
XmlElement valuesTrimElement = new XmlElement("trim");
valuesTrimElement.addAttribute(new Attribute("prefix", "values ("));
valuesTrimElement.addAttribute(new Attribute("suffix", ")"));
valuesTrimElement.addAttribute(new Attribute("suffixOverrides", ","));
valuesOtherwiseEle.addElement(valuesTrimElement);
return super.sqlMapInsertSelectiveElementGenerated(element, introspectedTable);
} }
/** /**
* 替换节点upsertByExampleSelective if信息 * updateByExampleSelective
* * 具体执行顺序 http://www.mybatis.org/generator/reference/pluggingIn.html
* @param element * @param element
* @param prefix
* @param introspectedTable * @param introspectedTable
* @param allColumns * @return
*/ */
private void replaceEleForUpsertByExampleSelective(XmlElement element, String prefix, IntrospectedTable introspectedTable, boolean allColumns) { @Override
// choose public boolean sqlMapUpdateByExampleSelectiveElementGenerated(XmlElement element, IntrospectedTable introspectedTable) {
XmlElement chooseEle = new XmlElement("choose"); // 清空
// when XmlElement answer = element;
XmlElement whenEle = new XmlElement("when"); answer.getElements().clear();
whenEle.addAttribute(new Attribute("test", prefix + METHOD_HAS_SELECTIVE + "()")); answer.getAttributes().clear();
for (IntrospectedColumn introspectedColumn : (allColumns ? introspectedTable.getAllColumns() : introspectedTable.getNonBLOBColumns())) {
XmlElement eleIf = new XmlElement("if");
eleIf.addAttribute(new Attribute("test", prefix + METHOD_HAS_SELECTIVE + "(\'" + introspectedColumn.getActualColumnName() + "\')"));
eleIf.addElement(new TextElement(MyBatis3FormattingUtilities.getParameterClause(introspectedColumn, prefix) + ","));
whenEle.addElement(eleIf);
}
// otherwise answer.addAttribute(new Attribute("id", introspectedTable.getUpdateByExampleSelectiveStatementId()));
XmlElement otherwiseEle = new XmlElement("otherwise"); answer.addAttribute(new Attribute("parameterType", "map"));
for (Element ele : element.getElements()) {
otherwiseEle.addElement(ele); commentGenerator.addComment(answer);
}
StringBuilder sb = new StringBuilder();
sb.append("update ");
sb.append(introspectedTable.getAliasedFullyQualifiedTableNameAtRuntime());
answer.addElement(new TextElement(sb.toString()));
// selective
XmlElement setChooseEle = new XmlElement("choose");
answer.addElement(setChooseEle);
XmlElement setWhenEle = new XmlElement("when");
setWhenEle.addAttribute(new Attribute("test", "selective.length > 0"));
setChooseEle.addElement(setWhenEle);
XmlElement setForeachEle = new XmlElement("foreach");
setForeachEle.addAttribute(new Attribute("collection", "selective"));
setForeachEle.addAttribute(new Attribute("item", "column"));
setForeachEle.addAttribute(new Attribute("open", "SET"));
setForeachEle.addAttribute(new Attribute("separator", ","));
setForeachEle.addElement(new TextElement("${column.value} = #{record.${column.javaProperty},jdbcType=${column.jdbcType}}"));
setWhenEle.addElement(setForeachEle);
XmlElement setOtherwiseEle = new XmlElement("otherwise");
setOtherwiseEle.addElement(XmlElementGeneratorTools.generateSetsSelective(
ListUtilities.removeGeneratedAlwaysColumns(introspectedTable.getAllColumns()),
"record."
));
setChooseEle.addElement(setOtherwiseEle);
answer.addElement(XmlElementGeneratorTools.getUpdateByExampleIncludeElement(introspectedTable));
return super.sqlMapUpdateByExampleSelectiveElementGenerated(element, introspectedTable);
}
/**
* updateByPrimaryKeySelective
* 具体执行顺序 http://www.mybatis.org/generator/reference/pluggingIn.html
* @param element
* @param introspectedTable
* @return
*/
@Override
public boolean sqlMapUpdateByPrimaryKeySelectiveElementGenerated(XmlElement element, IntrospectedTable introspectedTable) {
// 清空
XmlElement answer = element;
answer.getElements().clear();
answer.getAttributes().clear();
answer.addAttribute(new Attribute("id", introspectedTable.getUpdateByPrimaryKeySelectiveStatementId()));
answer.addAttribute(new Attribute("parameterType", "map"));
commentGenerator.addComment(answer);
StringBuilder sb = new StringBuilder();
sb.append("update ");
sb.append(introspectedTable.getFullyQualifiedTableNameAtRuntime());
answer.addElement(new TextElement(sb.toString()));
// selective
XmlElement setChooseEle = new XmlElement("choose");
answer.addElement(setChooseEle);
XmlElement setWhenEle = new XmlElement("when");
setWhenEle.addAttribute(new Attribute("test", "selective.length > 0"));
setChooseEle.addElement(setWhenEle);
XmlElement setForeachEle = new XmlElement("foreach");
setForeachEle.addAttribute(new Attribute("collection", "selective"));
setForeachEle.addAttribute(new Attribute("item", "column"));
setForeachEle.addAttribute(new Attribute("open", "SET"));
setForeachEle.addAttribute(new Attribute("separator", ","));
setForeachEle.addElement(new TextElement("${column.value} = #{record.${column.javaProperty},jdbcType=${column.jdbcType}}"));
setWhenEle.addElement(setForeachEle);
XmlElement setOtherwiseEle = new XmlElement("otherwise");
setOtherwiseEle.addElement(XmlElementGeneratorTools.generateSetsSelective(
ListUtilities.removeGeneratedAlwaysColumns(introspectedTable.getNonPrimaryKeyColumns()),
"record."
));
setChooseEle.addElement(setOtherwiseEle);
chooseEle.addElement(whenEle); XmlElementGeneratorTools.generateWhereByPrimaryKeyTo(answer, introspectedTable.getPrimaryKeyColumns(), "record.");
chooseEle.addElement(otherwiseEle);
// 清空原始节点，新增choose节点 return super.sqlMapUpdateByPrimaryKeySelectiveElementGenerated(element, introspectedTable);
element.getElements().clear();
element.addElement(chooseEle);
} }
} }
src/main/java/com/itfsw/mybatis/generator/plugins/UpsertPlugin.java
View file @ a8c0a38a
...@@ -48,6 +48,7 @@ public class UpsertPlugin extends BasePlugin { ...@@ -48,6 +48,7 @@ public class UpsertPlugin extends BasePlugin {
public static final String PRO_ALLOW_MULTI_QUERIES = "allowMultiQueries"; // property allowMultiQueries public static final String PRO_ALLOW_MULTI_QUERIES = "allowMultiQueries"; // property allowMultiQueries
private boolean allowMultiQueries = false; // 是否允许多sql提交 private boolean allowMultiQueries = false; // 是否允许多sql提交
private boolean withSelectiveEnhancedPlugin = false; // 是否启用了Selective增强插件
/** /**
* {@inheritDoc} * {@inheritDoc}
...@@ -70,6 +71,9 @@ public class UpsertPlugin extends BasePlugin { ...@@ -70,6 +71,9 @@ public class UpsertPlugin extends BasePlugin {
warnings.add("itfsw:插件" + this.getClass().getTypeName() + "插件您开启了allowMultiQueries支持，注意在jdbc url 配置中增加“allowMultiQueries=true”支持（不怎么建议使用该功能，开启多sql提交会增加sql注入的风险，请确保你所有sql都使用MyBatis书写，请不要使用statement进行sql提交）！"); warnings.add("itfsw:插件" + this.getClass().getTypeName() + "插件您开启了allowMultiQueries支持，注意在jdbc url 配置中增加“allowMultiQueries=true”支持（不怎么建议使用该功能，开启多sql提交会增加sql注入的风险，请确保你所有sql都使用MyBatis书写，请不要使用statement进行sql提交）！");
} }
// 是否启用了Selective增强插件
this.withSelectiveEnhancedPlugin = PluginTools.checkDependencyPlugin(context, SelectiveEnhancedPlugin.class);
return super.validate(warnings); return super.validate(warnings);
} }
...@@ -111,12 +115,21 @@ public class UpsertPlugin extends BasePlugin { ...@@ -111,12 +115,21 @@ public class UpsertPlugin extends BasePlugin {
} }
// ====================================== upsertSelective ====================================== // ====================================== upsertSelective ======================================
// 找出全字段对应的Model
FullyQualifiedJavaType fullFieldModel = introspectedTable.getRules().calculateAllFieldsClass();
Method mUpsertSelective = JavaElementGeneratorTools.generateMethod( Method mUpsertSelective = JavaElementGeneratorTools.generateMethod(
METHOD_UPSERT_SELECTIVE, METHOD_UPSERT_SELECTIVE,
JavaVisibility.DEFAULT, JavaVisibility.DEFAULT,
FullyQualifiedJavaType.getIntInstance(), FullyQualifiedJavaType.getIntInstance()
new Parameter(introspectedTable.getRules().calculateAllFieldsClass(), "record")
); );
if (withSelectiveEnhancedPlugin) {
mUpsertSelective.addParameter(new Parameter(fullFieldModel, "record", "@Param(\"record\")"));
// column枚举
FullyQualifiedJavaType selectiveType = new FullyQualifiedJavaType(fullFieldModel.getShortName() + "." + ModelColumnPlugin.ENUM_NAME);
mUpsertSelective.addParameter(new Parameter(selectiveType, "selective", "@Param(\"selective\")", true));
} else {
mUpsertSelective.addParameter(new Parameter(fullFieldModel, "record"));
}
commentGenerator.addGeneralMethodComment(mUpsertSelective, introspectedTable); commentGenerator.addGeneralMethodComment(mUpsertSelective, introspectedTable);
// interface 增加方法 // interface 增加方法
interfaze.addMethod(mUpsertSelective); interfaze.addMethod(mUpsertSelective);
...@@ -160,6 +173,11 @@ public class UpsertPlugin extends BasePlugin { ...@@ -160,6 +173,11 @@ public class UpsertPlugin extends BasePlugin {
new Parameter(introspectedTable.getRules().calculateAllFieldsClass(), "record", "@Param(\"record\")"), new Parameter(introspectedTable.getRules().calculateAllFieldsClass(), "record", "@Param(\"record\")"),
new Parameter(new FullyQualifiedJavaType(introspectedTable.getExampleType()), "example", "@Param(\"example\")") new Parameter(new FullyQualifiedJavaType(introspectedTable.getExampleType()), "example", "@Param(\"example\")")
); );
if (withSelectiveEnhancedPlugin){
// column枚举
FullyQualifiedJavaType selectiveType = new FullyQualifiedJavaType(fullFieldModel.getShortName() + "." + ModelColumnPlugin.ENUM_NAME);
mUpsertByExampleSelective.addParameter(new Parameter(selectiveType, "selective", "@Param(\"selective\")", true));
}
commentGenerator.addGeneralMethodComment(mUpsertByExampleSelective, introspectedTable); commentGenerator.addGeneralMethodComment(mUpsertByExampleSelective, introspectedTable);
// interface 增加方法 // interface 增加方法
interfaze.addMethod(mUpsertByExampleSelective); interfaze.addMethod(mUpsertByExampleSelective);
...@@ -191,60 +209,245 @@ public class UpsertPlugin extends BasePlugin { ...@@ -191,60 +209,245 @@ public class UpsertPlugin extends BasePlugin {
*/ */
private void generateXmlElementWithSelective(Document document, IntrospectedTable introspectedTable) { private void generateXmlElementWithSelective(Document document, IntrospectedTable introspectedTable) {
List<IntrospectedColumn> columns = ListUtilities.removeGeneratedAlwaysColumns(introspectedTable.getAllColumns()); List<IntrospectedColumn> columns = ListUtilities.removeGeneratedAlwaysColumns(introspectedTable.getAllColumns());
// ====================================== upsertSelective ======================================
XmlElement eleUpsertSelective = new XmlElement("insert");
eleUpsertSelective.addAttribute(new Attribute("id", METHOD_UPSERT_SELECTIVE));
// 添加注释(!!!必须添加注释，overwrite覆盖生成时，@see XmlFileMergerJaxp.isGeneratedNode会去判断注释中是否存在OLD_ELEMENT_TAGS中的一点，例子：@mbg.generated)
commentGenerator.addComment(eleUpsertSelective);
// 参数类型 if (withSelectiveEnhancedPlugin) {
eleUpsertSelective.addAttribute(new Attribute("parameterType", introspectedTable.getRules().calculateAllFieldsClass().getFullyQualifiedName())); // ====================================== upsertSelective ======================================
XmlElement eleUpsertSelective = new XmlElement("insert");
eleUpsertSelective.addAttribute(new Attribute("id", METHOD_UPSERT_SELECTIVE));
eleUpsertSelective.addAttribute(new Attribute("parameterType", "map"));
// 使用JDBC的getGenereatedKeys方法获取主键并赋值到keyProperty设置的领域模型属性中。所以只支持MYSQL和SQLServer // 添加注释(!!!必须添加注释，overwrite覆盖生成时，@see XmlFileMergerJaxp.isGeneratedNode会去判断注释中是否存在OLD_ELEMENT_TAGS中的一点，例子：@mbg.generated)
XmlElementGeneratorTools.useGeneratedKeys(eleUpsertSelective, introspectedTable); commentGenerator.addComment(eleUpsertSelective);
// insert // 使用JDBC的getGenereatedKeys方法获取主键并赋值到keyProperty设置的领域模型属性中。所以只支持MYSQL和SQLServer
eleUpsertSelective.addElement(new TextElement("insert into " + introspectedTable.getFullyQualifiedTableNameAtRuntime())); XmlElementGeneratorTools.useGeneratedKeys(eleUpsertSelective, introspectedTable, "record.");
eleUpsertSelective.addElement(XmlElementGeneratorTools.generateKeysSelective(columns));
eleUpsertSelective.addElement(new TextElement("values"));
eleUpsertSelective.addElement(XmlElementGeneratorTools.generateValuesSelective(columns));
eleUpsertSelective.addElement(new TextElement("on duplicate key update "));
// set 操作增加增量插件支持
this.incrementsSelectiveSupport(eleUpsertSelective, XmlElementGeneratorTools.generateSetsSelective(columns, null, false), introspectedTable, false);
document.getRootElement().addElement(eleUpsertSelective); // insert
logger.debug("itfsw(存在即更新插件):" + introspectedTable.getMyBatis3XmlMapperFileName() + "增加upsertSelective实现方法。"); eleUpsertSelective.addElement(new TextElement("insert into " + introspectedTable.getFullyQualifiedTableNameAtRuntime()));
if (this.allowMultiQueries) {
// ====================================== upsertByExampleSelective ====================================== // selective
XmlElement eleUpsertByExampleSelective = new XmlElement("insert"); XmlElement insertChooseEle = new XmlElement("choose");
eleUpsertByExampleSelective.addAttribute(new Attribute("id", METHOD_UPSERT_BY_EXAMPLE_SELECTIVE)); eleUpsertSelective.addElement(insertChooseEle);
// 参数类型
eleUpsertByExampleSelective.addAttribute(new Attribute("parameterType", "map")); XmlElement insertWhenEle = new XmlElement("when");
insertWhenEle.addAttribute(new Attribute("test", "selective.length > 0"));
insertChooseEle.addElement(insertWhenEle);
XmlElement insertForeachEle = new XmlElement("foreach");
insertForeachEle.addAttribute(new Attribute("collection", "selective"));
insertForeachEle.addAttribute(new Attribute("item", "column"));
insertForeachEle.addAttribute(new Attribute("open", "("));
insertForeachEle.addAttribute(new Attribute("separator", ","));
insertForeachEle.addAttribute(new Attribute("close", ")"));
insertForeachEle.addElement(new TextElement("${column.value}"));
insertWhenEle.addElement(insertForeachEle);
XmlElement insertOtherwiseEle = new XmlElement("otherwise");
insertOtherwiseEle.addElement(XmlElementGeneratorTools.generateKeysSelective(
ListUtilities.removeIdentityAndGeneratedAlwaysColumns(introspectedTable.getAllColumns()),
"record."
));
insertChooseEle.addElement(insertOtherwiseEle);
XmlElement insertTrimElement = new XmlElement("trim");
insertTrimElement.addAttribute(new Attribute("prefix", "("));
insertTrimElement.addAttribute(new Attribute("suffix", ")"));
insertTrimElement.addAttribute(new Attribute("suffixOverrides", ","));
insertOtherwiseEle.addElement(insertTrimElement);
XmlElement valuesChooseEle = new XmlElement("choose");
eleUpsertSelective.addElement(valuesChooseEle);
XmlElement valuesWhenEle = new XmlElement("when");
valuesWhenEle.addAttribute(new Attribute("test", "selective.length > 0"));
valuesChooseEle.addElement(valuesWhenEle);
XmlElement valuesForeachEle = new XmlElement("foreach");
valuesForeachEle.addAttribute(new Attribute("collection", "selective"));
valuesForeachEle.addAttribute(new Attribute("item", "column"));
valuesForeachEle.addAttribute(new Attribute("open", "values ("));
valuesForeachEle.addAttribute(new Attribute("separator", ","));
valuesForeachEle.addAttribute(new Attribute("close", ")"));
valuesForeachEle.addElement(new TextElement("#{record.${column.javaProperty},jdbcType=${column.jdbcType}}"));
valuesWhenEle.addElement(valuesForeachEle);
XmlElement valuesOtherwiseEle = new XmlElement("otherwise");
valuesOtherwiseEle.addElement(XmlElementGeneratorTools.generateValuesSelective(
ListUtilities.removeIdentityAndGeneratedAlwaysColumns(introspectedTable.getAllColumns()),
"record."
));
valuesChooseEle.addElement(valuesOtherwiseEle);
XmlElement valuesTrimElement = new XmlElement("trim");
valuesTrimElement.addAttribute(new Attribute("prefix", "values ("));
valuesTrimElement.addAttribute(new Attribute("suffix", ")"));
valuesTrimElement.addAttribute(new Attribute("suffixOverrides", ","));
valuesOtherwiseEle.addElement(valuesTrimElement);
eleUpsertSelective.addElement(new TextElement("on duplicate key update "));
// update selective
XmlElement setChooseEle = new XmlElement("choose");
eleUpsertSelective.addElement(setChooseEle);
XmlElement setWhenEle = new XmlElement("when");
setWhenEle.addAttribute(new Attribute("test", "selective.length > 0"));
setChooseEle.addElement(setWhenEle);
XmlElement setForeachEle = new XmlElement("foreach");
setForeachEle.addAttribute(new Attribute("collection", "selective"));
setForeachEle.addAttribute(new Attribute("item", "column"));
setForeachEle.addAttribute(new Attribute("separator", ","));
setForeachEle.addElement(new TextElement("${column.value} = #{record.${column.javaProperty},jdbcType=${column.jdbcType}}"));
setWhenEle.addElement(setForeachEle);
XmlElement setOtherwiseEle = new XmlElement("otherwise");
// set 操作增加增量插件支持
this.incrementsSelectiveSupport(setOtherwiseEle, XmlElementGeneratorTools.generateSetsSelective(columns, "record.", false), introspectedTable, false);
setChooseEle.addElement(setOtherwiseEle);
document.getRootElement().addElement(eleUpsertSelective);
logger.debug("itfsw(存在即更新插件):" + introspectedTable.getMyBatis3XmlMapperFileName() + "增加upsertSelective实现方法。");
if (this.allowMultiQueries) {
// ====================================== upsertByExampleSelective ======================================
XmlElement eleUpsertByExampleSelective = new XmlElement("insert");
eleUpsertByExampleSelective.addAttribute(new Attribute("id", METHOD_UPSERT_BY_EXAMPLE_SELECTIVE));
// 参数类型
eleUpsertByExampleSelective.addAttribute(new Attribute("parameterType", "map"));
// 添加注释(!!!必须添加注释，overwrite覆盖生成时，@see XmlFileMergerJaxp.isGeneratedNode会去判断注释中是否存在OLD_ELEMENT_TAGS中的一点，例子：@mbg.generated)
commentGenerator.addComment(eleUpsertByExampleSelective);
// 使用JDBC的getGenereatedKeys方法获取主键并赋值到keyProperty设置的领域模型属性中。所以只支持MYSQL和SQLServer
XmlElementGeneratorTools.useGeneratedKeys(eleUpsertByExampleSelective, introspectedTable, "record.");
// insert
eleUpsertByExampleSelective.addElement(new TextElement("insert into " + introspectedTable.getFullyQualifiedTableNameAtRuntime()));
// selective
insertChooseEle = new XmlElement("choose");
eleUpsertByExampleSelective.addElement(insertChooseEle);
insertWhenEle = new XmlElement("when");
insertWhenEle.addAttribute(new Attribute("test", "selective.length > 0"));
insertChooseEle.addElement(insertWhenEle);
insertForeachEle = new XmlElement("foreach");
insertForeachEle.addAttribute(new Attribute("collection", "selective"));
insertForeachEle.addAttribute(new Attribute("item", "column"));
insertForeachEle.addAttribute(new Attribute("open", "("));
insertForeachEle.addAttribute(new Attribute("separator", ","));
insertForeachEle.addAttribute(new Attribute("close", ")"));
insertForeachEle.addElement(new TextElement("${column.value}"));
insertWhenEle.addElement(insertForeachEle);
insertOtherwiseEle = new XmlElement("otherwise");
insertOtherwiseEle.addElement(XmlElementGeneratorTools.generateKeysSelective(
ListUtilities.removeIdentityAndGeneratedAlwaysColumns(introspectedTable.getAllColumns()),
"record."
));
insertChooseEle.addElement(insertOtherwiseEle);
insertTrimElement = new XmlElement("trim");
insertTrimElement.addAttribute(new Attribute("prefix", "("));
insertTrimElement.addAttribute(new Attribute("suffix", ")"));
insertTrimElement.addAttribute(new Attribute("suffixOverrides", ","));
insertOtherwiseEle.addElement(insertTrimElement);
this.generateExistsClause(introspectedTable, eleUpsertByExampleSelective, true, columns);
// multiQueries
eleUpsertByExampleSelective.addElement(new TextElement(";"));
// update
eleUpsertByExampleSelective.addElement(new TextElement("update " + introspectedTable.getAliasedFullyQualifiedTableNameAtRuntime()));
eleUpsertByExampleSelective.addElement(new TextElement("set"));
// selective
setChooseEle = new XmlElement("choose");
eleUpsertByExampleSelective.addElement(setChooseEle);
setWhenEle = new XmlElement("when");
setWhenEle.addAttribute(new Attribute("test", "selective.length > 0"));
setChooseEle.addElement(setWhenEle);
setForeachEle = new XmlElement("foreach");
setForeachEle.addAttribute(new Attribute("collection", "selective"));
setForeachEle.addAttribute(new Attribute("item", "column"));
setForeachEle.addAttribute(new Attribute("separator", ","));
setForeachEle.addElement(new TextElement("${column.value} = #{record.${column.javaProperty},jdbcType=${column.jdbcType}}"));
setWhenEle.addElement(setForeachEle);
setOtherwiseEle = new XmlElement("otherwise");
setOtherwiseEle.addElement(XmlElementGeneratorTools.generateSetsSelective(
ListUtilities.removeIdentityAndGeneratedAlwaysColumns(introspectedTable.getAllColumns()),
"record."
));
setChooseEle.addElement(setOtherwiseEle);
// update where
eleUpsertByExampleSelective.addElement(XmlElementGeneratorTools.getUpdateByExampleIncludeElement(introspectedTable));
document.getRootElement().addElement(eleUpsertByExampleSelective);
logger.debug("itfsw(存在即更新插件):" + introspectedTable.getMyBatis3XmlMapperFileName() + "增加upsertSelective实现方法。");
}
} else {
// ====================================== upsertSelective ======================================
XmlElement eleUpsertSelective = new XmlElement("insert");
eleUpsertSelective.addAttribute(new Attribute("id", METHOD_UPSERT_SELECTIVE));
// 添加注释(!!!必须添加注释，overwrite覆盖生成时，@see XmlFileMergerJaxp.isGeneratedNode会去判断注释中是否存在OLD_ELEMENT_TAGS中的一点，例子：@mbg.generated) // 添加注释(!!!必须添加注释，overwrite覆盖生成时，@see XmlFileMergerJaxp.isGeneratedNode会去判断注释中是否存在OLD_ELEMENT_TAGS中的一点，例子：@mbg.generated)
commentGenerator.addComment(eleUpsertByExampleSelective); commentGenerator.addComment(eleUpsertSelective);
// 参数类型
eleUpsertSelective.addAttribute(new Attribute("parameterType", introspectedTable.getRules().calculateAllFieldsClass().getFullyQualifiedName()));
// 使用JDBC的getGenereatedKeys方法获取主键并赋值到keyProperty设置的领域模型属性中。所以只支持MYSQL和SQLServer // 使用JDBC的getGenereatedKeys方法获取主键并赋值到keyProperty设置的领域模型属性中。所以只支持MYSQL和SQLServer
XmlElementGeneratorTools.useGeneratedKeys(eleUpsertByExampleSelective, introspectedTable, "record."); XmlElementGeneratorTools.useGeneratedKeys(eleUpsertSelective, introspectedTable);
// insert // insert
eleUpsertByExampleSelective.addElement(new TextElement("insert into " + introspectedTable.getFullyQualifiedTableNameAtRuntime())); eleUpsertSelective.addElement(new TextElement("insert into " + introspectedTable.getFullyQualifiedTableNameAtRuntime()));
eleUpsertByExampleSelective.addElement(XmlElementGeneratorTools.generateKeysSelective(columns, "record.")); eleUpsertSelective.addElement(XmlElementGeneratorTools.generateKeysSelective(columns));
this.generateExistsClause(introspectedTable, eleUpsertByExampleSelective, true, columns); eleUpsertSelective.addElement(new TextElement("values"));
eleUpsertSelective.addElement(XmlElementGeneratorTools.generateValuesSelective(columns));
eleUpsertSelective.addElement(new TextElement("on duplicate key update "));
// set 操作增加增量插件支持
this.incrementsSelectiveSupport(eleUpsertSelective, XmlElementGeneratorTools.generateSetsSelective(columns, null, false), introspectedTable, false);
// multiQueries document.getRootElement().addElement(eleUpsertSelective);
eleUpsertByExampleSelective.addElement(new TextElement(";")); logger.debug("itfsw(存在即更新插件):" + introspectedTable.getMyBatis3XmlMapperFileName() + "增加upsertSelective实现方法。");
if (this.allowMultiQueries) {
// ====================================== upsertByExampleSelective ======================================
XmlElement eleUpsertByExampleSelective = new XmlElement("insert");
eleUpsertByExampleSelective.addAttribute(new Attribute("id", METHOD_UPSERT_BY_EXAMPLE_SELECTIVE));
// 参数类型
eleUpsertByExampleSelective.addAttribute(new Attribute("parameterType", "map"));
// 添加注释(!!!必须添加注释，overwrite覆盖生成时，@see XmlFileMergerJaxp.isGeneratedNode会去判断注释中是否存在OLD_ELEMENT_TAGS中的一点，例子：@mbg.generated)
commentGenerator.addComment(eleUpsertByExampleSelective);
// update // 使用JDBC的getGenereatedKeys方法获取主键并赋值到keyProperty设置的领域模型属性中。所以只支持MYSQL和SQLServer
eleUpsertByExampleSelective.addElement(new TextElement("update " + introspectedTable.getAliasedFullyQualifiedTableNameAtRuntime())); XmlElementGeneratorTools.useGeneratedKeys(eleUpsertByExampleSelective, introspectedTable, "record.");
eleUpsertByExampleSelective.addElement(new TextElement("set"));
// set 操作增加增量插件支持
this.incrementsSelectiveSupport(eleUpsertByExampleSelective, XmlElementGeneratorTools.generateSetsSelective(ListUtilities.removeIdentityAndGeneratedAlwaysColumns(columns), "record."), introspectedTable, true);
// update where // insert
eleUpsertByExampleSelective.addElement(XmlElementGeneratorTools.getUpdateByExampleIncludeElement(introspectedTable)); eleUpsertByExampleSelective.addElement(new TextElement("insert into " + introspectedTable.getFullyQualifiedTableNameAtRuntime()));
eleUpsertByExampleSelective.addElement(XmlElementGeneratorTools.generateKeysSelective(columns, "record."));
this.generateExistsClause(introspectedTable, eleUpsertByExampleSelective, true, columns);
document.getRootElement().addElement(eleUpsertByExampleSelective); // multiQueries
logger.debug("itfsw(存在即更新插件):" + introspectedTable.getMyBatis3XmlMapperFileName() + "增加upsertSelective实现方法。"); eleUpsertByExampleSelective.addElement(new TextElement(";"));
// update
eleUpsertByExampleSelective.addElement(new TextElement("update " + introspectedTable.getAliasedFullyQualifiedTableNameAtRuntime()));
eleUpsertByExampleSelective.addElement(new TextElement("set"));
// set 操作增加增量插件支持
this.incrementsSelectiveSupport(eleUpsertByExampleSelective, XmlElementGeneratorTools.generateSetsSelective(ListUtilities.removeIdentityAndGeneratedAlwaysColumns(columns), "record."), introspectedTable, true);
// update where
eleUpsertByExampleSelective.addElement(XmlElementGeneratorTools.getUpdateByExampleIncludeElement(introspectedTable));
document.getRootElement().addElement(eleUpsertByExampleSelective);
logger.debug("itfsw(存在即更新插件):" + introspectedTable.getMyBatis3XmlMapperFileName() + "增加upsertSelective实现方法。");
}
} }
} }
...@@ -254,7 +457,7 @@ public class UpsertPlugin extends BasePlugin { ...@@ -254,7 +457,7 @@ public class UpsertPlugin extends BasePlugin {
* @param introspectedTable * @param introspectedTable
*/ */
private void generateXmlElementWithBLOBs(Document document, IntrospectedTable introspectedTable) { private void generateXmlElementWithBLOBs(Document document, IntrospectedTable introspectedTable) {
if (introspectedTable.hasBLOBColumns()){ if (introspectedTable.hasBLOBColumns()) {
List<IntrospectedColumn> columns = ListUtilities.removeGeneratedAlwaysColumns(introspectedTable.getAllColumns()); List<IntrospectedColumn> columns = ListUtilities.removeGeneratedAlwaysColumns(introspectedTable.getAllColumns());
// ====================================== upsertWithBLOBs ====================================== // ====================================== upsertWithBLOBs ======================================
XmlElement eleUpsertWithBLOBs = new XmlElement("insert"); XmlElement eleUpsertWithBLOBs = new XmlElement("insert");
...@@ -405,7 +608,37 @@ public class UpsertPlugin extends BasePlugin { ...@@ -405,7 +608,37 @@ public class UpsertPlugin extends BasePlugin {
private void generateExistsClause(IntrospectedTable introspectedTable, XmlElement element, boolean selective, List<IntrospectedColumn> columns) { private void generateExistsClause(IntrospectedTable introspectedTable, XmlElement element, boolean selective, List<IntrospectedColumn> columns) {
element.addElement(new TextElement("select")); element.addElement(new TextElement("select"));
if (selective) { if (selective) {
element.addElement(XmlElementGeneratorTools.generateValuesSelective(columns, "record.", false)); if (this.withSelectiveEnhancedPlugin){
// selective
XmlElement chooseEle = new XmlElement("choose");
element.addElement(chooseEle);
XmlElement selectWhenEle = new XmlElement("when");
selectWhenEle.addAttribute(new Attribute("test", "selective.length > 0"));
chooseEle.addElement(selectWhenEle);
XmlElement valuesForeachEle = new XmlElement("foreach");
valuesForeachEle.addAttribute(new Attribute("collection", "selective"));
valuesForeachEle.addAttribute(new Attribute("item", "column"));
valuesForeachEle.addAttribute(new Attribute("separator", ","));
valuesForeachEle.addElement(new TextElement("#{record.${column.javaProperty},jdbcType=${column.jdbcType}}"));
selectWhenEle.addElement(valuesForeachEle);
XmlElement selectOtherwiseEle = new XmlElement("otherwise");
selectOtherwiseEle.addElement(XmlElementGeneratorTools.generateValuesSelective(
ListUtilities.removeIdentityAndGeneratedAlwaysColumns(introspectedTable.getAllColumns()),
"record."
));
chooseEle.addElement(selectOtherwiseEle);
XmlElement valuesTrimElement = new XmlElement("trim");
valuesTrimElement.addAttribute(new Attribute("prefix", "("));
valuesTrimElement.addAttribute(new Attribute("suffix", ")"));
valuesTrimElement.addAttribute(new Attribute("suffixOverrides", ","));
selectOtherwiseEle.addElement(valuesTrimElement);
} else {
element.addElement(XmlElementGeneratorTools.generateValuesSelective(columns, "record.", false));
}
} else { } else {
for (Element element1 : XmlElementGeneratorTools.generateValues(columns, "record.", false)) { for (Element element1 : XmlElementGeneratorTools.generateValues(columns, "record.", false)) {
element.addElement(element1); element.addElement(element1);
......
src/main/java/com/itfsw/mybatis/generator/plugins/utils/XmlElementGeneratorTools.java
View file @ a8c0a38a
...@@ -346,7 +346,7 @@ public class XmlElementGeneratorTools { ...@@ -346,7 +346,7 @@ public class XmlElementGeneratorTools {
sb.setLength(0); sb.setLength(0);
} }
} }
if (sb.length() > 0 || bracket){ if (sb.length() > 0 || bracket) {
list.add(new TextElement(sb.append(bracket ? ")" : "").toString())); list.add(new TextElement(sb.append(bracket ? ")" : "").toString()));
} }
...@@ -372,22 +372,38 @@ public class XmlElementGeneratorTools { ...@@ -372,22 +372,38 @@ public class XmlElementGeneratorTools {
} }
for (IntrospectedColumn introspectedColumn : columns) { for (IntrospectedColumn introspectedColumn : columns) {
XmlElement eleIf = new XmlElement("if"); if (type != 3 && (introspectedColumn.isSequenceColumn() || introspectedColumn.getFullyQualifiedJavaType().isPrimitive())) {
eleIf.addAttribute(new Attribute("test", introspectedColumn.getJavaProperty(prefix) + " != null")); // if it is a sequence column, it is not optional
// This is required for MyBatis3 because MyBatis3 parses
// and calculates the SQL before executing the selectKey
// if it is primitive, we cannot do a null check
switch (type) {
case 2:
eleTrim.addElement(new TextElement(MyBatis3FormattingUtilities.getParameterClause(introspectedColumn, prefix) + ","));
break;
case 1:
eleTrim.addElement(new TextElement(MyBatis3FormattingUtilities.getEscapedColumnName(introspectedColumn) + ","));
break;
}
} else {
XmlElement eleIf = new XmlElement("if");
eleIf.addAttribute(new Attribute("test", introspectedColumn.getJavaProperty(prefix) + " != null"));
switch (type) {
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;
}
switch (type) { eleTrim.addElement(eleIf);
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);
} }
return eleTrim; return eleTrim;
...@@ -413,4 +429,39 @@ public class XmlElementGeneratorTools { ...@@ -413,4 +429,39 @@ public class XmlElementGeneratorTools {
return list; return list;
} }
/**
* 生成 xxxByPrimaryKey 的where 语句
* @param element
* @param primaryKeyColumns
* @return
*/
public static void generateWhereByPrimaryKeyTo(XmlElement element, List<IntrospectedColumn> primaryKeyColumns) {
generateWhereByPrimaryKeyTo(element, primaryKeyColumns, null);
}
/**
* 生成 xxxByPrimaryKey 的where 语句
* @param element
* @param primaryKeyColumns
* @param prefix
* @return
*/
public static void generateWhereByPrimaryKeyTo(XmlElement element, List<IntrospectedColumn> primaryKeyColumns, String prefix) {
StringBuilder sb = new StringBuilder();
boolean and = false;
for (IntrospectedColumn introspectedColumn : primaryKeyColumns) {
sb.setLength(0);
if (and) {
sb.append(" and ");
} else {
sb.append("where ");
and = true;
}
sb.append(MyBatis3FormattingUtilities.getEscapedColumnName(introspectedColumn));
sb.append(" = ");
sb.append(MyBatis3FormattingUtilities.getParameterClause(introspectedColumn, prefix));
element.addElement(new TextElement(sb.toString()));
}
}
} }
src/test/java/com/itfsw/mybatis/generator/plugins/BatchInsertPluginTest.java
View file @ a8c0a38a
...@@ -160,7 +160,7 @@ public class BatchInsertPluginTest { ...@@ -160,7 +160,7 @@ public class BatchInsertPluginTest {
.getObject() .getObject()
); );
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "batchInsert", params); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "batchInsert", params);
Assert.assertEquals(sql, "insert into tb (field1, field2) values ('test', null) , ('test', 1)"); Assert.assertEquals(sql, "insert into tb (field1, field2) values ('test', null) , ('test', 1)");
// 2. 执行sql // 2. 执行sql
Object count = tbMapper.invoke("batchInsert", params); Object count = tbMapper.invoke("batchInsert", params);
Assert.assertEquals(count, 2); Assert.assertEquals(count, 2);
...@@ -197,7 +197,7 @@ public class BatchInsertPluginTest { ...@@ -197,7 +197,7 @@ public class BatchInsertPluginTest {
Array.set(columns, 0, columnField2.getObject()); Array.set(columns, 0, columnField2.getObject());
String sql = SqlHelper.getFormatMapperSql(tbBlobsMapper.getObject(), "batchInsertSelective", params, columns); String sql = SqlHelper.getFormatMapperSql(tbBlobsMapper.getObject(), "batchInsertSelective", params, columns);
Assert.assertEquals(sql, "insert into tb_blobs ( field2 ) values ( 'null' ) , ( 'test123' )"); Assert.assertEquals(sql, "insert into tb_blobs ( field2 ) values ( 'null' ) , ( 'test123' )");
// 2. 执行sql // 2. 执行sql
Object count = tbBlobsMapper.invoke("batchInsertSelective", params, columns); Object count = tbBlobsMapper.invoke("batchInsertSelective", params, columns);
Assert.assertEquals(count, 2); Assert.assertEquals(count, 2);
......
src/test/java/com/itfsw/mybatis/generator/plugins/ExampleEnhancedPluginTest.java
View file @ a8c0a38a
...@@ -116,7 +116,7 @@ public class ExampleEnhancedPluginTest { ...@@ -116,7 +116,7 @@ public class ExampleEnhancedPluginTest {
method.invoke(tbExampleCriteria.getObject(), true, criteriaAdd); method.invoke(tbExampleCriteria.getObject(), true, criteriaAdd);
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExample.getObject()); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExample.getObject());
Assert.assertEquals(sql, "select id, field1 from tb WHERE ( id = '5' )"); Assert.assertEquals(sql, "select id, field1 from tb WHERE ( id = '5' )");
// 2. andIf false // 2. andIf false
ObjectUtil tbExample1 = new ObjectUtil(loader, packagz + ".TbExample"); ObjectUtil tbExample1 = new ObjectUtil(loader, packagz + ".TbExample");
......
src/test/java/com/itfsw/mybatis/generator/plugins/IncrementsPluginTest.java
View file @ a8c0a38a
...@@ -132,9 +132,9 @@ public class IncrementsPluginTest { ...@@ -132,9 +132,9 @@ public class IncrementsPluginTest {
// sql // sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateByExample", tbBuilder.invoke("build"), tbExample.getObject()); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateByExample", tbBuilder.invoke("build"), tbExample.getObject());
Assert.assertEquals(sql, "update tb set id = null, field1 = 'null', inc_f1 = inc_f1 + 100 , inc_f2 = null, inc_f3 = null WHERE ( id = '3' )"); Assert.assertEquals(sql, "update tb set id = null, field1 = 'null', inc_f1 = inc_f1 + 100 , inc_f2 = null, inc_f3 = null WHERE ( id = '3' )");
sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateByExampleSelective", tbBuilder.invoke("build"), tbExample.getObject()); sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateByExampleSelective", tbBuilder.invoke("build"), tbExample.getObject());
Assert.assertEquals(sql, "update tb SET inc_f1 = inc_f1 + 100 WHERE ( id = '3' )"); Assert.assertEquals(sql, "update tb SET inc_f1 = inc_f1 + 100 WHERE ( id = '3' )");
// 执行 // 执行
// inc_f1 增加100 // inc_f1 增加100
Object result = tbMapper.invoke("updateByExampleSelective", tbBuilder.invoke("build"), tbExample.getObject()); Object result = tbMapper.invoke("updateByExampleSelective", tbBuilder.invoke("build"), tbExample.getObject());
...@@ -167,9 +167,9 @@ public class IncrementsPluginTest { ...@@ -167,9 +167,9 @@ public class IncrementsPluginTest {
// sql // sql
sql = SqlHelper.getFormatMapperSql(tbKeysMapper.getObject(), "updateByPrimaryKey", tbKeysBuilder.invoke("build")); sql = SqlHelper.getFormatMapperSql(tbKeysMapper.getObject(), "updateByPrimaryKey", tbKeysBuilder.invoke("build"));
Assert.assertEquals(sql, "update tb_keys set field1 = 'null', field2 = null, inc_f1 = inc_f1 + 10 , inc_f2 = null , inc_f3 = inc_f3 + 30 where key1 = 1 and key2 = 'k1'"); Assert.assertEquals(sql, "update tb_keys set field1 = 'null', field2 = null, inc_f1 = inc_f1 + 10 , inc_f2 = null , inc_f3 = inc_f3 + 30 where key1 = 1 and key2 = 'k1'");
sql = SqlHelper.getFormatMapperSql(tbKeysMapper.getObject(), "updateByPrimaryKeySelective", tbKeysBuilder.invoke("build")); sql = SqlHelper.getFormatMapperSql(tbKeysMapper.getObject(), "updateByPrimaryKeySelective", tbKeysBuilder.invoke("build"));
Assert.assertEquals(sql, "update tb_keys SET inc_f1 = inc_f1 + 10 , inc_f3 = inc_f3 + 30 where key1 = 1 and key2 = 'k1'"); Assert.assertEquals(sql, "update tb_keys SET inc_f1 = inc_f1 + 10 , inc_f3 = inc_f3 + 30 where key1 = 1 and key2 = 'k1'");
// 执行 // 执行
result = tbKeysMapper.invoke("updateByPrimaryKeySelective", tbKeysBuilder.invoke("build")); result = tbKeysMapper.invoke("updateByPrimaryKeySelective", tbKeysBuilder.invoke("build"));
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
...@@ -194,17 +194,17 @@ public class IncrementsPluginTest { ...@@ -194,17 +194,17 @@ public class IncrementsPluginTest {
// sql // sql
sql = SqlHelper.getFormatMapperSql(tbBlobsMapper.getObject(), "updateByExampleWithBLOBs", tbBlobsWithBLOBsBuilder.invoke("build"), tbBlobsExample.getObject()); sql = SqlHelper.getFormatMapperSql(tbBlobsMapper.getObject(), "updateByExampleWithBLOBs", tbBlobsWithBLOBsBuilder.invoke("build"), tbBlobsExample.getObject());
Assert.assertEquals(sql, "update tb_blobs set id = null, field1 = 'null', inc_f1 = inc_f1 + 100 , inc_f2 = 50, inc_f3 = null , field2 = 'null', field3 = 'blob' WHERE ( id = '3' )"); Assert.assertEquals(sql, "update tb_blobs set id = null, field1 = 'null', inc_f1 = inc_f1 + 100 , inc_f2 = 50, inc_f3 = null , field2 = 'null', field3 = 'blob' WHERE ( id = '3' )");
tbBlobsWithBLOBsBuilder.invoke("id", 3l); tbBlobsWithBLOBsBuilder.invoke("id", 3l);
sql = SqlHelper.getFormatMapperSql(tbBlobsMapper.getObject(), "updateByPrimaryKeyWithBLOBs", tbBlobsWithBLOBsBuilder.invoke("build")); sql = SqlHelper.getFormatMapperSql(tbBlobsMapper.getObject(), "updateByPrimaryKeyWithBLOBs", tbBlobsWithBLOBsBuilder.invoke("build"));
Assert.assertEquals(sql, "update tb_blobs set field1 = 'null', inc_f1 = inc_f1 + 100 , inc_f2 = 50, inc_f3 = null , field2 = 'null', field3 = 'blob' where id = 3"); Assert.assertEquals(sql, "update tb_blobs set field1 = 'null', inc_f1 = inc_f1 + 100 , inc_f2 = 50, inc_f3 = null , field2 = 'null', field3 = 'blob' where id = 3");
// 执行 // 执行
tbBlobsWithBLOBsBuilder.invoke("incF3", 10l); tbBlobsWithBLOBsBuilder.invoke("incF3", 10l);
// 测试自增字段没有配置自增参数 // 测试自增字段没有配置自增参数
sql = SqlHelper.getFormatMapperSql(tbBlobsMapper.getObject(), "updateByPrimaryKeyWithBLOBs", tbBlobsWithBLOBsBuilder.invoke("build")); sql = SqlHelper.getFormatMapperSql(tbBlobsMapper.getObject(), "updateByPrimaryKeyWithBLOBs", tbBlobsWithBLOBsBuilder.invoke("build"));
Assert.assertEquals(sql, "update tb_blobs set field1 = 'null', inc_f1 = inc_f1 + 100 , inc_f2 = 50, inc_f3 = 10 , field2 = 'null', field3 = 'blob' where id = 3"); Assert.assertEquals(sql, "update tb_blobs set field1 = 'null', inc_f1 = inc_f1 + 100 , inc_f2 = 50, inc_f3 = 10 , field2 = 'null', field3 = 'blob' where id = 3");
result = tbBlobsMapper.invoke("updateByPrimaryKeyWithBLOBs", tbBlobsWithBLOBsBuilder.invoke("build")); result = tbBlobsMapper.invoke("updateByPrimaryKeyWithBLOBs", tbBlobsWithBLOBsBuilder.invoke("build"));
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
} }
......
src/test/java/com/itfsw/mybatis/generator/plugins/LogicalDeletePluginTest.java
View file @ a8c0a38a
...@@ -93,7 +93,7 @@ public class LogicalDeletePluginTest { ...@@ -93,7 +93,7 @@ public class LogicalDeletePluginTest {
// 验证sql // 验证sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "logicalDeleteByExample", tbExample.getObject()); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "logicalDeleteByExample", tbExample.getObject());
Assert.assertEquals(sql, "update tb set del_flag = 1 WHERE ( id = '1' )"); Assert.assertEquals(sql, "update tb set del_flag = 1 WHERE ( id = '1' )");
// 验证执行 // 验证执行
Object result = tbMapper.invoke("logicalDeleteByExample", tbExample.getObject()); Object result = tbMapper.invoke("logicalDeleteByExample", tbExample.getObject());
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
...@@ -147,7 +147,7 @@ public class LogicalDeletePluginTest { ...@@ -147,7 +147,7 @@ public class LogicalDeletePluginTest {
// 验证sql // 验证sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExample.getObject()); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExample.getObject());
Assert.assertEquals(sql, "select id, del_flag, and_logical_deleted, ts_1, ts_3, ts_4 from tb WHERE ( del_flag = '1' and id = '3' )"); Assert.assertEquals(sql, "select id, del_flag, and_logical_deleted, ts_1, ts_3, ts_4 from tb WHERE ( del_flag = '1' and id = '3' )");
// 验证执行 // 验证执行
Object result = tbMapper.invoke("selectByExample", tbExample.getObject()); Object result = tbMapper.invoke("selectByExample", tbExample.getObject());
Assert.assertEquals(((List)result).size(), 1); Assert.assertEquals(((List)result).size(), 1);
...@@ -174,7 +174,7 @@ public class LogicalDeletePluginTest { ...@@ -174,7 +174,7 @@ public class LogicalDeletePluginTest {
// 验证sql // 验证sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExample.getObject()); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExample", tbExample.getObject());
Assert.assertEquals(sql, "select id, del_flag, and_logical_deleted, ts_1, ts_3, ts_4 from tb WHERE ( del_flag = '0' and id = '3' )"); Assert.assertEquals(sql, "select id, del_flag, and_logical_deleted, ts_1, ts_3, ts_4 from tb WHERE ( del_flag = '0' and id = '3' )");
// 验证执行 // 验证执行
Object result = tbMapper.invoke("selectByExample", tbExample.getObject()); Object result = tbMapper.invoke("selectByExample", tbExample.getObject());
Assert.assertEquals(((List)result).size(), 0); Assert.assertEquals(((List)result).size(), 0);
...@@ -215,7 +215,7 @@ public class LogicalDeletePluginTest { ...@@ -215,7 +215,7 @@ public class LogicalDeletePluginTest {
// 验证sql // 验证sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByPrimaryKeyWithLogicalDelete", 5l, true); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByPrimaryKeyWithLogicalDelete", 5l, true);
Assert.assertEquals(sql, "select id, del_flag, and_logical_deleted, ts_1, ts_3, ts_4 , ts_2 from tb where id = 5 and del_flag = '1'"); Assert.assertEquals(sql, "select id, del_flag, and_logical_deleted, ts_1, ts_3, ts_4 , ts_2 from tb where id = 5 and del_flag = '1'");
// 验证执行 // 验证执行
Object result = tbMapper.invoke("selectByPrimaryKeyWithLogicalDelete", 5l, true); Object result = tbMapper.invoke("selectByPrimaryKeyWithLogicalDelete", 5l, true);
Assert.assertNull(result); Assert.assertNull(result);
......
src/test/java/com/itfsw/mybatis/generator/plugins/OldSelectiveEnhancedPluginTest.java
View file @ a8c0a38a
...@@ -111,7 +111,7 @@ public class OldSelectiveEnhancedPluginTest { ...@@ -111,7 +111,7 @@ public class OldSelectiveEnhancedPluginTest {
// sql // sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "insertSelective", tb.getObject()); 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 ( field_1, inc_f2 ) values ( 'null', 5 )");
Object result = tbMapper.invoke("insertSelective", tb.getObject()); Object result = tbMapper.invoke("insertSelective", tb.getObject());
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
} }
...@@ -146,7 +146,7 @@ public class OldSelectiveEnhancedPluginTest { ...@@ -146,7 +146,7 @@ public class OldSelectiveEnhancedPluginTest {
// sql // sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateByExampleSelective", tb.getObject(), TbExample.getObject()); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateByExampleSelective", tb.getObject(), TbExample.getObject());
Assert.assertEquals(sql, "update tb SET field_1 = 'null', inc_f2 = 5 WHERE ( id = '1' )"); Assert.assertEquals(sql, "update tb SET field_1 = 'null', inc_f2 = 5 WHERE ( id = '1' )");
Object result = tbMapper.invoke("updateByExampleSelective", tb.getObject(), TbExample.getObject()); Object result = tbMapper.invoke("updateByExampleSelective", tb.getObject(), TbExample.getObject());
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
} }
...@@ -178,7 +178,7 @@ public class OldSelectiveEnhancedPluginTest { ...@@ -178,7 +178,7 @@ public class OldSelectiveEnhancedPluginTest {
// sql // sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateByPrimaryKeySelective", tb.getObject()); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateByPrimaryKeySelective", tb.getObject());
Assert.assertEquals(sql, "update tb SET field_1 = 'null', inc_f2 = 5 where id = 2"); Assert.assertEquals(sql, "update tb SET field_1 = 'null', inc_f2 = 5 where id = 2");
Object result = tbMapper.invoke("updateByPrimaryKeySelective", tb.getObject()); Object result = tbMapper.invoke("updateByPrimaryKeySelective", tb.getObject());
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
} }
...@@ -212,7 +212,7 @@ public class OldSelectiveEnhancedPluginTest { ...@@ -212,7 +212,7 @@ public class OldSelectiveEnhancedPluginTest {
// sql // sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertSelective", tb.getObject()); 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 id = 10, 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()); Object result = tbMapper.invoke("upsertSelective", tb.getObject());
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
} }
...@@ -250,7 +250,7 @@ public class OldSelectiveEnhancedPluginTest { ...@@ -250,7 +250,7 @@ public class OldSelectiveEnhancedPluginTest {
// sql // sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExampleSelective", tb.getObject(), TbExample.getObject()); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExampleSelective", tb.getObject(), TbExample.getObject());
Assert.assertEquals(sql, "insert into tb ( id, field_1, inc_f2 ) select 99, 'null', 5 from dual where not exists ( select 1 from tb WHERE ( id = '99' ) ) ; update tb set inc_f2 = 5, inc_f3 = 10 WHERE ( id = '99' )"); Assert.assertEquals(sql, "insert into tb ( id, field_1, inc_f2 ) select 99, 'null', 5 from dual where not exists ( select 1 from tb WHERE ( id = '99' ) ) ; update tb set inc_f2 = 5, inc_f3 = 10 WHERE ( id = '99' )");
Object result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject()); Object result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject());
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject()); result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject());
......
src/test/java/com/itfsw/mybatis/generator/plugins/SelectOneByExamplePluginTest.java
View file @ a8c0a38a
...@@ -61,7 +61,7 @@ public class SelectOneByExamplePluginTest { ...@@ -61,7 +61,7 @@ public class SelectOneByExamplePluginTest {
// sql // sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectOneByExample", TbExample.getObject()); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectOneByExample", TbExample.getObject());
Assert.assertEquals(sql, "select id, field1, field2 from tb WHERE ( id = '1' ) limit 1"); Assert.assertEquals(sql, "select id, field1, field2 from tb WHERE ( id = '1' ) limit 1");
Object result = tbMapper.invoke("selectOneByExample", TbExample.getObject()); Object result = tbMapper.invoke("selectOneByExample", TbExample.getObject());
ObjectUtil Tb = new ObjectUtil(result); ObjectUtil Tb = new ObjectUtil(result);
Assert.assertEquals(Tb.get("id"), 1l); Assert.assertEquals(Tb.get("id"), 1l);
...@@ -88,7 +88,7 @@ public class SelectOneByExamplePluginTest { ...@@ -88,7 +88,7 @@ public class SelectOneByExamplePluginTest {
// sql // sql
String sql = SqlHelper.getFormatMapperSql(TbBlobsMapper.getObject(), "selectOneByExampleWithBLOBs", TbBlobsExample.getObject()); String sql = SqlHelper.getFormatMapperSql(TbBlobsMapper.getObject(), "selectOneByExampleWithBLOBs", TbBlobsExample.getObject());
Assert.assertEquals(sql, "select id, field1 , field2, field3 from tb_blobs WHERE ( id = '1' ) limit 1"); Assert.assertEquals(sql, "select id, field1 , field2, field3 from tb_blobs WHERE ( id = '1' ) limit 1");
Object result = TbBlobsMapper.invoke("selectOneByExampleWithBLOBs", TbBlobsExample.getObject()); Object result = TbBlobsMapper.invoke("selectOneByExampleWithBLOBs", TbBlobsExample.getObject());
ObjectUtil Tb = new ObjectUtil(result); ObjectUtil Tb = new ObjectUtil(result);
Assert.assertEquals(Tb.get("id"), 1l); Assert.assertEquals(Tb.get("id"), 1l);
......
src/test/java/com/itfsw/mybatis/generator/plugins/SelectSelectivePluginTest.java
View file @ a8c0a38a
...@@ -66,7 +66,7 @@ public class SelectSelectivePluginTest { ...@@ -66,7 +66,7 @@ public class SelectSelectivePluginTest {
Array.set(columns1, 0, columnField1.getObject()); Array.set(columns1, 0, columnField1.getObject());
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns1); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns1);
Assert.assertEquals(sql, "select field1 from tb WHERE ( id < '100' ) order by field2 asc"); Assert.assertEquals(sql, "select field1 from tb WHERE ( id < '100' ) order by field2 asc");
ObjectUtil columnField2 = new ObjectUtil(loader, packagz + ".Tb$Column#field2"); ObjectUtil columnField2 = new ObjectUtil(loader, packagz + ".Tb$Column#field2");
Object columns2 = Array.newInstance(columnField1.getCls(), 2); Object columns2 = Array.newInstance(columnField1.getCls(), 2);
...@@ -74,7 +74,7 @@ public class SelectSelectivePluginTest { ...@@ -74,7 +74,7 @@ public class SelectSelectivePluginTest {
Array.set(columns2, 1, columnField2.getObject()); Array.set(columns2, 1, columnField2.getObject());
sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns2); sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns2);
Assert.assertEquals(sql, "select field1 , field2 from tb WHERE ( id < '100' ) order by field2 asc"); Assert.assertEquals(sql, "select field1 , field2 from tb WHERE ( id < '100' ) order by field2 asc");
// 2. 执行sql // 2. 执行sql
...@@ -104,7 +104,7 @@ public class SelectSelectivePluginTest { ...@@ -104,7 +104,7 @@ public class SelectSelectivePluginTest {
tbExample.invoke("setDistinct", true); tbExample.invoke("setDistinct", true);
tbExample.set("orderByClause", "field1 asc"); tbExample.set("orderByClause", "field1 asc");
String sql1 = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns1); String sql1 = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns1);
Assert.assertEquals(sql1, "select distinct field1 from tb WHERE ( id < '100' ) order by field1 asc"); Assert.assertEquals(sql1, "select distinct field1 from tb WHERE ( id < '100' ) order by field1 asc");
List list1 = (List) tbMapper.invoke("selectByExampleSelective", tbExample.getObject(), columns1); List list1 = (List) tbMapper.invoke("selectByExampleSelective", tbExample.getObject(), columns1);
Assert.assertEquals(list1.size(), 3); Assert.assertEquals(list1.size(), 3);
} }
...@@ -188,7 +188,7 @@ public class SelectSelectivePluginTest { ...@@ -188,7 +188,7 @@ public class SelectSelectivePluginTest {
Array.set(columns1, 0, columnField1.getObject()); Array.set(columns1, 0, columnField1.getObject());
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectOneByExampleSelective", tbExample.getObject(), columns1); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectOneByExampleSelective", tbExample.getObject(), columns1);
Assert.assertEquals(sql, "select field1 from tb WHERE ( id = '3' ) order by field2 asc limit 1"); Assert.assertEquals(sql, "select field1 from tb WHERE ( id = '3' ) order by field2 asc limit 1");
// 2. 执行sql // 2. 执行sql
Object result = tbMapper.invoke("selectOneByExampleSelective", tbExample.getObject(), columns1); Object result = tbMapper.invoke("selectOneByExampleSelective", tbExample.getObject(), columns1);
...@@ -223,7 +223,7 @@ public class SelectSelectivePluginTest { ...@@ -223,7 +223,7 @@ public class SelectSelectivePluginTest {
Array.set(columns1, 0, columnField1.getObject()); Array.set(columns1, 0, columnField1.getObject());
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns1); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns1);
Assert.assertEquals(sql, "select field1 from tb WHERE ( id < '100' ) order by field1 asc"); Assert.assertEquals(sql, "select field1 from tb WHERE ( id < '100' ) order by field1 asc");
ObjectUtil columnField2 = new ObjectUtil(loader, packagz + ".Tb$Column#field2"); ObjectUtil columnField2 = new ObjectUtil(loader, packagz + ".Tb$Column#field2");
Object columns2 = Array.newInstance(columnField1.getCls(), 2); Object columns2 = Array.newInstance(columnField1.getCls(), 2);
...@@ -231,7 +231,7 @@ public class SelectSelectivePluginTest { ...@@ -231,7 +231,7 @@ public class SelectSelectivePluginTest {
Array.set(columns2, 1, columnField2.getObject()); Array.set(columns2, 1, columnField2.getObject());
sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns2); sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns2);
Assert.assertEquals(sql, "select field1 , field2 from tb WHERE ( id < '100' ) order by field1 asc"); Assert.assertEquals(sql, "select field1 , field2 from tb WHERE ( id < '100' ) order by field1 asc");
// 2. 执行sql // 2. 执行sql
...@@ -277,7 +277,7 @@ public class SelectSelectivePluginTest { ...@@ -277,7 +277,7 @@ public class SelectSelectivePluginTest {
Array.set(columns1, 0, columnField1.getObject()); Array.set(columns1, 0, columnField1.getObject());
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns1); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns1);
Assert.assertEquals(sql, "select field1 from tb WHERE ( id < '100' ) order by field1 asc"); Assert.assertEquals(sql, "select field1 from tb WHERE ( id < '100' ) order by field1 asc");
ObjectUtil columnField2 = new ObjectUtil(loader, packagz + ".Tb$Column#field2"); ObjectUtil columnField2 = new ObjectUtil(loader, packagz + ".Tb$Column#field2");
Object columns2 = Array.newInstance(columnField1.getCls(), 2); Object columns2 = Array.newInstance(columnField1.getCls(), 2);
...@@ -285,7 +285,7 @@ public class SelectSelectivePluginTest { ...@@ -285,7 +285,7 @@ public class SelectSelectivePluginTest {
Array.set(columns2, 1, columnField2.getObject()); Array.set(columns2, 1, columnField2.getObject());
sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns2); sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "selectByExampleSelective", tbExample.getObject(), columns2);
Assert.assertEquals(sql, "select field1 , field2 from tb WHERE ( id < '100' ) order by field1 asc"); Assert.assertEquals(sql, "select field1 , field2 from tb WHERE ( id < '100' ) order by field1 asc");
// 2. 执行sql // 2. 执行sql
......
src/test/java/com/itfsw/mybatis/generator/plugins/SelectiveEnhancedPluginTest.java
View file @ a8c0a38a
/* /*
* Copyright (c) 2017. * Copyright (c) 2018.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -33,7 +33,7 @@ import java.sql.SQLException; ...@@ -33,7 +33,7 @@ import java.sql.SQLException;
* *
* --------------------------------------------------------------------------- * ---------------------------------------------------------------------------
* @author: hewei * @author: hewei
* @time:2017/7/28 15:47 * @time:2018/4/20 10:57
* --------------------------------------------------------------------------- * ---------------------------------------------------------------------------
*/ */
public class SelectiveEnhancedPluginTest { public class SelectiveEnhancedPluginTest {
...@@ -42,7 +42,7 @@ public class SelectiveEnhancedPluginTest { ...@@ -42,7 +42,7 @@ public class SelectiveEnhancedPluginTest {
*/ */
@BeforeClass @BeforeClass
public static void init() throws SQLException, IOException, ClassNotFoundException { public static void init() throws SQLException, IOException, ClassNotFoundException {
DBHelper.createDB("scripts/SelectiveEnhancedPlugin/init.sql"); DBHelper.createDB("scripts/OldSelectiveEnhancedPlugin/init.sql");
} }
/** /**
...@@ -55,36 +55,10 @@ public class SelectiveEnhancedPluginTest { ...@@ -55,36 +55,10 @@ public class SelectiveEnhancedPluginTest {
tool.generate(); tool.generate();
Assert.assertEquals(tool.getWarnings().get(0), "itfsw:插件com.itfsw.mybatis.generator.plugins.SelectiveEnhancedPlugin插件需配合com.itfsw.mybatis.generator.plugins.ModelColumnPlugin插件使用！"); Assert.assertEquals(tool.getWarnings().get(0), "itfsw:插件com.itfsw.mybatis.generator.plugins.SelectiveEnhancedPlugin插件需配合com.itfsw.mybatis.generator.plugins.ModelColumnPlugin插件使用！");
// 2. 没有配置UpsertPlugin插件位置配置错误 // 2. 同时配置了OldSelectiveEnhancedPlugin插件
tool = MyBatisGeneratorTool.create("scripts/SelectiveEnhancedPlugin/mybatis-generator-with-UpsertPlugin-with-wrong-place.xml"); tool = MyBatisGeneratorTool.create("scripts/SelectiveEnhancedPlugin/mybatis-generator-with-OldSelectiveEnhancedPlugin.xml");
tool.generate(); tool.generate();
Assert.assertEquals(tool.getWarnings().get(0), "itfsw:插件com.itfsw.mybatis.generator.plugins.SelectiveEnhancedPlugin插件建议配置在插件com.itfsw.mybatis.generator.plugins.UpsertPlugin后面，否则某些功能可能得不到增强！"); Assert.assertEquals(tool.getWarnings().get(0), "itfsw:插件com.itfsw.mybatis.generator.plugins.SelectiveEnhancedPlugin不能和com.itfsw.mybatis.generator.plugins.OldSelectiveEnhancedPlugin插件同时使用！");
}
/**
* 测试Model
*/
@Test
public void testModel() throws IOException, XMLParserException, InvalidConfigurationException, InterruptedException, SQLException {
MyBatisGeneratorTool tool = MyBatisGeneratorTool.create("scripts/SelectiveEnhancedPlugin/mybatis-generator.xml");
tool.generate(new AbstractShellCallback() {
@Override
public void reloadProject(SqlSession sqlSession, ClassLoader loader, String packagz) throws Exception {
ObjectUtil tb = new ObjectUtil(loader, packagz + ".Tb");
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());
tb.invoke("selective", columns);
Assert.assertTrue((Boolean) tb.invoke("hasSelective"));
Assert.assertTrue((Boolean) tb.invoke("hasSelective", "field_1"));
Assert.assertFalse((Boolean) tb.invoke("hasSelective", "inc_f1"));
Assert.assertTrue((Boolean) tb.invoke("hasSelective", "inc_f2"));
}
});
} }
/** /**
...@@ -107,12 +81,11 @@ public class SelectiveEnhancedPluginTest { ...@@ -107,12 +81,11 @@ public class SelectiveEnhancedPluginTest {
Object columns = Array.newInstance(TbColumnField1.getCls(), 2); Object columns = Array.newInstance(TbColumnField1.getCls(), 2);
Array.set(columns, 0, TbColumnField1.getObject()); Array.set(columns, 0, TbColumnField1.getObject());
Array.set(columns, 1, TbColumnTsIncF2.getObject()); Array.set(columns, 1, TbColumnTsIncF2.getObject());
tb.invoke("selective", columns);
// sql // sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "insertSelective", tb.getObject()); 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 ( field_1 , inc_f2 ) values ( 'null' , 5 )");
Object result = tbMapper.invoke("insertSelective", tb.getObject()); Object result = tbMapper.invoke("insertSelective", tb.getObject(), columns);
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
} }
}); });
...@@ -142,12 +115,11 @@ public class SelectiveEnhancedPluginTest { ...@@ -142,12 +115,11 @@ public class SelectiveEnhancedPluginTest {
Object columns = Array.newInstance(TbColumnField1.getCls(), 2); Object columns = Array.newInstance(TbColumnField1.getCls(), 2);
Array.set(columns, 0, TbColumnField1.getObject()); Array.set(columns, 0, TbColumnField1.getObject());
Array.set(columns, 1, TbColumnTsIncF2.getObject()); Array.set(columns, 1, TbColumnTsIncF2.getObject());
tb.invoke("selective", columns);
// sql // sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateByExampleSelective", tb.getObject(), TbExample.getObject()); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateByExampleSelective", tb.getObject(), TbExample.getObject(), columns);
Assert.assertEquals(sql, "update tb SET field_1 = 'null', inc_f2 = 5 WHERE ( id = '1' )"); Assert.assertEquals(sql, "update tb SET field_1 = 'null' , inc_f2 = 5 WHERE ( id = '1' )");
Object result = tbMapper.invoke("updateByExampleSelective", tb.getObject(), TbExample.getObject()); Object result = tbMapper.invoke("updateByExampleSelective", tb.getObject(), TbExample.getObject(), columns);
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
} }
}); });
...@@ -174,12 +146,11 @@ public class SelectiveEnhancedPluginTest { ...@@ -174,12 +146,11 @@ public class SelectiveEnhancedPluginTest {
Object columns = Array.newInstance(TbColumnField1.getCls(), 2); Object columns = Array.newInstance(TbColumnField1.getCls(), 2);
Array.set(columns, 0, TbColumnField1.getObject()); Array.set(columns, 0, TbColumnField1.getObject());
Array.set(columns, 1, TbColumnTsIncF2.getObject()); Array.set(columns, 1, TbColumnTsIncF2.getObject());
tb.invoke("selective", columns);
// sql // sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateByPrimaryKeySelective", tb.getObject()); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "updateByPrimaryKeySelective", tb.getObject(), columns);
Assert.assertEquals(sql, "update tb SET field_1 = 'null', inc_f2 = 5 where id = 2"); Assert.assertEquals(sql, "update tb SET field_1 = 'null' , inc_f2 = 5 where id = 2");
Object result = tbMapper.invoke("updateByPrimaryKeySelective", tb.getObject()); Object result = tbMapper.invoke("updateByPrimaryKeySelective", tb.getObject(), columns);
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
} }
}); });
...@@ -208,12 +179,11 @@ public class SelectiveEnhancedPluginTest { ...@@ -208,12 +179,11 @@ public class SelectiveEnhancedPluginTest {
Array.set(columns, 0, TbColumnId.getObject()); Array.set(columns, 0, TbColumnId.getObject());
Array.set(columns, 1, TbColumnField1.getObject()); Array.set(columns, 1, TbColumnField1.getObject());
Array.set(columns, 2, TbColumnTsIncF2.getObject()); Array.set(columns, 2, TbColumnTsIncF2.getObject());
tb.invoke("selective", columns);
// sql // sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertSelective", tb.getObject()); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertSelective", tb.getObject(), columns);
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"); 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()); Object result = tbMapper.invoke("upsertSelective", tb.getObject(), columns);
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
} }
}); });
...@@ -246,16 +216,15 @@ public class SelectiveEnhancedPluginTest { ...@@ -246,16 +216,15 @@ public class SelectiveEnhancedPluginTest {
Array.set(columns, 0, TbColumnId.getObject()); Array.set(columns, 0, TbColumnId.getObject());
Array.set(columns, 1, TbColumnField1.getObject()); Array.set(columns, 1, TbColumnField1.getObject());
Array.set(columns, 2, TbColumnTsIncF2.getObject()); Array.set(columns, 2, TbColumnTsIncF2.getObject());
tb.invoke("selective", columns);
// sql // sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExampleSelective", tb.getObject(), TbExample.getObject()); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExampleSelective", tb.getObject(), TbExample.getObject(), columns);
Assert.assertEquals(sql, "insert into tb ( id, field_1, inc_f2 ) select 99, 'null', 5 from dual where not exists ( select 1 from tb WHERE ( id = '99' ) ) ; update tb set inc_f2 = 5, inc_f3 = 10 WHERE ( id = '99' )"); Assert.assertEquals(sql, "insert into tb ( id , field_1 , inc_f2 ) select 99 , 'null' , 5 from dual where not exists ( select 1 from tb WHERE ( id = '99' ) ) ; update tb set id = 99 , field_1 = 'null' , inc_f2 = 5 WHERE ( id = '99' )");
Object result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject()); Object result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject(), columns);
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject()); result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject(), columns);
Assert.assertEquals(result, 0); Assert.assertEquals(result, 0);
} }
}); });
} }
} }
\ No newline at end of file
src/test/java/com/itfsw/mybatis/generator/plugins/UpsertPluginTest.java
View file @ a8c0a38a
...@@ -79,7 +79,7 @@ public class UpsertPluginTest { ...@@ -79,7 +79,7 @@ public class UpsertPluginTest {
// sql // sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsert", tb.getObject()); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsert", tb.getObject());
Assert.assertEquals(sql, "insert into tb (id, field1, field2) values (10, 'ts1', 5) on duplicate key update id = 10, field1 = 'ts1', field2 = 5"); Assert.assertEquals(sql, "insert into tb (id, field1, field2) values (10, 'ts1', 5) on duplicate key update id = 10, field1 = 'ts1', field2 = 5");
Object result = tbMapper.invoke("upsert", tb.getObject()); Object result = tbMapper.invoke("upsert", tb.getObject());
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
...@@ -112,7 +112,7 @@ public class UpsertPluginTest { ...@@ -112,7 +112,7 @@ public class UpsertPluginTest {
// sql // sql
String sql = SqlHelper.getFormatMapperSql(TbBlobsMapper.getObject(), "upsertWithBLOBs", TbBlobsWithBLOBs.getObject()); String sql = SqlHelper.getFormatMapperSql(TbBlobsMapper.getObject(), "upsertWithBLOBs", TbBlobsWithBLOBs.getObject());
Assert.assertEquals(sql, "insert into tb_blobs (id, field1, field2, field3) values (10, 'ts1', 'ts2', 'null') on duplicate key update id = 10, field1 = 'ts1', field2 = 'ts2', field3 = 'null'"); Assert.assertEquals(sql, "insert into tb_blobs (id, field1, field2, field3) values (10, 'ts1', 'ts2', 'null') on duplicate key update id = 10, field1 = 'ts1', field2 = 'ts2', field3 = 'null'");
Object result = TbBlobsMapper.invoke("upsertWithBLOBs", TbBlobsWithBLOBs.getObject()); Object result = TbBlobsMapper.invoke("upsertWithBLOBs", TbBlobsWithBLOBs.getObject());
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
...@@ -133,7 +133,7 @@ public class UpsertPluginTest { ...@@ -133,7 +133,7 @@ public class UpsertPluginTest {
// sql // sql
sql = SqlHelper.getFormatMapperSql(TbSingleBlobMapper.getObject(), "upsertWithBLOBs", TbSingleBlob.getObject()); sql = SqlHelper.getFormatMapperSql(TbSingleBlobMapper.getObject(), "upsertWithBLOBs", TbSingleBlob.getObject());
Assert.assertEquals(sql, "insert into tb_single_blob (id, field2, field1) values (10, 3, 'ts1' ) on duplicate key update id = 10, field2 = 3, field1 = 'ts1'"); Assert.assertEquals(sql, "insert into tb_single_blob (id, field2, field1) values (10, 3, 'ts1' ) on duplicate key update id = 10, field2 = 3, field1 = 'ts1'");
result = TbSingleBlobMapper.invoke("upsertWithBLOBs", TbSingleBlob.getObject()); result = TbSingleBlobMapper.invoke("upsertWithBLOBs", TbSingleBlob.getObject());
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
...@@ -165,7 +165,7 @@ public class UpsertPluginTest { ...@@ -165,7 +165,7 @@ public class UpsertPluginTest {
// sql // sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertSelective", tb.getObject()); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertSelective", tb.getObject());
Assert.assertEquals(sql, "insert into tb ( id, field1 ) values ( 20, 'ts1' ) on duplicate key update id = 20, 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()); Object result = tbMapper.invoke("upsertSelective", tb.getObject());
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
...@@ -179,7 +179,7 @@ public class UpsertPluginTest { ...@@ -179,7 +179,7 @@ public class UpsertPluginTest {
// sql // sql
sql = SqlHelper.getFormatMapperSql(TbBlobsMapper.getObject(), "upsertSelective", TbBlobsWithBLOBs.getObject()); 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 id = 500, 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()); result = TbBlobsMapper.invoke("upsertSelective", TbBlobsWithBLOBs.getObject());
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
} }
...@@ -208,7 +208,7 @@ public class UpsertPluginTest { ...@@ -208,7 +208,7 @@ public class UpsertPluginTest {
// sql // sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExample", tb.getObject(), TbExample.getObject()); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExample", tb.getObject(), TbExample.getObject());
Assert.assertEquals(sql, "insert into tb (id, field1, field2) select 50, 'ts1', 5 from dual where not exists ( select 1 from tb WHERE ( id = '50' ) ) ; update tb set field1 = 'ts1', field2 = 5 WHERE ( id = '50' )"); Assert.assertEquals(sql, "insert into tb (id, field1, field2) select 50, 'ts1', 5 from dual where not exists ( select 1 from tb WHERE ( id = '50' ) ) ; update tb set field1 = 'ts1', field2 = 5 WHERE ( id = '50' )");
Object result = tbMapper.invoke("upsertByExample", tb.getObject(), TbExample.getObject()); Object result = tbMapper.invoke("upsertByExample", tb.getObject(), TbExample.getObject());
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
...@@ -245,7 +245,7 @@ public class UpsertPluginTest { ...@@ -245,7 +245,7 @@ public class UpsertPluginTest {
// sql // sql
String sql = SqlHelper.getFormatMapperSql(TbBlobsMapper.getObject(), "upsertByExampleWithBLOBs", TbBlobsWithBLOBs.getObject(), TbBlobsExample.getObject()); String sql = SqlHelper.getFormatMapperSql(TbBlobsMapper.getObject(), "upsertByExampleWithBLOBs", TbBlobsWithBLOBs.getObject(), TbBlobsExample.getObject());
Assert.assertEquals(sql, "insert into tb_blobs (id, field1, field2, field3) select 60, 'ts1', 'ts2', 'null' from dual where not exists ( select 1 from tb_blobs WHERE ( id = '60' ) ) ; update tb_blobs set id = 60, field1 = 'ts1', field2 = 'ts2', field3 = 'null' WHERE ( id = '60' )"); Assert.assertEquals(sql, "insert into tb_blobs (id, field1, field2, field3) select 60, 'ts1', 'ts2', 'null' from dual where not exists ( select 1 from tb_blobs WHERE ( id = '60' ) ) ; update tb_blobs set id = 60, field1 = 'ts1', field2 = 'ts2', field3 = 'null' WHERE ( id = '60' )");
Object result = TbBlobsMapper.invoke("upsertByExampleWithBLOBs", TbBlobsWithBLOBs.getObject(), TbBlobsExample.getObject()); Object result = TbBlobsMapper.invoke("upsertByExampleWithBLOBs", TbBlobsWithBLOBs.getObject(), TbBlobsExample.getObject());
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
...@@ -271,7 +271,7 @@ public class UpsertPluginTest { ...@@ -271,7 +271,7 @@ public class UpsertPluginTest {
// sql // sql
sql = SqlHelper.getFormatMapperSql(TbSingleBlobMapper.getObject(), "upsertByExampleWithBLOBs", TbSingleBlob.getObject(), TbSingleBlobExample.getObject()); sql = SqlHelper.getFormatMapperSql(TbSingleBlobMapper.getObject(), "upsertByExampleWithBLOBs", TbSingleBlob.getObject(), TbSingleBlobExample.getObject());
Assert.assertEquals(sql, "insert into tb_single_blob (id, field2, field1) select 70, 3, 'ts1' from dual where not exists ( select 1 from tb_single_blob WHERE ( id = '70' ) ) ; update tb_single_blob set id = 70, field2 = 3, field1 = 'ts1' WHERE ( id = '70' )"); Assert.assertEquals(sql, "insert into tb_single_blob (id, field2, field1) select 70, 3, 'ts1' from dual where not exists ( select 1 from tb_single_blob WHERE ( id = '70' ) ) ; update tb_single_blob set id = 70, field2 = 3, field1 = 'ts1' WHERE ( id = '70' )");
result = TbSingleBlobMapper.invoke("upsertByExampleWithBLOBs", TbSingleBlob.getObject(), TbSingleBlobExample.getObject()); result = TbSingleBlobMapper.invoke("upsertByExampleWithBLOBs", TbSingleBlob.getObject(), TbSingleBlobExample.getObject());
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
...@@ -307,7 +307,7 @@ public class UpsertPluginTest { ...@@ -307,7 +307,7 @@ public class UpsertPluginTest {
// sql // sql
String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExampleSelective", tb.getObject(), TbExample.getObject()); String sql = SqlHelper.getFormatMapperSql(tbMapper.getObject(), "upsertByExampleSelective", tb.getObject(), TbExample.getObject());
Assert.assertEquals(sql, "insert into tb ( id, field1 ) select 100, 'ts1' from dual where not exists ( select 1 from tb WHERE ( id = '100' ) ) ; update tb set field1 = 'ts1' WHERE ( id = '100' )"); Assert.assertEquals(sql, "insert into tb ( id, field1 ) select 100, 'ts1' from dual where not exists ( select 1 from tb WHERE ( id = '100' ) ) ; update tb set field1 = 'ts1' WHERE ( id = '100' )");
Object result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject()); Object result = tbMapper.invoke("upsertByExampleSelective", tb.getObject(), TbExample.getObject());
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
...@@ -325,7 +325,7 @@ public class UpsertPluginTest { ...@@ -325,7 +325,7 @@ public class UpsertPluginTest {
// sql // sql
sql = SqlHelper.getFormatMapperSql(TbBlobsMapper.getObject(), "upsertByExampleSelective", TbBlobsWithBLOBs.getObject(), TbBlobsExample.getObject()); sql = SqlHelper.getFormatMapperSql(TbBlobsMapper.getObject(), "upsertByExampleSelective", TbBlobsWithBLOBs.getObject(), TbBlobsExample.getObject());
Assert.assertEquals(sql, "insert into tb_blobs ( id, field1, field2 ) select 200, 'ts1', 'ts2' from dual where not exists ( select 1 from tb_blobs WHERE ( id = '60' ) ) ; update tb_blobs set field1 = 'ts1', field2 = 'ts2' WHERE ( id = '60' )"); Assert.assertEquals(sql, "insert into tb_blobs ( id, field1, field2 ) select 200, 'ts1', 'ts2' from dual where not exists ( select 1 from tb_blobs WHERE ( id = '60' ) ) ; update tb_blobs set field1 = 'ts1', field2 = 'ts2' WHERE ( id = '60' )");
result = TbBlobsMapper.invoke("upsertByExampleSelective", TbBlobsWithBLOBs.getObject(), TbBlobsExample.getObject()); result = TbBlobsMapper.invoke("upsertByExampleSelective", TbBlobsWithBLOBs.getObject(), TbBlobsExample.getObject());
Assert.assertEquals(result, 1); Assert.assertEquals(result, 1);
} }
......
src/test/java/com/itfsw/mybatis/generator/plugins/tools/SqlHelper.java
View file @ a8c0a38a
...@@ -60,7 +60,7 @@ public class SqlHelper { ...@@ -60,7 +60,7 @@ public class SqlHelper {
*/ */
public static String getFormatMapperSql(Object mapper, String methodName, Object... args) { public static String getFormatMapperSql(Object mapper, String methodName, Object... args) {
String sql = getMapperSql(mapper, methodName, args); String sql = getMapperSql(mapper, methodName, args);
return sql == null ? null : sql.replaceAll("\n\\s*", " "); return sql == null ? null : sql.replaceAll("\n", " ").replaceAll("\\s+", " ");
} }
/** /**
......
src/test/resources/scripts/SelectiveEnhancedPlugin/mybatis-generator-with-OldSelectiveEnhancedPlugin.xml 0 → 100644
View file @ a8c0a38a
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2018.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<!DOCTYPE generatorConfiguration
PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
"http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
<generatorConfiguration>
<properties resource="db.properties"/>
<!--导入属性配置 -->
<context id="default" targetRuntime="MyBatis3">
<!-- 插件 -->
<plugin type="com.itfsw.mybatis.generator.plugins.SelectiveEnhancedPlugin" />
<plugin type="com.itfsw.mybatis.generator.plugins.OldSelectiveEnhancedPlugin" />
<plugin type="com.itfsw.mybatis.generator.plugins.ModelColumnPlugin"/>
<!--jdbc的数据库连接 -->
<jdbcConnection driverClass="${driver}" connectionURL="${url}" userId="${username}" password="${password}" />
<!-- Model模型生成器,用来生成含有主键key的类，记录类 以及查询Example类
targetPackage 指定生成的model生成所在的包名
targetProject 指定在该项目下所在的路径 -->
<javaModelGenerator targetPackage="" targetProject=""/>
<!--Mapper映射文件生成所在的目录 为每一个数据库的表生成对应的SqlMap文件 -->
<sqlMapGenerator targetPackage="" targetProject="" />
<!-- 客户端代码，生成易于使用的针对Model对象和XML配置文件 的代码
type="ANNOTATEDMAPPER",生成Java Model 和基于注解的Mapper对象
type="MIXEDMAPPER",生成基于注解的Java Model 和相应的Mapper对象
type="XMLMAPPER",生成SQLMap XML文件和独立的Mapper接口 -->
<javaClientGenerator targetPackage="" targetProject="" type="XMLMAPPER"/>
<!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 要自动生成的表 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
<table tableName="tb">
<generatedKey column="id" sqlStatement="MySql" identity="true"/>
<columnOverride column="inc_f2" property="tsIncF2"/>
</table>
</context>
</generatorConfiguration>
\ No newline at end of file
src/test/resources/scripts/SelectiveEnhancedPlugin/mybatis-generator-without-ModelColumnPlugin.xml
View file @ a8c0a38a
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
~ Copyright (c) 2017. ~ Copyright (c) 2018.
~ ~
~ Licensed under the Apache License, Version 2.0 (the "License"); ~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License. ~ you may not use this file except in compliance with the License.
......
src/test/resources/scripts/SelectiveEnhancedPlugin/mybatis-generator.xml 0 → 100644
View file @ a8c0a38a
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2018.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<!DOCTYPE generatorConfiguration
PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
"http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
<generatorConfiguration>
<properties resource="db.properties"/>
<!--导入属性配置 -->
<context id="default" targetRuntime="MyBatis3">
<!-- 插件 -->
<plugin type="com.itfsw.mybatis.generator.plugins.UpsertPlugin">
<property name="allowMultiQueries" value="true"/>
</plugin>
<plugin type="com.itfsw.mybatis.generator.plugins.SelectiveEnhancedPlugin"/>
<plugin type="com.itfsw.mybatis.generator.plugins.ModelColumnPlugin"/>
<!--jdbc的数据库连接 -->
<jdbcConnection driverClass="${driver}" connectionURL="${url}" userId="${username}" password="${password}" />
<!-- Model模型生成器,用来生成含有主键key的类，记录类 以及查询Example类
targetPackage 指定生成的model生成所在的包名
targetProject 指定在该项目下所在的路径 -->
<javaModelGenerator targetPackage="" targetProject=""/>
<!--Mapper映射文件生成所在的目录 为每一个数据库的表生成对应的SqlMap文件 -->
<sqlMapGenerator targetPackage="" targetProject="" />
<!-- 客户端代码，生成易于使用的针对Model对象和XML配置文件 的代码
type="ANNOTATEDMAPPER",生成Java Model 和基于注解的Mapper对象
type="MIXEDMAPPER",生成基于注解的Java Model 和相应的Mapper对象
type="XMLMAPPER",生成SQLMap XML文件和独立的Mapper接口 -->
<javaClientGenerator targetPackage="" targetProject="" type="XMLMAPPER"/>
<!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 要自动生成的表 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
<table tableName="tb">
<generatedKey column="id" sqlStatement="MySql" identity="true"/>
<columnOverride column="inc_f2" property="tsIncF2"/>
</table>
</context>
</generatorConfiguration>
\ No newline at end of file
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