Skip to content

Commit 12b536c

Browse files
committed
Merge branch 'main' into tla_update
2 parents 77ab265 + 107401a commit 12b536c

File tree

5 files changed

+43
-18
lines changed

5 files changed

+43
-18
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
matrix:
1616
target:
1717
- test-sqlite
18-
- test-postgres-13
1918
- test-postgres-14
2019
- test-postgres-15
2120
- test-postgres-16
2221
- test-postgres-17
22+
- test-postgres-18
2323
- test-mariadb-10.6
2424
- test-mariadb-10.11
2525
- test-mariadb-11.4
@@ -28,7 +28,7 @@ jobs:
2828
- test-mysql-8.0.44
2929
- test-mysql-8.4
3030
- test-mysql-9.5.0
31-
31+
3232
steps:
3333
- name: Checkout repository
3434
uses: actions/checkout@v4

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ resources/public/admin:
2323
# All other phony targets run lrsql instances that can be used and tested
2424
# during development. All start up with fixed DB properties and seed creds.
2525

26-
.phony: clean-dev, ci, ephemeral, ephemeral-prod, sqlite, postgres, mariadb, mysql, bench, bench-async, keycloak-demo, ephemeral-oidc, superset-demo, clamav-demo, test-sqlite, test-postgres, test-postgres-11, test-postgres-12, test-postgres-13, test-postgres-14, test-postgres-15, test-mariadb, test-mariadb-10.6, test-mariadb-10.11, test-mariadb-11.4, test-mariadb-11.7.2, test-mariadb-11.8, test-mysql, test-mysql-8.0.44, test-mysql-8.4, test-mysql-9.5.0
26+
.phony: clean-dev, ci, ephemeral, ephemeral-prod, sqlite, postgres, mariadb, mysql, bench, bench-async, keycloak-demo, ephemeral-oidc, superset-demo, clamav-demo, test-sqlite, test-postgres, test-postgres-14, test-postgres-15, test-postgres-16, test-postgres-17, test-postgres-18, test-mariadb, test-mariadb-10.6, test-mariadb-10.11, test-mariadb-11.4, test-mariadb-11.7.2, test-mariadb-11.8, test-mysql, test-mysql-8.0.44, test-mysql-8.4, test-mysql-9.5.0
2727

2828
clean-dev:
2929
rm -rf *.db *.log resources/public tmp
@@ -45,9 +45,6 @@ TEST_MYSQL_COMMAND ?= clojure -M:test -m lrsql.test-runner --database mysql $(if
4545
test-postgres:
4646
$(TEST_PG_COMMAND)
4747

48-
test-postgres-13:
49-
LRSQL_TEST_DB_VERSION=13 $(TEST_PG_COMMAND)
50-
5148
test-postgres-14:
5249
LRSQL_TEST_DB_VERSION=14 $(TEST_PG_COMMAND)
5350

@@ -60,6 +57,9 @@ test-postgres-16:
6057
test-postgres-17:
6158
LRSQL_TEST_DB_VERSION=17 $(TEST_PG_COMMAND)
6259

60+
test-postgres-18:
61+
LRSQL_TEST_DB_VERSION=18 $(TEST_PG_COMMAND)
62+
6363
test-mariadb:
6464
$(TEST_MARIADB_COMMAND)
6565

README.md

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,24 @@ For releases and release notes, see the [Releases](https://github.com/yetanalyti
3737
- [OpenID Connect Support](doc/oidc.md)
3838
- [Auth0 Setup Guide](doc/oidc/auth0.md)
3939

40-
### DBMS-specific Sections
41-
42-
- [Postgres](doc/postgres.md)
43-
- [MariaDB](doc/mariadb.md)
44-
- [SQLite](doc/sqlite.md)
40+
### DBMS-specific Information
41+
42+
| DB Engine | Supported Versions |
43+
| ---------- | ------------------ |
44+
| [SQLite](doc/sqlite.md) | 3.42 (Embedded Engine) |
45+
| [Postgres](doc/postgres.md) | 14 |
46+
| | 15 |
47+
| | 16 |
48+
| | 17 |
49+
| | 18 |
50+
| [MariaDB](doc/mariadb.md) | 10.6 |
51+
| | 10.11 |
52+
| | 11.4 |
53+
| | 11.7.2 |
54+
| | 11.8 |
55+
| [MySQL](doc/mysql.md) | 8.0.44 |
56+
| | 8.4 |
57+
| | 9.5.0 |
4558

4659
### Reference
4760

doc/index.md

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,24 @@
1818
- [OpenID Connect Support](oidc.md)
1919
- [Auth0 Setup Guide](oidc/auth0.md)
2020

21-
### DBMS-specific Sections
22-
23-
- [Postgres](postgres.md)
24-
- [MariaDB](mariadb.md)
25-
- [MySQL](mysql.md)
26-
- [SQLite](sqlite.md)
21+
### DBMS-specific Information
22+
23+
| DB Engine | Supported Versions |
24+
| ---------- | ------------------ |
25+
| [SQLite](sqlite.md) | 3.42 (Embedded Engine) |
26+
| [Postgres](postgres.md) | 14 |
27+
| | 15 |
28+
| | 16 |
29+
| | 17 |
30+
| | 18 |
31+
| [MariaDB](mariadb.md) | 10.6 |
32+
| | 10.11 |
33+
| | 11.4 |
34+
| | 11.7.2 |
35+
| | 11.8 |
36+
| [MySQL](mysql.md) | 8.0.44 |
37+
| | 8.4 |
38+
| | 9.5.0 |
2739

2840
### Reference
2941

doc/postgres.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ The `connection`, `lrs`, and `webserver` sections of the config can then be set
101101

102102
### Supported Versions
103103

104-
SQL LRS supports PostgreSQL versions 11 through 15. It is tested against the [current minor point release](https://www.postgresql.org/support/versioning/) of each version.
104+
For an updated version list see [this table](index.md#dbms-specific-information). SQL LRS is tested against the [current minor point release](https://www.postgresql.org/support/versioning/) of each version.
105105

106106
### Unix Socket Support
107107

0 commit comments

Comments
 (0)