Oracle ROWID preference

Former-commit-id: 4b37093b

plugins/org.jkiss.dbeaver.oracle/plugin.xml

@@ -423,6 +423,10 @@
         </editor>
     </extension>
 
+    <extension point="org.eclipse.core.runtime.preferences">
+        <initializer class="org.jkiss.dbeaver.ext.oracle.OraclePreferencesInitializer"/>
+    </extension>
+
     <extension point="org.eclipse.ui.propertyPages">
         <page category="org.jkiss.dbeaver.preferences.main.common" id="org.jkiss.dbeaver.preferences.oracle.general" class="org.jkiss.dbeaver.ext.oracle.views.PrefPageOracle" name="Oracle">
             <enabledWhen>

plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/Activator.java

@@ -20,6 +20,9 @@ package org.jkiss.dbeaver.ext.oracle;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.jkiss.dbeaver.core.DBeaverCore;
+import org.jkiss.dbeaver.ext.oracle.model.OracleConstants;
+import org.jkiss.dbeaver.runtime.RuntimeUtils;
 import org.osgi.framework.BundleContext;
 
 /**
@@ -47,7 +50,9 @@ public class Activator extends AbstractUIPlugin {
     public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
-	}
+        RuntimeUtils.setDefaultPreferenceValue(
+            DBeaverCore.getGlobalPreferenceStore(), OracleConstants.PREF_SUPPORT_ROWID, true);
+    }
 
 	/*
 	 * (non-Javadoc)

plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/OraclePreferencesInitializer.java

+package org.jkiss.dbeaver.ext.oracle;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.jface.preference.IPreferenceStore;
+
+public class OraclePreferencesInitializer extends AbstractPreferenceInitializer {
+
+    public OraclePreferencesInitializer()
+    {
+    }
+
+    @Override
+    public void initializeDefaultPreferences()
+    {
+        // Init default preferences
+        IPreferenceStore store = Activator.getDefault().getPreferenceStore();
+    }
+
+} 
\ No newline at end of file

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

@@ -166,7 +166,7 @@ public class OracleTable extends OracleTablePhysical implements DBDPseudoAttribu
     @Override
     public DBDPseudoAttribute[] getPseudoAttributes() throws DBException
     {
-        if (CommonUtils.isEmpty(this.iotType)) {
+        if (CommonUtils.isEmpty(this.iotType) && getDataSource().getContainer().getPreferenceStore().getBoolean(OracleConstants.PREF_SUPPORT_ROWID)) {
             // IOT tables have index id instead of ROWID
             return new DBDPseudoAttribute[] {
                 OracleConstants.PSEUDO_ATTR_ROWID

plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/views/PrefPageOracle.java

@@ -19,20 +19,13 @@
 package org.jkiss.dbeaver.ext.oracle.views;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.*;
-import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.ext.oracle.model.OracleConstants;
-import org.jkiss.dbeaver.model.DBUtils;
-import org.jkiss.dbeaver.model.data.DBDBinaryFormatter;
-import org.jkiss.dbeaver.model.data.DBDValueController;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
 import org.jkiss.dbeaver.runtime.RuntimeUtils;
 import org.jkiss.dbeaver.ui.UIUtils;
-import org.jkiss.dbeaver.ui.preferences.PrefConstants;
 import org.jkiss.dbeaver.ui.preferences.TargetPrefPage;
 import org.jkiss.dbeaver.utils.AbstractPreferenceStore;
 
@@ -44,6 +37,7 @@ public class PrefPageOracle extends TargetPrefPage
     public static final String PAGE_ID = "org.jkiss.dbeaver.preferences.oracle.general"; //$NON-NLS-1$
 
     private Text explainTableText;
+    private Button rowidSupportCheck;
 
     public PrefPageOracle()
     {
@@ -56,7 +50,9 @@ public class PrefPageOracle extends TargetPrefPage
     {
         AbstractPreferenceStore store = dataSourceDescriptor.getPreferenceStore();
         return
-            store.contains(OracleConstants.PREF_EXPLAIN_TABLE_NAME)
+            store.contains(OracleConstants.PREF_EXPLAIN_TABLE_NAME) ||
+            store.contains(OracleConstants.PREF_SUPPORT_ROWID)
+
             ;
     }
 
@@ -76,6 +72,11 @@ public class PrefPageOracle extends TargetPrefPage
             explainTableText = UIUtils.createLabelText(planGroup, "Plan table", "");
         }
 
+        {
+            Group planGroup = UIUtils.createControlGroup(composite, "Misc", 2, GridData.FILL_HORIZONTAL, 0);
+            rowidSupportCheck = UIUtils.createLabelCheckbox(planGroup, "Use ROWID to identify rows", true);
+        }
+
         return composite;
     }
 
@@ -83,12 +84,14 @@ public class PrefPageOracle extends TargetPrefPage
     protected void loadPreferences(IPreferenceStore store)
     {
         explainTableText.setText(store.getString(OracleConstants.PREF_EXPLAIN_TABLE_NAME));
+        rowidSupportCheck.setSelection(store.getBoolean(OracleConstants.PREF_SUPPORT_ROWID));
     }
 
     @Override
     protected void savePreferences(IPreferenceStore store)
     {
         store.setValue(OracleConstants.PREF_EXPLAIN_TABLE_NAME, explainTableText.getText());
+        store.setValue(OracleConstants.PREF_SUPPORT_ROWID, rowidSupportCheck.getSelection());
         RuntimeUtils.savePreferenceStore(store);
     }
 
@@ -96,6 +99,7 @@ public class PrefPageOracle extends TargetPrefPage
     protected void clearPreferences(IPreferenceStore store)
     {
         store.setToDefault(OracleConstants.PREF_EXPLAIN_TABLE_NAME);
+        store.setToDefault(OracleConstants.PREF_SUPPORT_ROWID);
     }
 
     @Override