Merge branch 'DataBase' into 'development' (6a94599b) · Commits · Scherbaum Maximilian / BattleArena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

BattleArena
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

6a94599b

Commit 6a94599b authored 1 year ago by Schuh Martin

Downloads
- Plain Diff

Merge branch 'DataBase' into 'development'

Fixes for UI-Database integration

See merge request !16

parents 7c33f665 322017ae

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Persistence.java 25 additions, 23 deletions

...rt/battlearena/Model/DataStorage/Classes/Persistence.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java 3 additions, 4 deletions

...rt/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Utilities/Parser.java 2 additions, 2 deletions

...ttlearena/Model/DataStorage/Classes/Utilities/Parser.java
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Scripts/DDL_Script_AzureDB.sql 2 additions, 2 deletions

...tlearena/Model/DataStorage/Scripts/DDL_Script_AzureDB.sql
src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Scripts/DDL_Script_Oracle.sql 2 additions, 2 deletions

...ttlearena/Model/DataStorage/Scripts/DDL_Script_Oracle.sql
src/main/resources/player/playerAccount.json 1 addition, 1 deletion

src/main/resources/player/playerAccount.json
src/test/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Utilities/ParserTest.java 5 additions, 5 deletions

...arena/Model/DataStorage/Classes/Utilities/ParserTest.java

with 40 additions and 39 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment