Skip to content

Commit 555c745

Browse files
committed
Remove deprecated tables + v133 compatibility
1 parent f96c775 commit 555c745

21 files changed

Lines changed: 4 additions & 476 deletions

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Install tools
1717
run: apt update && apt install -y git wget
1818
- name: Checkout code
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v4
2020
- name: Gradle build
2121
env:
2222
API_VERSION: ${{ steps.get_version.outputs.API_VERSION }}

src/inttest/java/com/faforever/api/config/MainDbTestContainers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
@Configuration
2222
public class MainDbTestContainers {
2323
private static final MariaDBContainer<?> fafDBContainer = new MariaDBContainer<>("mariadb:10.6");
24-
private static final GenericContainer<?> flywayMigrationsContainer = new GenericContainer<>("faforever/faf-db-migrations:v129");
24+
private static final GenericContainer<?> flywayMigrationsContainer = new GenericContainer<>("faforever/faf-db-migrations:v133");
2525
private static final Network sharedNetwork = Network.newNetwork();
2626

2727
@Bean

src/inttest/resources/sql/prepDefaultData.sql

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
INSERT INTO oauth_clients (id, name, client_secret, client_type, redirect_uris, default_redirect_uri, default_scope)
2-
VALUES ('test', 'test', '{noop}test', 'public', 'http://localhost https://www.getpostman.com/oauth2/callback ',
3-
'http://localhost',
4-
'read_events read_achievements upload_map upload_mod upload_avatar write_account_data vote read_sensible_userdata');
5-
61
INSERT INTO login (id, login, email, password, ip)
72
VALUES (1, 'USER', 'user@faforever.com', '92b7b421992ef490f3b75898ec0e511f1a5c02422819d89719b20362b023ee4f',
83
'127.0.0.1'),

src/inttest/resources/sql/prepLeaderboardData.sql

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/inttest/resources/sql/prepMapData.sql

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ INSERT INTO map_version (id, description, max_players, width, height, version, f
66
(1, 'SCMP 001', 8, 5, 5, 1, 'maps/scmp_001.v0001.zip', 0, 1),
77
(2, 'SCMP 002', 8, 5, 5, 1, 'maps/scmp_002.v0001.zip', 0, 2);
88

9-
INSERT INTO ladder_map (id, idmap) VALUES
10-
(1, 1);
11-
129
INSERT INTO map_pool (id, name) VALUES
1310
(1, 'Ladder 1v1 <300'),
1411
(2, 'Ladder 1v1 300-800'),

src/inttest/resources/sql/truncateTables.sql

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,8 @@ DELETE FROM `game_player_stats`;
1717
DELETE FROM `game_review`;
1818
DELETE FROM `game_reviews_summary`;
1919
DELETE FROM `game_stats`;
20-
-- DELETE FROM `game_validity`;
21-
DELETE FROM `global_rating`;
22-
DELETE FROM `global_rating_distribution`;
23-
DELETE FROM `global_rating_rank_view`;
2420
-- DELETE FROM `group_permission`;
2521
DELETE FROM `group_permission_assignment`;
26-
DELETE FROM `jwt_users`;
27-
DELETE FROM `ladder1v1_rating`;
28-
DELETE FROM `ladder1v1_rating_distribution`;
29-
DELETE FROM `ladder1v1_rating_rank_view`;
30-
DELETE FROM `ladder_division`;
31-
DELETE FROM `ladder_division_score`;
32-
DELETE FROM `ladder_map`;
3322
-- DELETE FROM `leaderboard`;
3423
DELETE FROM `leaderboard_rating`;
3524
DELETE FROM `leaderboard_rating_journal`;
@@ -53,8 +42,6 @@ DELETE FROM `mod_version_review`;
5342
DELETE FROM `mod_version_reviews_summary`;
5443
DELETE FROM `moderation_report`;
5544
DELETE FROM `name_history`;
56-
DELETE FROM `oauth_clients`;
57-
DELETE FROM `oauth_tokens`;
5845
DELETE FROM `patchs_table`;
5946
DELETE FROM `player_achievements`;
6047
DELETE FROM `player_events`;

src/main/java/com/faforever/api/client/ClientType.java

Lines changed: 0 additions & 34 deletions
This file was deleted.

src/main/java/com/faforever/api/client/OAuthClient.java

Lines changed: 0 additions & 99 deletions
This file was deleted.

src/main/java/com/faforever/api/client/OAuthClientRepository.java

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/main/java/com/faforever/api/client/package-info.java

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)