#1696 Oracle trigger columns reading fix

plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTableBase.java

@@ -332,12 +332,13 @@ public abstract class OracleTableBase extends JDBCTable<OracleDataSource, Oracle
         {
             JDBCPreparedStatement dbStat = session.prepareStatement(
                 "SELECT TRIGGER_NAME,TABLE_OWNER,TABLE_NAME,COLUMN_NAME,COLUMN_LIST,COLUMN_USAGE\n" +
-                    "FROM SYS.ALL_TRIGGER_COLS WHERE TRIGGER_OWNER=?" +
+                    "FROM SYS.ALL_TRIGGER_COLS WHERE TABLE_OWNER=? AND TABLE_NAME=?" +
                     (forObject == null ? "" : " AND TRIGGER_NAME=?") +
                     "\nORDER BY TRIGGER_NAME");
-            dbStat.setString(1, owner.getName());
+            dbStat.setString(1, owner.getContainer().getName());
+            dbStat.setString(2, owner.getName());
             if (forObject != null) {
-                dbStat.setString(2, forObject.getName());
+                dbStat.setString(3, forObject.getName());
             }
             return dbStat;
         }

plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTableTrigger.java

@@ -23,14 +23,12 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 
 import java.sql.ResultSet;
 import java.util.Collection;
-import java.util.List;
 
 /**
  * OracleTableTrigger
  */
 public class OracleTableTrigger extends OracleTrigger<OracleTableBase>
 {
-    private List<OracleTriggerColumn> columns;
 
     public OracleTableTrigger(OracleTableBase table, String name)
     {
@@ -59,21 +57,7 @@ public class OracleTableTrigger extends OracleTrigger<OracleTableBase>
     @Association
     public Collection<OracleTriggerColumn> getColumns(DBRProgressMonitor monitor) throws DBException
     {
-        if (columns == null) {
-            parent.triggerCache.loadChildren(monitor, parent, this);
-        }
-        return columns;
+        return parent.triggerCache.getChildren(monitor, parent, this);
     }
 
-    boolean isColumnsCached()
-    {
-        return columns != null;
-    }
-
-    void setColumns(List<OracleTriggerColumn> columns)
-    {
-        this.columns = columns;
-    }
-
-
 }

plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTrigger.java

@@ -216,4 +216,8 @@ public abstract class OracleTrigger<PARENT extends DBSObject> extends OracleObje
             this);
     }
 
+    @Override
+    public String toString() {
+        return getFullyQualifiedName(DBPEvaluationContext.DDL);
+    }
 }

plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleTriggerColumn.java

@@ -105,4 +105,8 @@ public class OracleTriggerColumn extends AbstractTriggerColumn
         return trigger.getDataSource();
     }
 
+    @Override
+    public String toString() {
+        return getName();
+    }
 }