From 97c05edc272fcdb9e0258a5985b65bc45ef5b0de Mon Sep 17 00:00:00 2001 From: LonwoLonwo Date: Mon, 2 Nov 2020 19:16:32 +0300 Subject: [PATCH] #10219 view format options saving --- .../dbeaver/ext/oracle/model/OracleMaterializedView.java | 5 +++-- .../src/org/jkiss/dbeaver/ext/oracle/model/OracleView.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleMaterializedView.java b/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleMaterializedView.java index 0dfeaeb785..d5e36ba780 100644 --- a/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleMaterializedView.java +++ b/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleMaterializedView.java @@ -175,12 +175,13 @@ public class OracleMaterializedView extends OracleTableBase implements OracleSou currentDDLFormat = OracleDDLFormat.getCurrentFormat(getDataSource()); } OracleDDLFormat newFormat = OracleDDLFormat.FULL; - if (options.containsKey(OracleConstants.PREF_KEY_DDL_FORMAT)) { + boolean isFormatInOptions = options.containsKey(OracleConstants.PREF_KEY_DDL_FORMAT); + if (isFormatInOptions) { newFormat = (OracleDDLFormat) options.get(OracleConstants.PREF_KEY_DDL_FORMAT); } if (query == null || currentDDLFormat != newFormat && isPersisted()) { try { - if (query == null) { + if (query == null || !isFormatInOptions) { query = OracleUtils.getDDL(monitor, getTableTypeName(), this, currentDDLFormat, options); } else { query = OracleUtils.getDDL(monitor, getTableTypeName(), this, newFormat, options); diff --git a/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleView.java b/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleView.java index d16963cbe2..cc0ffefcfb 100644 --- a/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleView.java +++ b/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleView.java @@ -123,13 +123,14 @@ public class OracleView extends OracleTableBase implements OracleSourceObject, D currentDDLFormat = OracleDDLFormat.getCurrentFormat(getDataSource()); } OracleDDLFormat newFormat = OracleDDLFormat.FULL; - if (options.containsKey(OracleConstants.PREF_KEY_DDL_FORMAT)) { + boolean isFormatInOptions = options.containsKey(OracleConstants.PREF_KEY_DDL_FORMAT); + if (isFormatInOptions) { newFormat = (OracleDDLFormat) options.get(OracleConstants.PREF_KEY_DDL_FORMAT); } if (viewText == null || currentDDLFormat != newFormat) { try { - if (viewText == null) { + if (viewText == null || !isFormatInOptions) { viewText = OracleUtils.getDDL(monitor, getTableTypeName(), this, currentDDLFormat, options); } else { viewText = OracleUtils.getDDL(monitor, getTableTypeName(), this, newFormat, options); -- GitLab