Changeset 4732 for branches/ClientManagement/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication.DataAccess

Timestamp:

11/06/10 14:28:39 (14 years ago)

Author:

jhaider

Message:

#1197
Updated project

Location:

branches/ClientManagement/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication.DataAccess

Files:

• ClientManagment.dbml (modified) (2 diffs)
• ClientManagment.designer.cs (modified) (14 diffs)

branches/ClientManagement/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication.DataAccess/ClientManagment.dbml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?><Database Class="ClientManagmentDataContext" xmlns="http://schemas.microsoft.com/linqtosql/dbml/2007">
   <Table Name="" Member="Resources">
-    <Type Name="Resource" InheritanceCode="Resource" IsInheritanceDefault="true">
+    <Type Name="Resource" InheritanceCode="Resource">
       <Column Name="ResourceID" Member="Id" Storage="_ResourceID" AutoSync="OnInsert" Type="System.Guid" IsPrimaryKey="true" CanBeNull="false" />
       <Column Name="Name" Type="System.String" CanBeNull="false" />
       <Column Name="Description" Type="System.String" CanBeNull="true" />
-      <Column Name="ResourceType" Type="System.Guid" CanBeNull="false" IsDiscriminator="true" />
+      <Column Name="ResourceType" Type="System.String" CanBeNull="false" IsDiscriminator="true" />
       <Association Name="Resource_ResourceResourceGroup" Member="Clients" Storage="_ResourceResourceGroups" ThisKey="Id" OtherKey="ResourceId" Type="ResourceResourceGroup" />
       <Association Name="Resource_ResourceResourceGroup1" Member="ResourceGroups" Storage="_ResourceResourceGroups1" ThisKey="Id" OtherKey="ResourceGroupId" Type="ResourceResourceGroup" />
@@ -16 +16 @@
         <Column Name="OperatingSystem" Type="System.String" CanBeNull="true" />
       </Type>
-      <Type Name="ResourceGroup" InheritanceCode="ResourceGroup" />
+      <Type Name="ResourceGroup" InheritanceCode="ResourceGroup" IsInheritanceDefault="true" />
     </Type>
   </Table>

branches/ClientManagement/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication.DataAccess/ClientManagment.designer.cs

@@ -37 +37 @@
     partial void DeleteResourceResourceGroup(ResourceResourceGroup instance);
     #endregion
-
-
-    public ClientManagmentDataContext() :
-      base(global::HeuristicLab.Services.Authentication.DataAccess.Properties.Settings.Default.ClientManagementConnectionString, mappingSource) {
-      OnCreated();
-    }
-
+    
     public ClientManagmentDataContext(string connection) : 
         base(connection, mappingSource)
@@ -86 +80 @@
   
   [global::System.Data.Linq.Mapping.TableAttribute(Name="")]
-  [global::System.Data.Linq.Mapping.InheritanceMappingAttribute(Code="Resource", Type=typeof(Resource), IsDefault=true)]
+  [global::System.Data.Linq.Mapping.InheritanceMappingAttribute(Code="Resource", Type=typeof(Resource))]
   [global::System.Data.Linq.Mapping.InheritanceMappingAttribute(Code="Client", Type=typeof(Client))]
-  [global::System.Data.Linq.Mapping.InheritanceMappingAttribute(Code="ResourceGroup", Type=typeof(ResourceGroup))]
+  [global::System.Data.Linq.Mapping.InheritanceMappingAttribute(Code="ResourceGroup", Type=typeof(ResourceGroup), IsDefault=true)]
   public partial class Resource : INotifyPropertyChanging, INotifyPropertyChanged
   {
@@ -110 +104 @@
     partial void OnValidate(System.Data.Linq.ChangeAction action);
     partial void OnCreated();
-    partial void OnResourceIDChanging(System.Guid value);
-    partial void OnResourceIDChanged();
+    partial void OnIdChanging(System.Guid value);
+    partial void OnIdChanged();
     partial void OnNameChanging(string value);
     partial void OnNameChanged();
@@ -127 +121 @@
     }
     
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResourceID", AutoSync=AutoSync.OnInsert, IsPrimaryKey=true)]
-    public System.Guid ResourceID
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Name="ResourceID", Storage="_ResourceID", AutoSync=AutoSync.OnInsert, IsPrimaryKey=true)]
+    public System.Guid Id
     {
       get
@@ -138 +132 @@
         if ((this._ResourceID != value))
         {
-          this.OnResourceIDChanging(value);
+          this.OnIdChanging(value);
           this.SendPropertyChanging();
           this._ResourceID = value;
-          this.SendPropertyChanged("ResourceID");
-          this.OnResourceIDChanged();
+          this.SendPropertyChanged("Id");
+          this.OnIdChanged();
         }
       }
@@ -207 +201 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_ResourceResourceGroup", Storage="_ResourceResourceGroups", ThisKey="ResourceID", OtherKey="ResourceID")]
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_ResourceResourceGroup", Storage="_ResourceResourceGroups", ThisKey="Id", OtherKey="ResourceId")]
     public EntitySet<ResourceResourceGroup> Clients
     {
@@ -220 +214 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_ResourceResourceGroup1", Storage="_ResourceResourceGroups1", ThisKey="ResourceID", OtherKey="ResourceGroupID")]
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_ResourceResourceGroup1", Storage="_ResourceResourceGroups1", ThisKey="Id", OtherKey="ResourceGroupId")]
     public EntitySet<ResourceResourceGroup> ResourceGroups
     {
@@ -470 +464 @@
     partial void OnValidate(System.Data.Linq.ChangeAction action);
     partial void OnCreated();
-    partial void OnResourceIDChanging(System.Guid value);
-    partial void OnResourceIDChanged();
-    partial void OnResourceGroupIDChanging(System.Guid value);
-    partial void OnResourceGroupIDChanged();
+    partial void OnResourceIdChanging(System.Guid value);
+    partial void OnResourceIdChanged();
+    partial void OnResourceGroupIdChanging(System.Guid value);
+    partial void OnResourceGroupIdChanged();
     #endregion
     
@@ -483 +477 @@
     }
     
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResourceID", IsPrimaryKey=true)]
-    public System.Guid ResourceID
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Name="ResourceID", Storage="_ResourceID", IsPrimaryKey=true)]
+    public System.Guid ResourceId
     {
       get
@@ -494 +488 @@
         if ((this._ResourceID != value))
         {
-          if (this._Resource.HasLoadedOrAssignedValue)
-          {
-            throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
-          }
-          this.OnResourceIDChanging(value);
+          this.OnResourceIdChanging(value);
           this.SendPropertyChanging();
           this._ResourceID = value;
-          this.SendPropertyChanged("ResourceID");
-          this.OnResourceIDChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResourceGroupID", IsPrimaryKey=true)]
-    public System.Guid ResourceGroupID
+          this.SendPropertyChanged("ResourceId");
+          this.OnResourceIdChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Name="ResourceGroupID", Storage="_ResourceGroupID", IsPrimaryKey=true)]
+    public System.Guid ResourceGroupId
     {
       get
@@ -518 +508 @@
         if ((this._ResourceGroupID != value))
         {
-          if (this._Resource1.HasLoadedOrAssignedValue)
-          {
-            throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
-          }
-          this.OnResourceGroupIDChanging(value);
+          this.OnResourceGroupIdChanging(value);
           this.SendPropertyChanging();
           this._ResourceGroupID = value;
-          this.SendPropertyChanged("ResourceGroupID");
-          this.OnResourceGroupIDChanged();
-        }
-      }
-    }
-    
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_ResourceResourceGroup", Storage="_Resource", ThisKey="ResourceID", OtherKey="ResourceID", IsForeignKey=true)]
+          this.SendPropertyChanged("ResourceGroupId");
+          this.OnResourceGroupIdChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_ResourceResourceGroup", Storage="_Resource", ThisKey="ResourceId", OtherKey="Id", IsForeignKey=true)]
     public Resource Client
     {
@@ -554 +540 @@
           {
             value.Clients.Add(this);
-            this._ResourceID = value.ResourceID;
+            this._ResourceID = value.Id;
           }
           else
@@ -565 +551 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_ResourceResourceGroup1", Storage="_Resource1", ThisKey="ResourceGroupID", OtherKey="ResourceID", IsForeignKey=true)]
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_ResourceResourceGroup1", Storage="_Resource1", ThisKey="ResourceGroupId", OtherKey="Id", IsForeignKey=true)]
     public Resource ResourceGroup
     {
@@ -588 +574 @@
           {
             value.ResourceGroups.Add(this);
-            this._ResourceGroupID = value.ResourceID;
+            this._ResourceGroupID = value.Id;
           }
           else