Changeset 12584 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess

Timestamp:

07/03/15 16:35:17 (9 years ago)

Author:

dglaser

Message:

#2388: Changed all files to connect to localhost / sqlexpress

HeuristicLab.Services.Hive-3.3:

• Added Converter.cs and NewHiveService.cs, both will be integrated into existing HiveService.cs and Convert.cs when all methods are successfully implemented

HeuristicLab.Services.Hive.Web.Hive-3.3:

• Added publish profiles

HeuristicLab.Services.WebApp.Statistics-3.3:

• Added functionality to download TaskData as .hl file

Location:

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3

Files:

• Daos/AssignedResourceDao.cs (modified) (2 diffs)
• Daos/JobPermissionDao.cs (modified) (2 diffs)
• Daos/StateLogDao.cs (modified) (1 diff)
• Daos/TaskDao.cs (modified) (1 diff)
• SQL Scripts/Initialize Hive Database.sql (modified) (1 diff)
• app.config (modified) (1 diff)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/AssignedResourceDao.cs

@@ -22 +22 @@
 using System;
 using System.Data.Linq;
+using System.Linq;
 
 namespace HeuristicLab.Services.Hive.DataAccess.Daos {
@@ -30 +31 @@
       throw new NotImplementedException();
     }
+
+    public IQueryable<AssignedResource> GetByTaskId(Guid taskId) {
+      return Table.Where(x => x.TaskId == taskId);
+    }
   }
 }

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/JobPermissionDao.cs

@@ -22 +22 @@
 using System;
 using System.Data.Linq;
+using System.Linq;
 
 namespace HeuristicLab.Services.Hive.DataAccess.Daos {
@@ -30 +31 @@
       throw new NotImplementedException();
     }
+
+    public JobPermission GetByJobAndUserId(Guid jobId, Guid userId) {
+      return Table.SingleOrDefault(x => x.JobId == jobId && x.GrantedUserId == userId);
+    }
   }
 }

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/StateLogDao.cs

@@ -26 +26 @@
 namespace HeuristicLab.Services.Hive.DataAccess.Daos {
   public class StateLogDao : GenericDao<Guid, StateLog> {
+
+    private Table<Task> TaskTable {
+      get { return DataContext.GetTable<Task>(); }
+    }
+
     public StateLogDao(DataContext dataContext) : base(dataContext) { }
 

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/TaskDao.cs

@@ -36 +36 @@
     }
 
-    public IQueryable<Task> GetAllByJobId(Guid id) {
+    public IQueryable<Task> GetByJobId(Guid id) {
       return Table.Where(x => x.JobId == id);
     }

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Initialize Hive Database.sql

@@ -256 +256 @@
     CONSTRAINT [FK_FactClientInfo_DimUser] FOREIGN KEY ([UserId]) REFERENCES [statistics].[DimUser] ([UserId])
 );
-
 CREATE TABLE [statistics].[FactTask] (
   [TaskId]             UNIQUEIDENTIFIER NOT NULL,

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/app.config

@@ -7 +7 @@
   </configSections>
   <connectionStrings>
-    <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;" providerName="System.Data.SqlClient"/>
+    <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;" providerName="System.Data.SqlClient"/>
   </connectionStrings>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup><applicationSettings>