Changeset 8995 for branches/HiveTaskScheduler/HeuristicLab.Services.Hive.DataAccess

Timestamp:

12/04/12 15:38:44 (12 years ago)

Author:

ascheibe

Message:

#1712 merged trunk into branch

Location:

branches/HiveTaskScheduler/HeuristicLab.Services.Hive.DataAccess

Files:

• . (modified) (1 prop)
• 3.3/Enums/DowntimeType.cs (copied) (copied from trunk/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Enums/DowntimeType.cs)
• 3.3/HeuristicLab.Services.Hive.DataAccess-3.3.csproj (modified) (3 diffs)
• 3.3/HiveDataContext.cs (modified) (1 diff)
• 3.3/HiveDataContext.dbml (modified) (1 diff)
• 3.3/HiveDataContext.designer.cs (modified) (3 diffs)
• 3.3/SQL Scripts/Initialize Hive Database.sql (modified) (1 diff)

branches/HiveTaskScheduler/HeuristicLab.Services.Hive.DataAccess/3.3/HeuristicLab.Services.Hive.DataAccess-3.3.csproj

@@ -99 +99 @@
     <None Include="Plugin.cs.frame" />
     <Compile Include="Enums\Command.cs" />
+    <Compile Include="Enums\DowntimeType.cs" />
     <Compile Include="Enums\CpuArchitecture.cs" />
     <Compile Include="Plugin.cs" />
@@ -156 +157 @@
   </PropertyGroup>
   <PropertyGroup>
-   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -162 +163 @@
 
 call PreBuildEvent.cmd</PreBuildEvent>
-<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
 export ProjectDir=$(ProjectDir)
 export SolutionDir=$(SolutionDir)

branches/HiveTaskScheduler/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.cs

@@ +1 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
 using System;
 using System.Data.Linq.Mapping;

branches/HiveTaskScheduler/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml

@@ -95 +95 @@
       <Column Name="Recurring" Type="System.Boolean" DbType="Bit" CanBeNull="false" />
       <Column Name="RecurringId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="false" />
+      <Column Name="DowntimeType" Storage="_Type" Type="global::HeuristicLab.Services.Hive.DataAccess.DowntimeType" DbType="VarChar(MAX)" CanBeNull="false" />
       <Association Name="Resource_Downtime" Member="Resource" ThisKey="ResourceId" OtherKey="ResourceId" Type="Resource" IsForeignKey="true" DeleteRule="CASCADE" />
     </Type>

branches/HiveTaskScheduler/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.designer.cs

@@ -2164 +2164 @@
     private System.Guid _RecurringId;
     
+    private global::HeuristicLab.Services.Hive.DataAccess.DowntimeType _Type;
+    
     private EntityRef<Resource> _Resource;
     
@@ -2184 +2186 @@
     partial void OnRecurringIdChanging(System.Guid value);
     partial void OnRecurringIdChanged();
+    partial void OnDowntimeTypeChanging(global::HeuristicLab.Services.Hive.DataAccess.DowntimeType value);
+    partial void OnDowntimeTypeChanged();
     #endregion
     
@@ -2332 +2336 @@
           this.SendPropertyChanged("RecurringId");
           this.OnRecurringIdChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Type", DbType="VarChar(MAX)", CanBeNull=false)]
+    public global::HeuristicLab.Services.Hive.DataAccess.DowntimeType DowntimeType
+    {
+      get
+      {
+        return this._Type;
+      }
+      set
+      {
+        if ((this._Type != value))
+        {
+          this.OnDowntimeTypeChanging(value);
+          this.SendPropertyChanging();
+          this._Type = value;
+          this.SendPropertyChanged("DowntimeType");
+          this.OnDowntimeTypeChanged();
         }
       }

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

@@ -75 +75 @@
   [Recurring] Bit NOT NULL,
   [RecurringId] UniqueIdentifier NOT NULL,
+  [DowntimeType] VarChar(MAX) NOT NULL,
   CONSTRAINT [PK_dbo.Downtime] PRIMARY KEY ([DowntimeId])
   )