Skip to content

Commit 212f47d

Browse files
simaschsimasch
committed
Update to utPLSQL .NET API 1.5.0
1 parent dfa4468 commit 212f47d

File tree

15 files changed

+135
-148
lines changed

15 files changed

+135
-148
lines changed

‎PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/App.config‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<section name="oracle.manageddataaccess.client"
5-
type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
4+
<section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
65
</configSections>
76
<system.data>
87
<DbProviderFactories>
98
<remove invariant="Oracle.ManagedDataAccess.Client"/>
10-
<add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver"
11-
type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
9+
<add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
1210
</DbProviderFactories>
1311
</system.data>
1412
<runtime>
@@ -27,4 +25,4 @@
2725
</dataSources>
2826
</version>
2927
</oracle.manageddataaccess.client>
30-
</configuration>
28+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>

‎PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin.cs‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ internal delegate int IdeGetPopupObject(out IntPtr objectType, out IntPtr object
2828
//*FUNC: 79*/ char *(*IDE_GetObjectSource)(char *ObjectType, char *ObjectOwner, char *ObjectName);
2929
internal delegate IntPtr IdeGetObjectSource(string objectType, string objectOwner, string objectName);
3030

31+
//*FUNC: 97*/ extern char *(*IDE_GetConnectAs)();
32+
internal delegate IntPtr IdeGetConnectAs();
33+
3134
//*FUNC: 150*/ void (*IDE_CreateToolButton)(int ID, int Index, char *Name, char *BitmapFile, int BitmapHandle);
3235
internal delegate void IdeCreateToolButton(int id, int index, string name, string bitmapFile, long bitmapHandle);
3336

@@ -47,12 +50,14 @@ public class PlsqlDeveloperUtPlsqlPlugin
4750
internal static IdeCreatePopupItem createPopupItem;
4851
internal static IdeGetPopupObject getPopupObject;
4952
internal static IdeGetObjectSource getObjectSource;
53+
internal static IdeGetConnectAs getConnectAs;
5054
internal static IdeCreateToolButton createToolButton;
5155

5256
internal static int pluginId;
5357
internal static string username;
5458
internal static string password;
5559
internal static string database;
60+
internal static string connectAs;
5661

5762
private static PlsqlDeveloperUtPlsqlPlugin _plugin;
5863

@@ -163,6 +168,9 @@ public static void RegisterCallback(int index, IntPtr function)
163168
case 79:
164169
getObjectSource = (IdeGetObjectSource)Marshal.GetDelegateForFunctionPointer(function, typeof(IdeGetObjectSource));
165170
break;
171+
case 97:
172+
getConnectAs = (IdeGetConnectAs)Marshal.GetDelegateForFunctionPointer(function, typeof(IdeGetConnectAs));
173+
break;
166174
case 150:
167175
createToolButton = (IdeCreateToolButton)Marshal.GetDelegateForFunctionPointer(function, typeof(IdeCreateToolButton));
168176
break;
@@ -200,7 +208,7 @@ public static void OnMenuClick(int index)
200208
{
201209
if (connected())
202210
{
203-
var testResultWindow = new TestRunnerWindow(_plugin, username, password, database);
211+
var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs);
204212
Windows.Add(testResultWindow);
205213
testResultWindow.RunTestsAsync("_ALL", username, null, null, false);
206214
}
@@ -209,7 +217,7 @@ public static void OnMenuClick(int index)
209217
{
210218
if (connected())
211219
{
212-
var testResultWindow = new TestRunnerWindow(_plugin, username, password, database);
220+
var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs);
213221
Windows.Add(testResultWindow);
214222
testResultWindow.RunTestsAsync("_ALL", username, null, null, true);
215223
}
@@ -220,7 +228,7 @@ public static void OnMenuClick(int index)
220228
{
221229
getPopupObject(out IntPtr type, out IntPtr owner, out IntPtr name, out IntPtr subType);
222230

223-
var testResultWindow = new TestRunnerWindow(_plugin, username, password, database);
231+
var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs);
224232
Windows.Add(testResultWindow);
225233
testResultWindow.RunTestsAsync(Marshal.PtrToStringAnsi(type), Marshal.PtrToStringAnsi(owner),
226234
Marshal.PtrToStringAnsi(name), Marshal.PtrToStringAnsi(subType), false);
@@ -232,7 +240,7 @@ public static void OnMenuClick(int index)
232240
{
233241
getPopupObject(out IntPtr type, out IntPtr owner, out IntPtr name, out IntPtr subType);
234242

235-
var testResultWindow = new TestRunnerWindow(_plugin, username, password, database);
243+
var testResultWindow = new TestRunnerWindow(_plugin, username, password, database, connectAs);
236244
Windows.Add(testResultWindow);
237245
testResultWindow.RunTestsAsync(Marshal.PtrToStringAnsi(type), Marshal.PtrToStringAnsi(owner),
238246
Marshal.PtrToStringAnsi(name), Marshal.PtrToStringAnsi(subType), true);
@@ -266,6 +274,10 @@ private static void ConnectToDatabase()
266274
username = Marshal.PtrToStringAnsi(ptrUsername);
267275
password = Marshal.PtrToStringAnsi(ptrPassword);
268276
database = Marshal.PtrToStringAnsi(ptrDatabase);
277+
278+
IntPtr ptrConnectAs = getConnectAs();
279+
280+
connectAs = Marshal.PtrToStringAnsi(ptrConnectAs);
269281
}
270282
}
271283
catch (Exception e)

‎PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin.csproj‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>utPLSQL</RootNamespace>
1212
<AssemblyName>PlsqlDeveloperUtPlsqlPlugin</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<Deterministic>true</Deterministic>
1616
<TargetFrameworkProfile />
@@ -69,6 +69,7 @@
6969
<PlatformTarget>x86</PlatformTarget>
7070
<LangVersion>7.3</LangVersion>
7171
<ErrorReport>prompt</ErrorReport>
72+
<Prefer32Bit>false</Prefer32Bit>
7273
</PropertyGroup>
7374
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
7475
<OutputPath>bin\x86\Release\</OutputPath>
@@ -79,6 +80,7 @@
7980
<PlatformTarget>x86</PlatformTarget>
8081
<LangVersion>7.3</LangVersion>
8182
<ErrorReport>prompt</ErrorReport>
83+
<Prefer32Bit>false</Prefer32Bit>
8284
</PropertyGroup>
8385
<PropertyGroup>
8486
<ApplicationIcon>utPLSQL.ico</ApplicationIcon>
@@ -88,7 +90,7 @@
8890
<HintPath>..\packages\Costura.Fody.4.1.0\lib\net40\Costura.dll</HintPath>
8991
</Reference>
9092
<Reference Include="FontAwesome.Sharp, Version=5.15.3.0, Culture=neutral, processorArchitecture=MSIL">
91-
<HintPath>..\packages\FontAwesome.Sharp.5.15.3\lib\net40\FontAwesome.Sharp.dll</HintPath>
93+
<HintPath>..\packages\FontAwesome.Sharp.5.15.3\lib\net45\FontAwesome.Sharp.dll</HintPath>
9294
</Reference>
9395
<Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
9496
<HintPath>..\packages\Oracle.ManagedDataAccess.19.10.0\lib\net40\Oracle.ManagedDataAccess.dll</HintPath>
@@ -105,8 +107,8 @@
105107
<Reference Include="System.Xml.Linq" />
106108
<Reference Include="Microsoft.CSharp" />
107109
<Reference Include="System.Xml" />
108-
<Reference Include="utPLSQL.Api, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
109-
<HintPath>..\packages\utPLSQL.Api.1.4.1\lib\net40\utPLSQL.Api.dll</HintPath>
110+
<Reference Include="utPLSQL.Api, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
111+
<HintPath>..\packages\utPLSQL.Api.1.5.0\lib\net45\utPLSQL.Api.dll</HintPath>
110112
</Reference>
111113
</ItemGroup>
112114
<ItemGroup>

‎PlsqlDeveloperUtPlsqlPlugin/PlsqlDeveloperUtPlsqlPlugin/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<packages>
33
<package id="Costura.Fody" version="4.1.0" targetFramework="net40" />
44
<package id="Fody" version="6.0.0" targetFramework="net40" developmentDependency="true" />
5-
<package id="FontAwesome.Sharp" version="5.15.3" targetFramework="net40" />
5+
<package id="FontAwesome.Sharp" version="5.15.3" targetFramework="net45" />
66
<package id="Oracle.ManagedDataAccess" version="19.10.0" targetFramework="net40" />
77
<package id="UnmanagedExports" version="1.2.7" targetFramework="net40" />
88
<package id="UnmanagedExports.Repack" version="1.0.4" targetFramework="net40" />
9-
<package id="utPLSQL.Api" version="1.4.1" targetFramework="net40" />
9+
<package id="utPLSQL.Api" version="1.5.0" targetFramework="net45" />
1010
</packages>

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/App.config‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<section name="oracle.manageddataaccess.client"
5-
type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
4+
<section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
65
</configSections>
76
<system.data>
87
<DbProviderFactories>
98
<remove invariant="Oracle.ManagedDataAccess.Client"/>
10-
<add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver"
11-
type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
9+
<add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
1210
</DbProviderFactories>
1311
</system.data>
1412
<runtime>
@@ -27,4 +25,4 @@
2725
</dataSources>
2826
</version>
2927
</oracle.manageddataaccess.client>
30-
</configuration>
28+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/LoginForm.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ public LoginForm()
1212

1313
private void BtnRunTests_Click(object sender, EventArgs e)
1414
{
15-
var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text);
15+
var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text, null);
1616
testRunnerWindow.RunTestsAsync("USER", null, txtUsername.Text, null, false);
1717
}
1818

1919
private void btnCodeCoverage_Click(object sender, EventArgs e)
2020
{
21-
var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text);
21+
var testRunnerWindow = new TestRunnerWindow(null, txtUsername.Text, txtPassword.Text, txtDatabase.Text, null);
2222
testRunnerWindow.RunTestsAsync("USER", null, txtUsername.Text, null, true);
2323
}
2424
}

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/Properties/Resources.Designer.cs‎

Lines changed: 18 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/Properties/Settings.Designer.cs‎

Lines changed: 9 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Oracle.ManagedDataAccess" version="19.10.0" targetFramework="net40" />
4-
<package id="utPLSQL.Api" version="1.4.1" targetFramework="net40" />
4+
<package id="utPLSQL.Api" version="1.5.0" targetFramework="net45" />
55
</packages>

‎PlsqlDeveloperUtPlsqlPlugin/utPLSQL.UI.Standalone/utPLSQL.UI.Standalone.csproj‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
<OutputType>WinExe</OutputType>
99
<RootNamespace>utPLSQL.UI.Standalone</RootNamespace>
1010
<AssemblyName>utPLSQL.UI.Standalone</AssemblyName>
11-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<Deterministic>true</Deterministic>
14+
<TargetFrameworkProfile />
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -21,6 +22,7 @@
2122
<DefineConstants>DEBUG;TRACE</DefineConstants>
2223
<ErrorReport>prompt</ErrorReport>
2324
<WarningLevel>4</WarningLevel>
25+
<Prefer32Bit>false</Prefer32Bit>
2426
</PropertyGroup>
2527
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2628
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -30,6 +32,7 @@
3032
<DefineConstants>TRACE</DefineConstants>
3133
<ErrorReport>prompt</ErrorReport>
3234
<WarningLevel>4</WarningLevel>
35+
<Prefer32Bit>false</Prefer32Bit>
3336
</PropertyGroup>
3437
<ItemGroup>
3538
<Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
@@ -45,8 +48,8 @@
4548
<Reference Include="System.Drawing" />
4649
<Reference Include="System.Windows.Forms" />
4750
<Reference Include="System.Xml" />
48-
<Reference Include="utPLSQL.Api, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\utPLSQL.Api.1.4.1\lib\net40\utPLSQL.Api.dll</HintPath>
51+
<Reference Include="utPLSQL.Api, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
52+
<HintPath>..\packages\utPLSQL.Api.1.5.0\lib\net45\utPLSQL.Api.dll</HintPath>
5053
</Reference>
5154
</ItemGroup>
5255
<ItemGroup>
@@ -69,6 +72,7 @@
6972
<Compile Include="Properties\Resources.Designer.cs">
7073
<AutoGen>True</AutoGen>
7174
<DependentUpon>Resources.resx</DependentUpon>
75+
<DesignTime>True</DesignTime>
7276
</Compile>
7377
<None Include="App.config" />
7478
<None Include="packages.config" />

0 commit comments

Comments
 (0)