提交 f8311086 编写于 作者: S serge-rider

GP model code style

上级 160333f4
......@@ -77,7 +77,5 @@ public interface PostgreServerExtension
void configureDialect(PostgreDialect dialect);
String createWithClause(PostgreTableRegular table, PostgreTableBase tableBase);
String getTableModifiers(DBRProgressMonitor monitor, PostgreTableBase tableBase, boolean alter);
}
......@@ -179,18 +179,6 @@ public abstract class PostgreServerExtensionBase implements PostgreServerExtensi
}
@Override
public String createWithClause(PostgreTableRegular table, PostgreTableBase tableBase) {
StringBuilder withClauseBuilder = new StringBuilder();
if (table.getDataSource().getServerType().supportsOids() && table.isHasOids()) {
withClauseBuilder.append("\nWITH (\n\tOIDS=").append(table.isHasOids() ? "TRUE" : "FALSE");
withClauseBuilder.append("\n)");
}
return withClauseBuilder.toString();
}
@Override
public String getTableModifiers(DBRProgressMonitor monitor, PostgreTableBase tableBase, boolean alter) {
StringBuilder ddl = new StringBuilder();
......@@ -217,7 +205,7 @@ public abstract class PostgreServerExtensionBase implements PostgreServerExtensi
PostgreTableRegular table = (PostgreTableRegular) tableBase;
try {
if (!alter) {
ddl.append(tableBase.getDataSource().getServerType().createWithClause(table, tableBase));
ddl.append(createWithClause(table, tableBase));
}
boolean hasOtherSpecs = false;
PostgreTablespace tablespace = table.getTablespace(monitor);
......@@ -252,5 +240,17 @@ public abstract class PostgreServerExtensionBase implements PostgreServerExtensi
return ddl.toString();
}
protected String createWithClause(PostgreTableRegular table, PostgreTableBase tableBase) {
StringBuilder withClauseBuilder = new StringBuilder();
if (table.getDataSource().getServerType().supportsOids() && table.isHasOids()) {
withClauseBuilder.append("\nWITH (\n\tOIDS=").append(table.isHasOids() ? "TRUE" : "FALSE");
withClauseBuilder.append("\n)");
}
return withClauseBuilder.toString();
}
}
......@@ -20,8 +20,6 @@ import org.jkiss.dbeaver.ext.postgresql.model.*;
import org.jkiss.dbeaver.ext.postgresql.model.impls.PostgreServerExtensionBase;
import org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet;
import static org.jkiss.dbeaver.ext.postgresql.model.impls.greenplum.GreenplumWithClauseBuilder.generateWithClause;
/**
* PostgreServerGreenplum
*/
......@@ -66,6 +64,6 @@ public class PostgreServerGreenplum extends PostgreServerExtensionBase {
@Override
public String createWithClause(PostgreTableRegular table, PostgreTableBase tableBase) {
return generateWithClause(table, tableBase);
return GreenplumWithClauseBuilder.generateWithClause(table, tableBase);
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册