点错付出的代价

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/interfaces/Join.java

@@ -15,8 +15,6 @@
  */
 package com.baomidou.mybatisplus.core.conditions.interfaces;
 
-import static com.baomidou.mybatisplus.core.enums.SqlKeyword.EXISTS;
-
 import java.io.Serializable;
 
 /**
@@ -113,7 +111,7 @@ public interface Join<This> extends Serializable {
 
     /**
      * EXISTS ( sql 语句 )
-     * 例: exists("query id from table where age = 1")
+     * 例: exists("select id from table where age = 1")
      */
     default This exists(String existsSql) {
         return exists(true, existsSql);
@@ -126,7 +124,7 @@ public interface Join<This> extends Serializable {
 
     /**
      * NOT EXISTS ( sql 语句 )
-     * 例: notExists("query id from table where age = 1")
+     * 例: notExists("select id from table where age = 1")
      */
     default This notExists(String notExistsSql) {
         return notExists(true, notExistsSql);

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/pagination/Pagination.java

@@ -67,7 +67,7 @@ public class Pagination extends RowBounds implements Serializable {
     private boolean openSort = true;
 
     /**
-     * 优化 Count Sql 设置 false 执行 query count(1) from (listSql)
+     * 优化 Count Sql 设置 false 执行 select count(1) from (listSql)
      */
     private boolean optimizeCountSql = true;
 

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/sql/SqlFormatter.java

@@ -68,7 +68,7 @@ public class SqlFormatter {
         DML.add("update");
         DML.add("delete");
 
-        MISC.add("query");
+        MISC.add("select");
         MISC.add("on");
     }
 
@@ -146,7 +146,7 @@ public class SqlFormatter {
                     beginNewClause();
                 } else if (END_CLAUSES.contains(lcToken)) {
                     endNewClause();
-                } else if ("query".equals(lcToken)) {
+                } else if ("select".equals(lcToken)) {
                     select();
                 } else if (DML.contains(lcToken)) {
                     updateOrInsertOrDelete();

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/incrementer/H2KeyGenerator.java

@@ -15,7 +15,7 @@ public class H2KeyGenerator implements IKeyGenerator {
     @Override
     public String executeSql(String incrementerName) {
         StringBuilder sql = new StringBuilder();
-        sql.append("query ");
+        sql.append("select ");
         sql.append(incrementerName);
         sql.append(".nextval");
         return sql.toString();

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/incrementer/PostgreKeyGenerator.java

@@ -15,7 +15,7 @@ public class PostgreKeyGenerator implements IKeyGenerator {
     @Override
     public String executeSql(String incrementerName) {
         StringBuilder sql = new StringBuilder();
-        sql.append("query nextval('");
+        sql.append("select nextval('");
         sql.append(incrementerName);
         sql.append("')");
         return sql.toString();

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/dialects/DB2Dialect.java

@@ -40,14 +40,14 @@ public class DB2Dialect implements IDialect {
     }
 
     private static boolean hasDistinct(String originalSql) {
-        return originalSql.toLowerCase().contains("query distinct");
+        return originalSql.toLowerCase().contains("select distinct");
     }
 
     @Override
     public String buildPaginationSql(String originalSql, int offset, int limit) {
-        int startOfSelect = originalSql.toLowerCase().indexOf("query");
+        int startOfSelect = originalSql.toLowerCase().indexOf("select");
         StringBuilder pagingSelect = new StringBuilder(originalSql.length() + 100)
-            .append(originalSql.substring(0, startOfSelect)).append("query * from ( query ")
+            .append(originalSql.substring(0, startOfSelect)).append("select * from ( select ")
             .append(getRowNumber(originalSql));
         if (hasDistinct(originalSql)) {
             pagingSelect.append(" row_.* from ( ").append(originalSql.substring(startOfSelect)).append(" ) as row_");
@@ -56,7 +56,7 @@ public class DB2Dialect implements IDialect {
         }
         pagingSelect.append(" ) as temp_ where rownumber_ ");
 
-        // add the restriction to the outer query
+        // add the restriction to the outer select
         if (offset > 0) {
             String endString = offset + "+" + limit;
             pagingSelect.append("between ").append(offset).append("+1 and ").append(endString);

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/dialects/SQLServer2005Dialect.java

@@ -48,9 +48,9 @@ public class SQLServer2005Dialect implements IDialect {
 
         String loweredString = originalSql.toLowerCase();
         String sqlPartString = originalSql;
-        if (loweredString.trim().startsWith("query")) {
+        if (loweredString.trim().startsWith("select")) {
             int index = 6;
-            if (loweredString.startsWith("query distinct")) {
+            if (loweredString.startsWith("select distinct")) {
                 distinctStr = "DISTINCT ";
                 index = 15;
             }
@@ -64,9 +64,9 @@ public class SQLServer2005Dialect implements IDialect {
         }
 
         StringBuilder sql = new StringBuilder();
-        sql.append("WITH query AS (SELECT ").append(distinctStr).append("TOP 100 PERCENT ")
+        sql.append("WITH select AS (SELECT ").append(distinctStr).append("TOP 100 PERCENT ")
             .append(" ROW_NUMBER() OVER (").append(orderby).append(") as __row_number__, ").append(pagingBuilder)
-            .append(") SELECT * FROM query WHERE __row_number__ BETWEEN ")
+            .append(") SELECT * FROM select WHERE __row_number__ BETWEEN ")
             //FIX#299：原因：mysql中limit 10(offset,size) 是从第10开始（不包含10）,；而这里用的BETWEEN是两边都包含，所以改为offset+1
             .append(offset + 1)
             .append(" AND ")

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/tenant/TenantSqlParser.java

@@ -46,7 +46,7 @@ public class TenantSqlParser extends AbstractJsqlParser {
     private TenantHandler tenantHandler;
 
     /**
-     * query 语句处理
+     * select 语句处理
      */
     @Override
     public void processSelectBody(SelectBody selectBody) {

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/spring/MybatisMapperRefresh.java

@@ -254,7 +254,7 @@ public class MybatisMapperRefresh implements Runnable {
         for (XNode resultChild : xNode.getChildren()) {
             if ("association".equals(resultChild.getName()) || "collection".equals(resultChild.getName())
                 || "case".equals(resultChild.getName())) {
-                if (resultChild.getStringAttribute("query") == null) {
+                if (resultChild.getStringAttribute("select") == null) {
                     configuration.getResultMapNames().remove(
                         resultChild.getStringAttribute("id", resultChild.getValueBasedIdentifier()));
                     configuration.getResultMapNames().remove(

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/SqlRunner.java

@@ -115,7 +115,7 @@ public class SqlRunner implements ISqlRunner {
 
     /**
      * 根据sql查询Map结果集
-     * SqlRunner.db().selectList("query * from tbl_user where name={0}", "Caratacus")
+     * SqlRunner.db().selectList("select * from tbl_user where name={0}", "Caratacus")
      *
      * @param sql  sql语句，可添加参数，格式：{0},{1}
      * @param args 只接受String格式

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/querys/SqlServerQuery.java

@@ -39,7 +39,7 @@ public class SqlServerQuery extends AbstractDbQuery {
 
     @Override
     public String tablesSql() {
-        return "query cast(so.name as varchar(500)) as TABLE_NAME, " +
+        return "select cast(so.name as varchar(500)) as TABLE_NAME, " +
             "cast(sep.value as varchar(500)) as COMMENTS from sysobjects so " +
             "left JOIN sys.extended_properties sep on sep.major_id=so.id and sep.minor_id=0 " +
             "where (xtype='U' or xtype='v')";
@@ -58,7 +58,7 @@ public class SqlServerQuery extends AbstractDbQuery {
             + " AND sysindexkeys.indid = sysindexes.indid "
             + " AND syscolumns.colid = sysindexkeys.colid AND syscolumns.NAME = B.NAME) as 'KEY',"
             + "  b.is_identity isIdentity "
-            + " FROM ( query name,object_id from sys.tables UNION all query name,object_id from sys.views ) a "
+            + " FROM ( select name,object_id from sys.tables UNION all select name,object_id from sys.views ) a "
             + " INNER JOIN sys.COLUMNS b ON b.object_id = a.object_id "
             + " LEFT JOIN sys.types ON b.user_type_id = sys.types.user_type_id   "
             + " LEFT JOIN sys.extended_properties c ON c.major_id = b.object_id AND c.minor_id = b.column_id "