Skip to content

Commit ddd04e0

Browse files
AbelChengAbelCheng
committed
Switch DataAccess to DataBooster nuget package and convert Visual Studio 2010 Database project to SQL Server Data Tools (SSDT) Database Projects.
1 parent 48b5953 commit ddd04e0

27 files changed

+2367
-71
lines changed

‎TaskParallelFoundation/ConsoleTest/App.config‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,34 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3+
<configSections>
4+
<section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess" />
5+
</configSections>
36
<connectionStrings>
4-
<add name="TPW_Database" providerName="DDTek.Oracle" connectionString="TNSNames File=C:\Oracle\product\11.2.0\dbhome_1\NETWORK\ADMIN\tnsnames.ora;Data Source=ORCL;Authentication Method=Client;Connection Timeout=600;Pooling=True;Min Pool Size=16;Max Pool Size=256;Max Pool Size Behavior=SoftCap;Initial Command Timeout=60;Application Name=TaskParallelPump"/>
7+
<add name="TPW_Database" providerName="Oracle.ManagedDataAccess.Client" connectionString="Data Source=ORCL;User Id=/" />
8+
<!--<add name="TPW_Database" providerName="DDTek.Oracle" connectionString="TNSNames File=C:\Oracle\product\11.2.0\dbhome_1\NETWORK\ADMIN\tnsnames.ora;Data Source=ORCL;Authentication Method=Client;Connection Timeout=600;Pooling=True;Min Pool Size=16;Max Pool Size=256;Max Pool Size Behavior=SoftCap;Initial Command Timeout=60;Application Name=TaskParallelPump" />-->
59
<!--<add name="TPW_Database" providerName="System.Data.SqlClient" connectionString="Data Source=.\SQLEXPRESS;AttachDbFilename=E:\Projects\DbParallel\TaskParallelFoundation\ConsoleTest\SampleDatabase\SqlServer\TaskParallelWorkflow.mdf;Integrated Security=True;User Instance=True"/>-->
10+
<add name="DbParallel.ConsoleTest.MainConnection" providerName="Oracle.ManagedDataAccess.Client" connectionString="Data Source=SAMPLEDB;User Id=/" />
11+
<add name="DbParallel.ConsoleTest.AuxConnection" providerName="System.Data.SqlClient" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=SAMPLEDB;Integrated Security=True" />
612
</connectionStrings>
713
<appSettings>
814
<add key="TPW_Package" value="XYZ.TPW_SERVICE." />
915
<!--<add key="TPW_Package" value="dbo.TPW_SERVICE_" />-->
16+
<add key="DbParallel.ConsoleTest.MainPackage" value="SCHEMA.PACKAGE." />
1017
</appSettings>
18+
<system.data>
19+
<DbProviderFactories>
20+
<!-- Remove in case this is already defined in machine.config -->
21+
<remove invariant="Oracle.ManagedDataAccess.Client" />
22+
<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" />
23+
</DbProviderFactories>
24+
</system.data>
25+
<oracle.manageddataaccess.client>
26+
<version number="*">
27+
<settings>
28+
<!-- Set this path if you are using TNS aliases as connection strings -->
29+
<!-- Instead you can use "SERVER_NAME:PORT/SERVICE_NAME" as your data source -->
30+
<setting name="TNS_ADMIN" value="C:\oracle\product\11.2.0\client_1\network\admin" />
31+
</settings>
32+
</version>
33+
</oracle.manageddataaccess.client>
1134
</configuration>

‎TaskParallelFoundation/ConsoleTest/ConsoleTest.csproj‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
3737
<DebugSymbols>true</DebugSymbols>
3838
<OutputPath>bin\Debug\</OutputPath>
39-
<DefineConstants>DEBUG;TRACE</DefineConstants>
39+
<DefineConstants>TRACE;DEBUG;NO_SAMPLE</DefineConstants>
4040
<DebugType>full</DebugType>
4141
<PlatformTarget>AnyCPU</PlatformTarget>
4242
<CodeAnalysisLogFile>bin\Debug\TaskParallelWorkflow.ConsoleTest.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
@@ -64,14 +64,13 @@
6464
<CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
6565
</PropertyGroup>
6666
<ItemGroup>
67+
<Compile Include="DataAccess\ConfigHelper.sample.cs" />
68+
<Compile Include="DataAccess\DbPackage.sample.cs" />
69+
<Compile Include="DataAccess\MyBizMain.sample.cs" />
6770
<Compile Include="Program.cs" />
6871
<Compile Include="Properties\AssemblyInfo.cs" />
6972
</ItemGroup>
7073
<ItemGroup>
71-
<ProjectReference Include="..\DataAccess\DataAccess.csproj">
72-
<Project>{0BD1299C-6AE3-407C-844D-F69B90037846}</Project>
73-
<Name>DataAccess</Name>
74-
</ProjectReference>
7574
<ProjectReference Include="..\Dispatcher\Dispatcher.csproj">
7675
<Project>{8FE49098-9C54-43F7-876A-1486573FADF2}</Project>
7776
<Name>Dispatcher</Name>
@@ -83,7 +82,15 @@
8382
</None>
8483
</ItemGroup>
8584
<ItemGroup>
85+
<Reference Include="DbParallel.DataAccess, Version=1.1.0.1, Culture=neutral, processorArchitecture=MSIL">
86+
<SpecificVersion>False</SpecificVersion>
87+
<HintPath>..\packages\DataBooster.Oracle.Managed.1.1.0.1\lib\net40-Client\DbParallel.DataAccess.dll</HintPath>
88+
</Reference>
89+
<Reference Include="Oracle.ManagedDataAccess">
90+
<HintPath>..\packages\odp.net.managed.121.1.1\lib\net40\Oracle.ManagedDataAccess.dll</HintPath>
91+
</Reference>
8692
<Reference Include="System" />
93+
<Reference Include="System.Configuration" />
8794
<Reference Include="System.Data" />
8895
</ItemGroup>
8996
<ItemGroup>
@@ -119,6 +126,7 @@
119126
</BootstrapperPackage>
120127
</ItemGroup>
121128
<ItemGroup>
129+
<None Include="packages.config" />
122130
<None Include="SampleDatabase\SqlServer\TaskParallelWorkflow.mdf" />
123131
<None Include="SampleDatabase\SqlServer\TaskParallelWorkflow_log.LDF">
124132
<DependentUpon>TaskParallelWorkflow.mdf</DependentUpon>

‎TaskParallelFoundation/ConsoleTest/DataAccess/ConfigHelper.sample.cs‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
using System.Data.Common;
2+
using System.Configuration;
3+
4+
namespace DbParallel.ConsoleTest.DataAccess
5+
{
6+
public static partial class ConfigHelper
7+
{
8+
#region Setting key names defined in your config file, can be overridden in partial OnInitializing()
9+
private static string _ConnectionSettingKey = "DbParallel.ConsoleTest.MainConnection";
10+
private static string _PackageSettingKey = "DbParallel.ConsoleTest.MainPackage";
11+
private static string _AuxConnectionSettingKey = "DbParallel.ConsoleTest.AuxConnection";
12+
#endregion
13+
14+
#region Properties
15+
private static DbProviderFactory _DbProviderFactory;
16+
public static DbProviderFactory DbProviderFactory
17+
{
18+
get { return _DbProviderFactory; }
19+
}
20+
21+
private static string _ConnectionString;
22+
public static string ConnectionString
23+
{
24+
get { return _ConnectionString; }
25+
}
26+
27+
private static string _DatabasePackage;
28+
public static string DatabasePackage
29+
{
30+
get { return _DatabasePackage; }
31+
}
32+
33+
private static DbProviderFactory _AuxDbProviderFactory;
34+
public static DbProviderFactory AuxDbProviderFactory
35+
{
36+
get { return _AuxDbProviderFactory; }
37+
}
38+
39+
private static string _AuxConnectionString;
40+
public static string AuxConnectionString
41+
{
42+
get { return _AuxConnectionString; }
43+
}
44+
#endregion
45+
46+
static ConfigHelper()
47+
{
48+
OnInitializing();
49+
50+
#region Default Initialization
51+
ConnectionStringSettings connSetting = ConfigurationManager.ConnectionStrings[_ConnectionSettingKey];
52+
_DbProviderFactory = DbProviderFactories.GetFactory(connSetting.ProviderName);
53+
_ConnectionString = connSetting.ConnectionString;
54+
55+
_DatabasePackage = ConfigurationManager.AppSettings[_PackageSettingKey];
56+
if (_DatabasePackage == null)
57+
_DatabasePackage = string.Empty;
58+
59+
if (string.IsNullOrWhiteSpace(_AuxConnectionSettingKey) == false)
60+
{
61+
connSetting = ConfigurationManager.ConnectionStrings[_AuxConnectionSettingKey];
62+
_AuxDbProviderFactory = DbProviderFactories.GetFactory(connSetting.ProviderName);
63+
_AuxConnectionString = connSetting.ConnectionString;
64+
}
65+
#endregion
66+
67+
OnInitialized();
68+
}
69+
70+
static partial void OnInitializing();
71+
static partial void OnInitialized();
72+
}
73+
}

0 commit comments

Comments
 (0)