Query params per file #107
Merged
Conversation
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
…ing and bugfixing
FylmTM
suggested changes
Jan 11, 2019
...ain/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/util/FileTypeExtensionUtil.java
Outdated
Show resolved
Hide resolved
...gin/graphdb/test/integration/neo4j/tests/cypher/parameters/CypherParametersProviderTest.java
Outdated
Show resolved
Hide resolved
.../jetbrains/plugin/graphdb/test/integration/neo4j/tests/jetbrains/StatementCollectorTest.java
Outdated
Show resolved
Hide resolved
.../jetbrains/plugin/graphdb/test/integration/neo4j/tests/jetbrains/StatementCollectorTest.java
Outdated
Show resolved
Hide resolved
...n/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/actions/execute/ExecuteQueryAction.java
Show resolved
Hide resolved
...ains/plugin/graphdb/jetbrains/actions/ui/console/ToggleFileSpecificParametersUsedAction.java
Outdated
Show resolved
Hide resolved
…instead of replacing them
FylmTM
suggested changes
Jan 21, 2019
|
|
||
| public class CypherParametersProviderTest extends BaseIntegrationTest { | ||
|
|
||
| private class TestParametersProvider implements ParametersProvider { | ||
|
|
||
| private String parametersJson; | ||
| private String globalParametersJson, fileSpecificParametersJson; |
| @@ -43,13 +40,18 @@ public void registerParametersProvider(final ParametersProvider parametersProvid | |||
| } | |||
|
|
|||
| public Map<String, Object> getParameters(PsiElement element) throws Exception { | |||
| if (!isValidParametersMap(parametersProvider.getParametersJson())) { | |||
| return Collections.emptyMap(); | |||
| if (element == null) return Collections.emptyMap(); | |||
| @@ -24,11 +34,41 @@ public static VirtualFile getDataSourceFile(Project project, DataSourceApi dataS | |||
| public static VirtualFile getScratchFile(Project project, String fileName) throws IOException { | |||
| return ScratchFileService.getInstance().findFile( | |||
| ParameterRootType.getInstance(), | |||
| project.getName() + fileName, | |||
| project.getName() + "_" + fileName, | |||
There was a problem hiding this comment.
This is not backward compatible?
There was a problem hiding this comment.
Restored in b481123
| ScratchFileService.Option.create_if_missing | ||
| ); | ||
| } | ||
|
|
||
| public static String getParams(VirtualFile file) { |
There was a problem hiding this comment.
This is crazy.
Refactor to linear if statements.
Example:
if (stmnt) {
return
}
if (stmnt) {
return
}
mainwork
return
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.
Implements #91 on a basic level.
Some functionality may be added before next release, but this provides the bare minimum - two editors in Parameters tab, the second one for parameters specific to the Cypher file open right now. And a button (left column, 3rd button in Graph Database Console) to toggle between using global and file-specific parameters. File-specific params are saved in .json next to global params, a .json for each Cypher file that was opened in the editor.
Tests were modified to ensure that correct params are used when needed.
Future ideas: