Merge pull request #28 from richard67/patch-1

Fix SQL code style null to NULL, correct column name for ucm_content table also for postgresql
joomla · Jul 27, 2019 · d57a300 · d57a300
2 parents de47469 + de404c2
commit d57a300
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-07-27.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-07-27.sql
@@ -10,14 +10,14 @@ ALTER TABLE `#__tags` MODIFY COLUMN `checked_out_time` DATETIME NULL DEFAULT NUL
 ALTER TABLE `#__ucm_content` MODIFY COLUMN `core_checked_out_time` DATETIME NULL DEFAULT NULL;
 ALTER TABLE `#__user_notes` MODIFY COLUMN `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';
+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';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-07-27.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-07-27.sql
@@ -16,19 +16,19 @@ 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 "checked_out_time" DROP DEFAULT;
-ALTER TABLE "#__ucm_content" 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 "checked_out_time" = null WHERE "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';
+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';
diff --git a/administrator/components/com_checkin/Model/CheckinModel.php b/administrator/components/com_checkin/Model/CheckinModel.php
@@ -110,7 +110,7 @@ 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') . ' = null')
+				->set($db->quoteName('checked_out_time') . ' = NULL')
 				->where($db->quoteName('checked_out') . ' > 0');
 
 			$db->setQuery($query);