[jOOQ/jOOQ#9343] Extract new Tools#asString(Name) helper function

This commit is contained in:
Knut Wannheden 2019-10-15 06:54:03 +02:00
parent 51309a5a7e
commit 54d467fa34
4 changed files with 16 additions and 35 deletions

View File

@ -1376,8 +1376,6 @@ final class AlterTableImpl extends AbstractRowCountQuery implements
// [#9354] TODO: Research the syntax in the various dialects
// and add integration tests.
default:
ctx.sql(' ').visit(K_DROP_DEFAULT);
break;

View File

@ -37,7 +37,6 @@
*/
package org.jooq.impl;
import org.jooq.Name;
import org.jooq.Record;
import org.jooq.SQLDialect;
import org.jooq.Table;
@ -54,21 +53,6 @@ final class TableDataType<R extends Record> extends DefaultDataType<R> {
@SuppressWarnings("unchecked")
TableDataType(Table<R> table) {
super(SQLDialect.DEFAULT, (Class<R>) table.getRecordType(), getQualifiedName(table));
}
private static String getQualifiedName(Table<?> table) {
Name name = table.getQualifiedName();
if (!name.qualified())
return name.first();
StringBuilder sb = new StringBuilder();
Name[] parts = name.parts();
for (int i = 0; i < parts.length; i++) {
sb.append(parts[i].first());
if (i < parts.length - 1)
sb.append('.');
}
return sb.toString();
super(SQLDialect.DEFAULT, (Class<R>) table.getRecordType(), Tools.asString(table.getQualifiedName()));
}
}

View File

@ -5268,4 +5268,18 @@ final class Tools {
throw new UnsupportedOperationException("remove");
}
}
static final String asString(Name name) {
if (!name.qualified())
return name.first();
StringBuilder sb = new StringBuilder();
Name[] parts = name.parts();
for (int i = 0; i < parts.length; i++) {
sb.append(parts[i].first());
if (i < parts.length - 1)
sb.append('.');
}
return sb.toString();
}
}

View File

@ -37,7 +37,6 @@
*/
package org.jooq.impl;
import org.jooq.Name;
import org.jooq.SQLDialect;
import org.jooq.UDT;
import org.jooq.UDTRecord;
@ -53,21 +52,7 @@ final class UDTDataType<R extends UDTRecord<R>> extends DefaultDataType<R> {
private static final long serialVersionUID = 3262508265391094581L;
UDTDataType(UDT<R> udt) {
super(SQLDialect.DEFAULT, udt.getRecordType(), getQualifiedName(udt));
super(SQLDialect.DEFAULT, udt.getRecordType(), Tools.asString(udt.getQualifiedName()));
}
private static String getQualifiedName(UDT<?> udt) {
Name name = udt.getQualifiedName();
if (!name.qualified())
return name.first();
StringBuilder sb = new StringBuilder();
Name[] parts = name.parts();
for (int i = 0; i < parts.length; i++) {
sb.append(parts[i].first());
if (i < parts.length - 1)
sb.append('.');
}
return sb.toString();
}
}