github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#8528] Don't allow duplicate column names in tables

Browse Source
This commit is contained in:
Lukas Eder 2019-12-11 09:52:39 +01:00
parent a5aac20b8c
commit 4da8a11f92
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jOOQ/src/main/java/org/jooq/impl/DDLInterpreter.java
View File

@ -652,10 +652,16 @@ final class DDLInterpreter {
}
private final void addField(MutableTable existing, int index, UnqualifiedName name, DataType<?> dataType) {
MutableField field = new MutableField(name, existing, dataType);
for (MutableField mf : existing.fields)
if (mf.nameEquals(field.name()))
throw columnAlreadyExists(field.qualifiedName());
if (index == Integer.MAX_VALUE)
existing.fields.add( new MutableField(name, existing, dataType));
existing.fields.add(field);
else
existing.fields.add(index, new MutableField(name, existing, dataType));
existing.fields.add(index, field);
}
private final void addConstraint(Query query, ConstraintImpl impl, MutableTable existing) {
@ -980,7 +986,11 @@ final class DDLInterpreter {
}
private static final DataDefinitionException columnAlreadyExists(Field<?> field) {
return new DataDefinitionException("Column already exists: " + field.getQualifiedName());
return columnAlreadyExists(field.getQualifiedName());
}
private static final DataDefinitionException columnAlreadyExists(Name name) {
return new DataDefinitionException("Column already exists: " + name);
}
private static final DataDefinitionException sequenceNotExists(Sequence<?> sequence) {
@ -1078,16 +1088,12 @@ final class DDLInterpreter {
) {
MutableTable t = new MutableTable((UnqualifiedName) table.getUnqualifiedName(), schema, comment, options);
if (!columns.isEmpty()) {
for (int i = 0; i < columns.size(); i++) {
Field<?> column = columns.get(i);
t.fields.add(new MutableField((UnqualifiedName) column.getUnqualifiedName(), t, columnTypes.get(i)));
}
}
else if (select != null) {
if (!columns.isEmpty())
for (int i = 0; i < columns.size(); i++)
addField(t, Integer.MAX_VALUE, (UnqualifiedName) columns.get(i).getUnqualifiedName(), columnTypes.get(i));
else if (select != null)
for (Field<?> column : select.fields())
t.fields.add(new MutableField((UnqualifiedName) column.getUnqualifiedName(), t, column.getDataType()));
}
addField(t, Integer.MAX_VALUE, (UnqualifiedName) column.getUnqualifiedName(), column.getDataType());
return t;
}