From d9a1a69500d318bf686f80acad255d9d44f6910b Mon Sep 17 00:00:00 2001 From: wsbrenk Date: Wed, 26 Jun 2024 23:49:09 +0200 Subject: [PATCH] #2094 youth scout comment column length --- src/main/java/core/db/AbstractTable.java | 5 ++++- src/main/java/core/db/DBUpdater.java | 3 +++ src/main/java/core/db/YouthScoutCommentTable.java | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/core/db/AbstractTable.java b/src/main/java/core/db/AbstractTable.java index f3089d306..4cb41629a 100644 --- a/src/main/java/core/db/AbstractTable.java +++ b/src/main/java/core/db/AbstractTable.java @@ -51,7 +51,10 @@ public AbstractTable(String tableName, ConnectionManager connectionManager) { * @return Truncated string */ static String truncateString(String s, int maxLength) { - if (s != null && s.length() > maxLength) return s.substring(0, maxLength); + if (s != null && s.length() > maxLength){ + HOLogger.instance().warning(AbstractTable.class, "truncated string: " + s); + return s.substring(0, maxLength); + } return s; } diff --git a/src/main/java/core/db/DBUpdater.java b/src/main/java/core/db/DBUpdater.java index 8afeb4319..a08be3e3d 100644 --- a/src/main/java/core/db/DBUpdater.java +++ b/src/main/java/core/db/DBUpdater.java @@ -89,6 +89,9 @@ private void updateDBv900(int dbVersion) throws SQLException { var matchDetailsTable = dbManager.getTable(MatchDetailsTable.TABLENAME); matchDetailsTable.tryChangeColumn("Matchreport", "VARCHAR(40000)"); + var youthScoutCommentTable = dbManager.getTable(YouthScoutCommentTable.TABLENAME); + youthScoutCommentTable.tryChangeColumn("Text", "VARCHAR(1024)"); + var playerTable = dbManager.getTable(SpielerTable.TABLENAME); playerTable.tryAddColumn("SubForm", "FLOAT DEFAULT 0"); diff --git a/src/main/java/core/db/YouthScoutCommentTable.java b/src/main/java/core/db/YouthScoutCommentTable.java index ec0d3b9a4..ede843e5a 100644 --- a/src/main/java/core/db/YouthScoutCommentTable.java +++ b/src/main/java/core/db/YouthScoutCommentTable.java @@ -20,7 +20,7 @@ protected void initColumns() { columns = new ColumnDescriptor[]{ ColumnDescriptor.Builder.newInstance().setColumnName("YOUTHPLAYER_ID").setGetter((p) -> ((ScoutComment) p).getYouthPlayerId()).setSetter((p, v) -> ((ScoutComment) p).setYouthPlayerId( (int) v)).setType(Types.INTEGER).isNullable(false).build(), ColumnDescriptor.Builder.newInstance().setColumnName("INDEX").setGetter((p) -> ((ScoutComment) p).getIndex()).setSetter((p, v) -> ((ScoutComment) p).setIndex( (int) v)).setType(Types.INTEGER).isNullable(false).build(), - ColumnDescriptor.Builder.newInstance().setColumnName("Text").setGetter((p) -> ((ScoutComment) p).getText()).setSetter((p, v) -> ((ScoutComment) p).setText( (String) v)).setType(Types.VARCHAR).setLength(255).isNullable(true).build(), + ColumnDescriptor.Builder.newInstance().setColumnName("Text").setGetter((p) -> truncateString (((ScoutComment) p).getText(), 1024)).setSetter((p, v) -> ((ScoutComment) p).setText( (String) v)).setType(Types.VARCHAR).setLength(1024).isNullable(true).build(), ColumnDescriptor.Builder.newInstance().setColumnName("Type").setGetter((p) -> ((ScoutComment) p).getType().getValue()).setSetter((p, v) -> ((ScoutComment) p).setType(CommentType.valueOf((Integer) v))).setType(Types.INTEGER).isNullable(true).build(), ColumnDescriptor.Builder.newInstance().setColumnName("Variation").setGetter((p) -> ((ScoutComment) p).getVariation()).setSetter((p, v) -> ((ScoutComment) p).setVariation((Integer) v)).setType(Types.INTEGER).isNullable(true).build(), ColumnDescriptor.Builder.newInstance().setColumnName("SkillType").setGetter((p) -> Skills.ScoutCommentSkillTypeID.value(((ScoutComment) p).getSkillType())).setSetter((p, v) -> ((ScoutComment) p).setSkillType(Skills.ScoutCommentSkillTypeID.valueOf((Integer) v))).setType(Types.INTEGER).isNullable(true).build(),