UserSearch / 255 char is too small for URLs (geonetwork#4883)

* UserSearch / 255 char is too small for URLs * UserSearch / 255 char is too small for URLs / SQL migration. * UserSearch / 255 char is too small for URLs / SQL migration - keep DROP index at the end. * UserSearch / 255 char is too small for URLs / SQL migration - Thanks @ianwallen for Oracle hint. * UserSearch / 255 char is too small for URLs / SQL migration.
GeoCat · Sep 4, 2020 · f45a121 · f45a121
1 parent 2728b88
commit f45a121
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/domain/src/main/java/org/fao/geonet/domain/UserSearch.java b/domain/src/main/java/org/fao/geonet/domain/UserSearch.java
@@ -24,6 +24,7 @@
 
 import org.fao.geonet.domain.converter.UserSearchFeaturedTypeConverter;
 import org.fao.geonet.entitylistener.UserSearchEntityListenerManager;
+import org.hibernate.annotations.Type;
 
 import javax.annotation.Nullable;
 import javax.persistence.*;
@@ -58,8 +59,8 @@ public int getId() {
         return id;
     }
 
-
-    @Column
+    @Lob
+    @Type(type = "org.hibernate.type.TextType")
     public String getUrl() {
         return url;
     }

diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v3110/migrate-default.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v3110/migrate-default.sql
@@ -13,6 +13,8 @@ ALTER TABLE Validation ALTER COLUMN valType TYPE varchar(128);
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/server/timeZone', '', 0, 260, 'n');
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/users/identicon', 'gravatar:mp', 0, 9110, 'n');
 
+ALTER TABLE usersearch ALTER COLUMN url TYPE text;
+
 -- keep these at the bottom of the file!
 DROP INDEX idx_metadatafiledownloads_metadataid;
 DROP INDEX idx_metadatafileuploads_metadataid;

diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v3110/migrate-mysql.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v3110/migrate-mysql.sql
@@ -11,6 +11,9 @@ ALTER TABLE Validation ALTER COLUMN valType TYPE varchar(128);
 
 -- New setting for server timezone
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/server/timeZone', '', 0, 260, 'n');
+
+ALTER TABLE usersearch MODIFY url TEXT
+
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/users/identicon', 'gravatar:mp', 0, 9110, 'n');
 
 DROP INDEX idx_metadatafiledownloads_metadataid ON MetadataFileDownloads;

diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v3110/migrate-oracle.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v3110/migrate-oracle.sql
@@ -11,4 +11,10 @@ ALTER TABLE Validation ALTER COLUMN valType TYPE varchar(128);
 
 -- New setting for server timezone
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/server/timeZone', '', 0, 260, 'n');
+
+ALTER TABLE usersearch ADD (tempurl clob);
+ALTER TABLE usersearch SET tempurl = url, url = null;
+ALTER TABLE usersearch DROP COLUMN url;
+ALTER TABLE usersearch RENAME COLUMN tempurl to url;
+
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/users/identicon', 'gravatar:mp', 0, 9110, 'n');