miemie преди 5 години
родител
ревизия
2bb304de8f

+ 3 - 1
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/MysqlTestDataMapperTest.java

@@ -99,7 +99,9 @@ class MysqlTestDataMapperTest {
                 .setTestEnum(TestEnum.ONE));
             commonLogicDataMapper.insert(new CommonLogicData().setTestInt(i).setTestStr(str).setId(id));
             resultMapEntityMapper.insert(new ResultMapEntity().setId(id).setList(list).setMap(map).setMapp(map));
-            mysqlMapper.insert(new MysqlData().setOrder(i).setGroup(i).setId(id).setTestStr(str).setYaHoStr(str));
+            MysqlData data = new MysqlData().setOrder(i).setGroup(i).setTestStr(str).setYaHoStr(str);
+            mysqlMapper.insert(data);
+            assertThat(data.getId()).isNotNull();
         }
     }
 

+ 3 - 0
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/entity/MysqlData.java

@@ -15,7 +15,9 @@
  */
 package com.baomidou.mybatisplus.test.mysql.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -27,6 +29,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class MysqlData {
 
+    @TableId(type = IdType.AUTO)
     private Long id;
     private Integer order;
     private Integer group;

+ 33 - 25
mybatis-plus/src/test/resources/mysql/test_data.ddl.sql

@@ -3,7 +3,8 @@ drop table if exists common_logic_data;
 drop table if exists mysql_data;
 drop table if exists result_map_entity;
 
-CREATE TABLE common_data (
+CREATE TABLE common_data
+(
     id         BIGINT primary key,
     test_int   integer,
     test_str   varchar(50),
@@ -13,10 +14,11 @@ CREATE TABLE common_data (
     test_enum  integer,
     test_enum2 integer,
     tenant_id  bigint
-)ENGINE = innodb
-DEFAULT CHARSET = utf8;
+) ENGINE = innodb
+  DEFAULT CHARSET = utf8;
 
-CREATE TABLE common_logic_data (
+CREATE TABLE common_logic_data
+(
     id       BIGINT primary key,
     test_int integer,
     test_str varchar(50),
@@ -24,32 +26,38 @@ CREATE TABLE common_logic_data (
     u_time   datetime,
     deleted  tinyint default 0,
     version  integer default 0
-)ENGINE = innodb
-DEFAULT CHARSET = utf8;
+) ENGINE = innodb
+  DEFAULT CHARSET = utf8;
 
-CREATE TABLE mysql_data (
-    id         BIGINT primary key,
+CREATE TABLE mysql_data
+(
+    id         BIGINT auto_increment primary key,
     `order`    integer,
     `group`    integer,
     test_str   varchar(255),
     lambda_str varchar(255) default ''
-)ENGINE = innodb
-DEFAULT CHARSET = utf8;
+) ENGINE = innodb
+  DEFAULT CHARSET = utf8;
 
-CREATE TABLE result_map_entity (
-                                   id      BIGINT primary key,
-                                   column1 varchar(200) default '1',
-                                   column2 varchar(200) default '2',
-                                   column3 varchar(200) default '3',
-                                   column4 varchar(200) default '4',
-                                   list    varchar(200),
-                                   map     varchar(200),
-                                   mapp    varchar(200)
-)ENGINE = innodb
-DEFAULT CHARSET = utf8;
+CREATE TABLE result_map_entity
+(
+    id      BIGINT primary key,
+    column1 varchar(200) default '1',
+    column2 varchar(200) default '2',
+    column3 varchar(200) default '3',
+    column4 varchar(200) default '4',
+    list    varchar(200),
+    map     varchar(200),
+    mapp    varchar(200)
+) ENGINE = innodb
+  DEFAULT CHARSET = utf8;
 
-INSERT INTO common_data (id, test_int, test_str, c_time, test_enum, tenant_id) VALUES (666666666, 25, 'test', now(), 1, 1);
-INSERT INTO common_data (id, test_int, test_str, c_time, test_enum, tenant_id) VALUES (777777777, 25, 'test', now(), 1, 1);
+INSERT INTO common_data (id, test_int, test_str, c_time, test_enum, tenant_id)
+VALUES (666666666, 25, 'test', now(), 1, 1);
+INSERT INTO common_data (id, test_int, test_str, c_time, test_enum, tenant_id)
+VALUES (777777777, 25, 'test', now(), 1, 1);
 
-INSERT INTO common_logic_data (id, test_int, test_str, c_time) VALUES (666666666, 25, 'test', now());
-INSERT INTO common_logic_data (id, test_int, test_str, c_time) VALUES (777777777, 25, 'test', now());
+INSERT INTO common_logic_data (id, test_int, test_str, c_time)
+VALUES (666666666, 25, 'test', now());
+INSERT INTO common_logic_data (id, test_int, test_str, c_time)
+VALUES (777777777, 25, 'test', now());