diff --git a/.github/workflows/test_dht_node.yml b/.github/workflows/test_dht_node.yml index 0fed7b2ea..a1aacaf04 100644 --- a/.github/workflows/test_dht_node.yml +++ b/.github/workflows/test_dht_node.yml @@ -43,7 +43,7 @@ jobs: uses: actions/checkout@v3 - name: DHT-Node | Lint - run: cd dht-node && yarn && yarn run lint + run: cd database && yarn && cd ../dht-node && yarn && yarn run lint unit_test: name: Unit Tests - DHT Node diff --git a/.github/workflows/test_e2e.yml b/.github/workflows/test_e2e.yml index 6dbc31704..075373819 100644 --- a/.github/workflows/test_e2e.yml +++ b/.github/workflows/test_e2e.yml @@ -14,7 +14,8 @@ jobs: run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb - name: Prepare test system - run: sudo chown runner:docker -R * + run: | + sudo chown runner:docker -R * cd database && yarn cd ../backend && yarn diff --git a/database/migrations/0044-insert_missing_contributions.ts b/database/migrations/0044-insert_missing_contributions.ts index a14141498..2435cdd1d 100644 --- a/database/migrations/0044-insert_missing_contributions.ts +++ b/database/migrations/0044-insert_missing_contributions.ts @@ -5,7 +5,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { await queryFn( - `INSERT INTO gradido_community.contributions + `INSERT INTO contributions (user_id, created_at, contribution_date, memo, amount, moderator_id, confirmed_by, confirmed_at, transaction_id) SELECT user_id, @@ -18,12 +18,12 @@ SELECT balance_date AS confirmed_at, id FROM - gradido_community.transactions + transactions WHERE type_id = 1 AND NOT EXISTS( - SELECT * FROM gradido_community.contributions - WHERE gradido_community.contributions.transaction_id = gradido_community.transactions.id);`, + SELECT * FROM contributions + WHERE contributions.transaction_id = transactions.id);`, ) } diff --git a/database/src/index.ts b/database/src/index.ts index 86ac05c79..a4034e3d9 100644 --- a/database/src/index.ts +++ b/database/src/index.ts @@ -5,7 +5,7 @@ import { createPool } from 'mysql' import { Migration } from 'ts-mysql-migrate' import { clearDatabase } from './clear' import { latestDbVersion } from './config/detectLastDBVersion' -import path from 'path' +import path from 'node:path' const run = async (command: string) => { if (command === 'clear') {