Fix adapter with question mark only #3314
Merged
Conversation
This file contains 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
| val argumentAdapters = PsiTreeUtil.findChildrenOfType(this, SqlBindExpr::class.java) | ||
| .mapNotNull { typeResolver.argumentType(it).parentAdapter() } | ||
| val binders = PsiTreeUtil.findChildrenOfType(this, SqlBindExpr::class.java) | ||
| val argumentAdapters = binders.singleQuestionMark() ?: binders.mapNotNull { |
There was a problem hiding this comment.
this only works if theres only a single question mark in the whole file
There was a problem hiding this comment.
Thanks, added a test with two insert statements
| .mapNotNull { typeResolver.argumentType(it).parentAdapter() } | ||
| val binders = PsiTreeUtil.findChildrenOfType(this, SqlBindExpr::class.java) | ||
| val argumentAdapters = binders.singleQuestionMark() ?: binders.mapNotNull { | ||
| typeResolver.argumentType(it).parentAdapter() |
There was a problem hiding this comment.
you'll want to have your logic live in this function and have it be invoked as a flatMap so that you can expand a single SqlBindExpr to multiple PropertySpec
There was a problem hiding this comment.
and the logic would be
.flatMap {
it.parentOfType<SqlInsertStmt>()?.let {
if (it.acceptsTableInterface()) return@flatMap listOf(table.adapterProperty())
}
return listOf(typeResolver.argumentType(it).parentAdapter())
}.filterNotNull()
There was a problem hiding this comment.
Thanks, but don't you need if (it.acceptsTableInterface() && it.needsAdapter()) to prevent adding unused and unnecessary adapter property?
There was a problem hiding this comment.
ah right, because the table has only one adapter not multiple. Yes
sqldelight-compiler/src/main/kotlin/app/cash/sqldelight/core/lang/SqlDelightQueriesFile.kt
Outdated
Show resolved
Hide resolved
…ang/SqlDelightQueriesFile.kt
AlecKazakova
approved these changes
Jun 16, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #3233
Rather a hack, but works...