dbeaver/pro#2676 Use fully qualified names checkbox for SQL DDL view …

…generation

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreViewBase.java

@@ -50,7 +50,7 @@
  */
 public abstract class PostgreViewBase extends PostgreTableReal implements DBSView
 {
-    private String source;
+    private String viewQueryResult;
 
     public PostgreViewBase(PostgreSchema catalog)
     {
@@ -84,28 +84,21 @@ public Collection<? extends DBSTableIndex> getIndexes(DBRProgressMonitor monitor
         return null;
     }
 
-    public String getSource() {
-        return source;
-    }
-
     @Override
     @Property(hidden = true, editable = true, updatable = true, order = -1)
     public String getObjectDefinitionText(DBRProgressMonitor monitor, Map<String, Object> options) throws DBException
     {
-        if (source == null) {
+            String source;
             if (isPersisted()) {
                 source = getDataSource().getServerType().readViewDDL(monitor, this);
                 if (source == null) {
                     try (JDBCSession session = DBUtils.openMetaSession(monitor, this, "Read view definition")) {
-                        // Do not use view id as a parameter. For some reason it doesn't work for Redshift
-                        String definition = JDBCUtils.queryString(session, "SELECT pg_get_viewdef(" + getObjectId() + ", true)");
-                        if (definition == null) {
-                            throw new DBException("View '" + getName() + "' doesn't exist");
-                        }
-                        this.source = PostgreUtils.getViewDDL(monitor, this, definition, options);
+
+                        fetchViewQueryResult(session);
+                        source = PostgreUtils.getViewDDL(monitor, this, viewQueryResult, options);
                         String extDefinition = readExtraDefinition(session, options);
                         if (extDefinition != null) {
-                            this.source += "\n" + extDefinition;
+                            source += "\n" + extDefinition;
                         }
                     } catch (SQLException e) {
                         throw new DBException("Error reading view definition: " + e.getMessage(), e);
@@ -114,7 +107,6 @@ public String getObjectDefinitionText(DBRProgressMonitor monitor, Map<String, Ob
             } else {
                 source = "";
             }
-        }
 
         List<DBEPersistAction> actions = new ArrayList<>();
         if (CommonUtils.getOption(options, DBPScriptObject.OPTION_INCLUDE_COMMENTS)) {
@@ -155,18 +147,28 @@ public String getObjectDefinitionText(DBRProgressMonitor monitor, Map<String, Ob
         return ddl.toString();
     }
 
+    private void fetchViewQueryResult(JDBCSession session) throws SQLException, DBException {
+        if (viewQueryResult == null) {
+            // Do not use view id as a parameter. For some reason it doesn't work for Redshift
+            viewQueryResult = JDBCUtils.queryString(session, "SELECT pg_get_viewdef(" + getObjectId() + ", true)");
+        }
+        if (viewQueryResult == null) {
+            throw new DBException("View '" + getName() + "' doesn't exist");
+        }
+    }
+
     protected String readExtraDefinition(JDBCSession session, Map<String, Object> options) throws DBException {
         return null;
     }
 
     @Override
     public void setObjectDefinitionText(String sourceText) {
-        this.source = sourceText;
+        viewQueryResult=sourceText;
     }
 
     @Override
     public DBSObject refreshObject(@NotNull DBRProgressMonitor monitor) throws DBException {
-        this.source = null;
+        this.viewQueryResult = null;
         return super.refreshObject(monitor);
     }
 }