From 2672f9d7f697583cba3fef18fb75d5706e242c38 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 5 Feb 2018 16:09:31 -0300 Subject: [PATCH] Bug 20144: [sql_modes] Add default values for export_format columns Fix for: Field 'field_separator' doesn't have a default value Field 'encoding' doesn't have a default value field_separator and subfield_separator are only used for MARC csv profiles, no need to specify a default value Signed-off-by: Josef Moravec Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart --- .../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 diff --git a/installer/data/mysql/atomicupdate/bug_xxxxx_export_format_default.sql b/installer/data/mysql/atomicupdate/bug_xxxxx_export_format_default.sql new file mode 100644 index 0000000000..059958de3a --- /dev/null +++ b/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'; + diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 96d2c24d99..44901ab95a 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -687,10 +687,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`) diff --git a/t/db_dependent/Koha/CsvProfiles.t b/t/db_dependent/Koha/CsvProfiles.t index e5d02b2151..d823f40404 100644 --- a/t/db_dependent/Koha/CsvProfiles.t +++ b/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'); -- 2.20.1