@@ -, +, @@ NULL --- installer/data/mysql/atomicupdate/bug_29648_2.pl | 14 ++++++++++++++ installer/data/mysql/kohastructure.sql | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100755 installer/data/mysql/atomicupdate/bug_29648_2.pl --- a/installer/data/mysql/atomicupdate/bug_29648_2.pl +++ a/installer/data/mysql/atomicupdate/bug_29648_2.pl @@ -0,0 +1,14 @@ +use Modern::Perl; + +return { + bug_number => "29648", + description => "Allow tables_settings.default_display_length to be NULL", + up => sub { + my ($args) = @_; + my ($dbh, $out) = @$args{qw(dbh out)}; + $dbh->do(q{ + ALTER TABLE tables_settings + MODIFY COLUMN default_display_length smallint(6) DEFAULT NULL + }); + }, +} --- a/installer/data/mysql/kohastructure.sql +++ a/installer/data/mysql/kohastructure.sql @@ -5063,7 +5063,7 @@ CREATE TABLE `tables_settings` ( `module` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, `page` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, `tablename` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `default_display_length` smallint(6) NOT NULL DEFAULT 20, + `default_display_length` smallint(6) DEFAULT NULL, `default_sort_order` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, PRIMARY KEY (`module`(191),`page`(191),`tablename`(191)) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; --