Skip to content

Commit

Permalink
Changes in preparation for release of v4.3.0 (#250)
Browse files Browse the repository at this point in the history
Changes in preparation for release of v4.3.0

* Use mariadb 10.6 (an LTS release) in CI builds as 10.8 is EOL
* Updated HISTORY.md file
* Tweaks to README.md
* Update .sql to bump version of schema
* Refreshed schema files
  • Loading branch information
KarlLevik authored Dec 5, 2024
1 parent 09e78e5 commit 29898a8
Show file tree
Hide file tree
Showing 7 changed files with 124 additions and 77 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
services:
mariadb:
image: mariadb:10.8
image: mariadb:10.6
env:
MYSQL_USER: test
MYSQL_PASSWORD: test
Expand All @@ -28,7 +28,7 @@ jobs:
- uses: shogo82148/actions-setup-mysql@v1
with:
distribution: 'mariadb'
mysql-version: '10.8'
mysql-version: '10.6'
auto-start: false
- name: Build database
run: |
Expand Down
27 changes: 27 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,33 @@ History
Unreleased / master
-------------------

4.3.0 (2024-12-05)
-------------------

Note: The schema files now include a command in the first line to set the sanbox
mode which is incompatible with older clients. For more info and to disable, see:
https://mariadb.org/mariadb-dump-file-compatibility-change/

Admin: Changes to GitHub workflows as 'main' is now the default branch (previously 'master')

New or modified tables and columns:

- Add ``processingPipelineId`` column to the ``AutoProcProgram`` table
- Add new boolean column ``deleted`` to the ``AutoProcProgramAttachment`` table
- Add unique index on ``BLSample(containerId, location, subLocation)``
- Update the ``ProcessedTomogram`` table comment

Roles and permissions:

- Add new grants for Expeye and combine grants into two roles instead of three
- Add roles and grants for MaxScale
- Add role with grants for fragment screening

Scripts and data changes:

- Trim trailing '1' in the ``SpaceGroup`` table's ``spaceGroupShortName`` column
- Add scripts that can delete ``DataCollection`` and ``DataCollectionGroup`` rows and referenced rows in other tables

4.2.1 (2024-08-19)
-------------------

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@

# ispyb-database

This package provides everything needed to create the Diamond flavour of the ISPyB database schema. As the schema evolves the update scripts will also be published here, so other users of the schema should be able to stay up-to-date.
This repository provides everything needed to create the Diamond flavour of the ISPyB database schema. As the schema evolves the update scripts will also be published here, so other users of the schema should be able to stay up-to-date.

## Requirements

* Server and a client packages of MariaDB 10.3 or later.
* Server and a client packages of MariaDB 10.6 or later.
* A Unix-like OS with `bash` shell.
* The pandoc package (only required to build documentation at the end of the `build.sh` script.)
* If binary logging is enabled in the DB system, then execute this before importing the test schema: `SET GLOBAL log_bin_trust_function_creators=ON;`

## Installation

1. Install MariaDB. See the Wiki for ideas on how to install in a particular environment.
2. Copy `.my.example.cnf` to `.my.cnf` and then edit that file to set the `user` and `password`, e.g. `user = root` and use the `password` you set when securing. Optionally, you can also set e.g. `host` and `port`.
1. Install MariaDB. Please see the Wiki for ideas on how to install in a particular environment.
2. Copy `.my.example.cnf` to `.my.cnf` and then edit that file to set the `user` and `password`, e.g. `user = root` and correspond `password`. Optionally, you can also set e.g. `host` and `port`.
3. In a test environment run the `build.sh` file. This creates the database schema and applies the grants as described in the "Schema" and "Grants" sections below.

### Schema
Expand Down
Loading

0 comments on commit 29898a8

Please sign in to comment.