Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add join clause completion #4086

Merged
merged 1 commit into from
Apr 24, 2023
Merged

Add join clause completion #4086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 44 additions & 0 deletions ...in/app/cash/sqldelight/intellij/lang/completion/SqlDelightKeywordCompletionContributor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ package app.cash.sqldelight.intellij.lang.completion

import app.cash.sqldelight.core.SqlDelightProjectService
import app.cash.sqldelight.core.lang.SqlDelightLanguage
import app.cash.sqldelight.core.lang.util.findChildOfType
import app.cash.sqldelight.dialect.api.SqlDelightDialect
import com.alecstrong.sql.psi.core.psi.SqlCompoundSelectStmt
import com.alecstrong.sql.psi.core.psi.SqlCreateTableStmt
import com.alecstrong.sql.psi.core.psi.SqlStmtList
import com.alecstrong.sql.psi.core.psi.SqlTableName
import com.alecstrong.sql.psi.core.psi.SqlTypes
import com.intellij.codeInsight.completion.AddSpaceInsertHandler
import com.intellij.codeInsight.completion.CompletionContributor
Expand All @@ -12,7 +16,9 @@ import com.intellij.codeInsight.completion.CompletionParameters
import com.intellij.codeInsight.completion.CompletionProvider
import com.intellij.codeInsight.completion.CompletionResultSet
import com.intellij.codeInsight.completion.CompletionType
import com.intellij.codeInsight.completion.PrioritizedLookupElement
import com.intellij.codeInsight.lookup.LookupElementBuilder
import com.intellij.icons.AllIcons
import com.intellij.lang.ASTNode
import com.intellij.lang.PsiBuilder
import com.intellij.lang.parser.GeneratedParserUtilBase
Expand All @@ -25,12 +31,50 @@ import com.intellij.patterns.PlatformPatterns.psiElement
import com.intellij.psi.PsiFileFactory
import com.intellij.psi.impl.source.tree.TreeUtil
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.psi.util.parentOfType
import com.intellij.util.ProcessingContext

class SqlDelightKeywordCompletionContributor : CompletionContributor() {

init {
extend(CompletionType.BASIC, psiElement(), SqliteCompletionProvider())
extend(CompletionType.BASIC, psiElement().afterLeaf(psiElement(SqlTypes.JOIN)), JoinClauseCompletionProvider())
}

class JoinClauseCompletionProvider : CompletionProvider<CompletionParameters>() {
override fun addCompletions(
parameters: CompletionParameters,
context: ProcessingContext,
result: CompletionResultSet,
) {
val stmt = parameters.position.parentOfType<SqlCompoundSelectStmt>() ?: return
val tableName = stmt.findChildOfType<SqlTableName>() ?: return
val createTableStmt =
tableName.reference?.resolve()?.parentOfType<SqlCreateTableStmt>() ?: return
val tableConstraints = createTableStmt.tableConstraintList

for (constraint in tableConstraints) {
val columnNameList = constraint.columnNameList
val foreignKeyClause = constraint.foreignKeyClause ?: continue
val foreignTable = foreignKeyClause.foreignTable
val foreignColumNameList = foreignKeyClause.columnNameList

val columnExpr = columnNameList.zip(foreignColumNameList)
.joinToString(separator = " AND ") { (first, second) ->
"${tableName.name}.${first.name} = ${foreignTable.name}.${second.name}"
}

val lookupElement = PrioritizedLookupElement.withPriority(
LookupElementBuilder.create("${foreignTable.name} ON $columnExpr")
.withIcon(AllIcons.Nodes.DataTables)
.withInsertHandler(AddSpaceInsertHandler.INSTANCE),
1000.0,
)
result
.caseInsensitive()
.addElement(lookupElement)
}
}
}

class SqliteCompletionProvider : CompletionProvider<CompletionParameters>() {
Expand Down
67 changes: 67 additions & 0 deletions ...pp/cash/sqldelight/intellij/lang/completion/SqlDelightKeywordCompletionContributorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
package app.cash.sqldelight.intellij.lang.completion

import app.cash.sqldelight.core.lang.SqlDelightFileType
import app.cash.sqldelight.intellij.SqlDelightFixtureTestCase
import com.google.common.truth.Truth.assertThat
import com.intellij.codeInsight.completion.CompletionType

class SqlDelightKeywordCompletionContributorTest : SqlDelightFixtureTestCase() {

fun testJoinClauseCompletion() {
myFixture.configureByText(
SqlDelightFileType,
"""
|CREATE TABLE album(
| albumartist TEXT,
| albumname TEXT,
| albumcover TEXT,
| PRIMARY KEY(albumartist)
|);
|
|CREATE TABLE song(
| songid INTEGER,
| songartist TEXT,
| songalbum TEXT,
| songname TEXT,
| FOREIGN KEY(songartist) REFERENCES album(albumartist)
|);
|
|SELECT * FROM song JOIN <caret>
""".trimMargin(),
)

myFixture.complete(CompletionType.BASIC)

val lookupElementStrings = myFixture.lookupElementStrings
assertThat(lookupElementStrings).contains("album ON song.songartist = album.albumartist")
}

fun testJoinClauseCompletionWithCompositeForeignKey() {
myFixture.configureByText(
SqlDelightFileType,
"""
|CREATE TABLE album(
| albumartist TEXT,
| albumname TEXT,
| albumcover TEXT,
| PRIMARY KEY(albumartist, albumname)
|);
|
|CREATE TABLE song(
| songid INTEGER,
| songartist TEXT,
| songalbum TEXT,
| songname TEXT,
| FOREIGN KEY(songartist, songalbum) REFERENCES album(albumartist, albumname)
|);
|
|SELECT * FROM song JOIN <caret>
""".trimMargin(),
)

myFixture.complete(CompletionType.BASIC)

val lookupElementStrings = myFixture.lookupElementStrings
assertThat(lookupElementStrings).contains("album ON song.songartist = album.albumartist AND song.songalbum = album.albumname")
}
}