Skip to content

[4.0] Allow empty metakey values in database tables #27854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 10, 2020
Merged

[4.0] Allow empty metakey values in database tables #27854

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
68b29fc
Allow empty metakey values in database tables
richard67 Feb 8, 2020
2723a32
Remove meta from keywords in comments
richard67 Feb 8, 2020
58532e9
Use null instead empty string for empty metakey
richard67 Feb 9, 2020
421b191
Roll back unnecessary change for categories
richard67 Feb 9, 2020
f08bcf4
For tags do like for categories because varchar not null in past
richard67 Feb 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions administrator/components/com_admin/sql/updates/mysql/4.0.0-2020-02-08.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ALTER TABLE `#__banners` MODIFY `metakey` text NOT NULL DEFAULT '';
ALTER TABLE `#__banner_clients` MODIFY `metakey` text NOT NULL DEFAULT '';
ALTER TABLE `#__contact_details` MODIFY `metakey` text NOT NULL DEFAULT '';
ALTER TABLE `#__content` MODIFY `metakey` text NOT NULL DEFAULT '';
ALTER TABLE `#__languages` MODIFY `metakey` text NOT NULL DEFAULT '';
ALTER TABLE `#__newsfeeds` MODIFY `metakey` text NOT NULL DEFAULT '';
ALTER TABLE `#__tags` MODIFY `metakey` text NOT NULL DEFAULT '';
7 changes: 7 additions & 0 deletions administrator/components/com_admin/sql/updates/postgresql/4.0.0-2020-02-08.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ALTER TABLE "#__banners" ALTER COLUMN "metakey" SET DEFAULT '';
ALTER TABLE "#__banner_clients" ALTER COLUMN "metakey" SET DEFAULT '';
ALTER TABLE "#__contact_details" ALTER COLUMN "metakey" SET DEFAULT '';
ALTER TABLE "#__content" ALTER COLUMN "metakey" SET DEFAULT '';
ALTER TABLE "#__languages" ALTER COLUMN "metakey" SET DEFAULT '';
ALTER TABLE "#__newsfeeds" ALTER COLUMN "metakey" SET DEFAULT '';
ALTER TABLE "#__tags" ALTER COLUMN "metakey" SET DEFAULT '';
14 changes: 7 additions & 7 deletions installation/sql/mysql/joomla.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ CREATE TABLE IF NOT EXISTS `#__banners` (
`custombannercode` varchar(2048) NOT NULL,
`sticky` tinyint(1) unsigned NOT NULL DEFAULT 0,
`ordering` int(11) NOT NULL DEFAULT 0,
`metakey` text NOT NULL,
`metakey` text NOT NULL DEFAULT '',
`params` text NOT NULL,
`own_prefix` tinyint(1) NOT NULL DEFAULT 0,
`metakey_prefix` varchar(400) NOT NULL DEFAULT '',
Expand Down Expand Up @@ -188,7 +188,7 @@ CREATE TABLE IF NOT EXISTS `#__banner_clients` (
`state` tinyint(3) NOT NULL DEFAULT 0,
`checked_out` int(10) unsigned NOT NULL DEFAULT 0,
`checked_out_time` datetime,
`metakey` text NOT NULL,
`metakey` text NOT NULL DEFAULT '',
`own_prefix` tinyint(4) NOT NULL DEFAULT 0,
`metakey_prefix` varchar(400) NOT NULL DEFAULT '',
`purchase_type` tinyint(4) NOT NULL DEFAULT -1,
Expand Down Expand Up @@ -313,7 +313,7 @@ CREATE TABLE IF NOT EXISTS `#__contact_details` (
`created_by_alias` varchar(255) NOT NULL DEFAULT '',
`modified` datetime NOT NULL,
`modified_by` int(10) unsigned NOT NULL DEFAULT 0,
`metakey` text NOT NULL,
`metakey` text NOT NULL DEFAULT '',
`metadesc` text NOT NULL,
`metadata` text NOT NULL,
`featured` tinyint(3) unsigned NOT NULL DEFAULT 0 COMMENT 'Set if contact is featured.',
Expand Down Expand Up @@ -360,7 +360,7 @@ CREATE TABLE IF NOT EXISTS `#__content` (
`attribs` varchar(5120) NOT NULL,
`version` int(10) unsigned NOT NULL DEFAULT 1,
`ordering` int(11) NOT NULL DEFAULT 0,
`metakey` text NOT NULL,
`metakey` text NOT NULL DEFAULT '',
`metadesc` text NOT NULL,
`access` int(10) unsigned NOT NULL DEFAULT 0,
`hits` int(10) unsigned NOT NULL DEFAULT 0,
Expand Down Expand Up @@ -1258,7 +1258,7 @@ CREATE TABLE IF NOT EXISTS `#__languages` (
`sef` varchar(50) NOT NULL,
`image` varchar(50) NOT NULL,
`description` varchar(512) NOT NULL,
`metakey` text NOT NULL,
`metakey` text NOT NULL DEFAULT '',
`metadesc` text NOT NULL,
`sitename` varchar(1024) NOT NULL DEFAULT '',
`published` int(11) NOT NULL DEFAULT 0,
Expand Down Expand Up @@ -1580,7 +1580,7 @@ CREATE TABLE IF NOT EXISTS `#__newsfeeds` (
`created_by_alias` varchar(255) NOT NULL DEFAULT '',
`modified` datetime NOT NULL,
`modified_by` int(10) unsigned NOT NULL DEFAULT 0,
`metakey` text NOT NULL,
`metakey` text NOT NULL DEFAULT '',
`metadesc` text NOT NULL,
`metadata` text NOT NULL,
`publish_up` datetime,
Expand Down Expand Up @@ -1763,7 +1763,7 @@ CREATE TABLE IF NOT EXISTS `#__tags` (
`access` int(10) unsigned NOT NULL DEFAULT 0,
`params` text NOT NULL,
`metadesc` varchar(1024) NOT NULL COMMENT 'The meta description for the page.',
`metakey` varchar(1024) NOT NULL COMMENT 'The meta keywords for the page.',
`metakey` varchar(1024) NOT NULL DEFAULT '' COMMENT 'The meta keywords for the page.',
`metadata` varchar(2048) NOT NULL COMMENT 'JSON encoded metadata properties.',
`created_user_id` int(10) unsigned NOT NULL DEFAULT 0,
`created_time` datetime NOT NULL,
Expand Down
14 changes: 7 additions & 7 deletions installation/sql/postgresql/joomla.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ CREATE TABLE IF NOT EXISTS "#__banners" (
"custombannercode" varchar(2048) NOT NULL,
"sticky" smallint DEFAULT 0 NOT NULL,
"ordering" bigint DEFAULT 0 NOT NULL,
"metakey" text NOT NULL,
"metakey" text DEFAULT '' NOT NULL,
"params" text NOT NULL,
"own_prefix" smallint DEFAULT 0 NOT NULL,
"metakey_prefix" varchar(255) DEFAULT '' NOT NULL,
Expand Down Expand Up @@ -192,7 +192,7 @@ CREATE TABLE IF NOT EXISTS "#__banner_clients" (
"state" smallint DEFAULT 0 NOT NULL,
"checked_out" bigint DEFAULT 0 NOT NULL,
"checked_out_time" timestamp without time zone,
"metakey" text NOT NULL,
"metakey" text DEFAULT '' NOT NULL,
"own_prefix" smallint DEFAULT 0 NOT NULL,
"metakey_prefix" varchar(255) DEFAULT '' NOT NULL,
"purchase_type" smallint DEFAULT -1 NOT NULL,
Expand Down Expand Up @@ -318,7 +318,7 @@ CREATE TABLE IF NOT EXISTS "#__contact_details" (
"created_by_alias" varchar(255) NOT NULL DEFAULT '',
"modified" timestamp without time zone NOT NULL,
"modified_by" integer NOT NULL DEFAULT 0,
"metakey" text NOT NULL,
"metakey" text DEFAULT '' NOT NULL,
"metadesc" text NOT NULL,
"metadata" text NOT NULL,
"featured" smallint NOT NULL DEFAULT 0,
Expand Down Expand Up @@ -365,7 +365,7 @@ CREATE TABLE IF NOT EXISTS "#__content" (
"attribs" varchar(5120) NOT NULL,
"version" bigint DEFAULT 1 NOT NULL,
"ordering" bigint DEFAULT 0 NOT NULL,
"metakey" text NOT NULL,
"metakey" text DEFAULT '' NOT NULL,
"metadesc" text NOT NULL,
"access" bigint DEFAULT 0 NOT NULL,
"hits" bigint DEFAULT 0 NOT NULL,
Expand Down Expand Up @@ -1240,7 +1240,7 @@ CREATE TABLE IF NOT EXISTS "#__languages" (
"sef" varchar(50) NOT NULL,
"image" varchar(50) NOT NULL,
"description" varchar(512) NOT NULL,
"metakey" text NOT NULL,
"metakey" text DEFAULT '' NOT NULL,
"metadesc" text NOT NULL,
"sitename" varchar(1024) DEFAULT '' NOT NULL,
"published" bigint DEFAULT 0 NOT NULL,
Expand Down Expand Up @@ -1577,7 +1577,7 @@ CREATE TABLE IF NOT EXISTS "#__newsfeeds" (
"created_by_alias" varchar(255) DEFAULT '' NOT NULL,
"modified" timestamp without time zone NOT NULL,
"modified_by" integer DEFAULT 0 NOT NULL,
"metakey" text NOT NULL,
"metakey" text DEFAULT '' NOT NULL,
"metadesc" text NOT NULL,
"metadata" text NOT NULL,
"publish_up" timestamp without time zone,
Expand Down Expand Up @@ -1758,7 +1758,7 @@ CREATE TABLE IF NOT EXISTS "#__tags" (
"access" bigint DEFAULT 0 NOT NULL,
"params" text NOT NULL,
"metadesc" varchar(1024) NOT NULL,
"metakey" varchar(1024) NOT NULL,
"metakey" varchar(1024) DEFAULT '' NOT NULL,
"metadata" varchar(2048) NOT NULL,
"created_user_id" integer DEFAULT 0 NOT NULL,
"created_time" timestamp without time zone NOT NULL,
Expand Down