Skip to content

Commit f6d8682

Browse files
committed
Enhance literalDirective to accept additional boolean parameters and update SQL binding logic
1 parent 3ccc5c5 commit f6d8682

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

src/main/kotlin/org/domaframework/doma/intellij/inspection/sql/visitor/SqlTestDataAfterBlockCommentVisitor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class SqlTestDataAfterBlockCommentVisitor(
8484

8585
private fun isSqlLiteral(element: PsiElement): Boolean =
8686
element.elementType == SqlTypes.STRING ||
87-
listOf("true", "false", "null").contains(element.text) ||
87+
listOf("true", "false", "null").contains(element.text.lowercase()) ||
8888
element.text.matches(Regex("^\\d+$"))
8989

9090
/**

src/test/testData/src/main/java/doma/example/dao/inspection/TestDataCheckDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
interface TestDataCheckDao {
1414

1515
@Select
16-
EmployeeSummary literalDirective(String literalName, Integer literalId, Integer literalAge);
16+
EmployeeSummary literalDirective(String literalName, Integer literalId, Integer literalAge, Boolean literalTrue, Boolean literalFalse, Employee literalNull);
1717

1818
@Insert(sqlFile=true)
1919
int bindVariableDirective(Employee employee);

src/test/testData/src/main/resources/META-INF/doma/example/dao/inspection/TestDataCheckDao/literalDirective.sql

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ SELECT e.employee_id AS employeeId
55
WHERE e.employee_id = <error descr="Bind variables must be followed by test data">/*^ literalId */</error>
66
AND e.employee_name = <error descr="Bind variables must be followed by test data">/*^ literalName */</error>
77
AND e.age >= /*^ literalAge */99
8+
AND e.use = /* literalTrue */TRUE
9+
AND e.use = /* literalFalse */false
10+
AND e.use = /* literalNull */Null

0 commit comments

Comments
 (0)