Merge pull request #333 from Yachef/fix_multi_extends

correction erreurs quand heritage chainé
klee-contrib · Jan 17, 2024 · ff96394 · ff96394
2 parents 6948f37 + 2985c6f
commit ff96394
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/TopModel.Generator.Jpa/JpaDaoGenerator.cs b/TopModel.Generator.Jpa/JpaDaoGenerator.cs
@@ -57,7 +57,7 @@ protected override void HandleClass(string fileName, Class classe, string tag)
         string pk;
         if (!classe.PrimaryKey.Any() && classe.Extends != null)
         {
-            pk = Config.GetType(classe.Extends.PrimaryKey.Single());
+            pk = Config.GetType(classe.ExtendedProperties.Single(p => p.PrimaryKey));
         }
         else
         {

diff --git a/TopModel.Generator.Jpa/JpaModelPropertyGenerator.cs b/TopModel.Generator.Jpa/JpaModelPropertyGenerator.cs
@@ -266,7 +266,7 @@ private void WriteProperty(JavaWriter fw, Class classe, AssociationProperty prop
             }
 
             fw.AddImport("org.springframework.data.relational.core.mapping.Column");
-            fw.WriteLine(1, $@"@Column(""{property.Association.PrimaryKey.First().SqlName.ToLower()}"")");
+            fw.WriteLine(1, $@"@Column(""{property.Property.SqlName.ToLower()}"")");
             fw.WriteLine(1, $"private {_config.GetType(property)} {property.NameCamel};");
         }
     }