Skip to content

Commit 755921f

Browse files
authored
Merge pull request #4155 from gchq/gh-4150_show_not_vis
#4150 StroomQL `vis as` keyword replaced with `show` plus added valid…
2 parents 8def0ca + 8c241b4 commit 755921f

File tree

9 files changed

+233
-148
lines changed

9 files changed

+233
-148
lines changed

Diff for: BREAKING_CHANGES.md

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
66
and this project adheres to [Semantic Versioning](http://semver.org/).
77

88

9+
## [v7.3]
10+
* StroomQL `vis as` keyword combination replaced with `show`.
11+
912
## [v7.2]
1013

1114
* Quoted strings in dashboard table expressions can now be expressed with single and double quotes. As part of this change apostrophes in text are no longer escaped with `''` but instead require a leading `\` before them if they are in a single quoted string. In many cases it is preferable to use double quotes if the string in question has an apostrophe. Note that the use of `\` as an escape character also means that any existing `\` characters will need to be escaped with a preceding `\` so `\` must now become `\\`.

Diff for: stroom-app-gwt/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -484,4 +484,4 @@ tasks.register('gwtClean') {
484484
}
485485

486486
tasks.clean.dependsOn(tasks.gwtClean)
487-
487+
tasks.copySources.mustRunAfter(tasks.gwtClean)

Diff for: stroom-app/src/test/java/stroom/search/TestVisualisationTokenConsumer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void testVis() {
6161
eval count = count()
6262
group by EventTime
6363
select EventTime, count
64-
vis as LineChart (x = EventTime, y = count)
64+
show LineChart (x = EventTime, y = count)
6565
""";
6666

6767

Diff for: stroom-core-client-widget/src/main/java/edu/ycp/cs/dh/acegwt/public/ace/mode-stroom_query.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
1515
var StroomQueryHighlightRules = function() {
1616

1717
var keywords = (
18-
"from|select|where|filter|in|eval|and|or|not|sort|group|by|order|limit|having|as|when|desc|asc|window|vis|" +
18+
"from|select|where|filter|in|eval|and|or|not|sort|group|by|order|limit|having|as|when|desc|asc|window|show|" +
1919
"dictionary"
2020
);
2121

0 commit comments

Comments
 (0)