Coverage

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/insert/InsertDSL.java

@@ -30,6 +30,7 @@
 import org.mybatis.dynamic.sql.util.NullMapping;
 import org.mybatis.dynamic.sql.util.PropertyMapping;
 import org.mybatis.dynamic.sql.util.PropertyWhenPresentMapping;
+import org.mybatis.dynamic.sql.util.RowMapping;
 import org.mybatis.dynamic.sql.util.StringConstantMapping;
 
 public class InsertDSL<T> implements Buildable<InsertModel<T>> {
@@ -104,6 +105,11 @@ public InsertDSL<T> toStringConstant(String constant) {
             columnMappings.add(StringConstantMapping.of(column, constant));
             return InsertDSL.this;
         }
+
+        public InsertDSL<T> toRow() {
+            columnMappings.add(RowMapping.of(column));
+            return InsertDSL.this;
+        }
     }
 
     public static class Builder<T> {

src/main/java/org/mybatis/dynamic/sql/util/spring/NamedParameterJdbcTemplateExtensions.java

@@ -36,7 +36,6 @@
 import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
 import org.mybatis.dynamic.sql.util.Buildable;
 import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
@@ -159,17 +158,4 @@ public int update(Buildable<UpdateModel> updateStatement) {
     public int update(UpdateStatementProvider updateStatement) {
         return template.update(updateStatement.getUpdateStatement(), updateStatement.getParameters());
     }
-
-    /**
-     * Allow access to the underlying template for unusual circumstances.
-     *
-     * @return The underlying Spring JdbcOperations implementation
-     */
-    public JdbcOperations getJdbcOperations() {
-        return template.getJdbcOperations();
-    }
-
-    public NamedParameterJdbcTemplate getTemplate() {
-        return template;
-    }
 }

src/test/java/examples/simple/CompoundKeyDynamicSqlSupport.java

@@ -1,3 +1,18 @@
+/*
+ *    Copyright 2016-2023 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
 package examples.simple;
 
 import org.mybatis.dynamic.sql.SqlColumn;

src/test/java/examples/simple/CompoundKeyMapper.java

@@ -1,3 +1,18 @@
+/*
+ *    Copyright 2016-2023 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
 package examples.simple;
 
 import org.mybatis.dynamic.sql.util.mybatis3.CommonInsertMapper;

src/test/java/examples/simple/CompoundKeyRow.java

@@ -1,3 +1,18 @@
+/*
+ *    Copyright 2016-2023 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
 package examples.simple;
 
 public class CompoundKeyRow {

src/test/java/examples/simple/MyBatisMapToRowTest.java

@@ -1,3 +1,18 @@
+/*
+ *    Copyright 2016-2023 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
 package examples.simple;
 
 import java.io.InputStream;
@@ -22,6 +37,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mybatis.dynamic.sql.insert.render.BatchInsert;
+import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
 import org.mybatis.dynamic.sql.insert.render.MultiRowInsertStatementProvider;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
@@ -30,11 +46,12 @@
 import static examples.simple.CompoundKeyDynamicSqlSupport.id1;
 import static examples.simple.CompoundKeyDynamicSqlSupport.id2;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mybatis.dynamic.sql.SqlBuilder.insert;
 import static org.mybatis.dynamic.sql.SqlBuilder.insertBatch;
 import static org.mybatis.dynamic.sql.SqlBuilder.insertMultiple;
 import static org.mybatis.dynamic.sql.SqlBuilder.select;
 
-public class MyBatisMapToRowTest {
+class MyBatisMapToRowTest {
     private static final String JDBC_URL = "jdbc:hsqldb:mem:aname";
     private static final String JDBC_DRIVER = "org.hsqldb.jdbcDriver";
     private SqlSessionFactory sqlSessionFactory;
@@ -57,6 +74,36 @@ void setup() throws Exception {
         sqlSessionFactory = new SqlSessionFactoryBuilder().build(config);
     }
 
+    @Test
+    void testInsertOne() {
+        try (SqlSession session = sqlSessionFactory.openSession()) {
+            CompoundKeyMapper mapper = session.getMapper(CompoundKeyMapper.class);
+
+            Integer i = 1;
+
+            InsertStatementProvider<Integer> insertStatement = insert(i)
+                    .into(compoundKey)
+                    .map(id1).toConstant("22")
+                    .map(id2).toRow()
+                    .build()
+                    .render(RenderingStrategies.MYBATIS3);
+
+            String expected = "insert into CompoundKey (id1, id2) values (22, #{row,jdbcType=INTEGER})";
+            assertThat(insertStatement.getInsertStatement()).isEqualTo(expected);
+
+            int rows = mapper.insert(insertStatement);
+            assertThat(rows).isEqualTo(1);
+
+            SelectStatementProvider selectStatement = select(id1, id2)
+                    .from(compoundKey)
+                    .orderBy(id1, id2)
+                    .build().render(RenderingStrategies.MYBATIS3);
+
+            List<CompoundKeyRow> records = mapper.selectMany(selectStatement, this::mapRow);
+            assertThat(records).hasSize(1);
+        }
+    }
+
     @Test
     void testInsertMultiple() {
         try (SqlSession session = sqlSessionFactory.openSession()) {

src/test/java/examples/spring/CompoundKeyDynamicSqlSupport.java

@@ -1,3 +1,18 @@
+/*
+ *    Copyright 2016-2023 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
 package examples.spring;
 
 import org.mybatis.dynamic.sql.SqlColumn;

src/test/java/examples/spring/CompoundKeyRow.java

@@ -1,3 +1,18 @@
+/*
+ *    Copyright 2016-2023 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
 package examples.spring;
 
 public class CompoundKeyRow {

src/test/java/examples/spring/SpringMapToRowTest.java

@@ -1,39 +1,77 @@
+/*
+ *    Copyright 2016-2023 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
 package examples.spring;
 
 import static examples.spring.CompoundKeyDynamicSqlSupport.compoundKey;
 import static examples.spring.CompoundKeyDynamicSqlSupport.id1;
 import static examples.spring.CompoundKeyDynamicSqlSupport.id2;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mybatis.dynamic.sql.SqlBuilder.insert;
 import static org.mybatis.dynamic.sql.SqlBuilder.insertBatch;
 import static org.mybatis.dynamic.sql.SqlBuilder.insertMultiple;
 import static org.mybatis.dynamic.sql.SqlBuilder.select;
 
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.IntStream;
 
-import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Test;
 import org.mybatis.dynamic.sql.insert.render.BatchInsert;
+import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
 import org.mybatis.dynamic.sql.insert.render.MultiRowInsertStatementProvider;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
 import org.mybatis.dynamic.sql.select.SelectModel;
 import org.mybatis.dynamic.sql.util.Buildable;
 import org.mybatis.dynamic.sql.util.spring.NamedParameterJdbcTemplateExtensions;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import org.springframework.transaction.annotation.Transactional;
 
 @SpringJUnitConfig(classes = SpringConfiguration.class)
 @Transactional
-public class SpringMapToRowTest {
+class SpringMapToRowTest {
     @Autowired
     private NamedParameterJdbcTemplateExtensions template;
 
+    @Test
+    void testInsertOne() {
+        Integer i = 1;
+
+        InsertStatementProvider<Integer> insertStatement = insert(i)
+                .into(compoundKey)
+                .map(id1).toConstant("22")
+                .map(id2).toRow()
+                .build()
+                .render(RenderingStrategies.SPRING_NAMED_PARAMETER);
+
+        String expected = "insert into CompoundKey (id1, id2) values (22, :row)";
+        assertThat(insertStatement.getInsertStatement()).isEqualTo(expected);
+
+        int rows = template.insert(insertStatement);
+        assertThat(rows).isEqualTo(1);
+
+        Buildable<SelectModel> selectStatement = select(id1, id2)
+                .from(compoundKey)
+                .orderBy(id1, id2);
+
+        List<CompoundKeyRow> records = template.selectList(selectStatement, rowMapper);
+        assertThat(records).hasSize(1);
+    }
+
     @Test
     void testInsertMultiple() {
         List<Integer> integers = new ArrayList<>();
@@ -79,19 +117,6 @@ void testInsertBatch() {
         String expected = "insert into CompoundKey (id1, id2) values (22, :row)";
         assertThat(insertStatement.getInsertStatementSQL()).isEqualTo(expected);
 
-//        String sql = insertStatement.getInsertStatementSQL().replace(":row", "?");
-//        int[] rowCounts = template.getJdbcOperations().batchUpdate(sql, new BatchPreparedStatementSetter() {
-//            @Override
-//            public void setValues(@NotNull PreparedStatement ps, int i) throws SQLException {
-//                ps.setInt(1, insertStatement.getRecords().get(i));
-//            }
-//
-//            @Override
-//            public int getBatchSize() {
-//                return insertStatement.getRecords().size();
-//            }
-//        });
-
         int[] rowCounts = template.insertBatch(insertStatement);
 
         assertThat(IntStream.of(rowCounts).sum()).isEqualTo(3);

src/test/java/org/mybatis/dynamic/sql/insert/MapToRowTest.java

@@ -1,3 +1,18 @@
+/*
+ *    Copyright 2016-2023 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
 package org.mybatis.dynamic.sql.insert;
 
 import static org.assertj.core.api.Assertions.assertThat;