From 960b114078d2702f6bc9c3ca5c41e2528b86c92d Mon Sep 17 00:00:00 2001 From: Alexander Perfilyev Date: Wed, 26 Apr 2023 23:30:44 +0300 Subject: [PATCH] Use sql column name for migration generation instead of type name --- .../app/cash/sqldelight/core/lang/psi/SignatureData.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sqldelight-compiler/src/main/kotlin/app/cash/sqldelight/core/lang/psi/SignatureData.kt b/sqldelight-compiler/src/main/kotlin/app/cash/sqldelight/core/lang/psi/SignatureData.kt index 9db5e1b79ba..cfe0e3b1848 100644 --- a/sqldelight-compiler/src/main/kotlin/app/cash/sqldelight/core/lang/psi/SignatureData.kt +++ b/sqldelight-compiler/src/main/kotlin/app/cash/sqldelight/core/lang/psi/SignatureData.kt @@ -6,11 +6,10 @@ import com.alecstrong.sql.psi.core.psi.SqlColumnDef import com.intellij.refactoring.suggested.SuggestedRefactoringSupport import com.intellij.refactoring.suggested.SuggestedRefactoringSupport.ParameterAdditionalData -fun QueryColumn.parameterValue(): SuggestedRefactoringSupport.Parameter? = element.type().let { type -> - val column = type.column ?: return null +fun QueryColumn.parameterValue(): SuggestedRefactoringSupport.Parameter? = element.type().column?.let { column -> SuggestedRefactoringSupport.Parameter( - id = type.name, - name = type.name, + id = column.columnName.name, + name = column.columnName.name, type = column.columnType.typeName.text, additionalData = column.columnConstraintList.takeIf { it.isNotEmpty() }?.let { list -> ColumnConstraints((list.filter { it.text.isNotBlank() }.joinToString(" ") { it.text.trim() }))