Skip to content

Commit 130296e

Browse files
andrusandrus
committed
Rethinking QuotingStrategy to remove dependency on the ORM model...
moving quoting strategy picker to DbAdapter out of the call sites
1 parent 4961419 commit 130296e

25 files changed

Lines changed: 66 additions & 143 deletions

‎cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/DerbyMergerTokenFactory.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.apache.cayenne.dbsync.merge.token.db.SetColumnTypeToDb;
2626
import org.apache.cayenne.dbsync.merge.token.db.SetGeneratedFlagToDb;
2727
import org.apache.cayenne.dbsync.merge.token.db.SetNotNullToDb;
28-
import org.apache.cayenne.map.DataMap;
2928
import org.apache.cayenne.map.DbAttribute;
3029
import org.apache.cayenne.map.DbEntity;
3130

@@ -62,9 +61,7 @@ public MergerToken createSetNotNullToDb(DbEntity entity, DbAttribute column) {
6261

6362
@Override
6463
public List<String> createSql(DbAdapter adapter) {
65-
DataMap dataMap = getEntity().getDataMap();
66-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
67-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
64+
QuotingStrategy quotes = adapter.getQuotingStrategy(getEntity());
6865
StringBuilder sql = new StringBuilder("ALTER TABLE ");
6966
quotes.appendFQN(sql, getEntity().getCatalog(), getEntity().getSchema(), getEntity().getName());
7067
sql.append(" ALTER COLUMN ");
@@ -85,9 +82,7 @@ public MergerToken createSetAllowNullToDb(DbEntity entity, DbAttribute column) {
8582

8683
@Override
8784
public List<String> createSql(DbAdapter adapter) {
88-
DataMap dataMap = getEntity().getDataMap();
89-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
90-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
85+
QuotingStrategy quotes = adapter.getQuotingStrategy(getEntity());
9186
StringBuilder sql = new StringBuilder("ALTER TABLE ");
9287
quotes.appendFQN(sql, getEntity().getCatalog(), getEntity().getSchema(), getEntity().getName());
9388
sql.append(" ALTER COLUMN ");

‎cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/FirebirdMergerTokenFactory.java‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.apache.cayenne.dbsync.merge.token.db.DropColumnToDb;
2727
import org.apache.cayenne.dbsync.merge.token.db.SetAllowNullToDb;
2828
import org.apache.cayenne.dbsync.merge.token.db.SetNotNullToDb;
29-
import org.apache.cayenne.map.DataMap;
3029
import org.apache.cayenne.map.DbAttribute;
3130
import org.apache.cayenne.map.DbEntity;
3231

@@ -39,9 +38,7 @@ public class FirebirdMergerTokenFactory extends DefaultMergerTokenFactory {
3938
public MergerToken createDropColumnToDb(DbEntity entity, DbAttribute column) {
4039
return new DropColumnToDb(entity, column) {
4140
public List<String> createSql(DbAdapter adapter) {
42-
DataMap dataMap = getEntity().getDataMap();
43-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
44-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
41+
QuotingStrategy quotes = adapter.getQuotingStrategy(getEntity());
4542
StringBuilder sql = new StringBuilder("ALTER TABLE ");
4643
quotes.appendFQN(sql, getEntity().getCatalog(), getEntity().getSchema(), getEntity().getName());
4744
sql.append(" DROP ");
@@ -57,9 +54,7 @@ public List<String> createSql(DbAdapter adapter) {
5754
public MergerToken createSetNotNullToDb(DbEntity entity, DbAttribute column) {
5855
return new SetNotNullToDb(entity, column) {
5956
public List<String> createSql(DbAdapter adapter) {
60-
DataMap dataMap = getEntity().getDataMap();
61-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
62-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
57+
QuotingStrategy quotes = adapter.getQuotingStrategy(getEntity());
6358
String entityName = quotes.quotedFQN(getEntity().getCatalog(), getEntity().getSchema(),
6459
getEntity().getName());
6560
String columnName = quotes.quoted(getColumn().getName());
@@ -75,9 +70,7 @@ public List<String> createSql(DbAdapter adapter) {
7570
public MergerToken createSetAllowNullToDb(DbEntity entity, DbAttribute column) {
7671
return new SetAllowNullToDb(entity, column) {
7772
public List<String> createSql(DbAdapter adapter) {
78-
DataMap dataMap = getEntity().getDataMap();
79-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
80-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
73+
QuotingStrategy quotes = adapter.getQuotingStrategy(getEntity());
8174
String entityName = quotes.quotedFQN(getEntity().getCatalog(), getEntity().getSchema(),
8275
getEntity().getName());
8376
String columnName = quotes.quoted(getColumn().getName());

‎cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/HSQLMergerTokenFactory.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.apache.cayenne.dbsync.merge.token.db.SetColumnTypeToDb;
2626
import org.apache.cayenne.dbsync.merge.token.db.SetGeneratedFlagToDb;
2727
import org.apache.cayenne.dbsync.merge.token.db.SetPrimaryKeyToDb;
28-
import org.apache.cayenne.map.DataMap;
2928
import org.apache.cayenne.map.DbAttribute;
3029
import org.apache.cayenne.map.DbEntity;
3130

@@ -60,9 +59,7 @@ public MergerToken createSetAllowNullToDb(DbEntity entity, DbAttribute column) {
6059

6160
@Override
6261
public List<String> createSql(DbAdapter adapter) {
63-
DataMap dataMap = getEntity().getDataMap();
64-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
65-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
62+
QuotingStrategy quotes = adapter.getQuotingStrategy(getEntity());
6663
StringBuilder sql = new StringBuilder("ALTER TABLE ");
6764
quotes.appendFQN(sql, getEntity().getCatalog(), getEntity().getSchema(), getEntity().getName());
6865
sql.append(" ALTER COLUMN ");

‎cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/IngresMergerTokenFactory.java‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.apache.cayenne.dbsync.merge.token.db.SetColumnTypeToDb;
2929
import org.apache.cayenne.dbsync.merge.token.db.SetGeneratedFlagToDb;
3030
import org.apache.cayenne.dbsync.merge.token.db.SetNotNullToDb;
31-
import org.apache.cayenne.map.DataMap;
3231
import org.apache.cayenne.map.DbAttribute;
3332
import org.apache.cayenne.map.DbEntity;
3433
import org.apache.cayenne.map.DbJoin;
@@ -65,9 +64,7 @@ public MergerToken createDropColumnToDb(DbEntity entity, DbAttribute column) {
6564
@Override
6665
public List<String> createSql(DbAdapter adapter) {
6766
StringBuilder buf = new StringBuilder();
68-
DataMap dataMap = getEntity().getDataMap();
69-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
70-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
67+
QuotingStrategy quotes = adapter.getQuotingStrategy(getEntity());
7168
buf.append("ALTER TABLE ");
7269
quotes.appendFQN(buf, getEntity().getCatalog(), getEntity().getSchema(), getEntity().getName());
7370
buf.append(" DROP COLUMN ");
@@ -90,9 +87,7 @@ public List<String> createSql(DbAdapter adapter) {
9087
if (!rel.isToMany() && rel.isToPK() && !rel.isToDependentPK()) {
9188

9289
DbEntity source = (DbEntity) rel.getSourceEntity();
93-
DataMap dataMap = source.getDataMap();
94-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
95-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
90+
QuotingStrategy quotes = adapter.getQuotingStrategy(source);
9691
StringBuilder buf = new StringBuilder();
9792
StringBuilder refBuf = new StringBuilder();
9893

@@ -159,9 +154,7 @@ public List<String> createSql(DbAdapter adapter) {
159154

160155
StringBuilder sqlBuffer = new StringBuilder();
161156

162-
DataMap dataMap = getEntity().getDataMap();
163-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
164-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
157+
QuotingStrategy quotes = adapter.getQuotingStrategy(getEntity());
165158

166159
sqlBuffer.append("ALTER TABLE ");
167160
sqlBuffer.append(getEntity().getFullyQualifiedName());
@@ -193,9 +186,7 @@ public MergerToken createSetAllowNullToDb(DbEntity entity, DbAttribute column) {
193186
@Override
194187
public List<String> createSql(DbAdapter adapter) {
195188
StringBuilder sqlBuffer = new StringBuilder();
196-
DataMap dataMap = getEntity().getDataMap();
197-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
198-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
189+
QuotingStrategy quotes = adapter.getQuotingStrategy(getEntity());
199190
sqlBuffer.append("ALTER TABLE ");
200191
quotes.appendFQN(sqlBuffer, getEntity().getCatalog(), getEntity().getSchema(), getEntity().getName());
201192
sqlBuffer.append(" ALTER COLUMN ");
@@ -232,9 +223,7 @@ public List<String> createSql(DbAdapter adapter) {
232223
return Collections.emptyList();
233224
}
234225

235-
DataMap dataMap = getEntity().getDataMap();
236-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
237-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
226+
QuotingStrategy quotes = adapter.getQuotingStrategy(getEntity());
238227
StringBuilder buf = new StringBuilder();
239228
buf.append("ALTER TABLE ");
240229
quotes.appendFQN(buf, getEntity().getCatalog(), getEntity().getSchema(), getEntity().getName());

‎cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/MySQLMergerTokenFactory.java‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.apache.cayenne.dbsync.merge.token.db.SetGeneratedFlagToDb;
2828
import org.apache.cayenne.dbsync.merge.token.db.SetNotNullToDb;
2929
import org.apache.cayenne.dbsync.merge.token.db.SetPrimaryKeyToDb;
30-
import org.apache.cayenne.map.DataMap;
3130
import org.apache.cayenne.map.DbAttribute;
3231
import org.apache.cayenne.map.DbEntity;
3332
import org.apache.cayenne.map.DbRelationship;
@@ -49,9 +48,7 @@ public MergerToken createSetNotNullToDb(
4948
public List<String> createSql(DbAdapter adapter) {
5049
StringBuffer sqlBuffer = new StringBuffer();
5150

52-
DataMap dataMap = getEntity().getDataMap();
53-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
54-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
51+
QuotingStrategy quotes = adapter.getQuotingStrategy(getEntity());
5552

5653
sqlBuffer.append("ALTER TABLE ");
5754
quotes.appendFQN(sqlBuffer, getEntity().getCatalog(), getEntity().getSchema(), getEntity().getName());
@@ -78,9 +75,7 @@ public MergerToken createSetAllowNullToDb(
7875
public List<String> createSql(DbAdapter adapter) {
7976
StringBuffer sqlBuffer = new StringBuffer();
8077

81-
DataMap dataMap = getEntity().getDataMap();
82-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
83-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
78+
QuotingStrategy quotes = adapter.getQuotingStrategy(getEntity());
8479

8580
sqlBuffer.append("ALTER TABLE ");
8681
quotes.appendFQN(sqlBuffer, getEntity().getCatalog(), getEntity().getSchema(), getEntity().getName());
@@ -134,9 +129,7 @@ public List<String> createSql(DbAdapter adapter) {
134129
if (fkName == null) {
135130
return Collections.emptyList();
136131
}
137-
DataMap dataMap = entity.getDataMap();
138-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
139-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
132+
QuotingStrategy quotes = adapter.getQuotingStrategy(entity);
140133

141134
// http://dev.mysql.com/tech-resources/articles/mysql-cluster-50.html
142135
StringBuilder sql = new StringBuilder("ALTER TABLE ");

‎cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/OracleMergerTokenFactory.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.apache.cayenne.dbsync.merge.token.db.SetAllowNullToDb;
2626
import org.apache.cayenne.dbsync.merge.token.db.SetColumnTypeToDb;
2727
import org.apache.cayenne.dbsync.merge.token.db.SetNotNullToDb;
28-
import org.apache.cayenne.map.DataMap;
2928
import org.apache.cayenne.map.DbAttribute;
3029
import org.apache.cayenne.map.DbEntity;
3130

@@ -81,9 +80,7 @@ public MergerToken createSetAllowNullToDb(DbEntity entity, final DbAttribute col
8180
public List<String> createSql(DbAdapter adapter) {
8281
StringBuffer sqlBuffer = new StringBuffer();
8382

84-
DataMap dataMap = getEntity().getDataMap();
85-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
86-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
83+
QuotingStrategy quotes = adapter.getQuotingStrategy(getEntity());
8784
sqlBuffer.append("ALTER TABLE ");
8885
quotes.appendFQN(sqlBuffer, getEntity().getCatalog(), getEntity().getSchema(), getEntity().getName());
8986
sqlBuffer.append(" MODIFY ");
@@ -105,9 +102,7 @@ public MergerToken createSetNotNullToDb(DbEntity entity, final DbAttribute colum
105102
public List<String> createSql(DbAdapter adapter) {
106103
StringBuffer sqlBuffer = new StringBuffer();
107104

108-
DataMap dataMap = getEntity().getDataMap();
109-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
110-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
105+
QuotingStrategy quotes = adapter.getQuotingStrategy(getEntity());
111106
sqlBuffer.append("ALTER TABLE ");
112107
quotes.appendFQN(sqlBuffer, getEntity().getCatalog(), getEntity().getSchema(), getEntity().getName());
113108
sqlBuffer.append(" MODIFY ");

‎cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/SQLServerMergerTokenFactory.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.apache.cayenne.dbsync.merge.token.db.SetColumnTypeToDb;
2727
import org.apache.cayenne.dbsync.merge.token.db.SetGeneratedFlagToDb;
2828
import org.apache.cayenne.dbsync.merge.token.db.SetNotNullToDb;
29-
import org.apache.cayenne.map.DataMap;
3029
import org.apache.cayenne.map.DbAttribute;
3130
import org.apache.cayenne.map.DbEntity;
3231

@@ -83,9 +82,7 @@ public MergerToken createSetAllowNullToDb(DbEntity entity, final DbAttribute col
8382
public List<String> createSql(DbAdapter adapter) {
8483
StringBuffer sqlBuffer = new StringBuffer();
8584

86-
DataMap dataMap = getEntity().getDataMap();
87-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
88-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
85+
QuotingStrategy quotes = adapter.getQuotingStrategy(getEntity());
8986
sqlBuffer.append("ALTER TABLE ");
9087
quotes.appendFQN(sqlBuffer, getEntity().getCatalog(), getEntity().getSchema(), getEntity().getName());
9188
sqlBuffer.append(" ALTER COLUMN ");
@@ -107,9 +104,7 @@ public MergerToken createSetNotNullToDb(DbEntity entity, final DbAttribute colum
107104
public List<String> createSql(DbAdapter adapter) {
108105
StringBuffer sqlBuffer = new StringBuffer();
109106

110-
DataMap dataMap = getEntity().getDataMap();
111-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
112-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
107+
QuotingStrategy quotes = adapter.getQuotingStrategy(getEntity());
113108
sqlBuffer.append("ALTER TABLE ");
114109
quotes.appendFQN(sqlBuffer, getEntity().getCatalog(), getEntity().getSchema(), getEntity().getName());
115110
sqlBuffer.append(" ALTER COLUMN ");

‎cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/SybaseMergerTokenFactory.java‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.apache.cayenne.dbsync.merge.token.db.SetAllowNullToDb;
2727
import org.apache.cayenne.dbsync.merge.token.db.SetColumnTypeToDb;
2828
import org.apache.cayenne.dbsync.merge.token.db.SetNotNullToDb;
29-
import org.apache.cayenne.map.DataMap;
3029
import org.apache.cayenne.map.DbAttribute;
3130
import org.apache.cayenne.map.DbEntity;
3231

@@ -49,9 +48,7 @@ public MergerToken createAddColumnToDb(DbEntity entity, final DbAttribute column
4948
public List<String> createSql(DbAdapter adapter) {
5049

5150
StringBuffer sqlBuffer = new StringBuffer();
52-
DataMap dataMap = getEntity().getDataMap();
53-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
54-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
51+
QuotingStrategy quotes = adapter.getQuotingStrategy(getEntity());
5552
sqlBuffer.append("ALTER TABLE ");
5653
quotes.appendFQN(sqlBuffer, getEntity().getCatalog(), getEntity().getSchema(), getEntity().getName());
5754
sqlBuffer.append(" ADD ");
@@ -77,9 +74,7 @@ public MergerToken createDropColumnToDb(DbEntity entity, DbAttribute column) {
7774
@Override
7875
public List<String> createSql(DbAdapter adapter) {
7976
StringBuilder sqlBuffer = new StringBuilder();
80-
DataMap dataMap = getEntity().getDataMap();
81-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
82-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
77+
QuotingStrategy quotes = adapter.getQuotingStrategy(getEntity());
8378
sqlBuffer.append("ALTER TABLE ");
8479
quotes.appendFQN(sqlBuffer, getEntity().getCatalog(), getEntity().getSchema(), getEntity().getName());
8580
sqlBuffer.append(" DROP ");
@@ -163,9 +158,7 @@ private static StringBuffer createStringQuery(
163158
DbEntity entity,
164159
DbAttribute column) {
165160
StringBuffer sqlBuffer = new StringBuffer();
166-
DataMap dataMap = entity.getDataMap();
167-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
168-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
161+
QuotingStrategy quotes = adapter.getQuotingStrategy(entity);
169162
sqlBuffer.append("ALTER TABLE ");
170163
quotes.appendFQN(sqlBuffer, entity.getCatalog(), entity.getSchema(), entity.getName());
171164
sqlBuffer.append(" MODIFY ");

‎cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/token/db/AddColumnToDb.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.apache.cayenne.dba.JdbcAdapter;
2525
import org.apache.cayenne.dbsync.merge.factory.MergerTokenFactory;
2626
import org.apache.cayenne.dbsync.merge.token.MergerToken;
27-
import org.apache.cayenne.map.DataMap;
2827
import org.apache.cayenne.map.DbAttribute;
2928
import org.apache.cayenne.map.DbEntity;
3029

@@ -54,9 +53,7 @@ protected void appendPrefix(StringBuffer sqlBuffer, QuotingStrategy quotes) {
5453
@Override
5554
public List<String> createSql(DbAdapter adapter) {
5655
StringBuffer sqlBuffer = new StringBuffer();
57-
DataMap dataMap = getEntity().getDataMap();
58-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
59-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
56+
QuotingStrategy quotes = adapter.getQuotingStrategy(getEntity());
6057
appendPrefix(sqlBuffer, quotes);
6158

6259
sqlBuffer.append(adapter.preferredNativeColumnType(getColumn()).nativeType());

‎cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/token/db/DropColumnToDb.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.apache.cayenne.dba.QuotingStrategy;
2727
import org.apache.cayenne.dbsync.merge.factory.MergerTokenFactory;
2828
import org.apache.cayenne.dbsync.merge.token.MergerToken;
29-
import org.apache.cayenne.map.DataMap;
3029
import org.apache.cayenne.map.DbAttribute;
3130
import org.apache.cayenne.map.DbEntity;
3231

@@ -39,9 +38,7 @@ public DropColumnToDb(DbEntity entity, DbAttribute column) {
3938
@Override
4039
public List<String> createSql(DbAdapter adapter) {
4140
StringBuilder sqlBuffer = new StringBuilder();
42-
DataMap dataMap = getEntity().getDataMap();
43-
QuotingStrategy quotes = dataMap != null && dataMap.isQuotingSQLIdentifiers()
44-
? adapter.getQuotingStrategy() : QuotingStrategy.NONE;
41+
QuotingStrategy quotes = adapter.getQuotingStrategy(getEntity());
4542
sqlBuffer.append("ALTER TABLE ");
4643
quotes.appendFQN(sqlBuffer, getEntity().getCatalog(), getEntity().getSchema(), getEntity().getName());
4744
sqlBuffer.append(" DROP COLUMN ");

0 commit comments

Comments
 (0)