ManyToOne, otras mejoras

ErnestoNCarrea · Feb 18, 2017 · 255678e · 255678e
1 parent 17267da
commit 255678e
Show file tree

Hide file tree

Showing 14 changed files with 189 additions and 26 deletions.
diff --git a/Orm/Attributes/Association.cs b/Orm/Attributes/Association.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+
+namespace Lazaro.Orm.Attributes
+{
+        [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false)]
+        public abstract class Association : System.Attribute
+        {
+        }
+}
diff --git a/Orm/Attributes/Id.cs b/Orm/Attributes/Id.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+
+namespace Lazaro.Orm.Attributes
+{
+        [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false)]
+        public class Id : System.Attribute
+        {
+        }
+}
diff --git a/Orm/Attributes/ManyToMany.cs b/Orm/Attributes/ManyToMany.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+
+namespace Lazaro.Orm.Attributes
+{
+        [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false)]
+        public class ManyToMany : Association
+        {
+        }
+}
diff --git a/Orm/Attributes/ManyToOne.cs b/Orm/Attributes/ManyToOne.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+
+namespace Lazaro.Orm.Attributes
+{
+        [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false)]
+        public class ManyToOne : Association
+        {
+        }
+}
diff --git a/Orm/Attributes/OneToMany.cs b/Orm/Attributes/OneToMany.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+
+namespace Lazaro.Orm.Attributes
+{
+        [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false)]
+        public class OneToMany : Association
+        {
+        }
+}
diff --git a/Orm/Attributes/OneToOne.cs b/Orm/Attributes/OneToOne.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+
+namespace Lazaro.Orm.Attributes
+{
+        [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false)]
+        public class OneToOne : Association
+        {
+        }
+}
diff --git a/Orm/ColumnTypes.cs b/Orm/ColumnTypes.cs
@@ -1,14 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Lazaro.Orm
 {
         public enum ColumnTypes
         {
                 Serial,
-                Relation,
+                Association,
                 Integer,
                 MediumInt,
                 SmallInt,

diff --git a/Orm/EntityManager.cs b/Orm/EntityManager.cs
@@ -44,7 +44,18 @@ public void Persist(object entity)
 
                         foreach(var Col in ClassMetadata.Columns) {
                                 if (Col.GeneratedValueStategy == GeneratedValueStategies.None) {
-                                        InsertOrUpdate.ColumnValues.AddWithValue(Col.Name, ClassMetadata.ObjectInfo.GetColumnValue(entity, Col));
+                                        object ColValue;
+
+                                        if (Col.AssociationMetada != null && Col.AssociationMetada.AssociationType != AssociationTypes.None) {
+                                                // Association column. Get value from property on the other side
+                                                object OtherEndEntity = ClassMetadata.ObjectInfo.GetColumnValue(entity, Col);
+                                                ColValue = Col.AssociationMetada.OtherEndClass.ObjectInfo.GetColumnValue(OtherEndEntity, Col.AssociationMetada.OtherEndColumn);
+                                        } else {
+                                                // Regular member-to-column value
+                                                ColValue = ClassMetadata.ObjectInfo.GetColumnValue(entity, Col);
+                                        }
+
+                                        InsertOrUpdate.ColumnValues.AddWithValue(Col.Name, ColValue);
                                 }
                         }
 

diff --git a/Orm/Mapping/AnnotationMetadataFactory.cs b/Orm/Mapping/AnnotationMetadataFactory.cs
@@ -1,7 +1,9 @@
 using log4net;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
+using Lazaro.Orm.Attributes;
 
 namespace Lazaro.Orm.Mapping
 {
@@ -27,6 +29,7 @@ public void Init()
                         } */
                 }
 
+
                 public void ScanFolder(string folderName, bool recursive)
                 {
                         var Files = System.IO.Directory.EnumerateFiles(folderName, "*.dll", recursive ? System.IO.SearchOption.AllDirectories : System.IO.SearchOption.TopDirectoryOnly);
@@ -67,40 +70,78 @@ private void ScanAssembly(Assembly assembly)
                                         this.ClassMetadata.Add(Cls.FullName, ClsMeta);
                                 }
                         }
-                }
 
 
+                        this.FillAssociationInfo();
+                }
+
+
                 private ColumnMetadataCollection ScanClass(Type clsType)
                 {
                         var Res = new ColumnMetadataCollection();
 
                         var Members = clsType.GetMembers(BindingFlags.Instance | BindingFlags.GetField | BindingFlags.GetProperty | BindingFlags.NonPublic | BindingFlags.Public);
                         foreach(MemberInfo Mbr in Members) {
                                 var ColAttrs = Mbr.GetCustomAttributes(typeof(Attributes.Column), true);
-                                if(ColAttrs.Length > 0) {
-                                        var ColumnAttr = ColAttrs[0] as Attributes.Column;
-                                        var NewCol = new ColumnMetadata()
-                                        {
-                                                MemberName = Mbr.Name,
-                                                Id = ColumnAttr.Id,
-                                                GeneratedValueStategy = ColumnAttr.GeneratedValueStategy,
-                                                Name = ColumnAttr.Name,
-                                                Type = ColumnAttr.Type,
-                                                Length = ColumnAttr.Length,
-                                                Precision = ColumnAttr.Precision,
-                                                Nullable = ColumnAttr.Nullable,
-                                                Unique = ColumnAttr.Unique,
-                                        };
-                                        if(Mbr is PropertyInfo) {
-                                                NewCol.PropertyInfo = Mbr as PropertyInfo;
-                                                NewCol.MemberType = NewCol.PropertyInfo.PropertyType;
-                                        } else if (Mbr is FieldInfo) {
-                                                NewCol.FieldInfo = Mbr as FieldInfo;
-                                                NewCol.MemberType = NewCol.FieldInfo.FieldType;
+                                if(ColAttrs.Length == 1) {
+                                        var NewCol = ColumnMetadataFromColumnAttribute(Mbr, ColAttrs[0] as Attributes.Column);
+
+                                        var IdAttrs = Mbr.GetCustomAttributes(typeof(Attributes.Id), true);
+                                        if (IdAttrs.Length == 1) {
+                                                NewCol.Id = true;
+                                        }
+
+                                        var AssocAttrs = Mbr.GetCustomAttributes(typeof(Attributes.Association), true);
+                                        if (AssocAttrs.Length == 1) {
+                                                NewCol.AssociationMetada = AssociationMetadataFromAttribute(AssocAttrs[0] as Attributes.Association);
                                         }
 
                                         Res.Add(NewCol);
                                 }
+
+                        }
+
+                        return Res;
+                }
+
+                private AssociationMetadata AssociationMetadataFromAttribute(Association assocAttr)
+                {
+                        var Res = new Mapping.AssociationMetadata();
+
+                        if (assocAttr is Attributes.ManyToMany) {
+                                Res.AssociationType = AssociationTypes.ManyToMany;
+                        } else if (assocAttr is Attributes.ManyToOne) {
+                                Res.AssociationType = AssociationTypes.ManyToOne;
+                        } else if (assocAttr is Attributes.OneToMany) {
+                                Res.AssociationType = AssociationTypes.OneToMany;
+                        } else if (assocAttr is Attributes.OneToOne) {
+                                Res.AssociationType = AssociationTypes.OneToOne;
+                        }
+
+                        return Res;
+                }
+
+                protected ColumnMetadata ColumnMetadataFromColumnAttribute(MemberInfo mbrInfo, Attributes.Column colAttr)
+                {
+                        var Res = new ColumnMetadata()
+                        {
+                                MemberName = mbrInfo.Name,
+                                Id = colAttr.Id,
+                                GeneratedValueStategy = colAttr.GeneratedValueStategy,
+                                Name = colAttr.Name,
+                                Type = colAttr.Type,
+                                Length = colAttr.Length,
+                                Precision = colAttr.Precision,
+                                Nullable = colAttr.Nullable,
+                                Unique = colAttr.Unique,
+                        };
+
+                        if (mbrInfo is PropertyInfo) {
+                                Res.PropertyInfo = mbrInfo as PropertyInfo;
+                                Res.MemberType = Res.PropertyInfo.PropertyType;
+                        } else if (mbrInfo is FieldInfo) {
+                                Res.FieldInfo = mbrInfo as FieldInfo;
+                                Res.MemberType = Res.FieldInfo.FieldType;
                         }
 
                         return Res;

diff --git a/Orm/Mapping/AssociationMetadata.cs b/Orm/Mapping/AssociationMetadata.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Lazaro.Orm.Mapping
+{
+        public class AssociationMetadata
+        {
+                public AssociationTypes AssociationType { get; set; } = AssociationTypes.None;
+
+                public ClassMetadata OtherEndClass { get; set; }
+                public ColumnMetadata OtherEndColumn { get; set; }
+        }
+}
diff --git a/Orm/Mapping/AssociationTypes.cs b/Orm/Mapping/AssociationTypes.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace Lazaro.Orm.Mapping
+{
+        public enum AssociationTypes
+        {
+                None = 0,
+                OneToOne,
+                ManyToOne,
+                OneToMany,
+                ManyToMany
+        }
+}
diff --git a/Orm/Mapping/ColumnMetadata.cs b/Orm/Mapping/ColumnMetadata.cs
@@ -11,6 +11,8 @@ public class ColumnMetadata
                 public PropertyInfo PropertyInfo { get; internal set; }
                 public FieldInfo FieldInfo { get; internal set; }
 
+                public AssociationMetadata AssociationMetada { get; set; }
+
                 public bool Id { get; internal set; }
                 public GeneratedValueStategies GeneratedValueStategy { get; internal set; }
                 public string Name { get; internal set; }

diff --git a/Orm/Mapping/MetadataFactoryBase.cs b/Orm/Mapping/MetadataFactoryBase.cs
@@ -19,5 +19,24 @@ public ClassMetadata GetMetadataForClass(string className)
                                 throw new ApplicationException("No metadata found for class " + className);
                         }
                 }
+
+                protected void FillAssociationInfo()
+                {
+                        // Fill both ends on association columns
+                        foreach (var Cls in this.ClassMetadata.Values) {
+                                foreach(var Col in Cls.Columns) {
+                                        if(Col.AssociationMetada != null) {
+                                                if (Col.AssociationMetada.AssociationType == AssociationTypes.ManyToOne) {
+                                                        var OtherEnd = GetMetadataForClass(Col.MemberType);
+
+                                                        Col.AssociationMetada.OtherEndClass = OtherEnd;
+
+                                                        // We only support association to Id column for now
+                                                        Col.AssociationMetada.OtherEndColumn = OtherEnd.Columns.GetIdColumns()[0];
+                                                }
+                                        }
+                                }
+                        }
+                }
         }
 }
diff --git a/Orm/Orm.csproj b/Orm/Orm.csproj
@@ -57,6 +57,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Attributes\Association.cs" />
+    <Compile Include="Attributes\Id.cs" />
+    <Compile Include="Attributes\ManyToOne.cs" />
+    <Compile Include="Attributes\OneToOne.cs" />
+    <Compile Include="Attributes\OneToMany.cs" />
+    <Compile Include="Attributes\ManyToMany.cs" />
     <Compile Include="Attributes\Model.cs" />
     <Compile Include="Attributes\Column.cs" />
     <Compile Include="Attributes\Entity.cs" />
@@ -84,6 +90,8 @@
     <Compile Include="IdentifierStategies.cs" />
     <Compile Include="IEntityManager.cs" />
     <Compile Include="IRepository.cs" />
+    <Compile Include="Mapping\AssociationMetadata.cs" />
+    <Compile Include="Mapping\AssociationTypes.cs" />
     <Compile Include="Mapping\ClassMetadata.cs" />
     <Compile Include="Mapping\ClassMetadataCollection.cs" />
     <Compile Include="Mapping\ColumnMetadata.cs" />