Oracle FK read fix

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

@@ -530,9 +530,10 @@ public class OracleSchema extends OracleGlobalObject implements DBSSchema, DBPRe
             OracleTable parent, OracleTableForeignKey object, ResultSet dbResult)
             throws SQLException, DBException
         {
-            return new OracleTableForeignKeyColumn(
+            OracleTableColumn column = getTableColumn(session, parent, dbResult);
+            return column == null ? null : new OracleTableForeignKeyColumn(
                 object,
-                getTableColumn(session, parent, dbResult),
+                column,
                 JDBCUtils.safeGetInt(dbResult, "POSITION"));
         }
 

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

@@ -19,6 +19,7 @@
 package org.jkiss.dbeaver.ext.oracle.model;
 
 import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBUtils;
 import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils;
@@ -42,11 +43,11 @@ public class OracleTableForeignKey extends OracleTableConstraintBase implements
     private DBSForeignKeyModifyRule deleteRule;
 
     public OracleTableForeignKey(
-        OracleTableBase oracleTable,
-        String name,
-        OracleObjectStatus status,
-        OracleTableConstraint referencedKey,
-        DBSForeignKeyModifyRule deleteRule)
+        @NotNull OracleTableBase oracleTable,
+        @Nullable String name,
+        @Nullable OracleObjectStatus status,
+        @NotNull OracleTableConstraint referencedKey,
+        @NotNull DBSForeignKeyModifyRule deleteRule)
     {
         super(oracleTable, name, DBSEntityConstraintType.FOREIGN_KEY, status, false);
         this.referencedKey = referencedKey;
@@ -82,6 +83,7 @@ public class OracleTableForeignKey extends OracleTableConstraintBase implements
             referencedKey = refTable.getConstraint(monitor, refName);
             if (referencedKey == null) {
                 log.warn("Referenced constraint '" + refName + "' not found in table '" + refTable.getFullQualifiedName() + "'");
+                referencedKey = new OracleTableConstraint(refTable, "refName", DBSEntityConstraintType.UNIQUE_KEY, null, OracleObjectStatus.ERROR);
             }
         }
 

product/pad/dbeaver-artifacts.xml

@@ -23,6 +23,7 @@
     <products>
         <product id="dbeaver-standalone"/>
         <product id="dbeaver-eclipse"/>
+        <product id="dbeaver-enterprise"/>
     </products>
 
     <features>
@@ -36,6 +37,10 @@
         <feature id="features/org.jkiss.dbeaver.rcp" type="static"/>
         <feature id="features/org.jkiss.dbeaver.runtime" type="primary"/>
         <feature id="features/org.jkiss.dbeaver.standalone" type="primary"/>
+
+        <feature id="features/com.jkiss.dbeaver.ent.cassandra" type="primary"/>
+        <feature id="features/com.jkiss.dbeaver.ent.mongodb" type="primary"/>
+        <feature id="features/com.jkiss.dbeaver.enterprise" type="primary"/>
     </features>
 
     <plugins>
@@ -52,7 +57,13 @@
         <plugin id="plugins/org.jkiss.dbeaver.mysql" type="general"/>
         <plugin id="plugins/org.jkiss.dbeaver.nosql.cassandra" type="general"/>
         <plugin id="plugins/org.jkiss.dbeaver.oracle" type="general"/>
+        <plugin id="plugins/org.jkiss.dbeaver.db2" type="general"/>
         <plugin id="plugins/org.jkiss.dbeaver.wmi" type="general"/>
+        <plugin id="plugins/org.jkiss.dbeaver.firebird" type="general"/>
+        <plugin id="plugins/org.jkiss.dbeaver.postgresql" type="general"/>
+
+        <plugin id="plugins/com.jkiss.dbeaver.ent.cassandra" type="general"/>
+        <plugin id="plugins/com.jkiss.dbeaver.ent.mongodb" type="general"/>
     </plugins>
 
 </artifacts>

product/pad/dbeaver-product.xml

@@ -30,22 +30,25 @@
 
     <company>
         <name>JKISS</name>
-        <address1>Engelsa pr. 97-212</address1>
-        <address2> </address2>
-        <city>Saint-Petersburg</city>
-        <state>SPb</state>
-        <zip>194214</zip>
-        <country>Russian Federation</country>
         <web>http://jkiss.org</web>
         <contact>
             <first-name>Serge</first-name>
             <last-name>Rieder</last-name>
             <email>serge@jkiss.org</email>
-            <phone>+7-962-728-16-88</phone>
         </contact>
     </company>
 
     <versions>
+        <version>
+            <number>3.0.1</number>
+            <type>hotfix</type>
+            <date>10.09.2014</date>
+
+            <release-notes>
+                -
+            </release-notes>
+        </version>
+
         <version>
             <number>3.0.0</number>
             <type>major</type>

product/pad/dbeaver_pad.xml

@@ -33,12 +33,13 @@
     <Support_Info>
       <Support_Email>support@jkiss.org</Support_Email>
     </Support_Info>
+
   </Company_Info>
   <Program_Info>
     <Program_Name>DBeaver</Program_Name>
-    <Program_Version>3.0.0</Program_Version>
-    <Program_Release_Month>08</Program_Release_Month>
-    <Program_Release_Day>25</Program_Release_Day>
+    <Program_Version>3.0.1</Program_Version>
+    <Program_Release_Month>09</Program_Release_Month>
+    <Program_Release_Day>10</Program_Release_Day>
     <Program_Release_Year>2014</Program_Release_Year>
     <Program_Cost_Dollars>0</Program_Cost_Dollars>
     <Program_Type>Freeware</Program_Type>
@@ -47,12 +48,7 @@
     <Program_OS_Support>WinXP,WinVista,WinVista x64,Win7 x32,Win7 x64,Win2000,WinOther,Other,Mac OS X,Windows2000,Windows2003,WinServer,Linux,AIX,Solaris,Java</Program_OS_Support>
     <Program_Language>English</Program_Language>
     <Program_Change_Info>
-        - Community/Enterprise editions split
-        - NoSQL databases support improved
-        - Cassandra CQL extension
-        - Mongo DB extension
-        - Standalone DBeaver now based on Eclipse 4.4 (Luna)
-        - Many UI bugfixes and improvements
+        -
     </Program_Change_Info>
     <Program_System_Requirements></Program_System_Requirements>
     <Program_Category_Class>Development::Other</Program_Category_Class>
@@ -74,8 +70,8 @@
       <Application_XML_File_URL>http://dbeaver.jkiss.org/product/dbeaver_pad.xml</Application_XML_File_URL>
     </Application_URLs>
     <Download_URLs>
-      <Primary_Download_URL>http://dbeaver.jkiss.org/files/dbeaver-3.0.0-x86-setup.exe</Primary_Download_URL>
-      <Secondary_Download_URL>http://dbeaver.jkiss.org/files/dbeaver-3.0.0-x86_64-setup.exe</Secondary_Download_URL>
+      <Primary_Download_URL>http://dbeaver.jkiss.org/files/dbeaver-3.0.1-x86-setup.exe</Primary_Download_URL>
+      <Secondary_Download_URL>http://dbeaver.jkiss.org/files/dbeaver-3.0.1-x86_64-setup.exe</Secondary_Download_URL>
       <Additional_Download_URL_1></Additional_Download_URL_1>
       <Additional_Download_URL_2></Additional_Download_URL_2>
     </Download_URLs>