4 changed files with 52 additions and 102 deletions
--- a/Database-Attribute_System/Attributes/DbIntermediateForeignObject.cs
+++ b/Database-Attribute_System/Attributes/DbIntermediateForeignObject.cs
@ -41,12 +41,15 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
            this.classAttribute = classAttribute;
            this.foreignObjectType = fi.FieldType;

+            // Init foreign-object class
+            DbObject foreignClassAttribute = ClassAction.Init(this.foreignObjectType);
+
            if (classAttribute.primaryKeyAttributes.Count < 1) throw new InvalidOperationException($"'{classAttribute.parentClassType.Name}' does not have a primaryKey.");
            if (classAttribute.primaryKeyAttributes.Count > 1) throw new InvalidOperationException($"IntermediateObject does not support multiple primaryKeys.");
            // Get primaryKey name if none is set
            if (_keyName == null) _keyName = classAttribute.primaryKeyAttributes[0]._attributeName;

-            if (!(fi.FieldType.IsGenericType && (fi.FieldType.GetGenericTypeDefinition() == typeof(List<>))))  // 1:m
+            if (!(fi.FieldType is IList && fi.FieldType.IsGenericType))  // 1:m
                throw new InvalidOperationException($"IntermediateObject has to be typeof(List<T>). Maybe you meant to use DbForeignObject or DbReverseForeignObject for 1:m or 1:1 relations.");

            // Check the generic list and get inner-type
@ -63,14 +66,13 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
            }
            if (foreignObjectType == null) throw new InvalidOperationException("Could not read innter-type of generic-list!");

-            // Init inner-type class
-            DbObject foreignClassAttribute = ClassAction.Init(foreignObjectType);
-
+            // Now get the primaryKey from my foreignObject
+            DbObject foreignDbObject = ClassAction.Init(foreignObjectType);
            // Check the primaryKey/s
-            if (foreignClassAttribute.primaryKeyAttributes.Count < 1) throw new InvalidOperationException($"'{foreignClassAttribute.parentClassType.Name}' does not have a primaryKey.");
-            if (foreignClassAttribute.primaryKeyAttributes.Count > 1) throw new InvalidOperationException($"IntermediateObject does not support multiple primaryKeys. (Found '{foreignClassAttribute.primaryKeyAttributes.Count}' in '{foreignClassAttribute.parentClassType.Name}')");
+            if (foreignDbObject.primaryKeyAttributes.Count < 1) throw new InvalidOperationException($"'{foreignDbObject.parentClassType.Name}' does not have a primaryKey.");
+            if (foreignDbObject.primaryKeyAttributes.Count > 1) throw new InvalidOperationException($"IntermediateObject does not support multiple primaryKeys. (Found '{foreignDbObject.primaryKeyAttributes.Count}' in '{foreignDbObject.parentClassType.Name}')");
            // Save it
-            foreignPrimaryKeyAttribute = foreignClassAttribute.primaryKeyAttributes[0];
+            foreignPrimaryKeyAttribute = foreignDbObject.primaryKeyAttributes[0];

            if (_foreignKeyName == null) _foreignKeyName = foreignPrimaryKeyAttribute._attributeName;
        }
--- a/Database-Attribute_System/Attributes/DbReverseForeignObject.cs
+++ b/Database-Attribute_System/Attributes/DbReverseForeignObject.cs
@ -32,31 +32,14 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
            this.classAttribute = classAttribute;
            this.foreignObjectType = fi.FieldType;

+            // Init foreign-object class
+            DbObject foreignClassAttribute = ClassAction.Init(this.foreignObjectType);
+
            if (classAttribute.primaryKeyAttributes.Count < 1) throw new InvalidOperationException($"'{classAttribute.parentClassType.Name}' does not have a primaryKey.");
            if (classAttribute.primaryKeyAttributes.Count > 1) throw new InvalidOperationException($"ReverseForeignObject does not support multiple primaryKeys.");
            // Get primaryKey name if none is set
            if (_foreignKeyName == null) _foreignKeyName = classAttribute.primaryKeyAttributes[0]._attributeName;

-            // If its a List, get inner type
-            if (fi.FieldType.IsGenericType && (fi.FieldType.GetGenericTypeDefinition() == typeof(List<>)))
-            {
-                // Check the generic list and get inner-type
-                foreach (Type interfaceType in fi.FieldType.GetInterfaces())
-                {
-                    if (interfaceType.IsGenericType &&
-                        interfaceType.GetGenericTypeDefinition()
-                        == typeof(IList<>))
-                    {
-                        foreignObjectType = fi.FieldType.GetGenericArguments()[0];
-                        break;
-                    }
-                }
-                if (foreignObjectType == null) throw new InvalidOperationException("Could not read innter-type of generic-list!");
-            }
-
-            // Init inner-type class
-            DbObject foreignClassAttribute = ClassAction.Init(foreignObjectType);
-
            // Check if my primary-key is set in the foreign-class as foreignKey
            DbPrimaryKey primaryKey = classAttribute.primaryKeyAttributes[0];
            foreach (DbForeignKey foreignKey in foreignClassAttribute.foreignKeyAttributes)
--- a/Database-Attribute_System/ClassAction.cs
+++ b/Database-Attribute_System/ClassAction.cs
@ -27,8 +27,8 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
                // Check if given class is marked as dbObject
                if (!(classType.GetCustomAttribute(typeof(DbObject), true) is DbObject dbObject)) throw new InvalidOperationException($"Cannot init '{classType.Name}'. Missing Attribute 'DbObject'");

-                initiatedClassTypes.Add(classType, dbObject);     // Set it to the list
                dbObject.Init(classType);   // Init dbObject
+                initiatedClassTypes.Add(classType, dbObject);     // Set it to the list

                cachedDbObject = dbObject;
            }
@ -36,6 +36,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
            return cachedDbObject;
        }

+
        /// <summary>
        /// Fills an given dbObject with given data<para/>
        /// Data-attribute-names and class-fieldNames have to match! (non case-sensitive)
@ -43,21 +44,6 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
        /// <typeparam name="T"></typeparam>
        /// <param name="classObject">Given object (marked with Db-attributes)</param>
        /// <param name="data">The data</param>
-        /// <param name="key">Key-name of data</param>
-        public static void FillObject<T>(T classObject, string key, object data)
-        {
-            Dictionary<string, object> dicData = new Dictionary<string, object>();
-            dicData.Add(key, data);
-            FillObject<T>(classObject, dicData);
-        }
-        /// <summary>
-        /// Fills an given dbObject with given data<para/>
-        /// Data-attribute-names and class-fieldNames have to match! (non case-sensitive)
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="classObject">Given object (marked with Db-attributes)</param>
-        /// <param name="data">The data</param>
-        /// <param name="key">Key-name of data</param>
        public static void FillObject<T>(T classObject, Dictionary<string, object> data)
        {
            Type classType = classObject.GetType();
@ -68,8 +54,6 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
            // Iterate through data
            foreach (KeyValuePair<string, object> data_keySet in data)
            {
-                bool dataMatchFound = false;
-
                // Interate through class-fields
                foreach (BaseAttribute baseAttribute in dbObject.baseAttributes)
                {
@ -87,15 +71,16 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
                        object value = data_keySet.Value;
                        if (!(value is DBNull))     // Check if value is empty
                        {
+                            //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;
                        }

-                        dataMatchFound = true;
-                        break;
+
+
                    }
                }
-
-                if (!dataMatchFound) throw new InvalidOperationException($"Attribute '{data_keySet.Key}' has no match in object '{classObject.GetType().Name}'");
            }
        }

@ -104,11 +89,8 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
        /// Gets an dbObject by primaryKey/s
        /// </summary>
        /// <typeparam name="T"></typeparam>
-        /// <param name="classType">The classType (marked with Db-attributes)</param>
-        /// <param name="primaryKeyName">Name of the primaryKey</param>
-        /// <param name="primaryKeyValue">Value of the primaryKey</param>
-        /// <param name="primaryKeyData">KeyData of multiple primaryKeys</param>
-        /// <param name="queryExecutor">Function to handle query-calls</param>
+        /// <param name="classObject">Given object (marked with Db-attributes)</param>
+        /// <param name="queryExecutor">Function to handle query-calls - Has to return Dictionary[attributeName, attributeValue]</param>
        public static T GetByPrimaryKey<T>(Type classType, object primaryKeyValue, Func<string, List<Dictionary<string, object>>> queryExecutor) where T : new()
        {
            // Read dbObject-attribute
@ -119,15 +101,6 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System

            return GetByPrimaryKey<T>(classType, dbObject.primaryKeyAttributes[0]._attributeName, primaryKeyValue, queryExecutor);
        }
-        /// <summary>
-        /// Gets an dbObject by primaryKey/s
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="classType">The classType (marked with Db-attributes)</param>
-        /// <param name="primaryKeyName">Name of the primaryKey</param>
-        /// <param name="primaryKeyValue">Value of the primaryKey</param>
-        /// <param name="primaryKeyData">KeyData of multiple primaryKeys</param>
-        /// <param name="queryExecutor">Function to handle query-calls</param>
        public static T GetByPrimaryKey<T>(Type classType, string primaryKeyName, object primaryKeyValue, Func<string, List<Dictionary<string, object>>> queryExecutor) where T : new()
        {
            Dictionary<string, object> primaryKeyData = new Dictionary<string, object>() { };
@ -135,15 +108,6 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System

            return GetByPrimaryKey<T>(classType, primaryKeyData, queryExecutor);
        }
-        /// <summary>
-        /// Gets an dbObject by primaryKey/s
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="classType">The classType (marked with Db-attributes)</param>
-        /// <param name="primaryKeyName">Name of the primaryKey</param>
-        /// <param name="primaryKeyValue">Value of the primaryKey</param>
-        /// <param name="primaryKeyData">KeyData of multiple primaryKeys</param>
-        /// <param name="queryExecutor">Function to handle query-calls</param>
        public static T GetByPrimaryKey<T>(Type classType, Dictionary<string, object> primaryKeyData, Func<string, List<Dictionary<string, object>>> queryExecutor) where T: new()
        {
            // Read dbObject-attribute
@ -196,7 +160,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
        /// </summary>
        /// <typeparam name="T"></typeparam>
        /// <param name="classObject">Given object (marked with Db-attributes)</param>
-        /// <param name="queryExecutor">Function to handle query-calls</param>
+        /// <param name="queryExecutor">Function to handle query-calls - Has to return Dictionary[attributeName, attributeValue]</param>
        public static List<T> GetList<T>(Type classType, Func<string, List<Dictionary<string, object>>> queryExecutor) where T : new()
        {
            // Read dbObject - attribute
@ -217,21 +181,18 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
        }

        /// <summary>
-        /// Gets a list of dbObjects by attribute/s
+        /// Gets an dbObject by custom where-clause
        /// </summary>
        /// <typeparam name="T"></typeparam>
-        /// <param name="classType">Type of class</param>
-        /// <param name="fields">class-fields for select</param>
-        /// <param name="queryExecutor">Function to handle query-calls</param>
-        /// <returns>List of dbObjects</returns>
-        public static List<T> GetListByAttribute<T>(Type classType, Dictionary<string, object> fields, Func<string, List<Dictionary<string, object>>> queryExecutor) where T : new()
+        /// <param name="classObject">Given object (marked with Db-attributes)</param>
+        /// <param name="whereClause">Custom where-clause params attached to query (SELECT * FROM tableName WHERE whereClause)</param>
+        /// <param name="queryExecutor">Function to handle query-calls - Has to return Dictionary[attributeName, attributeValue]</param>
+        public static List<T> GetListWithWhere<T>(Type classType, Func<string, List<Dictionary<string, object>>> queryExecutor, params object[] whereClause) where T : new()
        {
            // Read dbObject - attribute
            DbObject dbObject = ClassAction.Init(classType);

-            Function.ConvertAttributeToDbAttributes(classType, fields);
-
-            string query = QueryBuilder.SelectByAttribute(dbObject._tableName, fields);   // Generate query
+            string query = QueryBuilder.SelectWithWhere(dbObject._tableName, whereClause);   // Generate query
            List<Dictionary<string, object>> dataSet = queryExecutor(query);    // Execute

            List<T> objs = new List<T>() { };
@ -246,18 +207,18 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
        }

        /// <summary>
-        /// Gets an dbObject by custom where-clause
+        /// Gets an dbObject by full query
        /// </summary>
        /// <typeparam name="T"></typeparam>
        /// <param name="classObject">Given object (marked with Db-attributes)</param>
-        /// <param name="whereClause">Custom where-clause params attached to query (SELECT * FROM tableName WHERE whereClause)</param>
-        /// <param name="queryExecutor">Function to handle query-calls</param>
-        public static List<T> GetListWithWhere<T>(Type classType, Func<string, List<Dictionary<string, object>>> queryExecutor, params object[] whereClause) where T : new()
+        /// <param name="customQuery">Custom sql-query</param>
+        /// <param name="queryExecutor">Function to handle query-calls - Has to return Dictionary[attributeName, attributeValue]</param>
+        public static List<T> GetListWithQuery<T>(Type classType, Func<string, List<Dictionary<string, object>>> queryExecutor, params object[] customQuery) where T : new()
        {
            // Read dbObject - attribute
            DbObject dbObject = ClassAction.Init(classType);

-            string query = QueryBuilder.SelectWithWhere(dbObject._tableName, whereClause);   // Generate query
+            string query = QueryBuilder.BuildQuery(customQuery);
            List<Dictionary<string, object>> dataSet = queryExecutor(query);    // Execute

            List<T> objs = new List<T>() { };
@ -271,19 +232,23 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
            return objs;    // Return list
        }

+
        /// <summary>
-        /// Gets an dbObject by full query
+        /// Gets a list of dbObjects by attribute/s
        /// </summary>
        /// <typeparam name="T"></typeparam>
-        /// <param name="classObject">Given object (marked with Db-attributes)</param>
-        /// <param name="customQuery">Custom sql-query</param>
-        /// <param name="queryExecutor">Function to handle query-calls</param>
-        public static List<T> GetListWithQuery<T>(Type classType, Func<string, List<Dictionary<string, object>>> queryExecutor, params object[] customQuery) where T : new()
+        /// <param name="classType">Type of class</param>
+        /// <param name="fields">class-fields for select</param>
+        /// <param name="queryExecutor">Function to handle query-calls - Has to return Dictionary[attributeName, attributeValue]</param>
+        /// <returns>List of dbObjects</returns>
+        public static List<T> GetListByAttribute<T>(Type classType, Dictionary<string, object> fields, Func<string, List<Dictionary<string, object>>> queryExecutor) where T : new()
        {
            // Read dbObject-attribute
            DbObject dbObject = ClassAction.Init(classType);

-            string query = QueryBuilder.BuildQuery(customQuery);
+            Function.ConvertAttributeToDbAttributes(classType, fields);
+
+            string query = QueryBuilder.SelectByAttribute(dbObject._tableName, fields);   // Generate query
            List<Dictionary<string, object>> dataSet = queryExecutor(query);    // Execute

            List<T> objs = new List<T>() { };
@ -305,7 +270,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
        /// </summary>
        /// <typeparam name="T"></typeparam>
        /// <param name="classObject">Given object (marked with Db-attributes)</param>
-        /// <param name="queryExecutor">Function to handle query-calls</param>
+        /// <param name="queryExecutor">Function to handle query-calls - Has to return Dictionary[attributeName, attributeValue]</param>
        public static void ResolveByPrimaryKey<T>(T classObject, Func<string, List<Dictionary<string, object>>> queryExecutor, bool throwExceptions = true)
        {
            string query = QueryBuilder.SelectByPrimaryKey(classObject);   // Generate query
@ -324,7 +289,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
        /// </summary>
        /// <typeparam name="T"></typeparam>
        /// <param name="classObject">Given object (marked with Db-attributes)</param>
-        /// <param name="queryExecutor">Function to handle query-calls</param>
+        /// <param name="queryExecutor">Function to handle query-calls - Has to return Dictionary[attributeName, attributeValue]</param>
        /// <param name="max_depth">Determents how deep resolving will be executed</param>
        public static void ResolveForeignKeys<T>(T classObject, Func<string, List<Dictionary<string, object>>> queryExecutor, int max_depth = 1) where T: new()
        {
@ -507,7 +472,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
        /// </summary>
        /// <typeparam name="T"></typeparam>
        /// <param name="classObject">Given object (marked with Db-attributes)</param>
-        /// <param name="queryExecutor">Function to handle query-calls</param>
+        /// <param name="queryExecutor">Function to handle query-calls - Has to return Dictionary[attributeName, attributeValue]</param>
        /// <param name="max_depth">Determents how deep resolving will be executed (if the corresponding foreignKey-object is resolved)</param>
        public static void Update<T>(T classObject, Func<string, List<Dictionary<string, object>>> queryExecutor, int max_depth = 1)
        {
@ -534,7 +499,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
        /// </summary>
        /// <typeparam name="T"></typeparam>
        /// <param name="classObject">Given object (marked with Db-attributes)</param>
-        /// <param name="queryExecutor">Function to handle query-calls</param>
+        /// <param name="queryExecutor">Function to handle query-calls - Has to return Dictionary[attributeName, attributeValue]</param>
        /// <param name="max_depth">Determents how deep insertion will be executed (if the corresponding foreignKey-object is resolved)</param>
        public static void Insert<T>(T classObject, Func<string, List<Dictionary<string, object>>> queryExecutor, int max_depth = 1)
        {
@ -562,7 +527,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
        /// </summary>
        /// <typeparam name="T"></typeparam>
        /// <param name="classObject">Given object (marked with Db-attributes)</param>
-        /// <param name="queryExecutor">Function to handle query-calls</param>
+        /// <param name="queryExecutor">Function to handle query-calls - Has to return Dictionary[attributeName, attributeValue]</param>
        /// <param name="max_depth">Determents how deep deletion will be executed (if the corresponding foreignKey-object is resolved)</param>
        public static void Delete<T>(T classObject, Func<string, List<Dictionary<string, object>>> queryExecutor, int max_depth = 1)
        {
--- a/Database-Attribute_System/Database-Attribute_System.csproj
+++ b/Database-Attribute_System/Database-Attribute_System.csproj
@ -4,7 +4,7 @@
    <TargetFramework>netcoreapp2.1</TargetFramework>
    <RootNamespace>eu.railduction.netcore.dll.Database_Attribute_System</RootNamespace>
    <SignAssembly>false</SignAssembly>
-    <Version>1.5.3</Version>
+    <Version>1.5.21</Version>
  </PropertyGroup>

 </Project>