From e8c13c6c0a923a820d5a86a4ebfb44c3d98d5ef1 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Tue, 25 May 2021 19:47:12 +0200 Subject: [PATCH] Removed non null constraint for URL field for Bookmark asset. Does not work because assets are first created without any special fields. --- ccm-cms/src/main/java/org/librecms/assets/Bookmark.java | 5 +---- .../ccm_cms/h2/V7_0_0_25__drop_non_null_bookmark_url.sql | 1 + .../ccm_cms/pgsql/V7_0_0_25__drop_non_null_bookmark_url.sql | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_25__drop_non_null_bookmark_url.sql create mode 100644 ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_25__drop_non_null_bookmark_url.sql diff --git a/ccm-cms/src/main/java/org/librecms/assets/Bookmark.java b/ccm-cms/src/main/java/org/librecms/assets/Bookmark.java index 9a2f7d3aa..4bb76066f 100644 --- a/ccm-cms/src/main/java/org/librecms/assets/Bookmark.java +++ b/ccm-cms/src/main/java/org/librecms/assets/Bookmark.java @@ -39,8 +39,6 @@ import org.librecms.ui.contentsections.assets.BookmarkCreateStep; import org.librecms.ui.contentsections.assets.BookmarkEditStep; import org.librecms.ui.contentsections.assets.MvcAssetEditKit; -import javax.validation.constraints.NotEmpty; - import static org.librecms.CmsConstants.*; import static org.librecms.assets.AssetConstants.*; @@ -78,8 +76,7 @@ public class Bookmark extends Asset implements Serializable { ) private LocalizedString description; - @Column(name = "URL", length = 2048, nullable = false) - @NotEmpty + @Column(name = "URL", length = 2048) private String url; public Bookmark() { diff --git a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_25__drop_non_null_bookmark_url.sql b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_25__drop_non_null_bookmark_url.sql new file mode 100644 index 000000000..659766b6a --- /dev/null +++ b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_25__drop_non_null_bookmark_url.sql @@ -0,0 +1 @@ +alter table ccm_cms.bookmarks alter column url drop noT null; diff --git a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_25__drop_non_null_bookmark_url.sql b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_25__drop_non_null_bookmark_url.sql new file mode 100644 index 000000000..659766b6a --- /dev/null +++ b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_25__drop_non_null_bookmark_url.sql @@ -0,0 +1 @@ +alter table ccm_cms.bookmarks alter column url drop noT null;