Merge pull request #5 from yuu-nkjm/develop

Finish preparing 0.9.4

README.md

@@ -16,7 +16,7 @@ You can get the binary using Maven from [Central Repository](http://mvnrepositor
 <dependency>
   <groupId>org.nkjmlab</groupId>
   <artifactId>sorm4j</artifactId>
-  <version>0.9.3</version>
+  <version>0.9.4</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.nkjmlab</groupId>
   <artifactId>sorm4j</artifactId>
-  <version>0.9.3</version>
+  <version>0.9.4</version>
   <name>sorm4j</name>
   <description>Simple micro Object-Relation Mapper for Java</description>
   <url>https://github.com/yuu-nkjm/sorm4j</url>

src/main/java/org/nkjmlab/sorm4j/mapping/AbstractOrmMapper.java

@@ -376,7 +376,7 @@ public Map<String, Object> loadOneMap(ResultSet resultSet) {
         ret = toSingleMap(resultSet);
       }
       if (resultSet.next()) {
-        throw new RuntimeException("Non-unique result returned");
+        throw new OrmException("Non-unique result returned");
       }
       return ret;
     } catch (SQLException e) {

src/test/java/org/nkjmlab/sorm4j/OrmConnectionTest.java

@@ -329,6 +329,17 @@ void testReadAllLazy() {
       assertThat(map.get("NAME") != null ? map.get("NAME") : map.get("name"))
           .isEqualTo(a.getName());
     });
+
+    srv.run(m -> {
+      try {
+        m.readAllLazy(Player.class).oneMap();
+        failBecauseExceptionWasNotThrown(OrmException.class);
+      } catch (OrmException e) {
+        assertThat(e.getMessage()).contains("Non-unique");
+      }
+    });
+
+
   }
 
   @Test

src/test/java/org/nkjmlab/sorm4j/TypedOrmConnectionTest.java

@@ -9,6 +9,7 @@
 import java.util.stream.Collectors;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.nkjmlab.sorm4j.mapping.OrmTransaction;
 import org.nkjmlab.sorm4j.mapping.TypedOrmConnectionImpl;
 import org.nkjmlab.sorm4j.util.Guest;
 import org.nkjmlab.sorm4j.util.Location;
@@ -29,6 +30,8 @@ void setUp() {
 
   @Test
   void testClose() {
+    Sorm.of(OrmTestUtils.createDataSourceH2()).getConnectionSource();
+
     srv.run(Guest.class, m -> {
       m.close();
       try {
@@ -414,6 +417,9 @@ void testToUntyped() {
   void testTransaction() {
     Guest a = OrmTestUtils.GUEST_ALICE;
 
+    srv.runTransaction(m -> {
+      m.insert(a);
+    }, Connection.TRANSACTION_READ_COMMITTED);
 
     srv.runTransaction(Guest.class, m -> {
       m.insert(a);
@@ -457,6 +463,25 @@ void testUpdateOnT() {
     Player a = OrmTestUtils.PLAYER_ALICE;
     Player b = OrmTestUtils.PLAYER_ALICE;
 
+    // auto-rolback
+    srv.executeTransaction(conn -> conn.insert(a));
+    // auto-rolback
+    srv.runTransaction(conn -> conn.insert(a));
+    try (OrmTransaction trans = srv.beginTransaction()) {
+      // auto-rolback
+      trans.insert(a);
+    }
+    try (OrmTransaction trans = srv.beginTransaction(Connection.TRANSACTION_READ_COMMITTED)) {
+      // auto-rolback
+      trans.insert(a);
+    }
+
+    try (Connection conn = srv.getJdbcConnection()) {
+      Sorm.toOrmConnection(conn);
+    } catch (SQLException e) {
+      e.printStackTrace();
+    }
+
     srv.run(Player.class, m -> m.runTransaction(conn -> {
       m.insert(a);
       // auto-rolback

src/test/java/org/nkjmlab/sorm4j/connectionsource/ConnectionSourceTest.java

@@ -3,6 +3,7 @@
 import java.sql.SQLException;
 import org.h2.jdbcx.JdbcConnectionPool;
 import org.junit.jupiter.api.Test;
+import org.nkjmlab.sorm4j.Sorm;
 
 class ConnectionSourceTest {
 
@@ -13,15 +14,17 @@ class ConnectionSourceTest {
   @Test
   void test() {
     JdbcConnectionPool cp = JdbcConnectionPool.create(url, user, pw);
-    DataSourceConnectionSource ds = new DataSourceConnectionSource(cp);
-    org.assertj.core.api.Assertions.assertThat(ds.getDataSource()).isEqualTo(cp);
-    org.assertj.core.api.Assertions.assertThat(ds.toString())
+    DataSourceConnectionSource cs = new DataSourceConnectionSource(cp);
+    org.assertj.core.api.Assertions.assertThat(cs.getDataSource()).isEqualTo(cp);
+    org.assertj.core.api.Assertions.assertThat(cs.toString())
         .contains(DataSourceConnectionSource.class.getSimpleName());
     try {
-      org.assertj.core.api.Assertions.assertThat(ds.getConnection()).isNotNull();
+      org.assertj.core.api.Assertions.assertThat(cs.getConnection()).isNotNull();
     } catch (SQLException e) {
       e.printStackTrace();
     }
+
+    Sorm.of(cs);
   }
 
 }

src/test/java/org/nkjmlab/sorm4j/mapping/BatchOfMultiRowInOneStatementProcessorTest.java

@@ -21,6 +21,8 @@ class BatchOfMultiRowInOneStatementProcessorTest {
 
   @BeforeAll
   static void beforAll() {
+    DebugPointFactory.onAll();
+    DebugPointFactory.offAll();
     DebugPointFactory.setModes(Map.of(DebugPointFactory.Name.MAPPING, true));
   }
 

src/test/java/org/nkjmlab/sorm4j/util/OrmTestUtils.java

@@ -30,7 +30,9 @@ public class OrmTestUtils {
       "CREATE TABLE IF NOT EXISTS players1 (id INT PRIMARY KEY, name VARCHAR, address VARCHAR)";
 
   public static Sorm createSorm() {
-    return Sorm.of(jdbcUrl, user, password);
+    Sorm ret = Sorm.of(jdbcUrl, user, password);
+    return ret;
+
   }
 
   public static void dropAndCreateTable(Sorm srv, Class<?> clazz) {