From f67333bd9ab1e196e2fe399e0e7b962896c0645e Mon Sep 17 00:00:00 2001 From: Andreas Fernandez <a.fernandez@scripting-base.de> Date: Sat, 9 Sep 2017 22:01:35 +0200 Subject: [PATCH] [BUGFIX] Remove NOT NULL constraints from l1[08]n_diffsource fields MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Having NOT NULL collides with MySQL strict mode, so these constraints get removed. Resolves: #82423 Releases: master, 8.7 Change-Id: Ic7a71ee40b6ad276a47405e3fd81c501868abb76 Reviewed-on: https://review.typo3.org/54084 Reviewed-by: Markus Hölzle <typo3@markus-hoelzle.de> Tested-by: Markus Hölzle <typo3@markus-hoelzle.de> Tested-by: TYPO3com <no-reply@typo3.com> Reviewed-by: Benjamin Kott <benjamin.kott@outlook.com> Tested-by: Benjamin Kott <benjamin.kott@outlook.com> --- .../Extensions/irre_tutorial/ext_tables.sql | 36 +++++++++---------- .../test_datahandler/ext_tables.sql | 2 +- typo3/sysext/core/ext_tables.sql | 6 ++-- .../Extensions/blog_example/ext_tables.sql | 4 +-- .../impexp_group_files/ext_tables.sql | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/ext_tables.sql b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/ext_tables.sql index b9d39af9dbca..b2fb61d06f73 100644 --- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/ext_tables.sql +++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/ext_tables.sql @@ -43,7 +43,7 @@ CREATE TABLE tx_irretutorial_1ncsv_hotel ( cruser_id int(11) DEFAULT '0' NOT NULL, sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, sorting int(10) DEFAULT '0' NOT NULL, deleted tinyint(4) DEFAULT '0' NOT NULL, hidden tinyint(4) DEFAULT '0' NOT NULL, @@ -79,7 +79,7 @@ CREATE TABLE tx_irretutorial_1ncsv_offer ( cruser_id int(11) DEFAULT '0' NOT NULL, sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, sorting int(10) DEFAULT '0' NOT NULL, deleted tinyint(4) DEFAULT '0' NOT NULL, hidden tinyint(4) DEFAULT '0' NOT NULL, @@ -115,7 +115,7 @@ CREATE TABLE tx_irretutorial_1ncsv_price ( cruser_id int(11) DEFAULT '0' NOT NULL, sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, sorting int(10) DEFAULT '0' NOT NULL, deleted tinyint(4) DEFAULT '0' NOT NULL, hidden tinyint(4) DEFAULT '0' NOT NULL, @@ -153,7 +153,7 @@ CREATE TABLE tx_irretutorial_1nff_hotel ( cruser_id int(11) DEFAULT '0' NOT NULL, sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, sorting int(10) DEFAULT '0' NOT NULL, deleted tinyint(4) DEFAULT '0' NOT NULL, hidden tinyint(4) DEFAULT '0' NOT NULL, @@ -192,7 +192,7 @@ CREATE TABLE tx_irretutorial_1nff_offer ( cruser_id int(11) DEFAULT '0' NOT NULL, sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, sorting int(10) DEFAULT '0' NOT NULL, deleted tinyint(4) DEFAULT '0' NOT NULL, hidden tinyint(4) DEFAULT '0' NOT NULL, @@ -231,7 +231,7 @@ CREATE TABLE tx_irretutorial_1nff_price ( cruser_id int(11) DEFAULT '0' NOT NULL, sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, sorting int(10) DEFAULT '0' NOT NULL, deleted tinyint(4) DEFAULT '0' NOT NULL, hidden tinyint(4) DEFAULT '0' NOT NULL, @@ -272,7 +272,7 @@ CREATE TABLE tx_irretutorial_mnasym_hotel ( cruser_id int(11) DEFAULT '0' NOT NULL, sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, sorting int(10) DEFAULT '0' NOT NULL, deleted tinyint(4) DEFAULT '0' NOT NULL, hidden tinyint(4) DEFAULT '0' NOT NULL, @@ -308,7 +308,7 @@ CREATE TABLE tx_irretutorial_mnasym_hotel_offer_rel ( cruser_id int(11) DEFAULT '0' NOT NULL, sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, deleted tinyint(4) DEFAULT '0' NOT NULL, hidden tinyint(4) DEFAULT '0' NOT NULL, @@ -346,7 +346,7 @@ CREATE TABLE tx_irretutorial_mnasym_offer ( cruser_id int(11) DEFAULT '0' NOT NULL, sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, sorting int(10) DEFAULT '0' NOT NULL, deleted tinyint(4) DEFAULT '0' NOT NULL, hidden tinyint(4) DEFAULT '0' NOT NULL, @@ -382,7 +382,7 @@ CREATE TABLE tx_irretutorial_mnasym_price ( cruser_id int(11) DEFAULT '0' NOT NULL, sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, sorting int(10) DEFAULT '0' NOT NULL, deleted tinyint(4) DEFAULT '0' NOT NULL, hidden tinyint(4) DEFAULT '0' NOT NULL, @@ -421,7 +421,7 @@ CREATE TABLE tx_irretutorial_mnmmasym_hotel ( cruser_id int(11) DEFAULT '0' NOT NULL, sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, sorting int(10) DEFAULT '0' NOT NULL, deleted tinyint(4) DEFAULT '0' NOT NULL, hidden tinyint(4) DEFAULT '0' NOT NULL, @@ -476,7 +476,7 @@ CREATE TABLE tx_irretutorial_mnmmasym_offer ( cruser_id int(11) DEFAULT '0' NOT NULL, sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, sorting int(10) DEFAULT '0' NOT NULL, deleted tinyint(4) DEFAULT '0' NOT NULL, hidden tinyint(4) DEFAULT '0' NOT NULL, @@ -532,7 +532,7 @@ CREATE TABLE tx_irretutorial_mnmmasym_price ( cruser_id int(11) DEFAULT '0' NOT NULL, sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, sorting int(10) DEFAULT '0' NOT NULL, deleted tinyint(4) DEFAULT '0' NOT NULL, hidden tinyint(4) DEFAULT '0' NOT NULL, @@ -571,7 +571,7 @@ CREATE TABLE tx_irretutorial_mnsym_hotel ( cruser_id int(11) DEFAULT '0' NOT NULL, sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, sorting int(10) DEFAULT '0' NOT NULL, deleted tinyint(4) DEFAULT '0' NOT NULL, hidden tinyint(4) DEFAULT '0' NOT NULL, @@ -607,7 +607,7 @@ CREATE TABLE tx_irretutorial_mnsym_hotel_rel ( cruser_id int(11) DEFAULT '0' NOT NULL, sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, deleted tinyint(4) DEFAULT '0' NOT NULL, hidden tinyint(4) DEFAULT '0' NOT NULL, @@ -646,7 +646,7 @@ CREATE TABLE tx_irretutorial_mnattr_hotel ( cruser_id int(11) DEFAULT '0' NOT NULL, sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, sorting int(10) DEFAULT '0' NOT NULL, deleted tinyint(4) DEFAULT '0' NOT NULL, hidden tinyint(4) DEFAULT '0' NOT NULL, @@ -682,7 +682,7 @@ CREATE TABLE tx_irretutorial_mnattr_hotel_offer_rel ( cruser_id int(11) DEFAULT '0' NOT NULL, sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, deleted tinyint(4) DEFAULT '0' NOT NULL, hidden tinyint(4) DEFAULT '0' NOT NULL, @@ -721,7 +721,7 @@ CREATE TABLE tx_irretutorial_mnattr_offer ( cruser_id int(11) DEFAULT '0' NOT NULL, sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, sorting int(10) DEFAULT '0' NOT NULL, deleted tinyint(4) DEFAULT '0' NOT NULL, hidden tinyint(4) DEFAULT '0' NOT NULL, diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_datahandler/ext_tables.sql b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_datahandler/ext_tables.sql index 171ce074d3ff..303d87c06e38 100644 --- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_datahandler/ext_tables.sql +++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_datahandler/ext_tables.sql @@ -19,7 +19,7 @@ CREATE TABLE tx_testdatahandler_element ( cruser_id int(11) DEFAULT '0' NOT NULL, sys_language_uid int(11) DEFAULT '0' NOT NULL, l10n_parent int(11) DEFAULT '0' NOT NULL, - l10n_diffsource mediumblob NOT NULL, + l10n_diffsource mediumblob, sorting int(10) DEFAULT '0' NOT NULL, deleted tinyint(4) DEFAULT '0' NOT NULL, hidden tinyint(4) DEFAULT '0' NOT NULL, diff --git a/typo3/sysext/core/ext_tables.sql b/typo3/sysext/core/ext_tables.sql index 3d77eb0e0f2e..5c853caedc0d 100644 --- a/typo3/sysext/core/ext_tables.sql +++ b/typo3/sysext/core/ext_tables.sql @@ -309,7 +309,7 @@ CREATE TABLE sys_file_metadata ( # Language fields sys_language_uid int(11) DEFAULT '0' NOT NULL, l10n_parent int(11) DEFAULT '0' NOT NULL, - l10n_diffsource mediumblob NOT NULL, + l10n_diffsource mediumblob, # Versioning fields t3ver_oid int(11) DEFAULT '0' NOT NULL, @@ -394,7 +394,7 @@ CREATE TABLE sys_file_reference ( # Language fields sys_language_uid int(11) DEFAULT '0' NOT NULL, l10n_parent int(11) DEFAULT '0' NOT NULL, - l10n_diffsource mediumblob NOT NULL, + l10n_diffsource mediumblob, # Reference fields (basically same as MM table) uid_local int(11) DEFAULT '0' NOT NULL, @@ -667,7 +667,7 @@ CREATE TABLE sys_category ( sys_language_uid int(11) DEFAULT '0' NOT NULL, l10n_parent int(11) DEFAULT '0' NOT NULL, - l10n_diffsource mediumblob NOT NULL, + l10n_diffsource mediumblob, title tinytext NOT NULL, description text, diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/ext_tables.sql b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/ext_tables.sql index ed5dfac67353..1db0eac634f2 100644 --- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/ext_tables.sql +++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/ext_tables.sql @@ -31,7 +31,7 @@ CREATE TABLE tx_blogexample_domain_model_blog ( sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, PRIMARY KEY (uid), KEY parent (pid), @@ -75,7 +75,7 @@ CREATE TABLE tx_blogexample_domain_model_post ( sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, PRIMARY KEY (uid), KEY parent (pid), diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/Extensions/impexp_group_files/ext_tables.sql b/typo3/sysext/impexp/Tests/Functional/Fixtures/Extensions/impexp_group_files/ext_tables.sql index b63f49832148..20acf338297e 100644 --- a/typo3/sysext/impexp/Tests/Functional/Fixtures/Extensions/impexp_group_files/ext_tables.sql +++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/Extensions/impexp_group_files/ext_tables.sql @@ -9,7 +9,7 @@ CREATE TABLE tx_impexpgroupfiles_item ( cruser_id int(11) DEFAULT '0' NOT NULL, sys_language_uid int(11) DEFAULT '0' NOT NULL, l18n_parent int(11) DEFAULT '0' NOT NULL, - l18n_diffsource mediumblob NOT NULL, + l18n_diffsource mediumblob, sorting int(10) DEFAULT '0' NOT NULL, deleted tinyint(4) DEFAULT '0' NOT NULL, hidden tinyint(4) DEFAULT '0' NOT NULL, -- GitLab