You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by mg...@apache.org on 2025/05/05 18:41:51 UTC
(cayenne) 01/01: Updated PK generators to avoid needlessly calling super.methods()
This is an automated email from the ASF dual-hosted git repository.
mgentry pushed a commit to branch CAY-2889
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit f709cca2b1f6b48c7ee909c0750571ebb9aea7d0
Author: Michael Gentry <bl...@gmail.com>
AuthorDate: Mon May 5 14:41:18 2025 -0400
Updated PK generators to avoid needlessly calling super.methods()
---
.../java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java | 4 ++--
.../java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java | 4 ++--
.../java/org/apache/cayenne/dba/sybase/SybasePkGenerator.java | 10 +++++-----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java b/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java
index 31489aff9..c8a965360 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java
@@ -157,7 +157,7 @@ public class MySQLPkGenerator extends JdbcPkGenerator {
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)) {
@@ -172,7 +172,7 @@ public class MySQLPkGenerator extends JdbcPkGenerator {
}
// 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...
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java b/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java
index 9f544f87b..798985e1c 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java
@@ -193,9 +193,9 @@ public class OraclePkGenerator extends JdbcPkGenerator {
&& 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();
}
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybasePkGenerator.java b/cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybasePkGenerator.java
index c26f4e081..f7bd8af66 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybasePkGenerator.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybasePkGenerator.java
@@ -100,8 +100,8 @@ public class SybasePkGenerator extends JdbcPkGenerator {
@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
@@ -139,8 +139,8 @@ public class SybasePkGenerator extends JdbcPkGenerator {
*/
@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
@@ -170,7 +170,7 @@ public class SybasePkGenerator extends JdbcPkGenerator {
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();