Changeset 8957 for trunk/sources/HeuristicLab.Services.Hive.DataAccess

Timestamp:

11/28/12 09:57:35 (12 years ago)

Author:

ascheibe

Message:

#1986 merged SlaveShutdown branch back into trunk

Location:

trunk/sources

Files:

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

trunk/sources/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)

trunk/sources/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>

trunk/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.designer.cs

@@ -3 +3 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.269
+//     Runtime Version:4.0.30319.17929
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -2153 +2153 @@
     private System.Guid _RecurringId;
     
+    private global::HeuristicLab.Services.Hive.DataAccess.DowntimeType _Type;
+    
     private EntityRef<Resource> _Resource;
     
@@ -2173 +2175 @@
     partial void OnRecurringIdChanging(System.Guid value);
     partial void OnRecurringIdChanged();
+    partial void OnDowntimeTypeChanging(global::HeuristicLab.Services.Hive.DataAccess.DowntimeType value);
+    partial void OnDowntimeTypeChanged();
     #endregion
     
@@ -2321 +2325 @@
           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();
         }
       }

trunk/sources/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])
   )