Skip to content

Commit c04e21e

Browse files
committed
Merge remote-tracking branch 'origin/main' into nulls-last
2 parents 6b474e8 + 66e0bf6 commit c04e21e

File tree

157 files changed

+2688
-2279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+2688
-2279
lines changed

.config/.markdown-link-check-all.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"urls": ["https://crates.io"]
88
}
99
],
10-
"ignorePatters": [
10+
"ignorePatterns": [
1111
{
1212
"pattern": "^https://twitter.com"
1313
},
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"ignorePatterns": [
33
{
4-
"_comment_1": "Our pipeline should depend only on the work we do.",
5-
"_comment_2": "If some third-party website breaks a link, that should produce a warning, and not block our PRs",
6-
"pattern": "^(?!https://github\\.com/(PRQL|prql)|https://prql-lang\\.org|https://raw\\.githubusercontent\\.com/PRQL).*$"
4+
"_comment_1": "Our pipeline depends only on our assets.",
5+
"_comment_2": "If some third-party website breaks a link, we cover that in ./.markdown-link-check-all.json",
6+
"_comment_3": "So this excludes anything that's not a relative link to a file in our repo or a link to our file on the web.",
7+
"pattern": "^(?!https://github\\.com/(PRQL|prql)|https://prql-lang\\.org|https://raw\\.githubusercontent\\.com/(PRQL|prql)|[./]+|file://).*$"
78
}
89
]
910
}

.github/workflows/nightly.yaml

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -92,31 +92,34 @@ jobs:
9292
command: udeps
9393
args: --all-targets
9494

95-
test-docker:
96-
# We only test the build in `test-all`; this also runs tests.
97-
runs-on: ubuntu-latest
98-
steps:
99-
- name: 📂 Checkout code
100-
uses: actions/checkout@v3
101-
102-
- uses: docker/setup-buildx-action@v2
103-
104-
- name: Build
105-
uses: docker/build-push-action@v4
106-
with:
107-
tags: prql:latest
108-
# Use the GHA cache
109-
load: true
110-
cache-from: type=gha
111-
cache-to: type=gha,mode=max
112-
113-
# https://aschmelyun.com/blog/using-docker-run-inside-of-github-actions/
114-
- name: Test
115-
uses: addnab/docker-run-action@v3
116-
with:
117-
image: prql:latest
118-
options: -v ${{ github.workspace }}/:/src
119-
run: task test-rust
95+
# We now use the devcontainer. TODO: is it possible to have a similar test for
96+
# that? Or that would require VSCode to install the dependencies?
97+
98+
# test-docker:
99+
# # We only test the build in `test-all`; this also runs tests.
100+
# runs-on: ubuntu-latest
101+
# steps:
102+
# - name: 📂 Checkout code
103+
# uses: actions/checkout@v3
104+
105+
# - uses: docker/setup-buildx-action@v2
106+
107+
# - name: Build
108+
# uses: docker/build-push-action@v4
109+
# with:
110+
# tags: prql:latest
111+
# # Use the GHA cache
112+
# load: true
113+
# cache-from: type=gha
114+
# cache-to: type=gha,mode=max
115+
116+
# # https://aschmelyun.com/blog/using-docker-run-inside-of-github-actions/
117+
# - name: Test
118+
# uses: addnab/docker-run-action@v3
119+
# with:
120+
# image: prql:latest
121+
# options: -v ${{ github.workspace }}/:/src
122+
# run: task test-rust
120123

121124
code-ql:
122125
# Currently almost the default code-ql config

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
cp target/release/prqlc .debpkg/usr/bin/prqlc
6969
chmod +x .debpkg/usr/bin/prqlc
7070
- name: 📦 Build .deb package
71-
uses: jiro4989/build-deb-action@v2
71+
uses: jiro4989/build-deb-action@v3
7272
with:
7373
package: prqlc
7474
package_root: .debpkg

.github/workflows/test-all.yaml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -114,27 +114,6 @@ jobs:
114114
with:
115115
use_cache: true
116116

117-
build-docker:
118-
# TODO: could extract this into its own workflow and run on any changes to `Dockerfile` on PRs
119-
# Note that we only build the image here; we then run tests in `nightly.yaml`
120-
runs-on: ubuntu-latest
121-
steps:
122-
- name: 📂 Checkout code
123-
uses: actions/checkout@v3
124-
125-
- uses: docker/setup-buildx-action@v2
126-
127-
- name: Build
128-
uses: docker/build-push-action@v4
129-
with:
130-
tags: prql:latest
131-
# Use the GHA cache
132-
load: true
133-
cache-from: type=gha
134-
# Only save cache on `main`
135-
cache-to:
136-
${{ github.ref_name == 'main' && 'type=gha,mode=max' || '' }}
137-
138117
test-min-rust-version:
139118
runs-on: ubuntu-latest
140119
steps:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ lcov.info
1313

1414
/*.prql
1515
_*.prql
16+
**/project/**/*.prql
1617
/*.rq
1718
_*.rq
1819
/*.pl

.pre-commit-config.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,22 @@ repos:
4242
rev: v3.11.2
4343
hooks:
4444
- id: markdown-link-check
45+
name: markdown-link-check-local
4546
files: \.md$
4647
args: ["--config=.config/.markdown-link-check-local.json"]
48+
# To run across everything (see nightly.yaml for more details)
49+
- id: markdown-link-check
50+
name: markdown-link-check-all
51+
stages: [manual]
52+
files: \.md$
53+
args: ["--config=.config/.markdown-link-check-all.json"]
4754
- repo: local
4855
hooks:
4956
- id: no-dbg
5057
name: no-dbg
5158
description: We shouldn't merge code with `dbg!` in
5259
language: pygrep
5360
types: ["rust"]
54-
# A regex searching sql files for either `prj-` or 'tgs-'.
5561
entry: "dbg!"
5662
- repo: local
5763
hooks:

CHANGELOG.md

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,23 @@ will become the public version at the next release._
77

88
**Features**:
99

10+
- We've made one large breaking change — "Lists" are now "Tuples", and
11+
represented with brackets `{}` rather than braces `[]`.
12+
13+
We've made this change to incorporate arrays without having syntax that's the
14+
opposite of almost every major language — specifically using `{}` for an array
15+
type and `[]` for a tuple type. (Though we recognize that `{}` for tuples is
16+
also rare (Hi, Erlang!), but didn't want to further load parentheses with
17+
meaning)
18+
19+
As part of this, we've also formalized tuples as containing both individual
20+
items (`select {foo, baz}`), and assignments (`select {foo=bar, baz=fuz}`).
21+
1022
- Add a `~=` regex search operator (@max-sixty, #2458). An example:
1123

1224
```prql no-eval
1325
from tracks
14-
filter (name ~= "Love")
26+
filter {name ~= "Love"}
1527
```
1628

1729
...compiles to;
@@ -537,10 +549,10 @@ below in this release).
537549

538550
```prql no-eval
539551
from numbers
540-
select [
552+
select {
541553
small = 1.000_000_1,
542554
big = 5_000_000,
543-
]
555+
}
544556
```
545557

546558
- The SQL output contains a comment with the PRQL compiler version (@aljazerzen,

0 commit comments

Comments
 (0)