Merge pull request #10225 from dbeaver/vieworaclefix#10219

#10219 view format options saving

Former-commit-id: 3ac66ddf

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);

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);