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 02366b9e..cc931115 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 @@ -37,11 +37,11 @@ public class DbTestStarter { .setDataSource(dataSource) .start(); - Row row1 = Db.selectOneById("tb_account", "id", 1); + Row row1 = Db.selectOneById(null,"tb_account", "id", 1); RowUtil.printPretty(row1); //查询全部 - List rows = Db.selectAll("tb_account"); + List rows = Db.selectAll(null,"tb_account"); RowUtil.printPretty(rows); @@ -53,7 +53,7 @@ public class DbTestStarter { row.set("user_name", "michael yang"); row.set("age", 18); row.set("birthday", new Date()); - Db.insert("tb_account", row); + Db.insert(null,"tb_account", row); //查看刚刚插入数据的主键 id System.out.println(">>>>>>>>>id: " + row.get("id")); @@ -79,7 +79,7 @@ public class DbTestStarter { //再次查询全部数据 - rows = Db.selectAll("tb_account"); + rows = Db.selectAll(null,"tb_account"); RowUtil.printPretty(rows); // for (Row row2 : rows) { @@ -96,10 +96,10 @@ public class DbTestStarter { r.prepareAttrsByKeySet(); r.setPrimaryKeys(RowKey.AUTO); }); - Db.insertBatch("tb_account", rows, 100); + Db.insertBatch(null,"tb_account", rows, 100); //再次查询全部数据 - rows = Db.selectAll("tb_account"); + rows = Db.selectAll(null,"tb_account"); RowUtil.printPretty(rows); } } diff --git a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/MultiDataSourceTester.java b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/MultiDataSourceTester.java index ee362935..236b47db 100644 --- a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/MultiDataSourceTester.java +++ b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/MultiDataSourceTester.java @@ -61,7 +61,7 @@ public class MultiDataSourceTester { //默认查询 db1 System.out.println("\n------ds1"); - List rows1 = Db.selectAll("tb_account"); + List rows1 = Db.selectAll(null,"tb_account"); RowUtil.printPretty(rows1); @@ -74,7 +74,7 @@ public class MultiDataSourceTester { // //查询数据源 ds2 System.out.println("\n------ds2"); DataSourceKey.use("ds2"); - List rows = Db.selectAll("tb_account"); + List rows = Db.selectAll(null,"tb_account"); RowUtil.printPretty(rows); // // boolean success = Db.tx(() -> { 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 f748af46..ac3d11bc 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 @@ -50,7 +50,7 @@ public class RowTestStarter { AuditManager.setAuditEnable(true); AuditManager.setMessageCollector(new ConsoleMessageCollector()); - Page rowPage = Db.paginate("tb_account", 1, 10, QueryWrapper.create().hint("USE_MERGE")); + Page rowPage = Db.paginate("flex","tb_account", 1, 10, QueryWrapper.create().hint("USE_MERGE")); System.out.println(rowPage); @@ -83,13 +83,13 @@ public class RowTestStarter { rowList.add(row); } - Db.insertBatch("tb_account",rowList); + Db.insertBatch(null,"tb_account",rowList); for (Row row : rowList) { System.out.println(">>>>>>>id: " + row.get("id")); } - List rows1 = Db.selectAll("tb_account"); + List rows1 = Db.selectAll(null,"tb_account"); RowUtil.printPretty(rows1); // //新增一条数据,自增 diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/controller/AccountController.java b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/controller/AccountController.java index 79ebb645..678529bf 100644 --- a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/controller/AccountController.java +++ b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/controller/AccountController.java @@ -73,10 +73,10 @@ public class AccountController { // account.setUserName("heihei"); // accountMapper.update(account); - Row row1 = Db.selectOneById("tb_account", "id", 1); + Row row1 = Db.selectOneById(null,"tb_account", "id", 1); System.out.println(">>>>>>> row1: " + row1); - Row row2 = Db.selectOneById("tb_account", "id", 2); + Row row2 = Db.selectOneById(null,"tb_account", "id", 2); System.out.println(">>>>>>> row2: " + row2); // Account account1 = accountMapper.selectOneById(1L); diff --git a/mybatis-flex-test/mybatis-flex-spring-test/src/test/java/com/mybatisflex/test/AccountTest.java b/mybatis-flex-test/mybatis-flex-spring-test/src/test/java/com/mybatisflex/test/AccountTest.java index 4b4f882f..efb482f8 100644 --- a/mybatis-flex-test/mybatis-flex-spring-test/src/test/java/com/mybatisflex/test/AccountTest.java +++ b/mybatis-flex-test/mybatis-flex-spring-test/src/test/java/com/mybatisflex/test/AccountTest.java @@ -41,7 +41,7 @@ public class AccountTest implements WithAssertions { @Test public void testSelectOneByRow() { - Row row = Db.selectOneById("tb_account", "id", 1); + Row row = Db.selectOneById(null,"tb_account", "id", 1); System.out.println(row); }