Merge pull request #775 from gradido/fix_database_migrations

fix_database_migrations
This commit is contained in:
Ulf Gebhardt 2021-08-25 00:05:12 +02:00 committed by GitHub
commit b721428abc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions

View File

@ -22,9 +22,10 @@ const DB_VERSION = '0001-init_db'
async function main() { async function main() {
// check for correct database version // check for correct database version
const con = await connection() const con = await connection()
const [rows] = await con.query(`SELECT fileName FROM migrations ORDER BY version DESC LIMIT 1;`) const [rows] = await con.query(`SELECT * FROM migrations ORDER BY version DESC LIMIT 1;`)
if ( if (
(<RowDataPacket>rows).length === 0 || (<RowDataPacket>rows).length === 0 ||
!(<RowDataPacket>rows)[0].fileName ||
(<RowDataPacket>rows)[0].fileName.indexOf(DB_VERSION) === -1 (<RowDataPacket>rows)[0].fileName.indexOf(DB_VERSION) === -1
) { ) {
throw new Error(`Wrong database version - the backend requires '${DB_VERSION}'`) throw new Error(`Wrong database version - the backend requires '${DB_VERSION}'`)

View File

@ -58,6 +58,7 @@ services:
# This makes sure the docker container has its own node modules. # This makes sure the docker container has its own node modules.
# Therefore it is possible to have a different node version on the host machine # Therefore it is possible to have a different node version on the host machine
- database_node_modules:/app/node_modules - database_node_modules:/app/node_modules
- database_build:/app/build
# bind the local folder to the docker to allow live reload # bind the local folder to the docker to allow live reload
- ./database:/app - ./database:/app
@ -149,4 +150,5 @@ volumes:
frontend_node_modules: frontend_node_modules:
backend_node_modules: backend_node_modules:
database_node_modules: database_node_modules:
database_build:
login_build_ubuntu_3.1: login_build_ubuntu_3.1: