@@ -, +, @@ columns --- .../data/mysql/atomicupdate/bug_xxxxx_export_format_default.sql | 3 +++ installer/data/mysql/kohastructure.sql | 8 ++++---- t/db_dependent/Koha/CsvProfiles.t | 6 ++++-- 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_xxxxx_export_format_default.sql --- a/installer/data/mysql/atomicupdate/bug_xxxxx_export_format_default.sql +++ a/installer/data/mysql/atomicupdate/bug_xxxxx_export_format_default.sql @@ -0,0 +1,3 @@ +ALTER TABLE export_format MODIFY csv_separator VARCHAR(2) NOT NULL DEFAULT ',', MODIFY field_separator VARCHAR(2), MODIFY subfield_separator VARCHAR(2); +ALTER TABLE export_format MODIFY encoding VARCHAR(255) DEFAULT 'utf8'; + --- a/installer/data/mysql/kohastructure.sql +++ a/installer/data/mysql/kohastructure.sql @@ -717,10 +717,10 @@ CREATE TABLE `export_format` ( `profile` varchar(255) NOT NULL, `description` mediumtext NOT NULL, `content` mediumtext NOT NULL, - `csv_separator` varchar(2) NOT NULL, - `field_separator` varchar(2) NOT NULL, - `subfield_separator` varchar(2) NOT NULL, - `encoding` varchar(255) NOT NULL, + `csv_separator` varchar(2) NOT NULL DEFAULT ',', + `field_separator` varchar(2), + `subfield_separator` varchar(2), + `encoding` varchar(255) NOT NULL DEFAULT 'utf8', `type` varchar(255) DEFAULT 'marc', `used_for` varchar(255) DEFAULT 'export_records', PRIMARY KEY (`export_format_id`) --- a/t/db_dependent/Koha/CsvProfiles.t +++ a/t/db_dependent/Koha/CsvProfiles.t @@ -36,12 +36,14 @@ my $new_csv_profile_1 = Koha::CsvProfile->new({ profile => 'my_csv_profile_name_for_test_1', description => 'my_csv_profile_description_for_test_1', type => 'sql', - used_for => 'late_issues' + used_for => 'late_issues', + content => 'a content', })->store; my $new_csv_profile_2 = Koha::CsvProfile->new({ profile => 'my_csv_profile_name_for_test_2', description => 'my_csv_profile_description_for_test_2', - type => 'marc' + type => 'marc', + content => 'another content', })->store; like( $new_csv_profile_1->export_format_id, qr|^\d+$|, 'Adding a new csv_profile should have set the export_format_id'); --