Changeset 8326 for branches/OaaS/HeuristicLab.Services.Hive.DataAccess

Timestamp:

07/25/12 14:12:47 (12 years ago)

Author:

fschoepp

Message:

#1888:

• Added IConnectionProvider interface + implementation based on jheinzelreiters transaction management
• Fixed transaction being promoted to dtc; transactions enabled again
• Changed HiveDao: transactions are managed properly

Location:

branches/OaaS/HeuristicLab.Services.Hive.DataAccess/3.3

Files:

• Settings.Designer.cs (modified) (1 diff)
• Settings.settings (modified) (1 diff)
• TransactionManager.cs (modified) (4 diffs)
• app.config (modified) (2 diffs)

branches/OaaS/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.Designer.cs

@@ -52 +52 @@
             }
         }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionSt" +
+            "ring")]
+        public string HiveConnectionStringName {
+            get {
+                return ((string)(this["HiveConnectionStringName"]));
+            }
+        }
     }
 }

branches/OaaS/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.settings

@@ -17 +17 @@
       <Value Profile="(Default)">HL.Hive</Value>
     </Setting>
+    <Setting Name="HiveConnectionStringName" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

branches/OaaS/HeuristicLab.Services.Hive.DataAccess/3.3/TransactionManager.cs

@@ -28 +28 @@
       int n = 10;
       while (n > 0) {
-        //TransactionScope transaction = CreateTransaction(serializable, longRunning);
+        TransactionScope transaction = CreateTransaction(serializable, longRunning);
         try {
           call();
-          //transaction.Complete();
+          transaction.Complete();
           n = 0;
         }
@@ -40 +40 @@
         }
         finally {
-          //transaction.Dispose();
+          transaction.Dispose();
         }
       }
@@ -48 +48 @@
       int n = 10;
       while (n > 0) {
-        //TransactionScope transaction = CreateTransaction(serializable, longRunning);
+        TransactionScope transaction = CreateTransaction(serializable, longRunning);
         try {
           T result = call();
-          //transaction.Complete();
+          transaction.Complete();
           n = 0;
           return result;
@@ -61 +61 @@
         }
         finally {
-          //transaction.Dispose();
+          transaction.Dispose();
         }
       }

branches/OaaS/HeuristicLab.Services.Hive.DataAccess/3.3/app.config

@@ -8 +8 @@
   <connectionStrings>
     <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString"
-      connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;"
+        connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;"      
       providerName="System.Data.SqlClient" />
   </connectionStrings>
@@ -19 +19 @@
         <value>HL.Hive</value>
       </setting>
+      <setting name="HiveConnectionStringName" serializeAs="String">
+        <value>HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString</value>
+      </setting>
     </HeuristicLab.Services.Hive.DataAccess.Settings>
   </applicationSettings>