Updated DataAccess with DataBooster package

AbelCheng · AbelCheng · commit 0300a4e1b2ab · 2013-07-30T03:30:58.000Z
diff --git a/T4SQLTemplateLibrary/SqlBuilder/DataAccess/ConfigHelper.cs b/T4SQLTemplateLibrary/SqlBuilder/DataAccess/ConfigHelper.cs
@@ -12,7 +12,7 @@ internal static int EnginePollInterval	// milliseconds
 			set { _EnginePollInterval = value; }
 		}
 
-		static partial void ConfigInit()
+		static partial void OnInitializing()
 		{
 			_ConnectionSettingKey = "T4SQLDB";
 			_PackageSettingKey = "Engine_Package";
diff --git a/T4SQLTemplateLibrary/SqlBuilder/DataAccess/ConfigHelper.sample.cs b/T4SQLTemplateLibrary/SqlBuilder/DataAccess/ConfigHelper.sample.cs
@@ -5,8 +5,10 @@ namespace T4SQL.SqlBuilder.DataAccess
 {
 	public static partial class ConfigHelper
 	{
-		private static string _ConnectionSettingKey = "T4SQLDB";
-		private static string _PackageSettingKey = "Engine_Package";
+		#region Setting key names defined in your config file, can be overridden in partial OnInitializing()
+		private static string _ConnectionSettingKey = "T4SQL.SqlBuilder.MainConnection";
+		private static string _PackageSettingKey = "T4SQL.SqlBuilder.MainPackage";
+		#endregion
 
 		#region Properties
 		private static DbProviderFactory _DbProviderFactory;
@@ -30,7 +32,7 @@ public static string DatabasePackage
 
 		static ConfigHelper()
 		{
-			ConfigInit();
+			OnInitializing();
 
 			#region Default Initialization
 			ConnectionStringSettings connSetting = ConfigurationManager.ConnectionStrings[_ConnectionSettingKey];
@@ -41,8 +43,11 @@ static ConfigHelper()
 			if (_DatabasePackage == null)
 				_DatabasePackage = string.Empty;
 			#endregion
+
+			OnInitialized();
 		}
 
-		static partial void ConfigInit();
+		static partial void OnInitializing();
+		static partial void OnInitialized();
 	}
 }
diff --git a/T4SQLTemplateLibrary/SqlBuilder/DataAccess/DbPackage.sample.cs b/T4SQLTemplateLibrary/SqlBuilder/DataAccess/DbPackage.sample.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Collections.Generic;
 using DbParallel.DataAccess;
 
 namespace T4SQL.SqlBuilder.DataAccess
diff --git a/T4SQLTemplateLibrary/SqlBuilder/DataAccess/MyBizMain.sample.cs b/T4SQLTemplateLibrary/SqlBuilder/DataAccess/MyBizMain.sample.cs
@@ -1,5 +1,3 @@
 #if DEBUG
-using System;
-using DbParallel.DataAccess;
-using T4SQL.SqlBuilder.DataAccess;
+
 #endif
diff --git a/T4SQLTemplateLibrary/SqlBuilder/SqlBuilder.csproj b/T4SQLTemplateLibrary/SqlBuilder/SqlBuilder.csproj
@@ -36,8 +36,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DbParallel.DataAccess, Version=1.0.0.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DataBooster.SqlServer.1.0.0.4\lib\net40-Client\DbParallel.DataAccess.dll</HintPath>
+    <Reference Include="DbParallel.DataAccess, Version=1.0.0.5, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\DataBooster.SqlServer.1.0.0.5\lib\net40-Client\DbParallel.DataAccess.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
diff --git a/T4SQLTemplateLibrary/SqlBuilder/app.config b/T4SQLTemplateLibrary/SqlBuilder/app.config
@@ -1,9 +1,9 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <connectionStrings>
-    <add name="T4SQL.SqlBuilder.MainConnection" providerName="System.Data.SqlClient" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=T4SQLDB;Integrated Security=True" />
-  <add name="T4SQL.SqlBuilder.MainConnection" providerName="System.Data.SqlClient" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=SAMPLEDB;Integrated Security=True" /></connectionStrings>
-  <appSettings>
-    <add key="T4SQL.SqlBuilder.MainPackage" value="T4SQL.ENGINE_" />
-  <add key="T4SQL.SqlBuilder.MainPackage" value="SCHEMA.PACKAGE_" /></appSettings>
+	<connectionStrings>
+		<add name="T4SQL.SqlBuilder.MainConnection" providerName="System.Data.SqlClient" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=T4SQLDB;Integrated Security=True" />
+	</connectionStrings>
+	<appSettings>
+		<add key="T4SQL.SqlBuilder.MainPackage" value="T4SQL.ENGINE_" />
+	</appSettings>
 </configuration>
diff --git a/T4SQLTemplateLibrary/SqlBuilder/packages.config b/T4SQLTemplateLibrary/SqlBuilder/packages.config
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DataBooster.SqlServer" version="1.0.0.4" targetFramework="net40-Client" />
+  <package id="DataBooster.SqlServer" version="1.0.0.5" targetFramework="net40-Client" />
 </packages>

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ internal static int EnginePollInterval // milliseconds`
`12`	`12`	`set { _EnginePollInterval = value; }`
`13`	`13`	`}`
`14`	`14`
`15`		`- static partial void ConfigInit()`
	`15`	`+ static partial void OnInitializing()`
`16`	`16`	`{`
`17`	`17`	`_ConnectionSettingKey = "T4SQLDB";`
`18`	`18`	`_PackageSettingKey = "Engine_Package";`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,10 @@ namespace T4SQL.SqlBuilder.DataAccess`
`5`	`5`	`{`
`6`	`6`	`public static partial class ConfigHelper`
`7`	`7`	`{`
`8`		`- private static string _ConnectionSettingKey = "T4SQLDB";`
`9`		`- private static string _PackageSettingKey = "Engine_Package";`
	`8`	`+ #region Setting key names defined in your config file, can be overridden in partial OnInitializing()`
	`9`	`+ private static string _ConnectionSettingKey = "T4SQL.SqlBuilder.MainConnection";`
	`10`	`+ private static string _PackageSettingKey = "T4SQL.SqlBuilder.MainPackage";`
	`11`	`+ #endregion`
`10`	`12`
`11`	`13`	`#region Properties`
`12`	`14`	`private static DbProviderFactory _DbProviderFactory;`
`@@ -30,7 +32,7 @@ public static string DatabasePackage`
`30`	`32`
`31`	`33`	`static ConfigHelper()`
`32`	`34`	`{`
`33`		`- ConfigInit();`
	`35`	`+ OnInitializing();`
`34`	`36`
`35`	`37`	`#region Default Initialization`
`36`	`38`	`ConnectionStringSettings connSetting = ConfigurationManager.ConnectionStrings[_ConnectionSettingKey];`
`@@ -41,8 +43,11 @@ static ConfigHelper()`
`41`	`43`	`if (_DatabasePackage == null)`
`42`	`44`	`_DatabasePackage = string.Empty;`
`43`	`45`	`#endregion`
	`46`	`+`
	`47`	`+ OnInitialized();`
`44`	`48`	`}`
`45`	`49`
`46`		`- static partial void ConfigInit();`
	`50`	`+ static partial void OnInitializing();`
	`51`	`+ static partial void OnInitialized();`
`47`	`52`	`}`
`48`	`53`	`}`