Skip to content
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

Jump to bottom

[4.0] Changing checked_out_time from nulldate to real null value #25715

Closed
wants to merge 9 commits into from
Closed

[4.0] Changing checked_out_time from nulldate to real null value #25715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
14694d8
Changing checked_out_time from nulldate to real null value
Hackwar Jul 27, 2019
74dc46c
Corrections for MySQL schema update
richard67 Jul 27, 2019
de47469
Merge pull request #27 from richard67/patch-1
Hackwar Jul 27, 2019
71656bc
Update 4.0.0-2019-07-27.sql
richard67 Jul 27, 2019
f3e436f
More SQL code style null to NULL
richard67 Jul 27, 2019
de404c2
Fix ucm content for postgresql too
richard67 Jul 27, 2019
d57a300
Merge pull request #28 from richard67/patch-1
Hackwar Jul 27, 2019
fdb2150
Correct MySQL schema update syntax errors
richard67 Jul 27, 2019
daeb460
Merge pull request #29 from richard67/patch-1
Hackwar Jul 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 23 additions & 0 deletions administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-07-27.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
ALTER TABLE `#__banner_clients` MODIFY `checked_out_time` DATETIME NULL DEFAULT NULL;
ALTER TABLE `#__categories` MODIFY `checked_out_time` DATETIME NULL DEFAULT NULL;
ALTER TABLE `#__content` MODIFY `checked_out_time` DATETIME NULL DEFAULT NULL;
ALTER TABLE `#__extensions` MODIFY `checked_out_time` DATETIME NULL DEFAULT NULL;
ALTER TABLE `#__fields` MODIFY `checked_out_time` DATETIME NULL DEFAULT NULL;
ALTER TABLE `#__fields_groups` MODIFY `checked_out_time` DATETIME NULL DEFAULT NULL;
ALTER TABLE `#__finder_filters` MODIFY `checked_out_time` DATETIME NULL DEFAULT NULL;
ALTER TABLE `#__menu` MODIFY `checked_out_time` DATETIME NULL DEFAULT NULL;
ALTER TABLE `#__tags` MODIFY `checked_out_time` DATETIME NULL DEFAULT NULL;
ALTER TABLE `#__ucm_content` MODIFY `core_checked_out_time` DATETIME NULL DEFAULT NULL;
ALTER TABLE `#__user_notes` MODIFY `checked_out_time` DATETIME NULL DEFAULT NULL;

UPDATE `#__banner_clients` SET `checked_out_time` = NULL WHERE `checked_out_time` = '0000-00-00 00:00:00';
UPDATE `#__categories` SET `checked_out_time` = NULL WHERE `checked_out_time` = '0000-00-00 00:00:00';
UPDATE `#__content` SET `checked_out_time` = NULL WHERE `checked_out_time` = '0000-00-00 00:00:00';
UPDATE `#__extensions` SET `checked_out_time` = NULL WHERE `checked_out_time` = '0000-00-00 00:00:00';
UPDATE `#__fields` SET `checked_out_time` = NULL WHERE `checked_out_time` = '0000-00-00 00:00:00';
UPDATE `#__fields_groups` SET `checked_out_time` = NULL WHERE `checked_out_time` = '0000-00-00 00:00:00';
UPDATE `#__finder_filters` SET `checked_out_time` = NULL WHERE `checked_out_time` = '0000-00-00 00:00:00';
UPDATE `#__menu` SET `checked_out_time` = NULL WHERE `checked_out_time` = '0000-00-00 00:00:00';
UPDATE `#__tags` SET `checked_out_time` = NULL WHERE `checked_out_time` = '0000-00-00 00:00:00';
UPDATE `#__ucm_content` SET `core_checked_out_time` = NULL WHERE `core_checked_out_time` = '0000-00-00 00:00:00';
UPDATE `#__user_notes` SET `checked_out_time` = NULL WHERE `checked_out_time` = '0000-00-00 00:00:00';
34 changes: 34 additions & 0 deletions administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-07-27.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
ALTER TABLE "#__banner_clients" ALTER COLUMN "checked_out_time" DROP DEFAULT;
ALTER TABLE "#__banner_clients" ALTER COLUMN "checked_out_time" DROP NOT NULL;
ALTER TABLE "#__categories" ALTER COLUMN "checked_out_time" DROP DEFAULT;
ALTER TABLE "#__categories" ALTER COLUMN "checked_out_time" DROP NOT NULL;
ALTER TABLE "#__content" ALTER COLUMN "checked_out_time" DROP DEFAULT;
ALTER TABLE "#__content" ALTER COLUMN "checked_out_time" DROP NOT NULL;
ALTER TABLE "#__extensions" ALTER COLUMN "checked_out_time" DROP DEFAULT;
ALTER TABLE "#__extensions" ALTER COLUMN "checked_out_time" DROP NOT NULL;
ALTER TABLE "#__fields" ALTER COLUMN "checked_out_time" DROP DEFAULT;
ALTER TABLE "#__fields" ALTER COLUMN "checked_out_time" DROP NOT NULL;
ALTER TABLE "#__fields_groups" ALTER COLUMN "checked_out_time" DROP DEFAULT;
ALTER TABLE "#__fields_groups" ALTER COLUMN "checked_out_time" DROP NOT NULL;
ALTER TABLE "#__finder_filters" ALTER COLUMN "checked_out_time" DROP DEFAULT;
ALTER TABLE "#__finder_filters" ALTER COLUMN "checked_out_time" DROP NOT NULL;
ALTER TABLE "#__menu" ALTER COLUMN "checked_out_time" DROP DEFAULT;
ALTER TABLE "#__menu" ALTER COLUMN "checked_out_time" DROP NOT NULL;
ALTER TABLE "#__tags" ALTER COLUMN "checked_out_time" DROP DEFAULT;
ALTER TABLE "#__tags" ALTER COLUMN "checked_out_time" DROP NOT NULL;
ALTER TABLE "#__ucm_content" ALTER COLUMN "core_checked_out_time" DROP DEFAULT;
ALTER TABLE "#__ucm_content" ALTER COLUMN "core_checked_out_time" DROP NOT NULL;
ALTER TABLE "#__user_notes" ALTER COLUMN "checked_out_time" DROP DEFAULT;
ALTER TABLE "#__user_notes" ALTER COLUMN "checked_out_time" DROP NOT NULL;

UPDATE "#__banner_clients" SET "checked_out_time" = NULL WHERE "checked_out_time" = '1970-01-01 00:00:00';
UPDATE "#__categories" SET "checked_out_time" = NULL WHERE "checked_out_time" = '1970-01-01 00:00:00';
UPDATE "#__content" SET "checked_out_time" = NULL WHERE "checked_out_time" = '1970-01-01 00:00:00';
UPDATE "#__extensions" SET "checked_out_time" = NULL WHERE "checked_out_time" = '1970-01-01 00:00:00';
UPDATE "#__fields" SET "checked_out_time" = NULL WHERE "checked_out_time" = '1970-01-01 00:00:00';
UPDATE "#__fields_groups" SET "checked_out_time" = NULL WHERE "checked_out_time" = '1970-01-01 00:00:00';
UPDATE "#__finder_filters" SET "checked_out_time" = NULL WHERE "checked_out_time" = '1970-01-01 00:00:00';
UPDATE "#__menu" SET "checked_out_time" = NULL WHERE "checked_out_time" = '1970-01-01 00:00:00';
UPDATE "#__tags" SET "checked_out_time" = NULL WHERE "checked_out_time" = '1970-01-01 00:00:00';
UPDATE "#__ucm_content" SET "core_checked_out_time" = NULL WHERE "core_checked_out_time" = '1970-01-01 00:00:00';
UPDATE "#__user_notes" SET "checked_out_time" = NULL WHERE "checked_out_time" = '1970-01-01 00:00:00';
2 changes: 1 addition & 1 deletion administrator/components/com_banners/Table/BannerTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ public function stick($pks = null, $state = 1, $userId = 0)
// Change the state
$table->sticky = $state;
$table->checked_out = 0;
$table->checked_out_time = $this->_db->getNullDate();
$table->checked_out_time = null;

// Check the row
$table->check();
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_banners/Table/ClientTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class ClientTable extends Table
public function __construct(DatabaseDriver $db)
{
$this->typeAlias = 'com_banners.client';
$this->checked_out_time = $db->getNullDate();
$this->checked_out_time = null;

$this->setColumnAlias('published', 'state');

Expand Down
6 changes: 2 additions & 4 deletions administrator/components/com_checkin/Model/CheckinModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ protected function populateState($ordering = 'table', $direction = 'asc')
public function checkin($ids = array())
{
$db = $this->getDbo();
$nullDate = $db->getNullDate();

if (!is_array($ids))
{
Expand Down Expand Up @@ -111,9 +110,8 @@ public function checkin($ids = array())
$query = $db->getQuery(true)
->update($db->quoteName($tn))
->set($db->quoteName('checked_out') . ' = DEFAULT')
->set($db->quoteName('checked_out_time') . ' = :checkouttime')
->where($db->quoteName('checked_out') . ' > 0')
->bind(':checkouttime', $nullDate);
->set($db->quoteName('checked_out_time') . ' = NULL')
->where($db->quoteName('checked_out') . ' > 0');

$db->setQuery($query);

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_tags/Table/TagTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ public function check()
$this->images = '{}';
}

if (!(int) $this->checked_out_time)
if (!$this->checked_out_time)
{
$this->checked_out_time = $date->toSql();
}
Expand Down