Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ version = findProperty('cliVersion') ?: '0.1.0-SNAPSHOT'
// branch instead (1.0.0-SNAPSHOT), which relix-core publishes to Central's snapshot
// repository on every push. A release pins a released engine (checkEnginePin).
// -PrelixEngineVersion=<v> overrides it for one build, to try a candidate engine.
ext.relixEngineVersion = (findProperty('relixEngineVersion') ?: '1.0.0-rc11') as String
ext.relixEngineVersion = (findProperty('relixEngineVersion') ?: '1.0.0-rc12') as String

def engineIsSnapshot = relixEngineVersion.endsWith('-SNAPSHOT')

Expand Down
4 changes: 2 additions & 2 deletions docs/command-examples/check.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ A problem is printed on standard error, and the status is 3:
relix check scripts/broken.relix 2>&1; echo "exit $?"
```
```
scripts/broken.relix:1:30: error: Undefined relation: 'Ordrs'
scripts/broken.relix:1:30: error: Undefined relation: 'Ordrs' — did you mean 'Orders'?
exit 3
```

Expand All @@ -23,7 +23,7 @@ read:
relix check --json scripts/broken.relix; echo "exit $?"
```
```
{"diagnostics":[{"file":"scripts/broken.relix","line":1,"column":30,"severity":"error","message":"Undefined relation: 'Ordrs'"}]}
{"diagnostics":[{"file":"scripts/broken.relix","line":1,"column":30,"severity":"error","message":"Undefined relation: 'Ordrs' — did you mean 'Orders'?"}]}
exit 3
```

Expand Down
3 changes: 2 additions & 1 deletion docs/command-examples/doc.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@ SELECT <condition> (Relation)
With no topic, `relix doc` lists the pages, as rows:

```shell
relix doc -o tsv | head -4
relix doc -o tsv | head -5
```
```
topic category title summary
getting-started guide Getting started Your first script — declare data, name a result, run it
glossary guide Glossary The vocabulary — relation, tuple, bag vs set, materialisation, pushdown
operators-by-task guide Operators by task The operator for each task SQL has no operator for, named in a question's words
σ operator Selection Filter rows by a condition
```

Expand Down
2 changes: 1 addition & 1 deletion docs/guide/command-line/catalog.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ relix -e 'Customers' 2>&1; echo "exit $?"
```
```
relix: warning: skipping ~/shop/.relix, which is not trusted; to load it: relix catalog trust ~/shop
-e:1:1: error: Undefined relation: 'Customers'
-e:1:1: error: Undefined relation: 'Customers' (defined: Regions)
relix: Customers is declared in ~/shop/.relix/catalog/00-sources.relix, which is not trusted; to load it: relix catalog trust ~/shop
exit 5
```
Expand Down
4 changes: 2 additions & 2 deletions docs/guide/command-line/commands/check.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ A problem is printed on standard error, and the status is 3:
relix check scripts/broken.relix 2>&1; echo "exit $?"
```
```
scripts/broken.relix:1:30: error: Undefined relation: 'Ordrs'
scripts/broken.relix:1:30: error: Undefined relation: 'Ordrs' — did you mean 'Orders'?
exit 3
```

Expand All @@ -63,7 +63,7 @@ read:
relix check --json scripts/broken.relix; echo "exit $?"
```
```
{"diagnostics":[{"file":"scripts/broken.relix","line":1,"column":30,"severity":"error","message":"Undefined relation: 'Ordrs'"}]}
{"diagnostics":[{"file":"scripts/broken.relix","line":1,"column":30,"severity":"error","message":"Undefined relation: 'Ordrs' — did you mean 'Orders'?"}]}
exit 3
```

Expand Down
3 changes: 2 additions & 1 deletion docs/guide/command-line/commands/doc.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,13 @@ SELECT <condition> (Relation)
With no topic, `relix doc` lists the pages, as rows:

```shell
relix doc -o tsv | head -4
relix doc -o tsv | head -5
```
```
topic category title summary
getting-started guide Getting started Your first script — declare data, name a result, run it
glossary guide Glossary The vocabulary — relation, tuple, bag vs set, materialisation, pushdown
operators-by-task guide Operators by task The operator for each task SQL has no operator for, named in a question's words
σ operator Selection Filter rows by a condition
```

Expand Down
2 changes: 1 addition & 1 deletion docs/guide/command-line/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ message`, the shape compilers use, so an editor or a CI annotator can jump to it
relix check scripts/broken.relix 2>&1; echo "exit $?"
```
```
scripts/broken.relix:1:30: error: Undefined relation: 'Ordrs'
scripts/broken.relix:1:30: error: Undefined relation: 'Ordrs' — did you mean 'Orders'?
exit 3
```

Expand Down
2 changes: 1 addition & 1 deletion docs/guide/command-line/output.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ is not there, a database that refuses the connection — is one line beginning `
relix -e 'SELECT amount > 100 (Ordrs)' 2>&1; echo "exit $?"
```
```
-e:1:22: error: Undefined relation: 'Ordrs'
-e:1:22: error: Undefined relation: 'Ordrs' — did you mean 'Orders'?
exit 3
```

Expand Down
2 changes: 1 addition & 1 deletion docs/guide/command-line/pipelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ script in a tree:
find scripts -name '*.relix' | sort | xargs relix check 2>&1 || echo "a script has a problem"
```
```
scripts/broken.relix:1:30: error: Undefined relation: 'Ordrs'
scripts/broken.relix:1:30: error: Undefined relation: 'Ordrs' — did you mean 'Orders'?
a script has a problem
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ void xargs() {

assertThat(result.status()).isEqualTo(3);
assertThat(result.out()).isEmpty();
assertThat(result.err()).isEqualTo("broken.relix:6:19: error: Undefined relation: 'Missing'\n");
assertThat(result.err()).isEqualTo("broken.relix:6:19: error: Undefined relation: 'Missing' (defined: N, Bad)\n");
}

@Test
Expand All @@ -180,7 +180,7 @@ void json() {
assertThat(result.err()).isEmpty();
assertThat(isJson(result.out())).as(result.out()).isTrue();
assertThat(result.out()).isEqualTo("{\"diagnostics\":[{\"file\":\"broken.relix\",\"line\":6,"
+ "\"column\":19,\"severity\":\"error\",\"message\":\"Undefined relation: 'Missing'\"}]}\n");
+ "\"column\":19,\"severity\":\"error\",\"message\":\"Undefined relation: 'Missing' (defined: N, Bad)\"}]}\n");
}

@Test
Expand Down Expand Up @@ -396,7 +396,7 @@ void broken() {
assertThat(result.status()).isEqualTo(3);
assertThat(isJson(result.out())).as(result.out()).isTrue();
assertThat(result.out()).contains("\"diagnostics\":[{\"severity\":\"error\","
+ "\"message\":\"Undefined relation: 'Missing'\",\"file\":\"broken.relix\",\"line\":6,\"column\":19}]");
+ "\"message\":\"Undefined relation: 'Missing' (defined: N, Bad)\",\"file\":\"broken.relix\",\"line\":6,\"column\":19}]");
}
}

Expand Down
Loading