Ruakij/Database-Attribute_System
1
0
Fork 0
Code Issues Pull Requests Projects Releases 24 Wiki Activity

Fixed Init stackOverFlowException for recursive objects

Browse Source
This commit is contained in:
Railz 2019-09-30 12:49:21 +02:00
parent d86e231bda
commit ef73a51ab5
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Database-Attribute_System/Attributes/DbForeignObject.cs
View File

@ -26,14 +26,15 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
this._foreignKeyName = foreignKeyName; this._foreignKeyName = foreignKeyName;
} }
public void Init(FieldInfo fi, DbObject classAttribute) public void Init(FieldInfo fi, DbObject classAttribute, DbObject foreignClassAttribute = null)
{ {
this.parentField = fi; this.parentField = fi;
this.classAttribute = classAttribute; this.classAttribute = classAttribute;
this.foreignObjectType = fi.FieldType; this.foreignObjectType = fi.FieldType;
// Init foreign-object class // Init foreign-object class
DbObject foreignClassAttribute = ClassAction.Init(this.foreignObjectType); if(foreignClassAttribute == null)
foreignClassAttribute = ClassAction.Init(this.foreignObjectType);
// Check if something is weird // Check if something is weird
if (foreignClassAttribute.primaryKeyAttributes.Count < 1) throw new InvalidOperationException($"'{foreignClassAttribute.parentClassType.Name}' does not have a primaryKey."); if (foreignClassAttribute.primaryKeyAttributes.Count < 1) throw new InvalidOperationException($"'{foreignClassAttribute.parentClassType.Name}' does not have a primaryKey.");

5
Database-Attribute_System/Attributes/DbObject.cs
View File

@ -69,7 +69,10 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
} }
else if (fi.GetCustomAttribute(typeof(DbForeignObject), true) is DbForeignObject fobj) // ForeignObjects else if (fi.GetCustomAttribute(typeof(DbForeignObject), true) is DbForeignObject fobj) // ForeignObjects
{ {
fobj.Init(fi, this); if(fi.FieldType == this.parentClassType) // Check if we are referencing ourselfes
fobj.Init(fi, this, this);
else
fobj.Init(fi, this);
this.foreignObjectAttributes.Add(fobj); this.foreignObjectAttributes.Add(fobj);
} }