Skip to content

Commit 21f812c

Browse files
mipo256mipo256
committed
Added Sequence generation support
1 parent b51c77b commit 21f812c

File tree

40 files changed

+781
-57
lines changed

40 files changed

+781
-57
lines changed

‎pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@
126126
</developers>
127127

128128
<profiles>
129-
130129
<profile>
131130
<id>no-jacoco</id>
132131
<build>

‎spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
*/
1616
package org.springframework.data.jdbc.core.convert;
1717

18-
import static org.springframework.data.jdbc.core.convert.SqlGenerator.*;
18+
import static org.springframework.data.jdbc.core.convert.SqlGenerator.ID_SQL_PARAMETER;
19+
import static org.springframework.data.jdbc.core.convert.SqlGenerator.ROOT_ID_PARAMETER;
20+
import static org.springframework.data.jdbc.core.convert.SqlGenerator.VERSION_SQL_PARAMETER;
1921

2022
import java.sql.ResultSet;
2123
import java.sql.SQLException;
@@ -62,6 +64,7 @@
6264
* @author Chirag Tailor
6365
* @author Diego Krupitza
6466
* @author Sergey Korotaev
67+
* @author Mikhail Polivakha
6568
* @since 1.1
6669
*/
6770
public class DefaultDataAccessStrategy implements DataAccessStrategy {
@@ -105,30 +108,35 @@ public DefaultDataAccessStrategy(SqlGeneratorSource sqlGeneratorSource, Relation
105108
public <T> Object insert(T instance, Class<T> domainType, Identifier identifier, IdValueSource idValueSource) {
106109

107110
SqlIdentifierParameterSource parameterSource = sqlParametersFactory.forInsert(instance, domainType, identifier,
108-
idValueSource);
111+
idValueSource);
109112

110113
String insertSql = sql(domainType).getInsert(parameterSource.getIdentifiers());
111114

112115
return insertStrategyFactory.insertStrategy(idValueSource, getIdColumn(domainType)).execute(insertSql,
113-
parameterSource);
116+
parameterSource);
114117
}
115118

116119
@Override
117120
public <T> Object[] insert(List<InsertSubject<T>> insertSubjects, Class<T> domainType, IdValueSource idValueSource) {
118121

119122
Assert.notEmpty(insertSubjects, "Batch insert must contain at least one InsertSubject");
120123
SqlIdentifierParameterSource[] sqlParameterSources = insertSubjects.stream()
121-
.map(insertSubject -> sqlParametersFactory.forInsert(insertSubject.getInstance(), domainType,
122-
insertSubject.getIdentifier(), idValueSource))
123-
.toArray(SqlIdentifierParameterSource[]::new);
124+
.map(insertSubject -> sqlParametersFactory.forInsert( //
125+
insertSubject.getInstance(), //
126+
domainType, //
127+
insertSubject.getIdentifier(), //
128+
idValueSource //
129+
) //
130+
) //
131+
.toArray(SqlIdentifierParameterSource[]::new);
124132

125133
String insertSql = sql(domainType).getInsert(sqlParameterSources[0].getIdentifiers());
126134

127135
return insertStrategyFactory.batchInsertStrategy(idValueSource, getIdColumn(domainType)).execute(insertSql,
128-
sqlParameterSources);
136+
sqlParameterSources);
129137
}
130138

131-
@Override
139+
@Override
132140
public <S> boolean update(S instance, Class<S> domainType) {
133141

134142
SqlIdentifierParameterSource parameterSource = sqlParametersFactory.forUpdate(instance, domainType);
@@ -479,5 +487,4 @@ private Class<?> getBaseType(PersistentPropertyPath<RelationalPersistentProperty
479487

480488
return baseProperty.getOwner().getType();
481489
}
482-
483490
}

‎spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/InsertStrategyFactory.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,5 +101,4 @@ public Object[] execute(String sql, SqlParameterSource[] sqlParameterSources) {
101101
return new Object[sqlParameterSources.length];
102102
}
103103
}
104-
105104
}

‎spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/MappingJdbcConverter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
* @since 3.2
6868
*/
6969
public class MappingJdbcConverter extends MappingRelationalConverter implements JdbcConverter, ApplicationContextAware {
70-
70+
7171
private static final Log LOG = LogFactory.getLog(MappingJdbcConverter.class);
7272
private static final Converter<Iterable<?>, Map<?, ?>> ITERABLE_OF_ENTRY_TO_MAP_CONVERTER = new IterableOfEntryToMapConverter();
7373

‎spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/SqlIdentifierParameterSource.java‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.util.Set;
2323

2424
import org.springframework.data.relational.core.sql.SqlIdentifier;
25+
import org.springframework.data.util.Pair;
2526
import org.springframework.jdbc.core.namedparam.AbstractSqlParameterSource;
2627

2728
/**
@@ -35,9 +36,11 @@
3536
*/
3637
class SqlIdentifierParameterSource extends AbstractSqlParameterSource {
3738

38-
private final Set<SqlIdentifier> identifiers = new HashSet<>();
39+
private final Set<SqlIdentifier> sqlIdentifiers = new HashSet<>();
3940
private final Map<String, Object> namesToValues = new HashMap<>();
4041

42+
private Pair<SqlIdentifier, Object> idToValue;
43+
4144
@Override
4245
public boolean hasValue(String paramName) {
4346
return namesToValues.containsKey(paramName);
@@ -54,30 +57,34 @@ public String[] getParameterNames() {
5457
}
5558

5659
Set<SqlIdentifier> getIdentifiers() {
57-
return Collections.unmodifiableSet(identifiers);
60+
return Collections.unmodifiableSet(sqlIdentifiers);
5861
}
5962

6063
void addValue(SqlIdentifier name, Object value) {
6164
addValue(name, value, Integer.MIN_VALUE);
6265
}
6366

64-
void addValue(SqlIdentifier identifier, Object value, int sqlType) {
67+
void addValue(SqlIdentifier sqlIdentifier, Object value, int sqlType) {
6568

66-
identifiers.add(identifier);
67-
String name = BindParameterNameSanitizer.sanitize(identifier.getReference());
69+
sqlIdentifiers.add(sqlIdentifier);
70+
String name = prepareSqlIdentifierName(sqlIdentifier);
6871
namesToValues.put(name, value);
6972
registerSqlType(name, sqlType);
7073
}
7174

72-
void addAll(SqlIdentifierParameterSource others) {
75+
void addAll(SqlIdentifierParameterSource others) {
7376

7477
for (SqlIdentifier identifier : others.getIdentifiers()) {
7578

76-
String name = BindParameterNameSanitizer.sanitize( identifier.getReference());
79+
String name = prepareSqlIdentifierName(identifier);
7780
addValue(identifier, others.getValue(name), others.getSqlType(name));
7881
}
7982
}
8083

84+
private static String prepareSqlIdentifierName(SqlIdentifier sqlIdentifier) {
85+
return BindParameterNameSanitizer.sanitize(sqlIdentifier.getReference());
86+
}
87+
8188
int size() {
8289
return namesToValues.size();
8390
}

0 commit comments

Comments
 (0)