Skip to content

Commit b1fd0f3

Browse files
authored
Merge pull request #3137 from quadratichq/qa
QA June 24
2 parents e925952 + 5195ff5 commit b1fd0f3

File tree

419 files changed

+13171
-6535
lines changed

Some content is hidden

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

419 files changed

+13171
-6535
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ jobs:
7878
RUSTFLAGS: -Cinstrument-coverage
7979
RUSTC_BOOTSTRAP: 1
8080
CARGO_BUILD_JOBS: 4
81+
BIGQUERY_CREDENTIALS: "${{ secrets.BIGQUERY_CREDENTIALS }}"
8182
run: |
8283
cd quadratic-${{ matrix.package }}
8384
${{ matrix.test_command }}
@@ -264,9 +265,8 @@ jobs:
264265
- name: Rust Cache
265266
uses: useblacksmith/rust-cache@v3
266267

267-
- name: Run cargo clippy in quadratic-core
268+
- name: Run cargo clippy
268269
run: |
269-
cd quadratic-core
270270
cargo clippy -- -D warnings
271271
272272
lint_typescript:

.github/workflows/preview-build-deploy-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ jobs:
538538
outputs:
539539
matrix: ${{ steps.generate-matrix.outputs.matrix }}
540540
env:
541-
matrix_runner: 156
541+
matrix_runner: 158
542542
e2e_url: ${{ needs.deploy_images.outputs.WEBSITE_URL }}
543543
deploy_time: ${{ needs.deploy_images.outputs.DEPLOY_TIME }}
544544
steps:
@@ -583,7 +583,7 @@ jobs:
583583
]
584584
runs-on: blacksmith-2vcpu-ubuntu-2404
585585
container:
586-
image: mcr.microsoft.com/playwright:v1.52.0-noble
586+
image: mcr.microsoft.com/playwright:v1.53.1-noble
587587
options: --user root
588588
if: github.head_ref != 'qa' || github.base_ref != 'main'
589589
timeout-minutes: 15
@@ -721,7 +721,7 @@ jobs:
721721
## Preview - Build, Deploy & Tests-E2E
722722
✅ Build images
723723
✅ Deploy images - ${{ env.deploy_time }} - [Preview](https://${{ env.e2e_url }})
724-
${{ needs.test-e2e-matrix-run.result == 'success' && '✅' || '❌' }} Tests-E2E - [Report](http://${{ env.s3_bucket }}.s3-website-us-west-2.amazonaws.com/pr-${{ github.event.pull_request.number }}/)
724+
${{ needs.test-e2e-matrix-run.result == 'success' && '✅' || '❌' }} Tests-E2E - [Report](https://${{ env.s3_bucket }}/pr-${{ github.event.pull_request.number }})
725725
edit-mode: replace
726726

727727
- name: Update comment on E2E tests end

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ docker/postgres-connection/data
8181
docker/mysql-connection/data
8282
docker/snowflake-connection/data
8383
docker/mssql-connection/data
84+
docker/cockroachdb-connection/data
85+
docker/mariadb-connection/data
86+
docker/bigquery-connection/data
8487
docker/ssh-postgres-connection/data
8588
docker/ssh-mysql-connection/data
8689
docker/ssh-mssql-connection/data

.vscode/settings.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"AABB",
55
"acked",
66
"actix",
7+
"allocvec",
78
"autoclean",
89
"autoincrement",
910
"AVERAGEIF",
@@ -24,6 +25,7 @@
2425
"Cinstrument",
2526
"clippy",
2627
"cmdk",
28+
"Cockroachdb",
2729
"codegen",
2830
"codingame",
2931
"containerd",
@@ -120,6 +122,7 @@
120122
"pixiapp",
121123
"Plotly",
122124
"pointerupoutside",
125+
"Pooler",
123126
"prec",
124127
"profraw",
125128
"proptest",
@@ -133,6 +136,7 @@
133136
"quadratichq",
134137
"rects",
135138
"Referer",
139+
"relayout",
136140
"RELCELL",
137141
"relcells",
138142
"repr",
@@ -166,6 +170,7 @@
166170
"Strftime",
167171
"sumif",
168172
"SUMIFS",
173+
"SUPABASE",
169174
"szhsin",
170175
"thiserror",
171176
"Timelike",

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ edition = "2024"
1414
description = "Infinite data grid with Python, JavaScript, and SQL built-in"
1515
repository = "https://github.com/quadratichq/quadratic"
1616
license-file = "LICENSE"
17-
version = "0.12.0"
17+
version = "0.13.0"
1818

1919
[profile.release]
2020
# Tell `rustc` to optimize for small code size.

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.12.0
1+
0.13.0

docker-compose.yml

Lines changed: 68 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,32 @@ services:
618618
- quadratic-connection-db
619619
- quadratic-connection-db-mysql-ssh
620620

621-
# This service covers non-ssh mssql connections as well since it's a complex build
621+
mariadb-connection:
622+
image: mariadb:latest
623+
restart: always
624+
container_name: mariadb-connection
625+
ports:
626+
- 13306:3306
627+
environment:
628+
MARIADB_DATABASE: mariadb-connection
629+
MARIADB_USER: user
630+
MARIADB_PASSWORD: password
631+
MARIADB_ROOT_PASSWORD: password
632+
command: --default-authentication-plugin=mysql_native_password
633+
healthcheck:
634+
test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
635+
interval: 10s
636+
timeout: 5s
637+
retries: 5
638+
volumes:
639+
- ./docker/mariadb-connection/data:/var/lib/mysql
640+
- ./docker/mariadb-connection/scripts:/docker-entrypoint-initdb.d
641+
profiles:
642+
- quadratic-connection
643+
- quadratic-connection-db
644+
- quadratic-connection-db-mariadb
645+
646+
# This service covers non-ssh mssql connections as well since it's a complex build
622647
ssh-mssql-connection:
623648
build:
624649
context: .
@@ -642,5 +667,47 @@ services:
642667
- quadratic-connection-db-mssql
643668
- quadratic-connection-db-mssql-ssh
644669

670+
bigquery-connection:
671+
image: ghcr.io/goccy/bigquery-emulator:latest
672+
platform: linux/x86_64
673+
restart: always
674+
container_name: bigquery-connection
675+
command: |
676+
--project=test --data-from-yaml=/work/data.yaml
677+
ports:
678+
- "9050:9050"
679+
- "9060:9060"
680+
volumes:
681+
- ./docker/bigquery-connection/setup:/work
682+
working_dir: /work
683+
profiles:
684+
- quadratic-connection
685+
- quadratic-connection-db
686+
- quadratic-connection-db-bigquery
687+
688+
cockraochdb-connection:
689+
image: cockroachdb/cockroach:latest
690+
restart: always
691+
container_name: cockroachdb-connection
692+
environment:
693+
COCKROACH_DATABASE: cockroachdb_connection
694+
# COCKROACH_USER: user
695+
# COCKROACH_PASSWORD: password
696+
ports:
697+
- "26257:26257"
698+
command: start-single-node --insecure
699+
healthcheck:
700+
test: ["CMD", "cockroach", "node", "status", "--insecure"]
701+
interval: 10s
702+
timeout: 5s
703+
retries: 5
704+
volumes:
705+
- ./docker/cockroachdb-connection/data:/cockroach/cockroach-data
706+
- ./docker/cockroachdb-connection/scripts:/docker-entrypoint-initdb.d
707+
profiles:
708+
- quadratic-connection
709+
- quadratic-connection-db
710+
- quadratic-connection-db-cockroachdb
711+
645712
networks:
646713
host:
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
projects:
2+
- id: test
3+
datasets:
4+
- id: dataset1
5+
tables:
6+
- id: table_a
7+
columns:
8+
- name: id
9+
type: INTEGER
10+
- name: name
11+
type: STRING
12+
- name: createdAt
13+
type: TIMESTAMP
14+
data:
15+
- id: 1
16+
name: alice
17+
createdAt: "2022-10-21T00:00:00"
18+
- id: 2
19+
name: bob
20+
createdAt: "2022-10-21T00:00:00"
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
DROP TABLE IF EXISTS "public"."all_native_data_types";
2+
3+
CREATE SEQUENCE IF NOT EXISTS all_native_data_types_id_seq;
4+
CREATE SEQUENCE IF NOT EXISTS all_native_data_types_serial_col_seq;
5+
CREATE SEQUENCE IF NOT EXISTS all_native_data_types_bigserial_col_seq;
6+
7+
CREATE TABLE "public"."all_native_data_types" (
8+
"id" int4 NOT NULL DEFAULT nextval('all_native_data_types_id_seq'::regclass),
9+
"smallint_col" int2,
10+
"integer_col" int4,
11+
"bigint_col" int8,
12+
"decimal_col" numeric(10,2),
13+
"numeric_col" numeric(10,2),
14+
"real_col" float4,
15+
"double_col" float8,
16+
"serial_col" int4 NOT NULL DEFAULT nextval('all_native_data_types_serial_col_seq'::regclass),
17+
"bigserial_col" int8 NOT NULL DEFAULT nextval('all_native_data_types_bigserial_col_seq'::regclass),
18+
"char_col" char(10),
19+
"varchar_col" varchar(255),
20+
"text_col" text,
21+
"bytea_col" bytea,
22+
"timestamp_col" timestamp,
23+
"timestamptz_col" timestamptz,
24+
"date_col" date,
25+
"time_col" time,
26+
"timetz_col" timetz,
27+
"interval_col" interval,
28+
"boolean_col" bool,
29+
"enum_col" varchar(10) CHECK ((enum_col)::text = ANY ((ARRAY['value1'::character varying, 'value2'::character varying, 'value3'::character varying])::text[])),
30+
"inet_col" inet,
31+
"json_col" json,
32+
"jsonb_col" jsonb,
33+
"uuid_col" uuid,
34+
"array_col" _int4,
35+
"null_bool_col" bool,
36+
PRIMARY KEY ("id")
37+
);
38+
39+
INSERT INTO "public"."all_native_data_types" ("id", "smallint_col", "integer_col", "bigint_col", "decimal_col", "numeric_col", "real_col", "double_col", "serial_col", "bigserial_col", "char_col", "varchar_col", "text_col", "bytea_col", "timestamp_col", "timestamptz_col", "date_col", "time_col", "timetz_col", "interval_col", "boolean_col", "enum_col", "inet_col", "json_col", "jsonb_col", "uuid_col", "array_col", "null_bool_col") VALUES
40+
(1, 32767, 2147483647, 9223372036854775807, 12345.67, 12345.67, 123.45, 123456789.123456, 1, 1, 'char_data', 'varchar_data', 'text_data', '\x5c784445414442454546', '2024-05-20 12:34:56', '2024-05-20 06:34:56+00', '2024-05-20', '12:34:56', '12:34:56+09:30', '1 year 2 mons 3 days 04:05:06', 't', 'value1', '192.168.1.1', '{"key": "value"}', '{"key": "value"}', '123e4567-e89b-12d3-a456-426614174000', '{1,2,3}', null);
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
-- Create database if it doesn't exist
2+
CREATE DATABASE IF NOT EXISTS `mariadb-connection`;
3+
4+
-- Create user if it doesn't exist and grant privileges
5+
CREATE USER IF NOT EXISTS 'user'@'%' IDENTIFIED BY 'password';
6+
GRANT ALL PRIVILEGES ON `mariadb-connection`.* TO 'user'@'%';
7+
FLUSH PRIVILEGES;

0 commit comments

Comments
 (0)