Use reference and not error-prone name

sqldelight · Aug 4, 2023 · f6a9b76 · f6a9b76
1 parent 59bdbf9
commit f6a9b76
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/core/src/main/kotlin/com/alecstrong/sql/psi/core/psi/mixins/ColumnNameMixin.kt b/core/src/main/kotlin/com/alecstrong/sql/psi/core/psi/mixins/ColumnNameMixin.kt
@@ -38,12 +38,13 @@ internal abstract class ColumnNameMixin(
 }
 
 fun SqlColumnName.getColumnDefOrNull(): SqlColumnDef? {
+  val ref = reference?.resolve() ?: return null
   val tables = tablesAvailable(this)
   for (table in tables) {
     val tableDef = table.tableName.parentOfType<SqlCreateTableStmt>() ?: continue
     for (columnDef in tableDef.columnDefList) {
-      val name = columnDef.columnName.name
-      if (name == this.name) {
+      val columnRef = columnDef.columnName.reference
+      if (columnRef != null && columnRef.resolve() == ref) {
         return columnDef
       }
     }

diff --git a/core/src/main/kotlin/com/alecstrong/sql/psi/core/psi/mixins/ForeignKeyClauseMixin.kt b/core/src/main/kotlin/com/alecstrong/sql/psi/core/psi/mixins/ForeignKeyClauseMixin.kt
@@ -35,7 +35,7 @@ fun SqlColumnDef.isForeignKey(): Boolean {
       if (foreignTableClause != null) {
         val columns = foreignTableClause.columnNameList
         for (column in columns) {
-          if (column.name == columnName.name) {
+          if (column.reference?.resolve() == columnName) {
             return true
           }
         }