Enhancements

Author: jeffgbutler

src/test/java/examples/custom_render/CustomRenderingTest.java

@@ -20,6 +20,7 @@
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 import org.apache.ibatis.mapping.Environment;
@@ -31,9 +32,12 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.mybatis.dynamic.sql.SqlBuilder;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.delete.DeleteDSLCompleter;
+import org.mybatis.dynamic.sql.render.RenderingStrategies;
 import org.mybatis.dynamic.sql.select.SelectDSLCompleter;
+import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -42,7 +46,7 @@ public class CustomRenderingTest {
 
     @Container
     private static PgContainer postgres = new PgContainer("examples/custom_render/dbInit.sql");
-
+    
     private static SqlSessionFactory sqlSessionFactory;
 
     @BeforeAll
@@ -149,7 +153,7 @@ public void testUpdate() {
     }
 
     @Test
-    public void testJsonQuery() {
+    public void testDefererence() {
         try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
             JsonTestMapper mapper = sqlSession.getMapper(JsonTestMapper.class);
 
@@ -167,15 +171,15 @@ public void testJsonQuery() {
             assertThat(rows).isEqualTo(2);
 
             Optional<JsonTest> record = mapper.selectOne(c ->
-                c.where(info, isEqualTo("{\"firstName\": \"Wilma\", \"lastName\": \"Flintstone\", \"age\": 25}")));
+                c.where(dereference(info, "age"), isEqualTo("25")));
 
             assertThat(record).hasValueSatisfying( c ->
                 c.getInfo().equals("{\"firstName\": \"Wilma\", \"lastName\": \"Flintstone\", \"age\": 25}"));
         }
     }
 
     @Test
-    public void testDefererence() {
+    public void testDefererence2() {
         try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
             JsonTestMapper mapper = sqlSession.getMapper(JsonTestMapper.class);
 
@@ -192,15 +196,19 @@ public void testDefererence() {
             int rows = mapper.insertMultiple(record1, record2);
             assertThat(rows).isEqualTo(2);
 
-            Optional<JsonTest> record = mapper.selectOne(c ->
-                c.where(dereference(info, "->>'age'"), isEqualTo("25")));
+            SelectStatementProvider selectStatement = SqlBuilder.select(dereference(info, "firstName").as("firstname"))
+                    .from(jsonTest)
+                    .where(dereference(info, "age"), isEqualTo("25"))
+                    .build()
+                    .render(RenderingStrategies.MYBATIS3);
 
-            assertThat(record).hasValueSatisfying( c ->
-                c.getInfo().equals("{\"firstName\": \"Wilma\", \"lastName\": \"Flintstone\", \"age\": 25}"));
+            List<Map<String, Object>> records = mapper.generalSelect(selectStatement);
+            assertThat(records.size()).isEqualTo(1);
+            assertThat(records.get(0).get("firstname")).isEqualTo("Wilma");
         }
     }
 
-    private <T> SqlColumn<String> dereference(SqlColumn<T> column, String drString) {
-        return SqlColumn.of(column.name() + drString, column.table());
+    private <T> SqlColumn<String> dereference(SqlColumn<T> column, String attribute) {
+        return SqlColumn.of(column.name() + "->>'" + attribute + "'", column.table());
     }
 }

src/test/java/examples/custom_render/JsonTestMapper.java

@@ -5,6 +5,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 import org.apache.ibatis.annotations.DeleteProvider;
@@ -27,6 +28,9 @@
 import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
 
 public interface JsonTestMapper {
+    @SelectProvider(type = SqlProviderAdapter.class, method = "select")
+    List<Map<String, Object>> generalSelect(SelectStatementProvider selectStatement);
+
     @SelectProvider(type = SqlProviderAdapter.class, method = "select")
     @Results(id = "JsonTestResult", value = {
             @Result(column = "id", property = "id", id = true),

src/test/java/examples/custom_render/PgContainer.java

@@ -1,9 +1,5 @@
 package examples.custom_render;
 
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
 import javax.sql.DataSource;
 
 import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
@@ -16,11 +12,6 @@ public PgContainer(String initScriptPath) {
         withInitScript(initScriptPath);
     }
 
-    public Connection connect() throws SQLException {
-        DriverManager.registerDriver(getJdbcDriverInstance());
-        return DriverManager.getConnection(getJdbcUrl(), getUsername(), getPassword());
-    }
-
     public DataSource getUnpooledDataSource() {
         return new UnpooledDataSource(getDriverClassName(), getJdbcUrl(), getUsername(), getPassword());
     }