Fixes #8 and #9 Set ORACLE_HOME if not set on system level.

simasch · simasch · commit 9f0318f159df · 2021-01-11T08:51:31.000+01:00
diff --git a/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin.cs b/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin.cs
@@ -10,6 +10,9 @@
 
 namespace utPLSQL
 {
+    //*FUNC: 4*/ extern char *(*SYS_OracleHome)();
+    internal delegate IntPtr SysOracleHome();
+
     //*FUNC: 11*/ BOOL (*IDE_Connected)();
     internal delegate bool IdeConnected();
 
@@ -23,8 +26,7 @@ namespace utPLSQL
     internal delegate void IdeCreatePopupItem(int id, int index, string name, string objectType);
 
     //*FUNC: 74*/ int (*IDE_GetPopupObject)(char **ObjectType, char **ObjectOwner, char **ObjectName, char **SubObject);
-    internal delegate int IdeGetPopupObject(out IntPtr objectType, out IntPtr objectOwner, out IntPtr objectName,
-        out IntPtr subObject);
+    internal delegate int IdeGetPopupObject(out IntPtr objectType, out IntPtr objectOwner, out IntPtr objectName, out IntPtr subObject);
 
     //*FUNC: 79*/ char *(*IDE_GetObjectSource)(char *ObjectType, char *ObjectOwner, char *ObjectName);
     internal delegate IntPtr IdeGetObjectSource(string objectType, string objectOwner, string objectName);
@@ -44,6 +46,8 @@ public class PlsqlDeveloperUtPlsqlPlugin
         private const int PluginPopupIndex = 1;
         private const int PluginPopupIndexWithCoverage = 2;
 
+        private static SysOracleHome sysOracleHome;
+
         private static IdeConnected connected;
         private static IdeGetConnectionInfo getConnectionInfo;
 
@@ -59,9 +63,9 @@ public class PlsqlDeveloperUtPlsqlPlugin
         private static string password;
         private static string database;
         private static string connectAs;
+        private static string oracleHome;
 
         private static PlsqlDeveloperUtPlsqlPlugin _plugin;
-
         private static readonly List<TestRunnerWindow> Windows = new List<TestRunnerWindow>();
 
         #region DLL exported API
@@ -83,7 +87,7 @@ public static void OnActivate()
         {
             try
             {
-                ConnectToDatabase();
+                getDatabaseInformation();
 
                 // Separate streams are needed!
                 var assembly = Assembly.GetExecutingAssembly();
@@ -150,6 +154,9 @@ public static void RegisterCallback(int index, IntPtr function)
         {
             switch (index)
             {
+                case 4:
+                    sysOracleHome = (SysOracleHome)Marshal.GetDelegateForFunctionPointer(function, typeof(SysOracleHome));
+                    break;
                 case 11:
                     connected = (IdeConnected)Marshal.GetDelegateForFunctionPointer(function, typeof(IdeConnected));
                     break;
@@ -181,7 +188,7 @@ public static void RegisterCallback(int index, IntPtr function)
         [DllExport("OnConnectionChange", CallingConvention = CallingConvention.Cdecl)]
         public static void OnConnectionChange()
         {
-            ConnectToDatabase();
+            getDatabaseInformation();
         }
 
         [DllExport("CreateMenuItem", CallingConvention = CallingConvention.Cdecl)]
@@ -211,7 +218,7 @@ public static void OnMenuClick(int index)
                 {
                     if (isConnected() && !isSydba())
                     {
-                        var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs);
+                        var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs, oracleHome);
                         Windows.Add(testResultWindow);
                         testResultWindow.RunTestsAsync("_ALL", username, null, null, false);
                     }
@@ -220,7 +227,7 @@ public static void OnMenuClick(int index)
                 {
                     if (isConnected() && !isSydba())
                     {
-                        var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs);
+                        var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs, oracleHome);
                         Windows.Add(testResultWindow);
                         testResultWindow.RunTestsAsync("_ALL", username, null, null, true);
                     }
@@ -231,7 +238,7 @@ public static void OnMenuClick(int index)
                     {
                         getPopupObject(out IntPtr type, out IntPtr owner, out IntPtr name, out IntPtr subType);
 
-                        var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs);
+                        var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs, oracleHome);
                         Windows.Add(testResultWindow);
                         testResultWindow.RunTestsAsync(Marshal.PtrToStringAnsi(type), Marshal.PtrToStringAnsi(owner),
                             Marshal.PtrToStringAnsi(name), Marshal.PtrToStringAnsi(subType), false);
@@ -243,7 +250,7 @@ public static void OnMenuClick(int index)
                     {
                         getPopupObject(out IntPtr type, out IntPtr owner, out IntPtr name, out IntPtr subType);
 
-                        var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs);
+                        var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs, oracleHome);
                         Windows.Add(testResultWindow);
                         testResultWindow.RunTestsAsync(Marshal.PtrToStringAnsi(type), Marshal.PtrToStringAnsi(owner),
                             Marshal.PtrToStringAnsi(name), Marshal.PtrToStringAnsi(subType), true);
@@ -290,7 +297,7 @@ private static bool isConnected()
             return true;
         }
 
-        private static void ConnectToDatabase()
+        private static void getDatabaseInformation()
         {
             try
             {
@@ -305,6 +312,10 @@ private static void ConnectToDatabase()
                     IntPtr ptrConnectAs = getConnectAs();
 
                     connectAs = Marshal.PtrToStringAnsi(ptrConnectAs);
+
+                    IntPtr ptrOracleHome = sysOracleHome();
+
+                    oracleHome = Marshal.PtrToStringAnsi(ptrOracleHome);
                 }
             }
             catch (Exception e)
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/LoginForm.cs b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/LoginForm.cs
@@ -12,13 +12,13 @@ public LoginForm()
 
         private void BtnRunTests_Click(object sender, EventArgs e)
         {
-            var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text, null);
+            var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text, null, null);
             testRunnerWindow.RunTestsAsync("USER", null, txtUsername.Text, null, false);
         }
 
         private void btnCodeCoverage_Click(object sender, EventArgs e)
         {
-            var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text, null);
+            var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text, null, null);
             testRunnerWindow.RunTestsAsync("USER", null, txtUsername.Text, null, true);
         }
     }
diff --git a/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/TestRunnerWindow.cs b/PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI/TestRunnerWindow.cs
@@ -28,6 +28,7 @@ public partial class TestRunnerWindow : Form
         private readonly string password;
         private readonly string database;
         private readonly string connectAs;
+        private readonly string oracleHome;
 
         private readonly List<TestResult> testResults = new List<TestResult>();
 
@@ -39,13 +40,14 @@ public partial class TestRunnerWindow : Form
         private int rowIndexOnRightClick;
         private int completedTests;
 
-        public TestRunnerWindow(object pluginIntegration, string username, string password, string database, string connectAs)
+        public TestRunnerWindow(object pluginIntegration, string username, string password, string database, string connectAs, string oracleHome)
         {
             this.pluginIntegration = pluginIntegration;
             this.username = username;
             this.password = password;
             this.database = database;
             this.connectAs = connectAs;
+            this.oracleHome = oracleHome;
 
             InitializeComponent();
         }
@@ -72,8 +74,20 @@ public async Task RunTestsAsync(string type, string owner, string name, string p
             SetWindowTitle(type, owner, name, procedure);
 
             testRunner = new RealTimeTestRunner();
-            testRunner.Connect(username, password, database);
 
+            try
+            {
+                if (oracleHome != null)
+                {
+                    Environment.SetEnvironmentVariable("ORACLE_HOME", oracleHome);
+                }
+                testRunner.Connect(username, password, database);
+            }
+            catch (Exception e)
+            {
+                MessageBox.Show(e.Message, "Connect failed", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
             try
             {
                 testRunner.GetVersion();
@@ -599,15 +613,15 @@ private async void menuItemRunTests_ClickAsync(object sender, EventArgs e)
         {
             var testResult = testResults[rowIndexOnRightClick];
 
-            var testResultWindow = new TestRunnerWindow(pluginIntegration, username, password, database, connectAs);
+            var testResultWindow = new TestRunnerWindow(pluginIntegration, username, password, database, connectAs, oracleHome);
             await testResultWindow.RunTestsAsync("PROCEDURE", testResult.Owner, testResult.Package, testResult.Procedure, false);
         }
 
         private async void menuItemCoverage_ClickAsync(object sender, EventArgs e)
         {
             var testResult = testResults[rowIndexOnRightClick];
 
-            var testResultWindow = new TestRunnerWindow(pluginIntegration, username, password, database, connectAs);
+            var testResultWindow = new TestRunnerWindow(pluginIntegration, username, password, database, connectAs, oracleHome);
             await testResultWindow.RunTestsAsync("PROCEDURE", testResult.Owner, testResult.Package, testResult.Procedure, true);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,9 @@`
`10`	`10`
`11`	`11`	`namespace utPLSQL`
`12`	`12`	`{`
	`13`	`+ //FUNC: 4/ extern char (SYS_OracleHome)();`
	`14`	`+ internal delegate IntPtr SysOracleHome();`
	`15`	`+`
`13`	`16`	`//FUNC: 11/ BOOL (*IDE_Connected)();`
`14`	`17`	`internal delegate bool IdeConnected();`
`15`	`18`
`@@ -23,8 +26,7 @@ namespace utPLSQL`
`23`	`26`	`internal delegate void IdeCreatePopupItem(int id, int index, string name, string objectType);`
`24`	`27`
`25`	`28`	`//FUNC: 74/ int (IDE_GetPopupObject)(char ObjectType, char ObjectOwner, char ObjectName, char *SubObject);`
`26`		`- internal delegate int IdeGetPopupObject(out IntPtr objectType, out IntPtr objectOwner, out IntPtr objectName,`
`27`		`- out IntPtr subObject);`
	`29`	`+ internal delegate int IdeGetPopupObject(out IntPtr objectType, out IntPtr objectOwner, out IntPtr objectName, out IntPtr subObject);`
`28`	`30`
`29`	`31`	`//FUNC: 79/ char (IDE_GetObjectSource)(char ObjectType, char ObjectOwner, char *ObjectName);`
`30`	`32`	`internal delegate IntPtr IdeGetObjectSource(string objectType, string objectOwner, string objectName);`
`@@ -44,6 +46,8 @@ public class PlsqlDeveloperUtPlsqlPlugin`
`44`	`46`	`private const int PluginPopupIndex = 1;`
`45`	`47`	`private const int PluginPopupIndexWithCoverage = 2;`
`46`	`48`
	`49`	`+ private static SysOracleHome sysOracleHome;`
	`50`	`+`
`47`	`51`	`private static IdeConnected connected;`
`48`	`52`	`private static IdeGetConnectionInfo getConnectionInfo;`
`49`	`53`
`@@ -59,9 +63,9 @@ public class PlsqlDeveloperUtPlsqlPlugin`
`59`	`63`	`private static string password;`
`60`	`64`	`private static string database;`
`61`	`65`	`private static string connectAs;`
	`66`	`+ private static string oracleHome;`
`62`	`67`
`63`	`68`	`private static PlsqlDeveloperUtPlsqlPlugin _plugin;`
`64`		`-`
`65`	`69`	`private static readonly List<TestRunnerWindow> Windows = new List<TestRunnerWindow>();`
`66`	`70`
`67`	`71`	`#region DLL exported API`
`@@ -83,7 +87,7 @@ public static void OnActivate()`
`83`	`87`	`{`
`84`	`88`	`try`
`85`	`89`	`{`
`86`		`- ConnectToDatabase();`
	`90`	`+ getDatabaseInformation();`
`87`	`91`
`88`	`92`	`// Separate streams are needed!`
`89`	`93`	`var assembly = Assembly.GetExecutingAssembly();`
`@@ -150,6 +154,9 @@ public static void RegisterCallback(int index, IntPtr function)`
`150`	`154`	`{`
`151`	`155`	`switch (index)`
`152`	`156`	`{`
	`157`	`+ case 4:`
	`158`	`+ sysOracleHome = (SysOracleHome)Marshal.GetDelegateForFunctionPointer(function, typeof(SysOracleHome));`
	`159`	`+ break;`
`153`	`160`	`case 11:`
`154`	`161`	`connected = (IdeConnected)Marshal.GetDelegateForFunctionPointer(function, typeof(IdeConnected));`
`155`	`162`	`break;`
`@@ -181,7 +188,7 @@ public static void RegisterCallback(int index, IntPtr function)`
`181`	`188`	`[DllExport("OnConnectionChange", CallingConvention = CallingConvention.Cdecl)]`
`182`	`189`	`public static void OnConnectionChange()`
`183`	`190`	`{`
`184`		`- ConnectToDatabase();`
	`191`	`+ getDatabaseInformation();`
`185`	`192`	`}`
`186`	`193`
`187`	`194`	`[DllExport("CreateMenuItem", CallingConvention = CallingConvention.Cdecl)]`
`@@ -211,7 +218,7 @@ public static void OnMenuClick(int index)`
`211`	`218`	`{`
`212`	`219`	`if (isConnected() && !isSydba())`
`213`	`220`	`{`
`214`		`- var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs);`
	`221`	`+ var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs, oracleHome);`
`215`	`222`	`Windows.Add(testResultWindow);`
`216`	`223`	`testResultWindow.RunTestsAsync("_ALL", username, null, null, false);`
`217`	`224`	`}`
`@@ -220,7 +227,7 @@ public static void OnMenuClick(int index)`
`220`	`227`	`{`
`221`	`228`	`if (isConnected() && !isSydba())`
`222`	`229`	`{`
`223`		`- var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs);`
	`230`	`+ var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs, oracleHome);`
`224`	`231`	`Windows.Add(testResultWindow);`
`225`	`232`	`testResultWindow.RunTestsAsync("_ALL", username, null, null, true);`
`226`	`233`	`}`
`@@ -231,7 +238,7 @@ public static void OnMenuClick(int index)`
`231`	`238`	`{`
`232`	`239`	`getPopupObject(out IntPtr type, out IntPtr owner, out IntPtr name, out IntPtr subType);`
`233`	`240`
`234`		`- var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs);`
	`241`	`+ var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs, oracleHome);`
`235`	`242`	`Windows.Add(testResultWindow);`
`236`	`243`	`testResultWindow.RunTestsAsync(Marshal.PtrToStringAnsi(type), Marshal.PtrToStringAnsi(owner),`
`237`	`244`	`Marshal.PtrToStringAnsi(name), Marshal.PtrToStringAnsi(subType), false);`
`@@ -243,7 +250,7 @@ public static void OnMenuClick(int index)`
`243`	`250`	`{`
`244`	`251`	`getPopupObject(out IntPtr type, out IntPtr owner, out IntPtr name, out IntPtr subType);`
`245`	`252`
`246`		`- var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs);`
	`253`	`+ var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs, oracleHome);`
`247`	`254`	`Windows.Add(testResultWindow);`
`248`	`255`	`testResultWindow.RunTestsAsync(Marshal.PtrToStringAnsi(type), Marshal.PtrToStringAnsi(owner),`
`249`	`256`	`Marshal.PtrToStringAnsi(name), Marshal.PtrToStringAnsi(subType), true);`
`@@ -290,7 +297,7 @@ private static bool isConnected()`
`290`	`297`	`return true;`
`291`	`298`	`}`
`292`	`299`
`293`		`- private static void ConnectToDatabase()`
	`300`	`+ private static void getDatabaseInformation()`
`294`	`301`	`{`
`295`	`302`	`try`
`296`	`303`	`{`
`@@ -305,6 +312,10 @@ private static void ConnectToDatabase()`
`305`	`312`	`IntPtr ptrConnectAs = getConnectAs();`
`306`	`313`
`307`	`314`	`connectAs = Marshal.PtrToStringAnsi(ptrConnectAs);`
	`315`	`+`
	`316`	`+ IntPtr ptrOracleHome = sysOracleHome();`
	`317`	`+`
	`318`	`+ oracleHome = Marshal.PtrToStringAnsi(ptrOracleHome);`
`308`	`319`	`}`
`309`	`320`	`}`
`310`	`321`	`catch (Exception e)`
Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,13 @@ public LoginForm()`
`12`	`12`
`13`	`13`	`private void BtnRunTests_Click(object sender, EventArgs e)`
`14`	`14`	`{`
`15`		`- var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text, null);`
	`15`	`+ var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text, null, null);`
`16`	`16`	`testRunnerWindow.RunTestsAsync("USER", null, txtUsername.Text, null, false);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`private void btnCodeCoverage_Click(object sender, EventArgs e)`
`20`	`20`	`{`
`21`		`- var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text, null);`
	`21`	`+ var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text, null, null);`
`22`	`22`	`testRunnerWindow.RunTestsAsync("USER", null, txtUsername.Text, null, true);`
`23`	`23`	`}`
`24`	`24`	`}`