Skip to content

Fix unnecessary indexed field names (e.g. entityManager4) #2567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 29, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,12 @@ abstract class CgAbstractClassFieldManager(context: CgContext) :

val baseVarName = constructBaseVarName(model)

val createdVariable = variableConstructor.getOrCreateVariable(model, baseVarName) as? CgVariable
?: error("`CgVariable` cannot be constructed from a $model model")
// `withNameScope` is used to avoid saving names for sub-models of model
val createdVariable = withNameScope {
variableConstructor.getOrCreateVariable(model, baseVarName) as? CgVariable
?: error("`CgVariable` cannot be constructed from a $model model")
}
existingVariableNames.add(createdVariable.name)

val declaration = CgDeclaration(classId, variableName = createdVariable.name, initializer = null)

Expand Down