github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1827 - @UniqueConstraint columnNames should be respecting ebean.allQuotedIdentifiers

Browse Source
This commit is contained in:
rob bygrave
2019-10-05 22:37:06 +13:00
parent 3574479627
commit 9b5ab542d7
3 changed files with 76 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
+3 -3
View File
@@ -134,12 +134,12 @@ public class AnnotationClass extends AnnotationParser {
}
for (Index index : findAnnotationsRecursive(cls, Index.class)) {
descriptor.addIndex(new IndexDefinition(index.columnNames(), index.name(), index.unique()));
descriptor.addIndex(new IndexDefinition(convertColumnNames(index.columnNames()), index.name(), index.unique()));
}
UniqueConstraint uc = findAnnotationRecursive(cls, UniqueConstraint.class);
if (uc != null) {
descriptor.addIndex(new IndexDefinition(uc.columnNames()));
descriptor.addIndex(new IndexDefinition(convertColumnNames(uc.columnNames())));
}
View view = findAnnotationRecursive(cls, View.class);
@@ -150,7 +150,7 @@ public class AnnotationClass extends AnnotationParser {
if (table != null) {
UniqueConstraint[] uniqueConstraints = table.uniqueConstraints();
for (UniqueConstraint c : uniqueConstraints) {
descriptor.addIndex(new IndexDefinition(c.columnNames()));
descriptor.addIndex(new IndexDefinition(convertColumnNames(c.columnNames())));
}
}
src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java
+8 -2
View File
@@ -103,8 +103,7 @@ public abstract class AnnotationParser extends AnnotationBase {
void readColumn(Column columnAnn, DeployBeanProperty prop) {
if (!isEmpty(columnAnn.name())) {
String dbColumn = databasePlatform.convertQuotedIdentifiers(columnAnn.name());
prop.setDbColumn(dbColumn);
prop.setDbColumn(databasePlatform.convertQuotedIdentifiers(columnAnn.name()));
}
prop.setDbInsertable(columnAnn.insertable());
@@ -138,4 +137,11 @@ public abstract class AnnotationParser extends AnnotationBase {
}
return groups.length == 0 || groups.length == 1 && Default.class.isAssignableFrom(groups[0]);
}
String[] convertColumnNames(String[] columnNames) {
for (int i = 0; i < columnNames.length; i++) {
columnNames[i] = databasePlatform.convertQuotedIdentifiers(columnNames[i]);
}
return columnNames;
}
}