Skip to content

Updated PK generators to avoid needlessly calling super.methods() #629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated PK generators to avoid needlessly calling super.methods() #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ protected long getLongPrimaryKey(Statement statement, String entityName) throws
statement.execute(lockString);

// select
String selectString = super.pkSelectString(entityName);
String selectString = pkSelectString(entityName);
adapter.getJdbcEventLogger().log(selectString);
long pk;
try (ResultSet rs = statement.executeQuery(selectString)) {
Expand All @@ -172,7 +172,7 @@ protected long getLongPrimaryKey(Statement statement, String entityName) throws
}

// update
String updateString = super.pkUpdateString(entityName) + " AND NEXT_ID = " + pk;
String updateString = pkUpdateString(entityName) + " AND NEXT_ID = " + pk;
adapter.getJdbcEventLogger().log(updateString);
int updated = statement.executeUpdate(updateString);
// optimistic lock failure...
Expand Down
4 changes: 2 additions & 2 deletions cayenne/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,9 @@ protected int pkCacheSize(DbEntity entity) {
&& keyGenerator.getGeneratorName() != null) {

Integer size = keyGenerator.getKeyCacheSize();
return (size != null && size >= 1) ? size : super.getPkCacheSize();
return (size != null && size >= 1) ? size : getPkCacheSize();
} else {
return super.getPkCacheSize();
return getPkCacheSize();
}
}

Expand Down
10 changes: 5 additions & 5 deletions cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybasePkGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ protected String pkTableCreateString() {
@Override
public void createAutoPk(DataNode node, List<DbEntity> dbEntities) throws Exception {
super.createAutoPk(node, dbEntities);
super.runUpdate(node, safePkProcDrop());
super.runUpdate(node, unsafePkProcCreate());
runUpdate(node, safePkProcDrop());
runUpdate(node, unsafePkProcCreate());
}

@Override
Expand Down Expand Up @@ -139,8 +139,8 @@ public List<String> createAutoPkStatements(List<DbEntity> dbEntities) {
*/
@Override
public void dropAutoPk(DataNode node, List<DbEntity> dbEntities) throws Exception {
super.runUpdate(node, safePkProcDrop());
super.runUpdate(node, safePkTableDrop());
runUpdate(node, safePkProcDrop());
runUpdate(node, safePkTableDrop());
}

@Override
Expand Down Expand Up @@ -170,7 +170,7 @@ protected long longPkFromDatabase(DataNode node, DbEntity entity) throws Excepti
try (Connection connection = node.getDataSource().getConnection()) {
try (CallableStatement statement = connection.prepareCall("{call auto_pk_for_table(?, ?)}")) {
statement.setString(1, entity.getName());
statement.setInt(2, super.getPkCacheSize());
statement.setInt(2, getPkCacheSize());

// can't use "executeQuery" per http://jtds.sourceforge.net/faq.html#expectingResultSet
statement.execute();
Expand Down