From 242e58464bdfdff8c8fdd943fc21578eaf19d3ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= Date: Tue, 28 Mar 2023 15:13:38 +0800 Subject: [PATCH] rename "Db.insertRow()" to "Db.insert()" --- docs/zh/db_row.md | 8 +++--- .../core/mybatis/FlexConfiguration.java | 2 +- .../core/provider/RowSqlProvider.java | 6 ++--- .../java/com/mybatisflex/core/row/Db.java | 21 +++++++++------- .../com/mybatisflex/core/row/RowMapper.java | 25 ++++++++++--------- .../core/row/RowMapperInvoker.java | 9 ++++--- .../com/mybatisflex/test/DbTestStarter.java | 2 +- .../com/mybatisflex/test/RowTestStarter.java | 6 ++--- readme_zh.md | 2 +- 9 files changed, 43 insertions(+), 38 deletions(-) diff --git a/docs/zh/db_row.md b/docs/zh/db_row.md index 6651e3c3..b9303a53 100644 --- a/docs/zh/db_row.md +++ b/docs/zh/db_row.md @@ -12,7 +12,7 @@ Db.insertBySql(sql,1,"michael"); Row account = new Row(); account.set("id",100); account.set(ACCOUNT.USER_NAME,"Michael"); -Db.insertRow("tb_account",account); +Db.insert("tb_account",account); //根据主键查询数据 @@ -67,7 +67,7 @@ Map result = row.toUnderlineKeysMap(); Row row = Row.ofKey(RowKey.ID_AUTO); row.set(ACCOUNT.USER_NAME,"Michael"); -Db.insertRow("tb_account",row); +Db.insert("tb_account",row); ``` **ID 为 UUID** @@ -77,7 +77,7 @@ Db.insertRow("tb_account",row); Row row = Row.ofKey(RowKey.ID_UUID); row.set(ACCOUNT.USER_NAME,"Michael"); -Db.insertRow("tb_account",row); +Db.insert("tb_account",row); ``` **自定义 Row 主键生成方式** @@ -89,7 +89,7 @@ RowKey myRowKey = RowKey.of("id", KeyType.Generator, "uuid", true); Row row = Row.ofKey(myRowKey); row.set(ACCOUNT.USER_NAME,"Michael"); -Db.insertRow("tb_account",row); +Db.insert("tb_account",row); ``` ## Db 中的 RowMapperInvoker diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexConfiguration.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexConfiguration.java index 898b9cfa..1ea6489e 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexConfiguration.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexConfiguration.java @@ -96,7 +96,7 @@ public class FlexConfiguration extends Configuration { @Override public void addMappedStatement(MappedStatement ms) { - //替换 RowMapper.insertRow 的主键生成器 + //替换 RowMapper.insert 的主键生成器 //替换 RowMapper.insertBatchWithFirstRowColumns 的主键生成器 if (ms.getId().startsWith("com.mybatisflex.core.row.RowMapper.insert")) { ms = replaceRowKeyGenerator(ms); diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/RowSqlProvider.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/RowSqlProvider.java index 40edf26d..b9312381 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/RowSqlProvider.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/RowSqlProvider.java @@ -52,13 +52,13 @@ public class RowSqlProvider { } /** - * insertRow 的 sql 构建 + * insert 的 sql 构建 * * @param params * @return sql - * @see RowMapper#insertRow(String, Row) + * @see RowMapper#insert(String, Row) */ - public static String insertRow(Map params) { + public static String insert(Map params) { String tableName = ProviderUtil.getTableName(params); Row row = ProviderUtil.getRow(params); ProviderUtil.setSqlArgs(params, row.obtainModifyValues()); diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/Db.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/Db.java index 98e82183..29ee62ca 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/Db.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/Db.java @@ -49,6 +49,18 @@ public class Db { }); } + + /** + * 网 tableName 插入一条 row 数据 + * + * @param tableName 表名 + * @param row 数据 + */ + public static int insert(String tableName, Row row) { + return invoker().insert(tableName, row); + } + + /** * 直接编写 sql 插入数据 * @@ -59,15 +71,6 @@ public class Db { return invoker().insertBySql(sql, args); } - /** - * 网 tableName 插入一条 row 数据 - * - * @param tableName 表名 - * @param row 数据 - */ - public static int insertRow(String tableName, Row row) { - return invoker().insertRow(tableName, row); - } /** * 批量插入数据 diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/RowMapper.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/RowMapper.java index 5a50505e..7bdc83ca 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/RowMapper.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/RowMapper.java @@ -35,6 +35,19 @@ public interface RowMapper { //////insert ////// + /** + * 插入 row 到数据表 + * + * @param tableName 表名 + * @param row 数据内容，当设置有主键时，主键会自动填充 + * @return 执行影响的行数 + * @see RowSqlProvider#insert(Map) + */ + @InsertProvider(value = RowSqlProvider.class, method = "insert") + int insert(@Param(FlexConsts.TABLE_NAME) String tableName, @Param(FlexConsts.ROW) Row row); + + + /** * 执行 insert sql 语句 * @@ -47,18 +60,6 @@ public interface RowMapper { int insertBySql(@Param(FlexConsts.SQL) String sql, @Param(FlexConsts.SQL_ARGS) Object... args); - /** - * 插入 row 到数据表 - * - * @param tableName 表名 - * @param row 数据内容，当设置有主键时，主键会自动填充 - * @return 执行影响的行数 - * @see RowSqlProvider#insertRow(Map) - */ - @InsertProvider(value = RowSqlProvider.class, method = "insertRow") - int insertRow(@Param(FlexConsts.TABLE_NAME) String tableName, @Param(FlexConsts.ROW) Row row); - - /** * 批量插入 rows 到数据表 *

diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/RowMapperInvoker.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/RowMapperInvoker.java index 480c1b51..d5637ec9 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/RowMapperInvoker.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/row/RowMapperInvoker.java @@ -61,14 +61,15 @@ public class RowMapperInvoker { } } + public int insert(String tableName, Row row) { + return execute(mapper -> mapper.insert(tableName, row)); + } + public int insertBySql(String sql, Object... args) { return execute(mapper -> mapper.insertBySql(sql, args)); } - public int insertRow(String tableName, Row row) { - return execute(mapper -> mapper.insertRow(tableName, row)); - } public int[] insertBatch(String tableName, Collection rows, int batchSize) { int[] results = new int[rows.size()]; @@ -89,7 +90,7 @@ public class RowMapperInvoker { } } } else { - mapper.insertRow(tableName, row); + mapper.insert(tableName, row); } } } finally { diff --git a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/DbTestStarter.java b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/DbTestStarter.java index 71b40f17..22ce757b 100644 --- a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/DbTestStarter.java +++ b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/DbTestStarter.java @@ -49,7 +49,7 @@ public class DbTestStarter { row.set("user_name", "michael yang"); row.set("age", 18); row.set("birthday", new Date()); - Db.insertRow("tb_account", row); + Db.insert("tb_account", row); //查看刚刚插入数据的主键 id System.out.println(">>>>>>>>>id: " + row.get("id")); diff --git a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/RowTestStarter.java b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/RowTestStarter.java index 80424fd0..4cca784a 100644 --- a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/RowTestStarter.java +++ b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/RowTestStarter.java @@ -53,7 +53,7 @@ public class RowTestStarter { .set("age", 22) .set("birthday", new Date()); bootstrap.execute(RowMapper.class, rowMapper -> - rowMapper.insertRow("tb_account", newRow)); + rowMapper.insert("tb_account", newRow)); // // //新增后，查看newRow 的 id，会自动被赋值 @@ -69,11 +69,11 @@ public class RowTestStarter { // // List newRowList = new ArrayList<>(); // for (int i = 0; i < 5; i++) { -// Row insertRow = Row.ofKey(RowKey.ID_AUTO) //id 自增 +// Row insert = Row.ofKey(RowKey.ID_AUTO) //id 自增 // .set("user_name", "new_user_" + i) // .set("age", 22) // .set("birthday", new Date()); -// newRowList.add(insertRow); +// newRowList.add(insert); // } // // //批量插入数据 diff --git a/readme_zh.md b/readme_zh.md index 92580c8d..bd5b93ca 100644 --- a/readme_zh.md +++ b/readme_zh.md @@ -412,7 +412,7 @@ Db.insertBySql(sql,1,"michael"); Row account=new Row(); account.set("id",100); account.set("name","Michael"); -Db.insertRow("tb_account",account); +Db.insert("tb_account",account); //根据主键查询数据