Browse Source

再再提交一波

miemie 7 years ago
parent
commit
e5588ecc75

+ 1 - 3
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/db/BaseDb.java

@@ -6,8 +6,6 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import com.baomidou.mybatisplus.test.h2.H2UserTest;
-
 /**
  * @author miemie
  * @since 2018-07-06
@@ -40,6 +38,6 @@ public class BaseDb {
     }
 
     private static String filePath(String path, String fileName) {
-        return H2UserTest.class.getResource(path + fileName).getPath();
+        return BaseDb.class.getResource(path + fileName).getPath();
     }
 }

+ 3 - 5
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/config/MysqlDb.java

@@ -19,21 +19,19 @@ public class MysqlDb extends BaseDb {
         ApplicationContext context = new ClassPathXmlApplicationContext("classpath:mysql/spring-test-mysql.xml");
         DataSource ds = context.getBean("dataSource", DataSource.class);
         try (Connection conn = ds.getConnection()) {
-            initData(conn, "/mysql/", "test_data.ddl.sql", "test_data.insert.sql");
+            initData(conn, "/mysql/", "test_data.ddl.sql");
         }
     }
 
-    public static void initData(Connection conn, String path, String ddlFileName, String insertFileName)
+    public static void initData(Connection conn, String path, String ddlFileName)
         throws SQLException, IOException {
         String createTableSql = readFile(path, ddlFileName);
         String[] sqls = createTableSql.split(";");
         Statement stmt = conn.createStatement();
         for (String sql : sqls) {
             if (StringUtils.isNotEmpty(sql)) {
-                stmt.execute(createTableSql);
+                stmt.execute(sql);
             }
         }
-        executeSql(stmt, path, insertFileName);
-        conn.commit();
     }
 }

+ 1 - 0
mybatis-plus/src/test/resources/mysql/test_data.ddl.sql

@@ -14,6 +14,7 @@ CREATE TABLE IF NOT EXISTS tb_test_data_logic (
 )
     ENGINE = innodb
     DEFAULT CHARSET = utf8;
+
 CREATE TABLE IF NOT EXISTS tb_test_data (
     id              BIGINT primary key,
     test_int        integer,

+ 0 - 0
mybatis-plus/src/test/resources/mysql/test_data.insert.sql