IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-02-06 09:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

rollback mysql8 changes

Browse Source
This commit is contained in:
einhornimmond 2025-06-28 19:33:16 +02:00
parent fdf6ab89aa
commit f67f65b47b
6 changed files with 15 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.github/workflows/test_e2e.yml vendored
View File

@ -40,9 +40,8 @@ jobs:
cd backend
cp .env.test_e2e .env
cd ..
bun turbo backend#build
bun turbo frontend#build
bun turbo backend#start frontend#start --env-mode=loose
bun turbo backend#build frontend#build --env-mode=loose
bun turbo backend#start frontend#start --env-mode=loose &
- name: End-to-end tests | prepare
run: |
@ -123,17 +122,8 @@ jobs:
uses: oven-sh/setup-bun@v2
- name: Boot up test system | docker-compose mariadb mailserver
run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mailserver
run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb mailserver
- name: Start mysql
run: |
sudo systemctl start mysql.service
sudo mysql -u root -proot <<EOF
ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'root';
FLUSH PRIVILEGES;
EOF
sudo mysql -u root -proot -e "SELECT user, host, plugin FROM mysql.user;"
- name: Prepare test system
run: |
sudo chown runner:docker -R *
@ -146,8 +136,6 @@ jobs:
cp .env.test_e2e .env
cd ../backend
cp .env.test_e2e .env
cd ../database
cp .env.test_e2e .env
cd ..
bun turbo seed --env-mode=loose
@ -237,9 +225,8 @@ jobs:
cd backend
cp .env.test_e2e .env
cd ..
bun turbo backend#build
bun turbo frontend#build
bun turbo backend#start frontend#start --env-mode=loose
bun turbo backend#build frontend#build --env-mode=loose
bun turbo backend#start frontend#start --env-mode=loose &
- name: End-to-end tests | prepare
run: |

7
backend/.env.test_e2e
View File

@ -6,13 +6,6 @@ HUMHUB_ACTIVE=false
GMS_ACTIVE=false
USE_CRYPTO_WORKER=true
# DB
DB_USER=root
DB_PASSWORD=root
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=gradido_community
# Email
EMAIL=true
EMAIL_TEST_MODUS=false

7
database/.env.test_e2e
View File

@ -1,7 +0,0 @@
# DB
DB_USER=root
DB_PASSWORD=root
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=gradido_community

2
database/migration/migrations/0003-login_server_tables.ts
View File

@ -116,7 +116,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
\`first_name\` varchar(150) NOT NULL,
\`last_name\` varchar(255) DEFAULT '',
\`username\` varchar(255) DEFAULT '',
\`description\` text DEFAULT NULL,
\`description\` text DEFAULT '',
\`password\` bigint unsigned DEFAULT '0',
\`pubkey\` binary(32) DEFAULT NULL,
\`privkey\` binary(80) DEFAULT NULL,

22
database/migration/migrations/0010-login_users_state_users_sync.ts
View File

@ -29,20 +29,14 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
// 18 entries
await queryFn(
`DELETE FROM state_users
WHERE id IN (
SELECT id FROM (
SELECT id FROM state_users
WHERE public_key NOT IN (
SELECT pubkey FROM login_users
WHERE pubkey IS NOT NULL
)
AND email IN (
SELECT email FROM state_users
GROUP BY email
HAVING COUNT(*) > 1
)
) AS subquery
)`,
WHERE id IN
(SELECT state_users.id FROM state_users
WHERE public_key NOT IN
(SELECT pubkey FROM login_users
WHERE pubkey IS NOT NULL)
AND email IN (SELECT email FROM state_users GROUP BY email HAVING COUNT(*) > 1
)
)`,
)
}

2
database/migration/migrations/0017-combine_user_tables.ts
View File

@ -93,7 +93,7 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom
\`first_name\` varchar(150) COLLATE utf8mb4_unicode_ci NOT NULL,
\`last_name\` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT '',
\`username\` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT '',
\`description\` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL,
\`description\` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT '',
\`password\` bigint(20) unsigned DEFAULT 0,
\`pubkey\` binary(32) DEFAULT NULL,
\`privkey\` binary(80) DEFAULT NULL,