Changeset 3220 for trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess

Timestamp:

03/25/10 19:57:44 (14 years ago)

Author:

kgrading

Message:

improved the DAL further, changed minor details for the presentation (#830)

Location:

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2

Files:

• ClientGroupDao.cs (modified) (1 diff)
• ContextFactory.cs (modified) (3 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess-3.2.csproj (modified) (1 diff)
• JobDao.cs (modified) (2 diffs)
• VarBinaryStream.cs (added)

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/ClientGroupDao.cs

@@ -153 +153 @@
       return target;
     }
+
+    public IEnumerable<ClientGroupDto> FindByName(string res) {
+      return (from cq in Context.ClientGroups
+              where cq.Resource.Name == res
+              select EntityToDto(cq, null)).ToList();      
+    }
+
+
   }
 }

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/ContextFactory.cs

@@ -3 +3 @@
 using System.Linq;
 using System.Text;
+using System.Data.Common;
+using System.Data.SqlClient;
 
 namespace HeuristicLab.Hive.Server.LINQDataAccess {
@@ -8 +10 @@
     [ThreadStatic]
     private static HiveDataContext _hiveDataContext;
+
+    [ThreadStatic]
+    private static SqlTransaction _currentTransaction;
 
     public static HiveDataContext Context { 
@@ -15 +20 @@
         return _hiveDataContext;        
       } 
-      set {
+      set {        
         _hiveDataContext = value;
       }
     }
+
+    public static SqlTransaction CurrentTransaction { 
+      get {
+        return _currentTransaction;
+      } set {
+        _currentTransaction = value;
+      } 
+    }
   }
 }

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/HeuristicLab.Hive.Server.LINQDataAccess-3.2.csproj

@@ -106 +106 @@
     </Compile>
     <Compile Include="UptimeCalendarDao.cs" />
+    <Compile Include="VarBinaryStream.cs" />
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/JobDao.cs

@@ -60 +60 @@
       Job job = Context.Jobs.SingleOrDefault(j => j.JobId.Equals(bObj.Id));
       DtoToEntity(bObj, job);
-      Context.SubmitChanges();
+      try {
+        Context.SubmitChanges();
+      } catch (ChangeConflictException cfe) {
+        
+      }
     }
 
@@ -112 +116 @@
 
     public Stream GetSerializedJobStream(Guid jobId) {
-      HiveDataContext hdc = new HiveDataContext();
-      String ConnStr = hdc.Connection.ConnectionString;
-      SqlConnection connection = new SqlConnection(hdc.Connection.ConnectionString);      
       VarBinarySource source =
         new VarBinarySource(
-          connection, null,
+          (SqlConnection)Context.Connection, null,
           "Job", "SerializedJob", "JobId", jobId);