Skip to content

Remove from #__extensions useless columns: system_data and custom_data #14750

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
wilsonge merged 2 commits into from
Mar 19, 2017
Merged

Remove from #__extensions useless columns: system_data and custom_data #14750

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
7a95eeb
Remove from #__extensions useless columns system_data and custom_data
Mar 18, 2017
eb86c05
Fix pk autoincrement values
Mar 19, 2017
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
2 changes: 2 additions & 0 deletions administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-03-18.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE `#__extensions` DROP COLUMN `custom_data`;
ALTER TABLE `#__extensions` DROP COLUMN `system_data`;
2 changes: 2 additions & 0 deletions administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-03-18.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE "#__extensions" DROP COLUMN "custom_data";
ALTER TABLE "#__extensions" DROP COLUMN "system_data";
1 change: 0 additions & 1 deletion administrator/components/com_joomlaupdate/models/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,6 @@ public function finaliseUpgrade()
$row->set('access', 0);
$row->set('client_id', 0);
$row->set('params', '');
$row->set('system_data', '');
$row->set('manifest_cache', $installer->generateManifestCache());

if (!$row->store())
Expand Down
322 changes: 160 additions & 162 deletions installation/sql/mysql/joomla.sql
View file
Open in desktop

Large diffs are not rendered by default.

332 changes: 165 additions & 167 deletions installation/sql/postgresql/joomla.sql
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions libraries/cms/installer/adapter/component.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,8 +630,6 @@ protected function storeExtension($deleteExisting = false)
$this->extension->access = 0;
$this->extension->client_id = 1;
$this->extension->params = $this->parent->getParams();
$this->extension->custom_data = '';
$this->extension->system_data = '';
}

$this->extension->manifest_cache = $this->parent->generateManifestCache();
Expand Down
12 changes: 6 additions & 6 deletions libraries/cms/installer/adapter/file.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,15 +249,15 @@ protected function storeExtension()
$this->extension->element = $this->element;

// There is no folder for files so leave it blank
$this->extension->folder = '';
$this->extension->enabled = 1;
$this->extension->folder = '';
$this->extension->enabled = 1;
$this->extension->protected = 0;
$this->extension->access = 0;
$this->extension->access = 0;
$this->extension->client_id = 0;
$this->extension->params = '';
$this->extension->system_data = '';
$this->extension->params = '';

// Update the manifest cache for the entry
$this->extension->manifest_cache = $this->parent->generateManifestCache();
$this->extension->custom_data = '';

if (!$this->extension->store())
{
Expand Down
12 changes: 4 additions & 8 deletions libraries/cms/installer/adapter/library.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,16 +257,12 @@ protected function storeExtension()
$this->extension->element = $this->element;

// There is no folder for libraries
$this->extension->folder = '';
$this->extension->enabled = 1;
$this->extension->folder = '';
$this->extension->enabled = 1;
$this->extension->protected = 0;
$this->extension->access = 1;
$this->extension->access = 1;
$this->extension->client_id = 0;
$this->extension->params = $this->parent->getParams();

// Custom data
$this->extension->custom_data = '';
$this->extension->system_data = '';
$this->extension->params = $this->parent->getParams();

// Update the manifest cache for the entry
$this->extension->manifest_cache = $this->parent->generateManifestCache();
Expand Down
4 changes: 1 addition & 3 deletions libraries/cms/installer/adapter/module.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,9 +374,7 @@ protected function storeExtension()
$this->extension->client_id = $this->clientId;
$this->extension->params = $this->parent->getParams();

// Custom data
$this->extension->custom_data = '';
$this->extension->system_data = '';
// Update the manifest cache for the entry
$this->extension->manifest_cache = $this->parent->generateManifestCache();

if (!$this->extension->store())
Expand Down
16 changes: 6 additions & 10 deletions libraries/cms/installer/adapter/package.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,21 +404,17 @@ protected function storeExtension()
}
else
{
$this->extension->name = $this->name;
$this->extension->type = 'package';
$this->extension->name = $this->name;
$this->extension->type = 'package';
$this->extension->element = $this->element;

// There is no folder for packages
$this->extension->folder = '';
$this->extension->enabled = 1;
$this->extension->folder = '';
$this->extension->enabled = 1;
$this->extension->protected = 0;
$this->extension->access = 1;
$this->extension->access = 1;
$this->extension->client_id = 0;

// Custom data
$this->extension->custom_data = '';
$this->extension->system_data = '';
$this->extension->params = $this->parent->getParams();
$this->extension->params = $this->parent->getParams();
}

// Update the manifest cache for the entry
Expand Down
22 changes: 9 additions & 13 deletions libraries/cms/installer/adapter/plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,22 +394,18 @@ protected function storeExtension()
else
{
// Store in the extensions table (1.6)
$this->extension->name = $this->name;
$this->extension->type = 'plugin';
$this->extension->ordering = 0;
$this->extension->element = $this->element;
$this->extension->folder = $this->group;
$this->extension->enabled = 0;
$this->extension->name = $this->name;
$this->extension->type = 'plugin';
$this->extension->ordering = 0;
$this->extension->element = $this->element;
$this->extension->folder = $this->group;
$this->extension->enabled = 0;
$this->extension->protected = 0;
$this->extension->access = 1;
$this->extension->access = 1;
$this->extension->client_id = 0;
$this->extension->params = $this->parent->getParams();

// Custom data
$this->extension->custom_data = '';
$this->extension->params = $this->parent->getParams();

// System data
$this->extension->system_data = '';
// Update the manifest cache for the entry
$this->extension->manifest_cache = $this->parent->generateManifestCache();

// Editor plugins are published by default
Expand Down
15 changes: 7 additions & 8 deletions libraries/cms/installer/adapter/template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,23 +362,22 @@ protected function storeExtension()
}
else
{
$this->extension->type = 'template';
$this->extension->type = 'template';
$this->extension->element = $this->element;

// There is no folder for templates
$this->extension->folder = '';
$this->extension->enabled = 1;
$this->extension->folder = '';
$this->extension->enabled = 1;
$this->extension->protected = 0;
$this->extension->access = 1;
$this->extension->access = 1;
$this->extension->client_id = $this->clientId;
$this->extension->params = $this->parent->getParams();

// Custom data
$this->extension->custom_data = '';
$this->extension->params = $this->parent->getParams();
}

// Name might change in an update
$this->extension->name = $this->name;

// Update the manifest cache for the entry
$this->extension->manifest_cache = $this->parent->generateManifestCache();

if (!$this->extension->store())
Expand Down
2 changes: 0 additions & 2 deletions tests/unit/schema/ddl.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,6 @@ CREATE TABLE `jos_extensions` (
`protected` INTEGER NOT NULL DEFAULT '0',
`manifest_cache` TEXT NOT NULL DEFAULT '',
`params` TEXT NOT NULL DEFAULT '',
`custom_data` TEXT NOT NULL DEFAULT '',
`system_data` TEXT NOT NULL DEFAULT '',
`checked_out` INTEGER NOT NULL DEFAULT '0',
`checked_out_time` TEXT NOT NULL DEFAULT '0000-00-00 00:00:00',
`ordering` INTEGER DEFAULT '0',
Expand Down
2 changes: 0 additions & 2 deletions tests/unit/schema/postgresql.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,6 @@ CREATE TABLE "jos_extensions" (
"protected" smallint DEFAULT 0 NOT NULL,
"manifest_cache" text NOT NULL,
"params" text NOT NULL,
"custom_data" text NOT NULL,
"system_data" text NOT NULL,
"checked_out" integer DEFAULT 0 NOT NULL,
"checked_out_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
"ordering" bigint DEFAULT 0,
Expand Down
Loading