Added table-name remover to matching-system of FillObject

CLassAction: Added GetList
Set Version to 1.5.11

Database-Attribute_System/Attributes/DbForeignObject.cs

@@ -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)
                         {

Database-Attribute_System/Attributes/DbObject.cs

@@ -71,7 +71,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System.Attributes
                 }
                 catch(InvalidOperationException ex)
                 {
-                    throw new InvalidOperationException($"Cannot init foreignObject-field '{fi.Name}' of '{classType.Name}'. {ex.Message}");
+                    throw new InvalidOperationException($"Cannot init foreignObject-field='{fi.Name}' of class='{classType.Name}'.", ex);
                 }
             }
         }

Database-Attribute_System/ClassAction.cs

@@ -43,7 +43,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="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)
         {
             Type classType = classObject.GetType();
@@ -57,10 +56,21 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
                 // Interate through class-fields
                 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 (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;
                     }
                 }
@@ -124,18 +134,57 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
             return obj;
         }
 
+        // ----
+
         /// <summary>
-        /// Resolves dbObject by primaryKey/s<pragma/>
-        /// Object needs to have primaryKey/s set!
+        /// 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 void ResolveByPrimaryKey<T>(T classObject, Func<string, List<Dictionary<string, object>>> queryExecutor)
+        public static List<T> GetList<T>(Type classType, Func<string, List<Dictionary<string, object>>> queryExecutor) where T : new()
         {
-            string query = QueryBuilder.SelectByPrimaryKey(classObject);   // Generate query
+            // Read dbObject - attribute
+            DbObject dbObject = ClassAction.Init(classType);
+
+            string query = QueryBuilder.SelectByAttribute(dbObject._tableName);   // Generate query
             List<Dictionary<string, object>> dataSet = queryExecutor(query);    // Execute
-            FillObject(classObject, dataSet[0]);   // Fill the object
+
+            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>
@@ -168,7 +217,21 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
             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/>
@@ -193,7 +256,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
                 // When its empty, get it
                 if(foreignObject_value == null)
                 {
-                    foreignObject_value = GetByPrimaryKey<T>(classType, foreignObjectAtt.foreignKeyAttribute.parentField.GetValue(classObject), queryExecutor); ;
+                    foreignObject_value = GetByPrimaryKey<T>(classType, foreignObjectAtt.foreignKeyAttribute.parentField.GetValue(classObject), queryExecutor);
                 }
 
                 // Recursive resolving

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

Database-Attribute_System/QueryBuilder.cs

@@ -56,6 +56,25 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
             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/>
         /// Object needs to have at least 1 primary-key!
@@ -181,14 +200,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] = ",";

Database-Attribute_System/internal/Function.cs

@@ -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,16 +88,14 @@ 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;
                     }
                 }
 
-                if (!nameFound) throw new InvalidOperationException($"{attributeNameAndValue.Key} has no classField!");
+                if (!nameFound) throw new InvalidOperationException($"'{attributeNameAndValue.Key}' has no classField!");
             }
         }
         internal static void ConvertAttributeToDbAttributes(Type classType, List<string> attributeNames)
@@ -118,7 +117,7 @@ namespace eu.railduction.netcore.dll.Database_Attribute_System
                     }
                 }
 
-                if (!nameFound) throw new InvalidOperationException($"{attributeNames[i]} has no classField!");
+                if (!nameFound) throw new InvalidOperationException($"'{attributeNames[i]}' has no classField!");
             }
         }
 
@@ -142,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