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

Fixes:

Browse Source 
- Fields not matching
- FieldType being lookedUp wrong
- dictionary-access-violation
- guid saved as string not casting
- InsertQuery built wrong
This commit is contained in:
Railz 2019-05-08 23:22:20 +02:00
parent ba0646f27c
commit ad3c1da0cd
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
{
this.parentField = fi;
this.classAttribute = classAttribute;
this.foreignObjectType = fi.GetType();
this.foreignObjectType = fi.FieldType;
// Init foreign-object class
DbObject foreignClassAttribute = ClassAction.Init(this.foreignObjectType);
@ -45,7 +45,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
if(this._foreignKeyName != null) // If i have a name
{
// check if name matches
if (foreignKey.parentField.Name.ToLower() == this._foreignKeyName)
if (foreignKey.parentField.Name.ToLower() == this._foreignKeyName.ToLower())
{
if(foreignKey.parentField.GetType() == primaryKeyType)
{

5
Database-Attribute_System/ClassAction.cs
View File

@ -60,7 +60,10 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
// If its a match, set the value
if (baseAttribute._attributeName.ToLower() == data_keySet.Key.ToLower())
{
baseAttribute.parentField.SetValue(classObject, data_keySet.Value);
object value = data_keySet.Value;
if (baseAttribute.parentField.FieldType == typeof(Guid)) value = new Guid((string)value); // If its a guid, i need to convert
baseAttribute.parentField.SetValue(classObject, value);
break;
}
}

8
Database-Attribute_System/QueryBuilder.cs
View File

@ -181,14 +181,14 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
if (attributes.Count != data.Count) throw new InvalidOperationException("Cannot generate SQL-Query. Attribute-count and data-count not equal.");
string attributesSeperatedByComma = "";
object[] attributeData = new object[attributes.Count*2];
object[] attributeData = new object[attributes.Count*2 -1];
int c = 0;
for(int i=0; i<attributes.Count*2; i+=2)
for(int i=0; i< attributes.Count; i++)
{
attributesSeperatedByComma += attributes[i];
attributeData[c] = data[i+1];
attributeData[c] = data[i];
if(c+1 != attributes.Count*2)
if(c+1 != attributeData.Length)
{
attributesSeperatedByComma += ", ";
attributeData[c+1] = ",";

5
Database-Attribute_System/internal/Function.cs
View File

@ -79,6 +79,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
{
// Read dbObject-attribute
DbObject dbObject = ClassAction.Init(classType);
Dictionary<string, object> convertedAttributeNameAndValues = new Dictionary<string, object>();
foreach (KeyValuePair<string, object> attributeNameAndValue in attributeNameAndValues)
{
@ -87,9 +88,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
{
if (attributeNameAndValue.Key.ToLower() == baseAttribute.parentField.Name.ToLower())
{
attributeNameAndValues.Remove(attributeNameAndValue.Key);
attributeNameAndValues.Add(baseAttribute._attributeName, attributeNameAndValue.Value);
convertedAttributeNameAndValues.Add(baseAttribute._attributeName, attributeNameAndValue.Value);
nameFound = true;
break;