增加@GeneratedValue注解的支持

cjbi · Sep 26, 2020 · 6e7171f · 6e7171f
1 parent a463778
commit 6e7171f
Show file tree

Hide file tree

Showing 21 changed files with 81 additions and 768 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -11,6 +11,3 @@ insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
-
-[Makefile]
-indent_style = space
diff --git a/mybatis-ext-core/pom.xml b/mybatis-ext-core/pom.xml
@@ -5,12 +5,13 @@
     <parent>
         <artifactId>mybatis-ext-parent</artifactId>
         <groupId>tech.wetech.mybatis</groupId>
-        <version>1.6.4-SNAPSHOT</version>
+        <version>1.6.4</version>
+        <relativePath>../mybatis-ext-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>mybatis-ext-core</artifactId>
-    <version>1.6.4-SNAPSHOT</version>
+    <version>1.6.4</version>
 
     <properties>
         <mybatis.version>3.5.5</mybatis.version>
@@ -62,4 +63,39 @@
         <!-- test end -->
     </dependencies>
 
-</project>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M5</version>
+                <configuration>
+                    <argLine>-Dfile.encoding=UTF-8</argLine>
+                    <systemProperties>
+                        <property>
+                            <name>derby.stream.error.file</name>
+                            <value>${project.build.directory}/derby.log</value>
+                        </property>
+                        <property>
+                            <name>derby.system.home</name>
+                            <value>${project.build.directory}</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+        </plugins>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+            </testResource>
+            <testResource>
+                <directory>src/test/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                    <include>**/*.sql</include>
+                    <include>**/*.properties</include>
+                </includes>
+            </testResource>
+        </testResources>
+    </build>
+</project>
diff --git a/mybatis-ext-core/src/test/java/tech/wetech/mybatis/BaseDataTest.java b/mybatis-ext-core/src/test/java/tech/wetech/mybatis/BaseDataTest.java
@@ -13,9 +13,9 @@
 
 public abstract class BaseDataTest {
 
-    public static final String DERBY_PROPERTIES = "derby.properties";
-    public static final String SCHEMA_SQL = "schema.sql";
-    public static final String DATA_SQL = "data.sql";
+    public static final String DERBY_PROPERTIES = "tech/wetech/mybatis/databases/goods/goods-derby.properties";
+    public static final String SCHEMA_SQL = "tech/wetech/mybatis/databases/goods/goods-derby-schema.sql";
+    public static final String DATA_SQL = "tech/wetech/mybatis/databases/goods/goods-derby-dataload.sql";
 
     public static void runScript(DataSource ds, String resource) throws IOException, SQLException {
         try (Connection connection = ds.getConnection()) {