-
Notifications
You must be signed in to change notification settings - Fork 31
Add column helper #541
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
Closed
Closed
Add column helper #541
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,13 @@ | ||
| package com.alecstrong.sql.psi.core.psi.mixins | ||
|
|
||
| import com.alecstrong.sql.psi.core.psi.QueryElement.QueryResult | ||
| import com.alecstrong.sql.psi.core.psi.SqlColumnDef | ||
| import com.alecstrong.sql.psi.core.psi.SqlCompositeElementImpl | ||
| import com.alecstrong.sql.psi.core.psi.SqlCreateTableStmt | ||
| import com.alecstrong.sql.psi.core.psi.SqlForeignKeyClause | ||
| import com.intellij.lang.ASTNode | ||
| import com.intellij.psi.PsiElement | ||
| import com.intellij.psi.util.parentOfType | ||
|
|
||
| internal abstract class ForeignKeyClauseMixin( | ||
| node: ASTNode, | ||
|
|
@@ -18,3 +21,26 @@ internal abstract class ForeignKeyClauseMixin( | |
| return super.queryAvailable(child) | ||
| } | ||
| } | ||
|
|
||
| fun SqlColumnDef.isForeignKey(): Boolean { | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. After thinking again, this won't work in sqldelight with the mysql dialect supporting |
||
| for (columnConstraint in columnConstraintList) { | ||
| if (columnConstraint.foreignKeyClause != null) { | ||
| return true | ||
| } | ||
| } | ||
| val createTableStmt: SqlCreateTableStmt? = parentOfType() | ||
| if (createTableStmt != null) { | ||
| for (tableConstraints in createTableStmt.tableConstraintList) { | ||
| val foreignTableClause = tableConstraints.foreignTableClause | ||
| if (foreignTableClause != null) { | ||
| val columns = foreignTableClause.columnNameList | ||
| for (column in columns) { | ||
| if (column.reference?.resolve() == columnName) { | ||
| return true | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return false | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
103 changes: 103 additions & 0 deletions
103
core/src/test/kotlin/com/alecstrong/sql/psi/core/GetForeignKeyHelperTest.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| package com.alecstrong.sql.psi.core | ||
|
|
||
| import com.alecstrong.sql.psi.core.psi.SqlColumnExpr | ||
| import com.alecstrong.sql.psi.core.psi.mixins.getColumnDefOrNull | ||
| import com.alecstrong.sql.psi.core.psi.mixins.isForeignKey | ||
| import com.alecstrong.sql.psi.test.fixtures.compileFile | ||
| import com.google.common.truth.Truth.assertThat | ||
| import org.junit.After | ||
| import org.junit.Before | ||
| import org.junit.Test | ||
| import java.io.File | ||
|
|
||
| class GetForeignKeyHelperTest { | ||
| @Before | ||
| fun before() { | ||
| File("build/tmp").deleteRecursively() | ||
| } | ||
|
|
||
| @After | ||
| fun after() { | ||
| SqlParserUtil.reset() | ||
| File("build/tmp").deleteRecursively() | ||
| } | ||
|
|
||
| @Test | ||
| fun columnConstraint() { | ||
| val sqlFile = compileFile( | ||
| """ | ||
| |CREATE TABLE foo ( | ||
| | id INT PRIMARY KEY | ||
| |); | ||
| | | ||
| |CREATE TABLE bar ( | ||
| |a TEXT REFERENCES foo(id) | ||
| |); | ||
| | | ||
| |SELECT a FROM bar; | ||
| """.trimMargin(), | ||
| ) | ||
| val select = sqlFile.sqlStmtList!!.stmtList.last() | ||
| val a = (select.compoundSelectStmt!!.selectStmtList.single().resultColumnList.single().expr as SqlColumnExpr).columnName | ||
|
|
||
| val columnDef = a.getColumnDefOrNull() | ||
| assertThat(columnDef).isNotNull() | ||
| assertThat(columnDef!!.isForeignKey()).isTrue() | ||
| } | ||
|
|
||
| @Test | ||
| fun tableConstraint() { | ||
| val sqlFile = compileFile( | ||
| """ | ||
| |CREATE TABLE foo ( | ||
| | id INT PRIMARY KEY | ||
| |); | ||
| | | ||
| |CREATE TABLE bar ( | ||
| |a INT, | ||
| |FOREIGN KEY (a) REFERENCES foo(id) | ||
| |); | ||
| | | ||
| |SELECT a FROM bar; | ||
| """.trimMargin(), | ||
| ) | ||
| val select = sqlFile.sqlStmtList!!.stmtList.last() | ||
| val a = (select.compoundSelectStmt!!.selectStmtList.single().resultColumnList.single().expr as SqlColumnExpr).columnName | ||
|
|
||
| val columnDef = a.getColumnDefOrNull() | ||
| assertThat(columnDef).isNotNull() | ||
| assertThat(columnDef!!.isForeignKey()).isTrue() | ||
| } | ||
|
|
||
| @Test | ||
| fun alterTable() { | ||
| compileFile( | ||
| """ | ||
| |CREATE TABLE foo ( | ||
| | id INT PRIMARY KEY | ||
| |); | ||
| | | ||
| |CREATE TABLE bar ( | ||
| |b TEXT | ||
| |); | ||
| """.trimMargin(), | ||
| fileName = "1.s", | ||
| ) | ||
| val alterFile = compileFile( | ||
| """ | ||
| |ALTER TABLE bar | ||
| | ADD COLUMN a INT REFERENCES foo(id) | ||
| |; | ||
| | | ||
| |SELECT a FROM bar; | ||
| """.trimMargin(), | ||
| fileName = "2.s", | ||
| ) | ||
| val select = alterFile.sqlStmtList!!.stmtList.last() | ||
| val a = (select.compoundSelectStmt!!.selectStmtList.single().resultColumnList.single().expr as SqlColumnExpr).columnName | ||
|
|
||
| val columnDef = a.getColumnDefOrNull() | ||
| assertThat(columnDef).isNotNull() | ||
| assertThat(columnDef!!.isForeignKey()).isTrue() | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's a little more nuanced then this, since columns can come from an alter table statement
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm also pretty sure this is already done elsewhere in code quite a bit (going from column name to column def)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, you are right. Also added a test for alter table.