Added table-name remover to matching-system of FillObject

CLassAction: Added GetList
Set Version to 1.5.11

Database-Attribute_System/Attributes/BaseAttribute.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+
+namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
+{
+    public class BaseAttribute : Attribute
+    {
+        public FieldInfo parentField;
+        public DbObject classAttribute;
+
+        public string _attributeName;
+
+        public BaseAttribute()
+        {
+
+        }
+    }
+}

Database-Attribute_System/Attributes/BaseAttributes/DbAttribute.cs

@@ -1,15 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
 {
     [AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
-    public class DbAttribute : Attribute
+    public class DbAttribute : BaseAttribute
     {
-        public string _attributeName;
-
         /// <summary>
         /// Marks variable as database-attribute
         /// </summary>
@@ -18,5 +17,13 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
         {
             this._attributeName = attributeName;
         }
+
+        public void Init(FieldInfo fi, DbObject classAttribute)
+        {
+            this.parentField = fi;
+            this.classAttribute = classAttribute;
+
+            this._attributeName = this._attributeName ?? fi.Name;     // If no alternative attribute-name is specified, use the property-name
+        }
     }
 }

Database-Attribute_System/Attributes/BaseAttributes/DbForeignKey.cs

@@ -1,25 +1,29 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
 {
     [AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
-    public class DbForeignKey : Attribute
+    public class DbForeignKey : BaseAttribute
     {
-        public Type _classType;
-        public string _attributeName;
-
         /// <summary>
         /// Marks variable as foreignKey of given class
         /// </summary>
-        /// <param name="classType">Type of class to which this is the ForeignKey</param>
         /// <param name="dbAttributeName">Name of database-attribute (case-sensitivity is determined from database-attribute-settings) ['null' if the same as field-name]</param>
-        public DbForeignKey(Type classType, string attributeName = null)
+        public DbForeignKey(string attributeName = null)
         {
-            this._classType = classType;
             this._attributeName = attributeName;
         }
+
+        public void Init(FieldInfo fi, DbObject classAttribute)
+        {
+            this.parentField = fi;
+            this.classAttribute = classAttribute;
+
+            this._attributeName = this._attributeName ?? fi.Name;     // If no alternative attribute-name is specified, use the property-name
+        }
     }
 }

Database-Attribute_System/Attributes/BaseAttributes/DbPrimaryKey.cs

@@ -1,23 +1,29 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
 {
     [AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
-    public class DbPrimaryKey : Attribute
+    public class DbPrimaryKey : BaseAttribute
     {
-        public Type _classType;
-        public string _attributeName;
-
         /// <summary>
         /// Marks variable as primaryKey fo current class
         /// </summary>
         /// <param name="dbAttributeName">Name of database-attribute (case-sensitivity is determined from database-attribute-settings) ['null' if the same as field-name]</param>
         public DbPrimaryKey(string attributeName = null)
         {
-            this._attributeName = attributeName;
+            this._attributeName = attributeName;    // Todo: Automatic resolving of name if it is null (?)
+        }
+
+        public void Init(FieldInfo fi, DbObject classAttribute)
+        {
+            this.parentField = fi;
+            this.classAttribute = classAttribute;
+
+            this._attributeName = this._attributeName ?? fi.Name;     // If no alternative attribute-name is specified, use the property-name
         }
     }
 }

Database-Attribute_System/Attributes/DbForeignObject.cs

@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+
+namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
+{
+    [AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
+    public class DbForeignObject : Attribute
+    {
+        public Type foreignObjectType;
+
+        public string _foreignKeyName;
+        public DbForeignKey foreignKeyAttribute;
+
+        public FieldInfo parentField;
+        public DbObject classAttribute;
+
+        /// <summary>
+        /// Marks variable as foreign-object of an dbObject
+        /// </summary>
+        /// <param name="foreignKeyName">Fieldname of foreignKey associated with the foreignObject</param>
+        public DbForeignObject(string foreignKeyName = null)
+        {
+            this._foreignKeyName = foreignKeyName;
+        }
+
+        public void Init(FieldInfo fi, DbObject classAttribute)
+        {
+            this.parentField = fi;
+            this.classAttribute = classAttribute;
+            this.foreignObjectType = fi.FieldType;
+
+            // Init foreign-object class
+            DbObject foreignClassAttribute = ClassAction.Init(this.foreignObjectType);
+
+            // 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($"ForeignObject does not support multiple primaryKeys.");
+
+            Type primaryKeyType = foreignClassAttribute.primaryKeyAttributes[0].parentField.GetType();  // Read type of primaryKey in foreignObject-class
+            foreach(DbForeignKey foreignKey in classAttribute.foreignKeyAttributes)     // Search for matching foreignKey
+            {
+                if(this._foreignKeyName != null)     // If i have a name
+                {
+                    // check if name matches
+                    if (foreignKey.parentField.Name.ToLower() == this._foreignKeyName.ToLower())
+                    {
+                        if(foreignKey.parentField.GetType() == primaryKeyType)
+                        {
+                            this._foreignKeyName = foreignKey.parentField.Name;
+                            foreignKeyAttribute = foreignKey;
+                            break;
+                        }
+                        else
+                        {
+                            // If a name was specified and the key does not match its an error
+                            throw new InvalidOperationException($"ForeignKey='{this._foreignKeyName}' is typeOf='{foreignKey.parentField.GetType().Name}' but primaryKey of foreignObject-class is typeOf='{primaryKeyType.Name}'.");
+                        }
+                    }
+                }
+                else    // No name
+                {
+                    // Check if type matches
+                    if (foreignKey.parentField.GetType() == primaryKeyType)
+                    {
+                        this._foreignKeyName = foreignKey.parentField.Name;
+                        foreignKeyAttribute = foreignKey;
+                        break;
+                    }
+                }
+            }
+
+            // Check if key-retrieval was successful
+            if (foreignKeyAttribute == null) throw new InvalidOperationException($"No coresponding foreignKey.");
+        }
+    }
+}

Database-Attribute_System/Attributes/DbObject.cs

@@ -12,13 +12,68 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
     {
         public string _tableName;
 
+        public Type parentClassType;
+
+        // All childrenAttributes
+        public List<BaseAttribute> baseAttributes = new List<BaseAttribute>() { };
+        public List<DbPrimaryKey> primaryKeyAttributes = new List<DbPrimaryKey>() { };
+        public List<DbAttribute> attributeAttributes = new List<DbAttribute>() { };
+        public List<DbForeignKey> foreignKeyAttributes = new List<DbForeignKey>() { };
+        public List<DbForeignObject> foreignObjectAttributes = new List<DbForeignObject>() { };
+
         /// <summary>
         /// Marks variable as database-table
         /// </summary>
         /// <param name="tableName">Name of database-table (case-sensitivity is determined from database-table-settings) ['null' if the same as class-name]</param>
         public DbObject(string tableName = null)
         {
-            this._tableName = tableName;
+            this._tableName = tableName;    // Todo: Automatic resolving of name if it is null (?)
+        }
+
+        public void Init(Type classType)
+        {
+            this.parentClassType = classType;
+            this._tableName = this._tableName ?? classType.Name;    // If no alternative table-name is specified, use the class-name
+
+            // Iterate thru all fields
+            foreach (System.Reflection.FieldInfo fi in classType.GetRuntimeFields())
+            {
+                try
+                {
+                    // Check if current field is a db-field and initiate it
+                    if (fi.GetCustomAttribute(typeof(DbPrimaryKey), true) is DbPrimaryKey pkey)     // PrimaryKey
+                    {
+                        pkey.Init(fi, this);
+
+                        this.baseAttributes.Add(pkey);
+                        this.primaryKeyAttributes.Add(pkey);
+                    }
+                    else if (fi.GetCustomAttribute(typeof(DbAttribute), true) is DbAttribute att)   // Attributes
+                    {
+                        att.Init(fi, this);
+
+                        this.baseAttributes.Add(att);
+                        this.attributeAttributes.Add(att);
+                    }
+                    else if (fi.GetCustomAttribute(typeof(DbForeignKey), true) is DbForeignKey fkey)    // ForeignKeys
+                    {
+                        fkey.Init(fi, this);
+
+                        this.baseAttributes.Add(fkey);
+                        this.foreignKeyAttributes.Add(fkey);
+                    }
+                    else if (fi.GetCustomAttribute(typeof(DbForeignObject), true) is DbForeignObject fobj)    // ForeignObjects
+                    {
+                        fobj.Init(fi, this);
+
+                        this.foreignObjectAttributes.Add(fobj);
+                    }
+                }
+                catch(InvalidOperationException ex)
+                {
+                    throw new InvalidOperationException($"Cannot init foreignObject-field='{fi.Name}' of class='{classType.Name}'.", ex);
+                }
+            }
         }
     }
 }

Database-Attribute_System/ClassAction.cs

@@ -1,4 +1,5 @@
-using System;
+using eu.railduction.netcore.dll.Database_Attribute_System.Attributes;
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Text;
@@ -7,6 +8,34 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
 {
     public class ClassAction
     {
+        private static Dictionary<Type, DbObject> initiatedClassTypes = new Dictionary<Type, DbObject>() { };
+        /// <summary>
+        /// Initiates the attribute-system and preloads all necessary information<para/>
+        /// INFO: Will initiate necessary foreignObjects recursively!<para/>
+        /// If an class is already initiated, it will be ignored!
+        /// </summary>
+        /// <param name="classType">The classType to preload</param>
+        /// <returns>DbObject-attribute corresponding to the class</returns>
+        public static DbObject Init(Type classType)
+        {
+            DbObject cachedDbObject;
+            initiatedClassTypes.TryGetValue(classType, out cachedDbObject);
+
+            if (cachedDbObject == null)
+            {
+                // 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'");
+
+                dbObject.Init(classType);   // Init dbObject
+                initiatedClassTypes.Add(classType, dbObject);     // Set it to the list
+
+                cachedDbObject = dbObject;
+            }
+
+            return cachedDbObject;
+        }
+
+
         /// <summary>
         /// Fills an given dbObject with given data<para/>
         /// Data-attribute-names and class-fieldNames have to match! (non case-sensitive)
@@ -14,56 +43,34 @@ 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="runDataLossChecks">This checks if any class-field and data-attribute does not exists in either (Slower)</param>
+        public static void FillObject<T>(T classObject, Dictionary<string, object> data)
-        public static void FillObject<T>(T classObject, Dictionary<string, object> data, bool runDataLossChecks = true)
         {
             Type classType = classObject.GetType();
 
-            string tableName = Function.GetDbTableName(classType);
+            // Read dbObject-attribute
-
+            DbObject dbObject = ClassAction.Init(classType);
-            // Get class-fields
-            Dictionary<string, FieldInfo> dbFields = Function.ReadDbClassFields(classObject);
-
-            if (runDataLossChecks)
-            {
-                // Check every data-attribute for match in class-fields
-                foreach (KeyValuePair<string, object> data_keySet in data)
-                {
-                    bool isFound = false;
-                    foreach (KeyValuePair<string, FieldInfo> field_keySet in dbFields)
-                    {
-                        if (field_keySet.Key.ToLower() == data_keySet.Key.ToLower())
-                            isFound = true;
-                    }
-
-                    if (!isFound)
-                        throw new InvalidOperationException($"Could not fill object. Data-Attribute '{data_keySet.Key}' was not found in class!");
-                }
-                // Check every class-field for match in data-attributes
-                foreach (KeyValuePair<string, FieldInfo> field_keySet in dbFields)
-                {
-                    bool isFound = false;
-                    foreach (KeyValuePair<string, object> data_keySet in data)
-                    {
-                        if (field_keySet.Key.ToLower() == data_keySet.Key.ToLower())
-                            isFound = true;
-                    }
-
-                    if (!isFound)
-                        throw new InvalidOperationException($"Could not fill object. Class-field '{field_keySet.Key}' was not found in data!");
-                }
-            }      
 
             // Iterate through data
             foreach (KeyValuePair<string, object> data_keySet in data)
             {
                 // Interate through class-fields
-                foreach (KeyValuePair<string, FieldInfo> field_keySet in dbFields)
+                foreach (BaseAttribute baseAttribute in dbObject.baseAttributes)
                 {
+                    // Remove any leading dots and table-specifiers
+                    string dbAttName = data_keySet.Key;
+                    if (dbAttName.Contains("."))
+                    {
+                        string[] dbAttNameSplit = dbAttName.Split('.');     // Split at the '.'
+                        dbAttName = dbAttNameSplit[dbAttNameSplit.Length - 1];  // Copy the ending text
+                    }
+
                     // If its a match, set the value
-                    if (field_keySet.Key.ToLower() == data_keySet.Key.ToLower())
+                    if (baseAttribute._attributeName.ToLower() == data_keySet.Key.ToLower())
                     {
-                        field_keySet.Value.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;
                     }
                 }
@@ -72,21 +79,192 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
 
 
         /// <summary>
-        /// Resolves an object with the database<para/>
+        /// Gets an dbObject by primaryKey/s
-        /// Needs to have primaryKey/s set!<para/>
-        /// - Generates an query<para/>
-        /// - Sends an query via Func<para/>
-        /// - Fills the object with data
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <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>
-        /// <param name="runDataLossChecks">This checks if any class-field and data-attribute does not exists in either (Slower)</param>
+        public static T GetByPrimaryKey<T>(Type classType, object primaryKeyValue, Func<string, List<Dictionary<string, object>>> queryExecutor) where T : new()
-        public static void ResolveByPrimaryKey<T>(T classObject, Func<string, List<Dictionary<string, object>>> queryExecutor, bool runDataLossChecks = true)
         {
-            string query = QueryBuilder.SelectByPrimaryKey(classObject);
+            Dictionary<string, object> primaryKeyData = new Dictionary<string, object>() { };
-            List<Dictionary<string, object>> dataSet = queryExecutor(query);
+            primaryKeyData.Add(null, primaryKeyValue);
-            FillObject(classObject, dataSet[0], runDataLossChecks);
+
+            return GetByPrimaryKey<T>(classType, primaryKeyData, queryExecutor);
+        }
+        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>() { };
+            primaryKeyData.Add(primaryKeyName, primaryKeyValue);
+
+            return GetByPrimaryKey<T>(classType, primaryKeyData, queryExecutor);
+        }
+        public static T GetByPrimaryKey<T>(Type classType, Dictionary<string, object> primaryKeyData, Func<string, List<Dictionary<string, object>>> queryExecutor) where T: new()
+        {
+            // Create new empty object
+            T obj = new T();
+
+            // Read dbObject-attribute
+            DbObject dbObject = ClassAction.Init(classType);
+
+            // iterate thru them to check and fill object
+            foreach (DbPrimaryKey primaryKeyAtt in dbObject.primaryKeyAttributes)
+            {
+                bool dataMatchFound = false;
+
+                // Now search the corresponding primaryKeyData
+                foreach (KeyValuePair<string, object> primaryKey in primaryKeyData)
+                {
+                    // primaryKey matches
+                    if(primaryKeyAtt._attributeName.ToLower() == primaryKey.Key.ToLower())
+                    {
+                        // Set data
+                        primaryKeyAtt.parentField.SetValue(obj, primaryKey.Value);
+
+                        dataMatchFound = true;
+                        break;
+                    }
+                }
+
+                // If no data was found matching this field
+                if (!dataMatchFound) throw new InvalidOperationException($"Cannot create object with primaryKeyData. No data assigned to field '{primaryKeyAtt.parentField.Name}'");
+            }
+
+            ResolveByPrimaryKey<T>(obj, queryExecutor);
+
+            return obj;
+        }
+
+        // ----
+
+        /// <summary>
+        /// Gets all dbObjects of class/table
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <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 List<T> GetList<T>(Type classType, Func<string, List<Dictionary<string, object>>> queryExecutor) where T : new()
+        {
+            // Read dbObject - attribute
+            DbObject dbObject = ClassAction.Init(classType);
+
+            string query = QueryBuilder.SelectByAttribute(dbObject._tableName);   // Generate query
+            List<Dictionary<string, object>> dataSet = queryExecutor(query);    // Execute
+
+            List<T> objs = new List<T>() { };
+            foreach (Dictionary<string, object> data in dataSet)
+            {
+                T obj = new T();    // New object
+                FillObject(obj, data);   // Fill it
+                objs.Add(obj);      // Add to list
+            }
+
+            return objs;    // Return list
+        }
+
+        /// <summary>
+        /// Gets an dbObject by primaryKey/s
+        /// </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 - 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);
+
+            string query = QueryBuilder.SelectWithWhere(dbObject._tableName, whereClause);   // Generate query
+            List<Dictionary<string, object>> dataSet = queryExecutor(query);    // Execute
+
+            List<T> objs = new List<T>() { };
+            foreach (Dictionary<string, object> data in dataSet)
+            {
+                T obj = new T();    // New object
+                FillObject(obj, data);   // Fill it
+                objs.Add(obj);      // Add to list
+            }
+
+            return objs;    // Return list
+        }
+        
+        /// <summary>
+        /// Gets a list of dbObjects by attribute/s
+        /// </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 - Has to return Dictionary[attributeName, attributeValue]</param>
+        /// <param name="runDataLossChecks">This checks if any class-field and data-attribute does not exists in either (Slower)</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);
+
+            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>() { };
+            foreach(Dictionary<string, object> data in dataSet)
+            {
+                T obj = new T();    // New object
+                FillObject(obj, data);   // Fill it
+                objs.Add(obj);      // Add to list
+            }
+
+            return objs;    // Return list
+        }
+
+        // -----
+
+        /// <summary>
+        /// Resolves dbObject by primaryKey/s<pragma/>
+        /// Object needs to have primaryKey/s set!
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <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 void ResolveByPrimaryKey<T>(T classObject, Func<string, List<Dictionary<string, object>>> queryExecutor)
+        {
+            string query = QueryBuilder.SelectByPrimaryKey(classObject);   // Generate query
+            List<Dictionary<string, object>> dataSet = queryExecutor(query);    // Execute
+            FillObject(classObject, dataSet[0]);   // Fill the object
+        }
+
+        /// <summary>
+        /// Resolves all foreignKeys with the database<pragma/>
+        /// Only works if the foreignKey is single (not assembled)!
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <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>
+        /// <param name="max_depth">Determents how deep resolving will be executed</param>
+        /// <param name="runDataLossChecks">This checks if any class-field and data-attribute does not exists in either (Slower)</param>
+        public static void ResolveForeignKeys<T>(T classObject, Func<string, List<Dictionary<string, object>>> queryExecutor, int max_depth = 1) where T: new()
+        {
+            Type classType = classObject.GetType();
+
+            // Read dbObject-attribute
+            DbObject dbObject = ClassAction.Init(classType);
+
+            foreach (DbForeignObject foreignObjectAtt in dbObject.foreignObjectAttributes)
+            {
+                object foreignObject_value = foreignObjectAtt.parentField.GetValue(classObject);
+
+                // When its empty, get it
+                if(foreignObject_value == null)
+                {
+                    foreignObject_value = GetByPrimaryKey<T>(classType, foreignObjectAtt.foreignKeyAttribute.parentField.GetValue(classObject), queryExecutor);
+                }
+
+                // Recursive resolving
+                if (max_depth - 1 > 0)
+                {
+                    ResolveForeignKeys(foreignObject_value, queryExecutor, max_depth - 1);
+                }
+            }
         }
     }
 }

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.2.3</Version>
+    <Version>1.5.13</Version>
   </PropertyGroup>
 
 </Project>

Database-Attribute_System/QueryBuilder.cs

@@ -8,33 +8,24 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
     public class QueryBuilder
     {
         /// <summary>
-        /// Builds an SELECT-Sql-query based on an object<para/>
+        /// Builds an SELECT-Sql-query based on an object
-        /// Object needs to have at least 1 primary-key!
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="classObject">Given object (marked with Db-attributes)</param>
+        /// <param name="tableName">The db-table-name</param>
         /// <returns>SELECT-Sql-query</returns>
         public static string SelectByPrimaryKey<T>(T classObject)
         {
             Type classType = classObject.GetType();
 
-            // Get db-table-name from class
+            // Read dbObject-attribute
-            string tableName = Function.GetDbTableName(classType);
+            DbObject dbObject = ClassAction.Init(classType);
 
-            // Get class db-fields
+            // Check if 'byPrimaryKey' is possible
-            Dictionary<string, object> dbPrimaryKeys = new Dictionary<string, object>() { };
+            if (dbObject.primaryKeyAttributes.Count == 0) throw new InvalidOperationException($"Cannot generate SQL-Query of '{classType.Name}'. No primary-key/s!");
-            Dictionary<string, object> dbAttributes = new Dictionary<string, object>() { };
+            Dictionary<string, object> dbPrimaryKeys = Function.ReadFieldData(Function.ConvertToDerivedList(dbObject.primaryKeyAttributes), classObject);
-            Dictionary<string, object> dbForeignKeys = new Dictionary<string, object>() { };
-            Function.ReadDbClassFields(classObject, ref dbPrimaryKeys, ref dbAttributes, ref dbForeignKeys);
-            if (dbPrimaryKeys.Count == 0) throw new InvalidOperationException($"Cannot generate SQL-Query of '{classType.Name}'. No primary-key/s found!");
 
-            // Build where statements with primaryKey/s
+            return SelectByAttribute(dbObject._tableName, dbPrimaryKeys);
-            object[] param = DbFunction.BuildKeyEqualQuery(dbPrimaryKeys, " AND ");
-            // Add SQL-command part
-            param[0] = $"SELECT * FROM {tableName} WHERE "+ param[0];
-            
-            // Build and return the query
-            return BuildQuery(param);
         }
 
         /// <summary>
@@ -42,53 +33,47 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
         /// Object needs to have at least 1 attribute!
         /// </summary>
         /// <typeparam name="T"></typeparam>
-        /// <param name="classObject">Given object (marked with Db-attributes)</param>
+        /// <param name="tableName">The db-table-name</param>
-        /// <param name="attributeNames">Attributes and/or foreignKeys to use in lookup</param>
+        /// <param name="dbAttributes">The db-attributes with dbAttribute-name and value<para/>If null is given, it will generate a default 'SELECT * FROM tableName'</param>
         /// <returns>SELECT-Sql-query</returns>
-        public static string SelectByAttribute<T>(T classObject, params string[] attributeNames)
+        public static string SelectByAttribute(string tableName, Dictionary<string, object> dbAttributes = null)
         {
-            Type classType = classObject.GetType();
-
-            // Get db-table-name from class
-            string tableName = Function.GetDbTableName(classType);
-
-            // Get class db-fields
-            Dictionary<string, object> dbPrimaryKeys = new Dictionary<string, object>() { };
-            Dictionary<string, object> dbAttributes = new Dictionary<string, object>() { };
-            Dictionary<string, object> dbForeignKeys = new Dictionary<string, object>() { };
-            Function.ReadDbClassFields(classObject, ref dbPrimaryKeys, ref dbAttributes, ref dbForeignKeys);
-            if (dbAttributes.Count == 0) throw new InvalidOperationException($"Cannot generate SQL-Query of '{classType.Name}'. No attribute found!");
-
-
-            Dictionary<string, object> attributes = new Dictionary<string, object>() { };
-            // Iterate through given names
-            foreach (string attributeName in attributeNames)
-            {
-                // Iterate through attributes of class
-                foreach (KeyValuePair<string, object> dbAttribute in dbAttributes)
-                {
-                    // If its a match, copy it to list
-                    if (dbAttribute.Key.ToLower() == attributeName.ToLower())
-                    {
-                        attributes.Add(dbAttribute.Key, dbAttribute.Value);
-                    }
-                }
-            }
-
             object[] param = new object[1];
-            if (attributeNames != null)
+            if (dbAttributes != null)
             {
                 // Build where statements with primaryKey/s
-                param = DbFunction.BuildKeyEqualQuery(attributes, " AND ");
+                param = DbFunction.BuildKeyEqualQuery(dbAttributes, " AND ");
             }
 
+            string sqlCmd = $"SELECT * FROM {tableName}";
             // Add SQL-command part
-            param[0] = $"SELECT * FROM {tableName} WHERE " + param[0];
+            if (dbAttributes != null)
+                param[0] = $"{sqlCmd} WHERE {param[0]}";
+            else
+                param[0] = sqlCmd;
 
             // Build and return the query
             return BuildQuery(param);
         }
 
+        /// <summary>
+        /// Builds an SELECT-Sql-query based on an object with custom where clause<para/>
+        /// Object needs to have at least 1 attribute!
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="tableName">The db-table-name</param>
+        /// <param name="whereClause">Custom where-clause params attached to query (SELECT * FROM tableName WHERE whereClause)</param>
+        /// <returns>SELECT-Sql-query</returns>
+        public static string SelectWithWhere(string tableName, params object[] whereClause)
+        {
+            string sqlCmd = $"SELECT * FROM {tableName}";
+            // Add SQL-command part
+            if (!(whereClause[0] is string)) throw new InvalidOperationException("Cannot generate SQL-query. WhereClause-params not starting with string!");
+            whereClause[0] = $"{sqlCmd} WHERE {whereClause[0]}";
+
+            // Build and return the query
+            return BuildQuery(whereClause);
+        }
 
         /// <summary>
         /// Builds an UPDATE-Sql-query based on an object<para/>
@@ -101,15 +86,14 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
         {
             Type classType = classObject.GetType();
 
-            // Get db-table-name from class
+            // Read dbObject-attribute
-            string tableName = Function.GetDbTableName(classType);
+            DbObject dbObject = ClassAction.Init(classType);
 
-            // Get class db-fields
+            // Check if 'byPrimaryKey' is possible
-            Dictionary<string, object> dbPrimaryKeys = new Dictionary<string, object>() { };
+            if (dbObject.primaryKeyAttributes.Count == 0) throw new InvalidOperationException($"Cannot generate SQL-Query of '{classType.Name}'. No primary-key/s!");
-            Dictionary<string, object> dbAttributes = new Dictionary<string, object>() { };
+            Dictionary<string, object> dbPrimaryKeys = Function.ReadFieldData(Function.ConvertToDerivedList(dbObject.primaryKeyAttributes), classObject);
-            Dictionary<string, object> dbForeignKeys = new Dictionary<string, object>() { };
+            Dictionary<string, object> dbForeignKeys = Function.ReadFieldData(Function.ConvertToDerivedList(dbObject.foreignKeyAttributes), classObject);
-            Function.ReadDbClassFields(classObject, ref dbPrimaryKeys, ref dbAttributes, ref dbForeignKeys);
+            Dictionary<string, object> dbAttributes = Function.ReadFieldData(Function.ConvertToDerivedList(dbObject.attributeAttributes), classObject);
-            if (dbPrimaryKeys.Count == 0) throw new InvalidOperationException($"Cannot generate SQL-Query of '{classType.Name}'. No primary-key/s found!");
 
             // Add foreign-keys to attributes
             foreach (KeyValuePair<string, object> dbForeignKey in dbForeignKeys)
@@ -120,7 +104,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
             // Build set-parameters
             object[] paramSet = DbFunction.BuildKeyEqualQuery(dbAttributes, ", ");
             // Add SQL-command part
-            paramSet[0] = $"UPDATE {tableName} SET "+ paramSet[0];
+            paramSet[0] = $"UPDATE {dbObject._tableName} SET "+ paramSet[0];
 
             // Build where-parameters
             object[] paramWhere = DbFunction.BuildKeyEqualQuery(dbPrimaryKeys, " AND ");
@@ -142,77 +126,98 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
         {
             Type classType = classObject.GetType();
 
-            // Get db-table-name from class
+            // Read dbObject-attribute
-            string tableName = Function.GetDbTableName(classType);
+            DbObject dbObject = ClassAction.Init(classType);
 
-            // Get class db-fields
+            // Check if 'byPrimaryKey' is possible
-            Dictionary<string, object> dbPrimaryKeys = new Dictionary<string, object>() { };
+            if (dbObject.primaryKeyAttributes.Count == 0) throw new InvalidOperationException($"Cannot generate SQL-Query of '{classType.Name}'. No primary-key/s!");
-            Dictionary<string, object> dbAttributes = new Dictionary<string, object>() { };
+            Dictionary<string, object> dbPrimaryKeys = Function.ReadFieldData(Function.ConvertToDerivedList(dbObject.primaryKeyAttributes), classObject);
-            Dictionary<string, object> dbForeignKeys = new Dictionary<string, object>() { };
-            Function.ReadDbClassFields(classObject, ref dbPrimaryKeys, ref dbAttributes, ref dbForeignKeys);
-            if (dbPrimaryKeys.Count == 0) throw new InvalidOperationException($"Cannot generate SQL-Query of '{classType.Name}'. No primary-key/s found!");
-
-            // Build where-parameters
-            object[] paramWhere = DbFunction.BuildKeyEqualQuery(dbPrimaryKeys, " AND ");
-            // Add SQL-command part
-            paramWhere[0] = $"DELETE FROM {tableName} WHERE "+ paramWhere[0];
 
             // Build and return the query
-            return BuildQuery(paramWhere);
+            return DeleteByAttribute(dbObject._tableName, dbPrimaryKeys);
         }
 
-        /// <summary>
+        public static string DeleteByAttribute(string tableName, Dictionary<string, object> dbAttributes = null)
-        /// Builds an DELETE-Sql-query based on an object<para/>
-        /// Object needs to have at least 1 primary-key!
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="classObject">Given object (marked with Db-attributes)</param>
-        /// <param name="attributeNames">Attributes and/or foreignKeys to use in lookup</param>
-        /// <returns>DELETE-Sql-query</returns>
-        public static string DeleteByAttribute<T>(T classObject, params string[] attributeNames)
         {
-            Type classType = classObject.GetType();
-
-            // Get db-table-name from class
-            string tableName = Function.GetDbTableName(classType);
-
-            // Get class db-fields
-            Dictionary<string, object> dbPrimaryKeys = new Dictionary<string, object>() { };
-            Dictionary<string, object> dbAttributes = new Dictionary<string, object>() { };
-            Dictionary<string, object> dbForeignKeys = new Dictionary<string, object>() { };
-            Function.ReadDbClassFields(classObject, ref dbPrimaryKeys, ref dbAttributes, ref dbForeignKeys);
-            if (dbAttributes.Count == 0) throw new InvalidOperationException($"Cannot generate SQL-Query of '{classType.Name}'. No attribute found!");
-
-
-            Dictionary<string, object> attributes = new Dictionary<string, object>() { };
-            // Iterate through given names
-            foreach (string attributeName in attributeNames)
-            {
-                // Iterate through attributes of class
-                foreach (KeyValuePair<string, object> dbAttribute in dbAttributes)
-                {
-                    // If its a match, copy it to list
-                    if (dbAttribute.Key.ToLower() == attributeName.ToLower())
-                    {
-                        attributes.Add(dbAttribute.Key, dbAttribute.Value);
-                    }
-                }
-            }
-
             object[] param = new object[1];
-            if (attributeNames != null)
+            if (dbAttributes != null)
             {
                 // Build where statements with primaryKey/s
-                param = DbFunction.BuildKeyEqualQuery(attributes, " AND ");
+                param = DbFunction.BuildKeyEqualQuery(dbAttributes, " AND ");
             }
 
+            string sqlCmd = $"DELETE FROM {tableName}";
             // Add SQL-command part
-            param[0] = $"DELETE FROM {tableName} WHERE " + param[0];
+            if (dbAttributes != null)
+                param[0] = $"{sqlCmd} WHERE {param[0]}";
+            else
+                param[0] = sqlCmd;
 
             // Build and return the query
             return BuildQuery(param);
         }
 
+        /// <summary>
+        /// Builds an INSERT-Sql-query based on an object<para/>
+        /// </summary>
+        /// <param name="tableName"></param>
+        /// <param name="dbAttributes"></param>
+        /// <returns></returns>
+        public static string InsertAttributesByObject<T>(T classObject)
+        {
+            Type classType = classObject.GetType();
+
+            // Read dbObject-attribute
+            DbObject dbObject = ClassAction.Init(classType);
+
+            List<string> attributes = new List<string>() { };
+            List<object> data = new List<object>() { };
+            foreach(BaseAttribute baseAttribute in dbObject.baseAttributes)
+            {
+                attributes.Add(baseAttribute._attributeName);
+                data.Add(baseAttribute.parentField.GetValue(classObject));
+            }
+
+            return InsertAttributes(dbObject._tableName, attributes, data);
+        }
+        public static string InsertAttributes(string tableName, Dictionary<string, object> dbAttributes)
+        {
+            if (dbAttributes.Count == 0) throw new InvalidOperationException("Cannot generate SQL-Query. No attributes to insert.");
+
+            List<string> attributes = new List<string>() { };
+            List<object> data = new List<object>() { };
+
+            foreach (KeyValuePair<string, object> attribute in dbAttributes)
+            {
+                attributes.Add(attribute.Key);
+                data.Add(attribute.Value);
+            }
+
+            return InsertAttributes(tableName, attributes, data);
+        }
+        public static string InsertAttributes(string tableName, List<string> attributes, List<object> data)
+        {
+            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 -1];
+            int c = 0;
+            for(int i=0; i< attributes.Count; i++)
+            {
+                attributesSeperatedByComma += attributes[i];
+                attributeData[c] = data[i];
+
+                if(c+1 != attributeData.Length)
+                {
+                    attributesSeperatedByComma += ", ";
+                    attributeData[c+1] = ",";
+                }
+                c +=2;
+            }
+
+            // Build and return the query
+            return BuildQuery($"INSERT INTO {tableName} ({attributesSeperatedByComma}) VALUES (", attributeData, ")");
+        }
 
 
 

Database-Attribute_System/internal/Function.cs

@@ -31,77 +31,94 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
             }
         }
 
-        internal static void ReadDbClassFields<T>(T classObject, ref Dictionary<string, object> dbPrimaryKeys, ref Dictionary<string, object> dbAttributes, ref Dictionary<string, object> dbForeignKeys)
+        internal static List<BaseAttribute> ConvertToDerivedList(List<DbPrimaryKey> list)
         {
-            Type classType = typeof(T);
+            List<BaseAttribute> derivedList = new List<BaseAttribute>() { };
+            foreach (BaseAttribute key in list)
+            {
+                derivedList.Add(key);
+            }
+            return derivedList;
+        }
+        internal static List<BaseAttribute> ConvertToDerivedList(List<DbAttribute> list)
+        {
+            List<BaseAttribute> derivedList = new List<BaseAttribute>() { };
+            foreach (BaseAttribute key in list)
+            {
+                derivedList.Add(key);
+            }
+            return derivedList;
+        }
+        internal static List<BaseAttribute> ConvertToDerivedList(List<DbForeignKey> list)
+        {
+            List<BaseAttribute> derivedList = new List<BaseAttribute>() { };
+            foreach (BaseAttribute key in list)
+            {
+                derivedList.Add(key);
+            }
+            return derivedList;
+        }
 
-            // Reset lists (just in case)
+        internal static Dictionary<string, object> ReadFieldData<T>(List<BaseAttribute> fieldAttributes, T classObject)
-            dbPrimaryKeys = new Dictionary<string, object>() { };
+        {
-            dbAttributes = new Dictionary<string, object>() { };
+            Dictionary<string, object> fieldData = new Dictionary<string, object>() { };
-            dbForeignKeys = new Dictionary<string, object>() { };
 
-            // Iterate thru all properties
+            foreach (BaseAttribute attribute in fieldAttributes)
-            foreach (System.Reflection.FieldInfo fi in classType.GetRuntimeFields())
             {
-                // Check if current field is a db-field
+                // Read the data and add it
-                if (fi.GetCustomAttribute(typeof(DbPrimaryKey), true) is DbPrimaryKey pkey) // PrimaryKey
+                fieldData.Add(
-                {
+                    attribute._attributeName,
-                    string dbAttributeName = pkey._attributeName ?? fi.Name;     // If no alternative attribute-name is specified, use the property-name
+                    attribute.parentField.GetValue(classObject)
-                    object value = fi.GetValue(classObject);
+                    );
-                    dbPrimaryKeys.Add(dbAttributeName, value);
             }
-                else if (fi.GetCustomAttribute(typeof(DbAttribute), true) is DbAttribute att)   // Attributes
+
-                {
+            return fieldData;   // Return the data
-                    string dbAttributeName = att._attributeName ?? fi.Name;     // If no alternative attribute-name is specified, use the property-name
-                    object value = fi.GetValue(classObject);
-                    dbAttributes.Add(dbAttributeName, value);
         }
-                else if (fi.GetCustomAttribute(typeof(DbForeignKey), true) is DbForeignKey fkey)    // ForeignKeys
+
+        internal static void ConvertAttributeToDbAttributes(Type classType, Dictionary<string, object> attributeNameAndValues)
         {
-                    string dbAttributeName = fkey._attributeName ?? fi.Name;     // If no alternative attribute-name is specified, use the property-name
+            // Read dbObject-attribute
-                    object value = fi.GetValue(classObject);
+            DbObject dbObject = ClassAction.Init(classType);
-                    dbForeignKeys.Add(dbAttributeName, value);
+            Dictionary<string, object> convertedAttributeNameAndValues = new Dictionary<string, object>();
-                }
+
+            foreach (KeyValuePair<string, object> attributeNameAndValue in attributeNameAndValues)
+            {
+                bool nameFound = false;
+                foreach (BaseAttribute baseAttribute in dbObject.baseAttributes)
+                {
+                    if (attributeNameAndValue.Key.ToLower() == baseAttribute.parentField.Name.ToLower())
+                    {
+                        convertedAttributeNameAndValues.Add(baseAttribute._attributeName, attributeNameAndValue.Value);
+
+                        nameFound = true;
+                        break;
                     }
                 }
 
-        internal static Dictionary<string, FieldInfo> ReadDbClassFields<T>(T classObject)
+                if (!nameFound) throw new InvalidOperationException($"'{attributeNameAndValue.Key}' has no classField!");
-        {
-            Type classType = typeof(T);
-
-            Dictionary<string, FieldInfo> dbFields = new Dictionary<string, FieldInfo>();
-
-            // Iterate thru all properties
-            foreach (System.Reflection.FieldInfo fi in classType.GetRuntimeFields())
-            {
-                // Check if current field is a db-field
-                if (fi.GetCustomAttribute(typeof(DbPrimaryKey), true) is DbPrimaryKey pkey) // PrimaryKey
-                {
-                    string dbAttributeName = pkey._attributeName ?? fi.Name;     // If no alternative attribute-name is specified, use the property-name
-                    dbFields.Add(dbAttributeName, fi);
             }
-                else if (fi.GetCustomAttribute(typeof(DbAttribute), true) is DbAttribute att)   // Attributes
-                {
-                    string dbAttributeName = att._attributeName ?? fi.Name;     // If no alternative attribute-name is specified, use the property-name
-                    dbFields.Add(dbAttributeName, fi);
         }
-                else if (fi.GetCustomAttribute(typeof(DbForeignKey), true) is DbForeignKey fkey)    // ForeignKeys
+        internal static void ConvertAttributeToDbAttributes(Type classType, List<string> attributeNames)
         {
-                    string dbAttributeName = fkey._attributeName ?? fi.Name;     // If no alternative attribute-name is specified, use the property-name
+            // Read dbObject-attribute
-                    dbFields.Add(dbAttributeName, fi);
+            DbObject dbObject = ClassAction.Init(classType);
+
+            for(int i=0; i< dbObject.baseAttributes.Count; i++)
+            {
+                bool nameFound = false;
+                foreach (BaseAttribute baseAttribute in dbObject.baseAttributes)
+                {
+                    if(attributeNames[i].ToLower() == baseAttribute.parentField.Name.ToLower())
+                    {
+                        attributeNames[i] = baseAttribute._attributeName;
+
+                        nameFound = true;
+                        break;
                     }
                 }
 
-            return dbFields;
+                if (!nameFound) throw new InvalidOperationException($"'{attributeNames[i]}' has no classField!");
             }
-
-        public static string GetDbTableName(Type classType)
-        {
-            // Check if class has attribute 'DbObject' and get the database table-name
-            if (!(classType.GetCustomAttribute(typeof(DbObject), true) is DbObject dbObjectAttribute)) throw new InvalidOperationException($"Cannot generate SQL-Query of '{classType.Name}'. Missing Attribute 'DbObject'");
-            string tableName = dbObjectAttribute._tableName ?? classType.Name;    // If no alternative table-name is specified, use the class-name
-
-            return tableName;
         }
 
 
@@ -124,7 +141,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
                 DateTime dateTime = (DateTime)obj;
                 return "'" + SqlSerialise(dateTime) + "'";     // wrap in sql-brackets and convert to sql-datetime
             }
-            else if (obj.GetType() == typeof(Guid))        // Handle DateTime
+            else if (obj.GetType() == typeof(Guid))        // Handle Guid
             {
                 string guid = ((Guid)obj).ToString();  // Get Guid as string
                 return "'" + guid + "'";                 // wrap in sql-brackets