From 18bbe0f30548b558f653f0eb1652ba3427646dee Mon Sep 17 00:00:00 2001 From: Ankush Maherwal Date: Wed, 8 Dec 2021 15:00:22 +0530 Subject: [PATCH 1/2] Task #172430 feat: Update JGive code to make Joomla 4 compatible --- administrator/sql/install.mysql.utf8.sql | 10 +++++----- administrator/sql/updates/mysql/1.4.7.sql | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/administrator/sql/install.mysql.utf8.sql b/administrator/sql/install.mysql.utf8.sql index 455e0bd7..c40c3621 100755 --- a/administrator/sql/install.mysql.utf8.sql +++ b/administrator/sql/install.mysql.utf8.sql @@ -10,15 +10,15 @@ CREATE TABLE IF NOT EXISTS `#__tjfields_fields` ( `required` varchar(255) NOT NULL DEFAULT '', `readonly` int(11) NOT NULL DEFAULT 0, `created_by` int(11) NOT NULL DEFAULT 0, - `description` text NOT NULL, - `js_function` text NOT NULL, - `validation_class` text NOT NULL, + `description` text DEFAULT NULL, + `js_function` text DEFAULT NULL, + `validation_class` text DEFAULT NULL, `ordering` int(11) NOT NULL DEFAULT 0, `filterable` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0 - For not filterable field. 1 for filterable field', `client` varchar(255) NOT NULL DEFAULT '', `group_id` int(11) NOT NULL DEFAULT 0, `showonlist` tinyint(1) NOT NULL DEFAULT 0, - `params` varchar(500) DEFAULT '', + `params` text DEFAULT NULL, PRIMARY KEY (`id`) ) DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci AUTO_INCREMENT=1; @@ -26,7 +26,7 @@ CREATE TABLE IF NOT EXISTS `#__tjfields_fields_value` ( `id` int(11) NOT NULL AUTO_INCREMENT, `field_id` int(11) NOT NULL COMMENT 'Field table ID' DEFAULT 0, `content_id` int(11) NOT NULL COMMENT 'client specific id' DEFAULT 0, - `value` text NOT NULL, + `value` text DEFAULT NULL, `option_id` int(11) DEFAULT NULL DEFAULT 0, `user_id` int(11) NOT NULL DEFAULT 0, `email_id` varchar(255) NOT NULL DEFAULT '', diff --git a/administrator/sql/updates/mysql/1.4.7.sql b/administrator/sql/updates/mysql/1.4.7.sql index e325b81d..ea00e099 100644 --- a/administrator/sql/updates/mysql/1.4.7.sql +++ b/administrator/sql/updates/mysql/1.4.7.sql @@ -8,18 +8,18 @@ ALTER TABLE `#__tjfields_fields` CHANGE `type` `type` varchar(255) NOT NULL DEFA ALTER TABLE `#__tjfields_fields` CHANGE `state` `state` tinyint(1) NOT NULL DEFAULT 0; ALTER TABLE `#__tjfields_fields` CHANGE `required` `required` varchar(255) NOT NULL DEFAULT ''; ALTER TABLE `#__tjfields_fields` CHANGE `created_by` `created_by` int(11) NOT NULL DEFAULT 0; -ALTER TABLE `#__tjfields_fields` CHANGE `description` `description` text NOT NULL; -ALTER TABLE `#__tjfields_fields` CHANGE `js_function` `js_function` text NOT NULL; -ALTER TABLE `#__tjfields_fields` CHANGE `validation_class` `validation_class` text NOT NULL; +ALTER TABLE `#__tjfields_fields` CHANGE `description` `description` text DEFAULT NULL; +ALTER TABLE `#__tjfields_fields` CHANGE `js_function` `js_function` text DEFAULT NULL; +ALTER TABLE `#__tjfields_fields` CHANGE `validation_class` `validation_class` text DEFAULT NULL; ALTER TABLE `#__tjfields_fields` CHANGE `ordering` `ordering` int(11) NOT NULL DEFAULT 0; ALTER TABLE `#__tjfields_fields` CHANGE `client` `client` varchar(255) NOT NULL DEFAULT ''; ALTER TABLE `#__tjfields_fields` CHANGE `group_id` `group_id` int(11) NOT NULL DEFAULT 0; ALTER TABLE `#__tjfields_fields` CHANGE `showonlist` `showonlist` tinyint(1) NOT NULL DEFAULT 0; -ALTER TABLE `#__tjfields_fields` CHANGE `params` `params` varchar(500) DEFAULT ''; +ALTER TABLE `#__tjfields_fields` CHANGE `params` `params` text DEFAULT NULL; ALTER TABLE `#__tjfields_fields_value` CHANGE `field_id` `field_id` int(11) NOT NULL COMMENT 'Field table ID' DEFAULT 0; ALTER TABLE `#__tjfields_fields_value` CHANGE `content_id` `content_id` int(11) NOT NULL COMMENT 'client specific id' DEFAULT 0; -ALTER TABLE `#__tjfields_fields_value` CHANGE `value` `value` text NOT NULL; +ALTER TABLE `#__tjfields_fields_value` CHANGE `value` `value` text DEFAULT NULL; ALTER TABLE `#__tjfields_fields_value` CHANGE `option_id` `option_id` int(11) DEFAULT NULL DEFAULT 0; ALTER TABLE `#__tjfields_fields_value` CHANGE `user_id` `user_id` int(11) NOT NULL DEFAULT 0; ALTER TABLE `#__tjfields_fields_value` CHANGE `email_id` `email_id` varchar(255) NOT NULL DEFAULT ''; From eea412a2f9eb1bd878337696fd5001abd534e39e Mon Sep 17 00:00:00 2001 From: Ankush Maherwal Date: Wed, 8 Dec 2021 15:02:24 +0530 Subject: [PATCH 2/2] Task #173069 feat: Update infra extensions code used in JGive to make Joomla 4 compatible --- administrator/sql/updates/mysql/{1.4.7.sql => 2.0.0.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename administrator/sql/updates/mysql/{1.4.7.sql => 2.0.0.sql} (100%) diff --git a/administrator/sql/updates/mysql/1.4.7.sql b/administrator/sql/updates/mysql/2.0.0.sql similarity index 100% rename from administrator/sql/updates/mysql/1.4.7.sql rename to administrator/sql/updates/mysql/2.0.0.sql