moparisthebest/JdbcMapper
1
0
Fork 0
mirror of https://github.com/moparisthebest/JdbcMapper synced 2024-12-21 23:08:52 -05:00
Code Issues Releases Wiki Activity

Partially implement PreparedStatement.getGeneratedKeys() returning long/Long in JdbcMapper

Browse Source
This commit is contained in:
Travis Burtrum 2018-09-26 00:30:11 -04:00
parent b04e9092d2
commit fad614f85a
3 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
jdbcmapper/src/main/java/com/moparisthebest/jdbc/codegen/JdbcMapperProcessor.java
View File

@ -23,6 +23,7 @@ import java.util.stream.Stream;
//IFJAVA8_END //IFJAVA8_END
import static com.moparisthebest.jdbc.TryClose.tryClose; import static com.moparisthebest.jdbc.TryClose.tryClose;
import static com.moparisthebest.jdbc.codegen.JdbcMapper.DatabaseType.ORACLE;
import static com.moparisthebest.jdbc.codegen.JdbcMapperFactory.SUFFIX; import static com.moparisthebest.jdbc.codegen.JdbcMapperFactory.SUFFIX;
/** /**
@ -474,8 +475,9 @@ public class JdbcMapperProcessor extends AbstractProcessor {
for (final SpecialVariableElement param : inListBindParams.values()) for (final SpecialVariableElement param : inListBindParams.values())
setArray(w, databaseType, arrayNumberTypeName, arrayStringTypeName, param); setArray(w, databaseType, arrayNumberTypeName, arrayStringTypeName, param);
w.write("\t\t\tps = "); w.write("\t\t\tps = ");
final boolean isGeneratedKeyLong = !parsedSQl.isSelect() && (returnType.equals("long") || returnType.equals("java.lang.Long"));
final boolean cachePreparedStatements = sql.cachePreparedStatement().combine(defaultCachePreparedStatements) && !bindInList; final boolean cachePreparedStatements = sql.cachePreparedStatement().combine(defaultCachePreparedStatements) && !bindInList;
if (cachePreparedStatements) { if (cachePreparedStatements && !isGeneratedKeyLong) { // make isGeneratedKeyLong work with cachePreparedStatements
w.write("this.prepareStatement("); w.write("this.prepareStatement(");
w.write(Integer.toString(cachedPreparedStatements)); w.write(Integer.toString(cachedPreparedStatements));
w.write(", "); w.write(", ");
@ -487,7 +489,16 @@ public class JdbcMapperProcessor extends AbstractProcessor {
w.write(sqlStatement.replace("\"", "\\\"") w.write(sqlStatement.replace("\"", "\\\"")
.replace("\n", "\\n\" +\n\t\t\t \"") .replace("\n", "\\n\" +\n\t\t\t \"")
.replace("REPLACEMEWITHUNQUOTEDQUOTEPLZ", "\"")); .replace("REPLACEMEWITHUNQUOTEDQUOTEPLZ", "\""));
w.write("\");\n"); w.write("\"");
if(isGeneratedKeyLong) {
if(databaseType == ORACLE) {
// todo: cache this
w.write(", new int[]{1}");
} else {
w.write(", java.sql.Statement.RETURN_GENERATED_KEYS");
}
}
w.write(");\n");
// now bind parameters // now bind parameters
if(bindInList) { if(bindInList) {
@ -506,8 +517,25 @@ public class JdbcMapperProcessor extends AbstractProcessor {
w.write("\t\t\tps.executeUpdate();\n"); w.write("\t\t\tps.executeUpdate();\n");
} else if (returnType.equals("int") || returnType.equals("java.lang.Integer")) { } else if (returnType.equals("int") || returnType.equals("java.lang.Integer")) {
w.write("\t\t\treturn ps.executeUpdate();\n"); w.write("\t\t\treturn ps.executeUpdate();\n");
} else if (returnType.equals("boolean") || returnType.equals("java.lang.Boolean")) {
w.write("\t\t\treturn ps.executeUpdate() > 0;\n");
} else if (isGeneratedKeyLong) {
w.write("\t\t\tps.executeUpdate();\n"); // todo: what about java8+ ps.executeLargeUpdate()?
w.write("\t\t\tResultSet rs = null;\n" +
"\t\t\ttry {\n" +
"\t\t\t\trs = ps.getGeneratedKeys();\n" +
"\t\t\t\treturn rs.next() ? ");
if(returnType.equals("long")) {
w.write("rs.getLong(1) : 0");
} else {
w.write("com.moparisthebest.jdbc.util.ResultSetUtil.getObjectLong(rs, 1) : null");
}
w.write(";\n" +
"\t\t\t} finally {\n" +
"\t\t\t\ttryClose(rs);\n" +
"\t\t\t}\n");
} else { } else {
processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "@JdbcMapper.SQL sql other than SELECT must return either void, int, or Integer", methodElement); processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "@JdbcMapper.SQL sql other than SELECT must return either void, int, Integer, boolean, Boolean, long, or Long", methodElement);
continue; continue;
} }
} else { } else {

6
test/src/main/java/com/moparisthebest/jdbc/codegen/PersonDAO.java
View File

@ -32,6 +32,12 @@ public interface PersonDAO extends JdbcMapper {
@JdbcMapper.SQL("INSERT INTO person (person_no, birth_date, last_name, first_name) VALUES ({personNo}, {birthDate}, {firstName}, {lastName})") @JdbcMapper.SQL("INSERT INTO person (person_no, birth_date, last_name, first_name) VALUES ({personNo}, {birthDate}, {firstName}, {lastName})")
int insertPerson(long personNo, Date birthDate, String firstName, String lastName); int insertPerson(long personNo, Date birthDate, String firstName, String lastName);
@JdbcMapper.SQL("INSERT INTO person (person_no, birth_date, last_name, first_name) VALUES ({personNo}, {birthDate}, {firstName}, {lastName})")
long insertPersonGeneratedKey(long personNo, Date birthDate, String firstName, String lastName);
@JdbcMapper.SQL("INSERT INTO person (person_no, birth_date, last_name, first_name) VALUES ({personNo}, {birthDate}, {firstName}, {lastName})")
Long insertPersonGeneratedKeyLong(long personNo, Date birthDate, String firstName, String lastName);
@JdbcMapper.SQL("UPDATE person SET first_name = {firstName} WHERE last_name = {lastName}") @JdbcMapper.SQL("UPDATE person SET first_name = {firstName} WHERE last_name = {lastName}")
int setFirstName(String firstName, String lastName); int setFirstName(String firstName, String lastName);

8
test/src/main/java/com/moparisthebest/jdbc/codegen/PrestoPersonDAO.java
View File

@ -19,7 +19,7 @@ import java.time.*;
*/ */
@JdbcMapper.Mapper( @JdbcMapper.Mapper(
jndiName = "bob", jndiName = "bob",
databaseType = JdbcMapper.DatabaseType.ANY, // PrestoPersonDao breaks with ORACLE or UNNEST databaseType = JdbcMapper.DatabaseType.ANY, // todo: PrestoPersonDao breaks with ORACLE or UNNEST
cachePreparedStatements = JdbcMapper.OptionalBool.FALSE cachePreparedStatements = JdbcMapper.OptionalBool.FALSE
, sqlParser = PrestoSQLParser.class , sqlParser = PrestoSQLParser.class
, allowReflection = JdbcMapper.OptionalBool.TRUE , allowReflection = JdbcMapper.OptionalBool.TRUE
@ -32,6 +32,12 @@ public interface PrestoPersonDAO extends PersonDAO {
@JdbcMapper.SQL("INSERT INTO person (person_no, birth_date, last_name, first_name) VALUES ({personNo}, {birthDate}, {firstName}, {lastName})") @JdbcMapper.SQL("INSERT INTO person (person_no, birth_date, last_name, first_name) VALUES ({personNo}, {birthDate}, {firstName}, {lastName})")
int insertPerson(long personNo, Date birthDate, String firstName, String lastName); int insertPerson(long personNo, Date birthDate, String firstName, String lastName);
@JdbcMapper.SQL("INSERT INTO person (person_no, birth_date, last_name, first_name) VALUES ({personNo}, {birthDate}, {firstName}, {lastName})")
long insertPersonGeneratedKey(long personNo, Date birthDate, String firstName, String lastName);
@JdbcMapper.SQL("INSERT INTO person (person_no, birth_date, last_name, first_name) VALUES ({personNo}, {birthDate}, {firstName}, {lastName})")
Long insertPersonGeneratedKeyLong(long personNo, Date birthDate, String firstName, String lastName);
@JdbcMapper.SQL("UPDATE person SET first_name = {firstName} WHERE last_name = {lastName}") @JdbcMapper.SQL("UPDATE person SET first_name = {firstName} WHERE last_name = {lastName}")
int setFirstName(String firstName, String lastName); int setFirstName(String firstName, String lastName);