Skip to content

Fixing sql fields #13091

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 2 commits into from
Dec 5, 2016
Merged

Fixing sql fields #13091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6577c4f
Merging com_fields queries into one file.
Dec 5, 2016
c13c43e
Adjusting catid/group_id rename in PostgreSQL installation.
Dec 5, 2016
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
29 changes: 28 additions & 1 deletion administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-08-29.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `#__fields` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`asset_id` int(10) NOT NULL DEFAULT 0,
`context` varchar(255) NOT NULL DEFAULT '',
`catid` int(10) NOT NULL DEFAULT 0,
`group_id` int(10) NOT NULL DEFAULT 0,
`assigned_cat_ids` varchar(255) NOT NULL DEFAULT '',
`title` varchar(255) NOT NULL DEFAULT '',
`alias` varchar(255) NOT NULL DEFAULT '',
Expand Down Expand Up @@ -38,6 +38,33 @@ CREATE TABLE IF NOT EXISTS `#__fields` (
KEY `idx_language` (`language`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;

CREATE TABLE IF NOT EXISTS `#__fields_groups` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`asset_id` int(10) NOT NULL DEFAULT 0,
`extension` varchar(255) NOT NULL DEFAULT '',
`title` varchar(255) NOT NULL DEFAULT '',
`alias` varchar(255) NOT NULL DEFAULT '',
`note` varchar(255) NOT NULL DEFAULT '',
`description` text NOT NULL,
`state` tinyint(1) NOT NULL DEFAULT '0',
`checked_out` int(11) NOT NULL DEFAULT '0',
`checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`ordering` int(11) NOT NULL DEFAULT '0',
`language` char(7) NOT NULL DEFAULT '',
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`created_by` int(10) unsigned NOT NULL DEFAULT '0',
`modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`modified_by` int(10) unsigned NOT NULL DEFAULT '0',
`access` int(11) NOT NULL DEFAULT '1',
PRIMARY KEY (`id`),
KEY `idx_checkout` (`checked_out`),
KEY `idx_state` (`state`),
KEY `idx_created_by` (`created_by`),
KEY `idx_access` (`access`),
KEY `idx_extension` (`extension`),
KEY `idx_language` (`language`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;

CREATE TABLE IF NOT EXISTS `#__fields_values` (
`field_id` int(10) unsigned NOT NULL,
`context` varchar(255) NOT NULL,
Expand Down
28 changes: 0 additions & 28 deletions administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-16.sql
View file
Open in desktop

This file was deleted.

30 changes: 29 additions & 1 deletion administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-08-29.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CREATE TABLE "#__fields" (
"id" serial NOT NULL,
"asset_id" bigint DEFAULT 0 NOT NULL,
"context" varchar(255) DEFAULT '' NOT NULL,
"catid" bigint DEFAULT 0 NOT NULL,
"group_id" bigint DEFAULT 0 NOT NULL,
"assigned_cat_ids" varchar(255) DEFAULT '' NOT NULL,
"title" varchar(255) DEFAULT '' NOT NULL,
"alias" varchar(255) DEFAULT '' NOT NULL,
Expand Down Expand Up @@ -41,6 +41,34 @@ CREATE INDEX "#__fields_idx_access" ON "#__fields" ("access");
CREATE INDEX "#__fields_idx_context" ON "#__fields" ("context");
CREATE INDEX "#__fields_idx_language" ON "#__fields" ("language");

--
-- Table: #__fields_groups
--
CREATE TABLE "#__fields_groups" (
"id" serial NOT NULL,
"asset_id" bigint DEFAULT 0 NOT NULL,
"extension" varchar(255) DEFAULT '' NOT NULL,
"title" varchar(255) DEFAULT '' NOT NULL,
"alias" varchar(255) DEFAULT '' NOT NULL,
"note" varchar(255) DEFAULT '' NOT NULL,
"description" text DEFAULT '' NOT NULL,
"state" smallint DEFAULT 0 NOT NULL,
"ordering" bigint DEFAULT 0 NOT NULL,
"language" varchar(7) DEFAULT '' NOT NULL,
"created" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
"created_by" bigint DEFAULT 0 NOT NULL,
"modified" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
"modified_by" bigint DEFAULT 0 NOT NULL,
"access" bigint DEFAULT 0 NOT NULL,
PRIMARY KEY ("id")
);
CREATE INDEX "#__fields_idx_checked_out" ON "#__fields_groups" ("checked_out");
Copy link
Contributor

@alikon alikon Dec 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sql CREATE INDEX "#__fields_idx_checked_out" ON "#__fields_groups" ("checked_out");

cannot see a checked_out field on #__fields_group table declaration

Copy link
Contributor

@alikon alikon Dec 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems missed from mysql table declaration

Copy link
Contributor Author

@Bakual Bakual Dec 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed missed those on the update files. Do you want to do the PR or should I do it?

Copy link
Contributor

@alikon alikon Dec 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isn't better to revert+fix+remerge ?

Copy link
Contributor Author

@Bakual Bakual Dec 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, we just can add those two columns in a different PR.

Copy link
Contributor

@alikon alikon Dec 6, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok see #13102

CREATE INDEX "#__fields_idx_state" ON "#__fields_groups" ("state");
CREATE INDEX "#__fields_idx_created_by" ON "#__fields_groups" ("created_by");
CREATE INDEX "#__fields_idx_access" ON "#__fields_groups" ("access");
CREATE INDEX "#__fields_idx_extension" ON "#__fields_groups" ("extension");
CREATE INDEX "#__fields_idx_language" ON "#__fields_groups" ("language");

--
-- Table: #__fields_values
--
Expand Down
27 changes: 0 additions & 27 deletions administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-16.sql
View file
Open in desktop

This file was deleted.

33 changes: 32 additions & 1 deletion installation/sql/postgresql/joomla.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ CREATE TABLE "#__fields" (
"id" serial NOT NULL,
"asset_id" bigint DEFAULT 0 NOT NULL,
"context" varchar(255) DEFAULT '' NOT NULL,
"catid" bigint DEFAULT 0 NOT NULL,
"group_id" bigint DEFAULT 0 NOT NULL,
"assigned_cat_ids" varchar(255) DEFAULT '' NOT NULL,
"title" varchar(255) DEFAULT '' NOT NULL,
"alias" varchar(255) DEFAULT '' NOT NULL,
Expand Down Expand Up @@ -686,6 +686,37 @@ CREATE INDEX "#__fields_idx_access" ON "#__fields" ("access");
CREATE INDEX "#__fields_idx_context" ON "#__fields" ("context");
CREATE INDEX "#__fields_idx_language" ON "#__fields" ("language");

--
-- Table: #__fields_groups
--

CREATE TABLE "#__fields_groups" (
"id" serial NOT NULL,
"asset_id" bigint DEFAULT 0 NOT NULL,
"extension" varchar(255) DEFAULT '' NOT NULL,
"title" varchar(255) DEFAULT '' NOT NULL,
"alias" varchar(255) DEFAULT '' NOT NULL,
"note" varchar(255) DEFAULT '' NOT NULL,
"description" text NOT NULL,
"state" smallint DEFAULT '0' NOT NULL,
"checked_out" integer DEFAULT '0' NOT NULL,
"checked_out_time" timestamp without time zone '1970-01-01 00:00:00' NOT NULL,
"ordering" integer DEFAULT '0' NOT NULL,
"language" varchar(7) DEFAULT '' NOT NULL,
"created" timestamp without time zone '1970-01-01 00:00:00' NOT NULL,
"created_by" bigint DEFAULT '0' NOT NULL,
"modified" timestamp without time zone '1970-01-01 00:00:00' NOT NULL,
"modified_by" bigint DEFAULT '0' NOT NULL,
"access" bigint DEFAULT '1' NOT NULL,
PRIMARY KEY ("id")
);
CREATE INDEX "#__fields_groups_idx_checked_out" ON "#__fields_groups" ("checked_out");
CREATE INDEX "#__fields_groups_idx_state" ON "#__fields_groups" ("state");
CREATE INDEX "#__fields_groups_idx_created_by" ON "#__fields_groups" ("created_by");
CREATE INDEX "#__fields_groups_idx_access" ON "#__fields_groups" ("access");
CREATE INDEX "#__fields_groups_idx_extension" ON "#__fields_groups" ("extension");
CREATE INDEX "#__fields_groups_idx_language" ON "#__fields_groups" ("language");

--
-- Table: #__fields_values
--
Expand Down