Database fields with timestamp type now allow CURRENT_TIMESTAMP to be set as default...

Add default values to created and modified columns of Profile_list table to fix issue #338

diff --git a/classes/Profile_list.php b/classes/Profile_list.php
index b60f4afffdc6d008886015a7ecc3154f7195e20a..e1e02da23c0265ffd08808927776601718775c9c 100644 (file)
--- a/classes/Profile_list.php
+++ b/classes/Profile_list.php
@@ -48,8 +48,8 @@ class Profile_list extends Managed_DataObject
                 'description' => array('type' => 'text', 'description' => 'description of the people tag'),
                 'private' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'is this tag private'),
 
-                'created' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date the tag was added'),
-                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date the tag was modified'),
+                'created' => array('type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date the tag was added'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date the tag was modified'),
 
                 'uri' => array('type' => 'varchar', 'length' => 191, 'description' => 'universal identifier'),
                 'mainpage' => array('type' => 'varchar', 'length' => 191, 'description' => 'page to link to'),

diff --git a/lib/schema.php b/lib/schema.php
index f536f01645366a911ec95e78e24a16e37e60a88f..17d4192ed4f0e7159626f55313353e6b44507613 100644 (file)
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -790,7 +790,7 @@ class Schema
 
     function quoteDefaultValue($cd)
     {
-        if ($cd['type'] == 'datetime' && $cd['default'] == 'CURRENT_TIMESTAMP') {
+        if (($cd['type'] == 'datetime' || $cd['type'] == 'timestamp') && $cd['default'] == 'CURRENT_TIMESTAMP') {
             return $cd['default'];
         } else {
             return $this->quoteValue($cd['default']);