This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 220c71a55 Rethinking QuotingStrategy to remove dependency on the ORM
model...
220c71a55 is described below
commit 220c71a55d0ec349ee315c91de0d14fe9c3da135
Author: Andrus Adamchik <[email protected]>
AuthorDate: Thu Jun 25 14:32:07 2026 -0400
Rethinking QuotingStrategy to remove dependency on the ORM model...
cleanup
---
cayenne/src/main/java/org/apache/cayenne/dba/DbAdapter.java | 9 ++-------
cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java | 7 +++++++
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/DbAdapter.java
b/cayenne/src/main/java/org/apache/cayenne/dba/DbAdapter.java
index e37d792e9..8eff6e1f6 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/DbAdapter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/DbAdapter.java
@@ -26,7 +26,6 @@ import
org.apache.cayenne.access.translator.ejbql.EJBQLTranslator;
import org.apache.cayenne.access.translator.procedure.ProcedureTranslator;
import org.apache.cayenne.access.translator.select.SelectTranslator;
import org.apache.cayenne.access.types.ExtendedTypeMap;
-import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbRelationship;
@@ -304,14 +303,10 @@ public interface DbAdapter {
*
* @since 5.0
*/
- default QuotingStrategy getQuotingStrategy(DbEntity entity) {
- DataMap dataMap = entity != null ? entity.getDataMap() : null;
- return dataMap != null && dataMap.isQuotingSQLIdentifiers() ?
getQuotingStrategy() : QuotingStrategy.NONE;
- }
+ QuotingStrategy getQuotingStrategy(DbEntity entity);
/**
- * Allows the users to get access to the adapter decorated by a given
- * adapter.
+ * Allows the users to get access to the adapter decorated by a given
adapter.
*
* @since 4.0
*/
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
b/cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
index fc08c3eac..32d39552a 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
@@ -38,6 +38,7 @@ import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.RuntimeProperties;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.log.JdbcEventLogger;
+import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbJoin;
@@ -709,6 +710,12 @@ public class JdbcAdapter implements DbAdapter {
return quotingStrategy;
}
+ @Override
+ public QuotingStrategy getQuotingStrategy(DbEntity entity) {
+ DataMap dataMap = entity != null ? entity.getDataMap() : null;
+ return dataMap != null && dataMap.isQuotingSQLIdentifiers() ?
quotingStrategy : QuotingStrategy.NONE;
+ }
+
/**
* Simply returns this, as JdbcAdapter is not a wrapper.
*
