Skip to content

Fixed check for List type test data #157

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

Merged
merged 1 commit into from
May 12, 2025
Merged

Fixed check for List type test data #157

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
6 changes: 4 additions & 2 deletions ...domaframework/doma/intellij/inspection/sql/visitor/SqlTestDataAfterBlockCommentVisitor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import com.intellij.psi.PsiComment
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import com.intellij.psi.PsiLiteralExpression
import com.intellij.psi.PsiWhiteSpace
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.psi.util.nextLeafs
import org.domaframework.doma.intellij.common.isInjectionSqlFile
Expand Down Expand Up @@ -102,13 +101,16 @@ class SqlTestDataAfterBlockCommentVisitor(
* These values can be separated by commas, and the entire list must be enclosed in parentheses.
*/
private fun isMatchListTestData(element: PsiElement): Boolean {
// Ensure the list starts with an opening parenthesis, as this is required
// for the structure to match the expected "list type test data" pattern.
if (element.nextSibling?.elementType != SqlTypes.LEFT_PAREN) return false
val parenthesesListPattern =
Regex(
"""^\(\s*(?:(?:"[^"]*"|'[^']*'|\d+|true|false|null)\s*(?:,\s*(?:"[^"]*"|'[^']*'|\d+|true|false|null)\s*)*)?\)$""",
)
val testDataText =
element.nextLeafs
.takeWhile { it !is PsiWhiteSpace }
.takeWhile { it.prevSibling is PsiElement && it.prevSibling?.elementType != SqlTypes.RIGHT_PAREN }
.toList()
.joinToString("") { it.text }
return testDataText.matches(parenthesesListPattern)
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/resources/META-INF/doma/example/dao/inspection/TestDataCheckDao/commentBlock.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ SELECT e.employee_id AS employeeId
/*%! This comment will be removed */
WHERE e.employee_id = <error descr="Bind variables must be followed by test data">/*^ id */</error>
AND e.age >= /*^ literalAge */99
AND e.sub_id IN /* subIds */(1,2,3)
AND e.sub_id IN /* subIds */(1, 2, 3)