Changeset 7384 for branches/OKB (trunk integration)

Timestamp:

01/20/12 14:18:04 (13 years ago)

Author:

ascheibe

Message:

#1174 renamed UserId to UserGroupId

Location:

branches/OKB (trunk integration)

Files:

• HeuristicLab.Services.OKB.DataAccess/3.3/OKB.dbml (modified) (2 diffs)
• HeuristicLab.Services.OKB.DataAccess/3.3/OKB.designer.cs (modified) (7 diffs)
• HeuristicLab.Services.OKB.DataAccess/3.3/SQL Scripts/Initialize OKB.sql (modified) (previous)
• HeuristicLab.Services.OKB/3.3/Administration/AdministrationService.cs (modified) (4 diffs)

branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataAccess/3.3/OKB.dbml

@@ -20 +20 @@
     <Type Name="AlgorithmUser">
       <Column Name="AlgorithmId" Type="System.Int64" DbType="BigInt NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
-      <Column Name="UserId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
+      <Column Name="UserGroupId" Storage="_UserId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
       <Association Name="Algorithm_AlgorithmUser" Member="Algorithm" ThisKey="AlgorithmId" OtherKey="Id" Type="Algorithm" IsForeignKey="true" DeleteRule="CASCADE" DeleteOnNull="true" />
     </Type>
@@ -27 +27 @@
     <Type Name="ProblemUser">
       <Column Name="ProblemId" Type="System.Int64" DbType="BigInt NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
-      <Column Name="UserId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
+      <Column Name="UserGroupId" Storage="_UserId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
       <Association Name="Problem_ProblemUser" Member="Problem" ThisKey="ProblemId" OtherKey="Id" Type="Problem" IsForeignKey="true" DeleteRule="CASCADE" DeleteOnNull="true" />
     </Type>

branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataAccess/3.3/OKB.designer.cs

@@ -3 +3 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.1
+//     Runtime Version:4.0.30319.239
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -512 +512 @@
     partial void OnAlgorithmIdChanging(long value);
     partial void OnAlgorithmIdChanged();
-    partial void OnUserIdChanging(System.Guid value);
-    partial void OnUserIdChanged();
+    partial void OnUserGroupIdChanging(System.Guid value);
+    partial void OnUserGroupIdChanged();
     #endregion
     
@@ -547 +547 @@
     
     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserId", DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true)]
-    public System.Guid UserId
+    public System.Guid UserGroupId
     {
       get
@@ -557 +557 @@
         if ((this._UserId != value))
         {
-          this.OnUserIdChanging(value);
+          this.OnUserGroupIdChanging(value);
           this.SendPropertyChanging();
           this._UserId = value;
-          this.SendPropertyChanged("UserId");
-          this.OnUserIdChanged();
+          this.SendPropertyChanged("UserGroupId");
+          this.OnUserGroupIdChanged();
         }
       }
@@ -639 +639 @@
     partial void OnProblemIdChanging(long value);
     partial void OnProblemIdChanged();
-    partial void OnUserIdChanging(System.Guid value);
-    partial void OnUserIdChanged();
+    partial void OnUserGroupIdChanging(System.Guid value);
+    partial void OnUserGroupIdChanged();
     #endregion
     
@@ -674 +674 @@
     
     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserId", DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true)]
-    public System.Guid UserId
+    public System.Guid UserGroupId
     {
       get
@@ -684 +684 @@
         if ((this._UserId != value))
         {
-          this.OnUserIdChanging(value);
+          this.OnUserGroupIdChanging(value);
           this.SendPropertyChanging();
           this._UserId = value;
-          this.SendPropertyChanged("UserId");
-          this.OnUserIdChanged();
+          this.SendPropertyChanged("UserGroupId");
+          this.OnUserGroupIdChanged();
         }
       }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Administration/AdministrationService.cs

@@ -172 +172 @@
 
       using (OKBDataContext okb = new OKBDataContext()) {
-        return okb.AlgorithmUsers.Where(x => x.AlgorithmId == algorithmId).Select(x => x.UserId).ToArray();
+        return okb.AlgorithmUsers.Where(x => x.AlgorithmId == algorithmId).Select(x => x.UserGroupId).ToArray();
       }
     }
@@ -180 +180 @@
       using (OKBDataContext okb = new OKBDataContext()) {
         okb.AlgorithmUsers.DeleteAllOnSubmit(okb.AlgorithmUsers.Where(x => x.AlgorithmId == algorithmId));
-        okb.AlgorithmUsers.InsertAllOnSubmit(users.Select(x => new DataAccess.AlgorithmUser { AlgorithmId = algorithmId, UserId = x }));
+        okb.AlgorithmUsers.InsertAllOnSubmit(users.Select(x => new DataAccess.AlgorithmUser { AlgorithmId = algorithmId, UserGroupId = x }));
         okb.SubmitChanges();
       }
@@ -297 +297 @@
 
       using (OKBDataContext okb = new OKBDataContext()) {
-        return okb.ProblemUsers.Where(x => x.ProblemId == problemId).Select(x => x.UserId).ToArray();
+        return okb.ProblemUsers.Where(x => x.ProblemId == problemId).Select(x => x.UserGroupId).ToArray();
       }
     }
@@ -305 +305 @@
       using (OKBDataContext okb = new OKBDataContext()) {
         okb.ProblemUsers.DeleteAllOnSubmit(okb.ProblemUsers.Where(x => x.ProblemId == problemId));
-        okb.ProblemUsers.InsertAllOnSubmit(users.Select(x => new DataAccess.ProblemUser { ProblemId = problemId, UserId = x }));
+        okb.ProblemUsers.InsertAllOnSubmit(users.Select(x => new DataAccess.ProblemUser { ProblemId = problemId, UserGroupId = x }));
         okb.SubmitChanges();
       }