Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/30/11 15:44:34 (13 years ago)
Author:
ascheibe
Message:

#1648 worked on webservice and added more unit tests

Location:
branches/ClientUserManagement/HeuristicLab.Services.Access.DataAccess/3.3
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/ClientUserManagement/HeuristicLab.Services.Access.DataAccess/3.3/ClientManagement.dbml

    r6852 r6858  
    22  <Connection Mode="AppSettings" ConnectionString="Data Source=.;Initial Catalog=HeuristicLab.ClientManagement;Integrated Security=True" SettingsObjectName="HeuristicLab.Services.Access.DataAccess.Properties.Settings" SettingsPropertyName="HeuristicLab_ClientManagementConnectionString" Provider="System.Data.SqlClient" />
    33  <Table Name="dbo.Resource" Member="Resources">
    4     <Type Name="Resource" InheritanceCode="Resource">
     4    <Type Name="Resource" InheritanceCode="Resource" IsInheritanceDefault="true">
    55      <Column Name="Id" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />
    66      <Column Name="Name" Type="System.String" DbType="NVarChar(MAX) NOT NULL" CanBeNull="false" />
    … …  
    1010      <Association Name="Resource_ResourceResourceGroup1" Member="ResourceResourceGroupsParents" Storage="_ResourceResourceGroups1" ThisKey="Id" OtherKey="ResourceId" Type="ResourceResourceGroup" />
    1111      <Association Name="Resource_ClientLog" Member="ClientLogs" ThisKey="Id" OtherKey="ResourceId" Type="ClientLog" />
    12       <Association Name="Resource_ClientError" Member="ClientErrors" ThisKey="Id" OtherKey="ClientId" Type="ClientError" />
    1312      <Association Name="Resource_ResourcePlugin" Member="ResourcePlugins" ThisKey="Id" OtherKey="ResourceId" Type="ResourcePlugin" />
    14       <Type Name="Client" InheritanceCode="Client" IsInheritanceDefault="true">
     13      <Type Name="Client" InheritanceCode="Client">
    1514        <Column Name="HeuristicLabVersion" Type="System.String" DbType="NVarChar(MAX)" CanBeNull="false" />
    1615        <Column Name="MemorySize" Type="System.Int32" DbType="Int" CanBeNull="true" />
    … …  
    5554      <Column Name="ClientId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
    5655      <Column Name="UserId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
    57       <Association Name="Resource_ClientError" Member="Resource" ThisKey="ClientId" OtherKey="Id" Type="Resource" IsForeignKey="true" />
    58       <Association Name="UserGroupBase_ClientError" Member="UserGroupBase" ThisKey="UserId" OtherKey="Id" Type="UserGroupBase" IsForeignKey="true" />
    5956    </Type>
    6057  </Table>
    6158  <Table Name="dbo.UserGroup" Member="UserGroupBases">
    62     <Type Name="UserGroupBase" InheritanceCode="UserGroupBase">
    63       <Column Name="Id" AutoSync="Never" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />
     59    <Type Name="UserGroupBase" InheritanceCode="UserGroupBase" IsInheritanceDefault="true">
     60      <Column Name="Id" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
    6461      <Column Name="Type" Type="System.String" DbType="NVarChar(10) NOT NULL" CanBeNull="false" IsDiscriminator="true" />
    65       <Association Name="UserGroupBase_ClientError" Member="ClientErrors" ThisKey="Id" OtherKey="UserId" Type="ClientError" />
    6662      <Association Name="UserGroupBase_UserGroupUserGroup" Member="UserGroupUserGroupsChilds" Storage="_UserGroupUserGroups" ThisKey="Id" OtherKey="UserGroupId" Type="UserGroupUserGroup" />
    6763      <Association Name="UserGroupBase_UserGroupUserGroup1" Member="UserGroupUserGroupsParents" Storage="_UserGroupUserGroups1" ThisKey="Id" OtherKey="UserGroupUserGroupId" Type="UserGroupUserGroup" />

  • branches/ClientUserManagement/HeuristicLab.Services.Access.DataAccess/3.3/ClientManagement.dbml.layout

    r6852 r6858  
    7272      </nestedChildShapes>
    7373    </classShape>
    74     <associationConnector edgePoints="[(6.625 : 1.84699625651042); (10.375 : 1.84699625651042)]" fixedFrom="NotFixed" fixedTo="NotFixed">
    75       <AssociationMoniker Name="/ClientManagementDataContext/Resource/Resource_ClientError" />
    76       <nodes>
    77         <classShapeMoniker Id="20c6e07e-aa12-43dc-87d6-dae5bf173da4" />
    78         <classShapeMoniker Id="5e8ae5e1-4026-47e5-91fb-9607de024aad" />
    79       </nodes>
    80     </associationConnector>
    8174    <classShape Id="452ce94a-9bd2-4968-9a5f-a0ab1dba6b2e" absoluteBounds="7.875, 3.875, 2, 1.1939925130208327">
    8275      <DataClassMoniker Name="/ClientManagementDataContext/UserGroupBase" />
    … …  
    165158      </nodes>
    166159    </inheritanceConnector>
    167     <associationConnector edgePoints="[(9.875 : 3.90625); (10.53125 : 3.90625); (10.53125 : 2.65549967447917)]" fixedFrom="NotFixed" fixedTo="NotFixed">
    168       <AssociationMoniker Name="/ClientManagementDataContext/UserGroupBase/UserGroupBase_ClientError" />
    169       <nodes>
    170         <classShapeMoniker Id="452ce94a-9bd2-4968-9a5f-a0ab1dba6b2e" />
    171         <classShapeMoniker Id="5e8ae5e1-4026-47e5-91fb-9607de024aad" />
    172       </nodes>
    173     </associationConnector>
    174160    <associationConnector edgePoints="[(9.875 : 4.53449625651042); (10.75 : 4.53449625651042)]" fixedFrom="NotFixed" fixedTo="NotFixed">
    175161      <AssociationMoniker Name="/ClientManagementDataContext/UserGroupBase/UserGroupBase_UserGroupUserGroup" />

  • branches/ClientUserManagement/HeuristicLab.Services.Access.DataAccess/3.3/ClientManagement.designer.cs

    r6852 r6858  
    197197 
    198198  [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Resource")]
    199   [global::System.Data.Linq.Mapping.InheritanceMappingAttribute(Code="Resource", Type=typeof(Resource))]
    200   [global::System.Data.Linq.Mapping.InheritanceMappingAttribute(Code="Client", Type=typeof(Client), IsDefault=true)]
     199  [global::System.Data.Linq.Mapping.InheritanceMappingAttribute(Code="Resource", Type=typeof(Resource), IsDefault=true)]
     200  [global::System.Data.Linq.Mapping.InheritanceMappingAttribute(Code="Client", Type=typeof(Client))]
    201201  [global::System.Data.Linq.Mapping.InheritanceMappingAttribute(Code="ClientGroup", Type=typeof(ClientGroup))]
    202202  public partial class Resource : INotifyPropertyChanging, INotifyPropertyChanged
    … …  
    218218   
    219219    private EntitySet<ClientLog> _ClientLogs;
    220    
    221     private EntitySet<ClientError> _ClientErrors;
    222220   
    223221    private EntitySet<ResourcePlugin> _ResourcePlugins;
    … …  
    242240      this._ResourceResourceGroups1 = new EntitySet<ResourceResourceGroup>(new Action<ResourceResourceGroup>(this.attach_ResourceResourceGroups1), new Action<ResourceResourceGroup>(this.detach_ResourceResourceGroups1));
    243241      this._ClientLogs = new EntitySet<ClientLog>(new Action<ClientLog>(this.attach_ClientLogs), new Action<ClientLog>(this.detach_ClientLogs));
    244       this._ClientErrors = new EntitySet<ClientError>(new Action<ClientError>(this.attach_ClientErrors), new Action<ClientError>(this.detach_ClientErrors));
    245242      this._ResourcePlugins = new EntitySet<ResourcePlugin>(new Action<ResourcePlugin>(this.attach_ResourcePlugins), new Action<ResourcePlugin>(this.detach_ResourcePlugins));
    246243      OnCreated();
    … …  
    366363    }
    367364   
    368     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_ClientError", Storage="_ClientErrors", ThisKey="Id", OtherKey="ClientId")]
    369     public EntitySet<ClientError> ClientErrors
    370     {
    371       get
    372       {
    373         return this._ClientErrors;
    374       }
    375       set
    376       {
    377         this._ClientErrors.Assign(value);
    378       }
    379     }
    380    
    381365    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_ResourcePlugin", Storage="_ResourcePlugins", ThisKey="Id", OtherKey="ResourceId")]
    382366    public EntitySet<ResourcePlugin> ResourcePlugins
    … …  
    443427   
    444428    private void detach_ClientLogs(ClientLog entity)
    445     {
    446       this.SendPropertyChanging();
    447       entity.Resource = null;
    448     }
    449    
    450     private void attach_ClientErrors(ClientError entity)
    451     {
    452       this.SendPropertyChanging();
    453       entity.Resource = this;
    454     }
    455    
    456     private void detach_ClientErrors(ClientError entity)
    457429    {
    458430      this.SendPropertyChanging();
    … …  
    11581130    private System.Nullable<System.Guid> _UserId;
    11591131   
    1160     private EntityRef<Resource> _Resource;
    1161    
    1162     private EntityRef<UserGroupBase> _UserGroupBase;
    1163    
    11641132    #region Extensibility Method Definitions
    11651133    partial void OnLoaded();
    … …  
    11841152    public ClientError()
    11851153    {
    1186       this._Resource = default(EntityRef<Resource>);
    1187       this._UserGroupBase = default(EntityRef<UserGroupBase>);
    11881154      OnCreated();
    11891155    }
    … …  
    13001266        if ((this._ClientId != value))
    13011267        {
    1302           if (this._Resource.HasLoadedOrAssignedValue)
    1303           {
    1304             throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
    1305           }
    13061268          this.OnClientIdChanging(value);
    13071269          this.SendPropertyChanging();
    … …  
    13241286        if ((this._UserId != value))
    13251287        {
    1326           if (this._UserGroupBase.HasLoadedOrAssignedValue)
    1327           {
    1328             throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
    1329           }
    13301288          this.OnUserIdChanging(value);
    13311289          this.SendPropertyChanging();
    … …  
    13371295    }
    13381296   
    1339     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_ClientError", Storage="_Resource", ThisKey="ClientId", OtherKey="Id", IsForeignKey=true)]
    1340     public Resource Resource
    1341     {
    1342       get
    1343       {
    1344         return this._Resource.Entity;
    1345       }
    1346       set
    1347       {
    1348         Resource previousValue = this._Resource.Entity;
    1349         if (((previousValue != value)
    1350               || (this._Resource.HasLoadedOrAssignedValue == false)))
    1351         {
    1352           this.SendPropertyChanging();
    1353           if ((previousValue != null))
    1354           {
    1355             this._Resource.Entity = null;
    1356             previousValue.ClientErrors.Remove(this);
    1357           }
    1358           this._Resource.Entity = value;
    1359           if ((value != null))
    1360           {
    1361             value.ClientErrors.Add(this);
    1362             this._ClientId = value.Id;
    1363           }
    1364           else
    1365           {
    1366             this._ClientId = default(Nullable<System.Guid>);
    1367           }
    1368           this.SendPropertyChanged("Resource");
    1369         }
    1370       }
    1371     }
    1372    
    1373     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="UserGroupBase_ClientError", Storage="_UserGroupBase", ThisKey="UserId", OtherKey="Id", IsForeignKey=true)]
    1374     public UserGroupBase UserGroupBase
    1375     {
    1376       get
    1377       {
    1378         return this._UserGroupBase.Entity;
    1379       }
    1380       set
    1381       {
    1382         UserGroupBase previousValue = this._UserGroupBase.Entity;
    1383         if (((previousValue != value)
    1384               || (this._UserGroupBase.HasLoadedOrAssignedValue == false)))
    1385         {
    1386           this.SendPropertyChanging();
    1387           if ((previousValue != null))
    1388           {
    1389             this._UserGroupBase.Entity = null;
    1390             previousValue.ClientErrors.Remove(this);
    1391           }
    1392           this._UserGroupBase.Entity = value;
    1393           if ((value != null))
    1394           {
    1395             value.ClientErrors.Add(this);
    1396             this._UserId = value.Id;
    1397           }
    1398           else
    1399           {
    1400             this._UserId = default(Nullable<System.Guid>);
    1401           }
    1402           this.SendPropertyChanged("UserGroupBase");
    1403         }
    1404       }
    1405     }
    1406    
    14071297    public event PropertyChangingEventHandler PropertyChanging;
    14081298   
    … …  
    14271317 
    14281318  [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.UserGroup")]
    1429   [global::System.Data.Linq.Mapping.InheritanceMappingAttribute(Code="UserGroupBase", Type=typeof(UserGroupBase))]
     1319  [global::System.Data.Linq.Mapping.InheritanceMappingAttribute(Code="UserGroupBase", Type=typeof(UserGroupBase), IsDefault=true)]
    14301320  [global::System.Data.Linq.Mapping.InheritanceMappingAttribute(Code="User", Type=typeof(User))]
    14311321  [global::System.Data.Linq.Mapping.InheritanceMappingAttribute(Code="UserGroup", Type=typeof(UserGroup))]
    … …  
    14381328   
    14391329    private string _Type;
    1440    
    1441     private EntitySet<ClientError> _ClientErrors;
    14421330   
    14431331    private EntitySet<UserGroupUserGroup> _UserGroupUserGroups;
    … …  
    14571345    public UserGroupBase()
    14581346    {
    1459       this._ClientErrors = new EntitySet<ClientError>(new Action<ClientError>(this.attach_ClientErrors), new Action<ClientError>(this.detach_ClientErrors));
    14601347      this._UserGroupUserGroups = new EntitySet<UserGroupUserGroup>(new Action<UserGroupUserGroup>(this.attach_UserGroupUserGroups), new Action<UserGroupUserGroup>(this.detach_UserGroupUserGroups));
    14611348      this._UserGroupUserGroups1 = new EntitySet<UserGroupUserGroup>(new Action<UserGroupUserGroup>(this.attach_UserGroupUserGroups1), new Action<UserGroupUserGroup>(this.detach_UserGroupUserGroups1));
    … …  
    14631350    }
    14641351   
    1465     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true, IsDbGenerated=true)]
     1352    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true)]
    14661353    public System.Guid Id
    14671354    {
    … …  
    15031390    }
    15041391   
    1505     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="UserGroupBase_ClientError", Storage="_ClientErrors", ThisKey="Id", OtherKey="UserId")]
    1506     public EntitySet<ClientError> ClientErrors
    1507     {
    1508       get
    1509       {
    1510         return this._ClientErrors;
    1511       }
    1512       set
    1513       {
    1514         this._ClientErrors.Assign(value);
    1515       }
    1516     }
    1517    
    15181392    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="UserGroupBase_UserGroupUserGroup", Storage="_UserGroupUserGroups", ThisKey="Id", OtherKey="UserGroupId")]
    15191393    public EntitySet<UserGroupUserGroup> UserGroupUserGroupsChilds
    … …  
    15601434        this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
    15611435      }
    1562     }
    1563    
    1564     private void attach_ClientErrors(ClientError entity)
    1565     {
    1566       this.SendPropertyChanging();
    1567       entity.UserGroupBase = this;
    1568     }
    1569    
    1570     private void detach_ClientErrors(ClientError entity)
    1571     {
    1572       this.SendPropertyChanging();
    1573       entity.UserGroupBase = null;
    15741436    }
    15751437   
Note: See TracChangeset for help on using the changeset viewer.