Skip to content

Commit

Permalink
Merge pull request #4155 from gchq/gh-4150_show_not_vis
Browse files Browse the repository at this point in the history
#4150 StroomQL `vis as` keyword replaced with `show` plus added valid…
  • Loading branch information
stroomdev66 authored Mar 11, 2024
2 parents 8def0ca + 8c241b4 commit 755921f
Show file tree
Hide file tree
Showing 9 changed files with 233 additions and 148 deletions.
3 changes: 3 additions & 0 deletions BREAKING_CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).


## [v7.3]
* StroomQL `vis as` keyword combination replaced with `show`.

## [v7.2]

* 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 `\\`.
2 changes: 1 addition & 1 deletion stroom-app-gwt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -484,4 +484,4 @@ tasks.register('gwtClean') {
}

tasks.clean.dependsOn(tasks.gwtClean)

tasks.copySources.mustRunAfter(tasks.gwtClean)
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ void testVis() {
eval count = count()
group by EventTime
select EventTime, count
vis as LineChart (x = EventTime, y = count)
show LineChart (x = EventTime, y = count)
""";


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
var StroomQueryHighlightRules = function() {

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

Expand Down
Loading

0 comments on commit 755921f

Please sign in to comment.