add Enum and EnumMembers attributes

Author: makhin

Generator/Enumeration.cs

@@ -5,9 +5,11 @@ namespace Efrpg
     public class Enumeration
     {
         public readonly string EnumName;
-        public readonly List<KeyValuePair<string, string>> Items;
+        public readonly List<EnumerationMember> Items;
 
-        public Enumeration(string enumName, List<KeyValuePair<string, string>> items)
+        public List<string> EnumAttributes = new List<string>();
+
+        public Enumeration(string enumName, List<EnumerationMember> items)
         {
             EnumName = enumName;
             Items    = items;

Generator/EnumerationMember.cs

@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+
+namespace Efrpg
+{
+    public class EnumerationMember
+    {
+        public readonly string Key;
+        public readonly string Value;
+        public readonly Dictionary<string, object> AllValues;
+
+        public List<string> Attributes = new List<string>();
+
+        public EnumerationMember(string key, string value, Dictionary<string, object> allValues)
+        {
+            Key = key;
+            Value = value;
+            AllValues = allValues;
+        }
+    }
+}

Generator/Filtering/DbContextFilter.cs

@@ -30,6 +30,8 @@ protected DbContextFilter()
         public abstract string MappingTableRename(string mappingTable, string tableName, string entityName);
         public abstract void UpdateTable(Table table);
         public abstract void UpdateColumn(Column column, Table table);
+        public abstract void UpdateEnum(Enumeration enumeration);
+        public abstract void UpdateEnumMember(EnumerationMember enumerationMember);
         public abstract void ViewProcessing(Table view);
         public abstract string StoredProcedureRename(StoredProcedure sp);
         public abstract string StoredProcedureReturnModelRename(string name, StoredProcedure sp);

Generator/Filtering/IDbContextFilter.cs

@@ -21,6 +21,8 @@ public interface IDbContextFilter
         string     MappingTableRename(string mappingTable, string tableName, string entityName);
         void       UpdateTable(Table table);
         void       UpdateColumn(Column column, Table table);
+        void       UpdateEnum(Enumeration enumeration);
+        void       UpdateEnumMember(EnumerationMember enumerationMember);
         void       ViewProcessing(Table view);
         string     StoredProcedureRename(StoredProcedure sp);
         string     StoredProcedureReturnModelRename(string name, StoredProcedure sp);

Generator/Filtering/MultiContextFilter.cs

@@ -346,6 +346,16 @@ public override void UpdateColumn(Column column, Table table)
             Settings.UpdateColumn?.Invoke(column, table, null);
         }
 
+        public override void UpdateEnum(Enumeration enumeration)
+        {
+
+        }
+
+        public override void UpdateEnumMember(EnumerationMember enumerationMember)
+        {
+
+        }
+
         public override void ViewProcessing(Table view)
         {
             // Find the multi-context settings for this view

Generator/Filtering/SingleContextFilter.cs

@@ -94,6 +94,16 @@ public override void UpdateColumn(Column column, Table table)
             Settings.UpdateColumn?.Invoke(column, table, EnumDefinitions);
         }
 
+        public override void UpdateEnum(Enumeration enumeration)
+        {
+            Settings.UpdateEnum?.Invoke(enumeration);
+        }
+
+        public override void UpdateEnumMember(EnumerationMember enumerationMember)
+        {
+            Settings.UpdateEnumMember?.Invoke(enumerationMember);
+        }
+
         public override void ViewProcessing(Table view)
         {
             // Callback to Settings, which can be set within <database>.tt

Generator/Generator.csproj

@@ -61,6 +61,7 @@
   <ItemGroup>
     <Compile Include="AssemblyHelper.cs" />
     <Compile Include="EfrpgVersion.cs" />
+    <Compile Include="EnumerationMember.cs" />
     <Compile Include="FileManagement\VisualStudioFileManager.cs" />
     <Compile Include="FileManagement\CustomFileManager.cs" />
     <Compile Include="FileManagement\EntityFrameworkTemplateFileManager.cs" />

Generator/Generators/Generator.cs

@@ -416,6 +416,15 @@ private void AddTablesToFilters(List<RawTable> rawTables)
 
                     table.Suffix = Settings.TableSuffix;
                 }
+
+                foreach (var enumeration in filter.Enums)
+                {
+                    filter.UpdateEnum(enumeration);
+                    foreach (var enumerationMember in enumeration.Items)
+                    {
+                        filter.UpdateEnumMember(enumerationMember);
+                    }
+                }
             }
         }
 

Generator/Readers/DatabaseReader.cs

@@ -807,7 +807,8 @@ public List<Enumeration> ReadEnums(List<EnumerationSettings> enums)
                     {
                         using (var rdr = cmd.ExecuteReader())
                         {
-                            var items = new List<KeyValuePair<string, string>>();
+                            var items = new List<EnumerationMember>();
+
                             while (rdr.Read())
                             {
                                 var name = rdr["NameField"].ToString().Trim();
@@ -823,11 +824,20 @@ public List<Enumeration> ReadEnums(List<EnumerationSettings> enums)
                                 if (string.IsNullOrEmpty(value))
                                     continue;
 
-                                items.Add(new KeyValuePair<string, string>(name, value));
+                                var allValues = new Dictionary<string, object>();
+                                for (var n = 2; n < rdr.FieldCount; ++n)
+                                {
+                                    var o = rdr.GetValue(n);
+                                    allValues.Add(rdr.GetName(n), o != DBNull.Value ? o : null);
+                                }
+
+                                items.Add(new EnumerationMember(name, value, allValues));
                             }
 
                             if(items.Any())
+                            {
                                 result.Add(new Enumeration(e.Name, items));
+                            }
                         }
                     }
                     catch (Exception)

Generator/Readers/PostgreSqlDatabaseReader.cs

@@ -193,7 +193,7 @@ protected override string MultiContextSQL()
 
         protected override string EnumSQL(string table, string nameField, string valueField)
         {
-            return string.Format(@"SELECT ""{0}"" as ""NameField"", ""{1}"" as ""ValueField"" FROM ""{2}"";", nameField, valueField, table);
+            return string.Format(@"SELECT ""{0}"" as ""NameField"", ""{1}"" as ""ValueField"", * FROM ""{2}"";", nameField, valueField, table);
         }
 
         protected override string SequenceSQL()