Extra fix: Association names like "taskId_id" should now be "task_id"

TouK · Oct 22, 2021 · 2756c93 · 2756c93
1 parent a7959cb
commit 2756c93
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/annotation-processor/src/main/kotlin/pl/touk/krush/source/TablesGenerator.kt b/annotation-processor/src/main/kotlin/pl/touk/krush/source/TablesGenerator.kt
@@ -115,7 +115,7 @@ class TablesGenerator : SourceGenerator {
             val name = assoc.targetIdPropName(targetIdProp)
             val columnType = targetIdProp.type.asUnderlyingClassName()
             CodeBlock.builder()
-            val initializer = associationInitializer(assoc, targetIdProp, name)
+            val initializer = associationInitializer(assoc, targetIdProp)
             tableSpec.addProperty(
                 PropertySpec.builder(name, Column::class.asClassName().parameterizedBy(columnType.copy(nullable = true)))
                     .initializer(initializer)
@@ -349,9 +349,9 @@ class TablesGenerator : SourceGenerator {
         }
     }
 
-    private fun associationInitializer(assoc: AssociationDefinition, idProp: PropertyDefinition, idName: String) : CodeBlock {
+    private fun associationInitializer(assoc: AssociationDefinition, idProp: PropertyDefinition) : CodeBlock {
         val columnName = assoc.joinColumns.find { it.name == idProp.columnName.toString() }?.name
-            ?: "${idName}_${assoc.targetId.name.asVariable()}"
+            ?: "${assoc.name.asVariable()}_${assoc.targetId.name.asVariable()}"
         val idCodeBlock = idCodeBlock(idProp, assoc.target.simpleName, columnName)
 
         return CodeBlock.builder().add(idCodeBlock)