Changeset 967 for branches/1.2

Timestamp:

02/12/08 00:15:47 (9 months ago)

Author:

hans

Message:

Refs #558 - Applying patch from Joe for 0000-00-00 & MySQL

Files:

• branches/1.2/generator/classes/propel/engine/database/model/Domain.php (modified) (1 diff)

branches/1.2/generator/classes/propel/engine/database/model/Domain.php

@@ -247 +247 @@
-                        return $this->booleanValue($this->defaultValue);
-                } elseif ($this->propelType === PropelTypes::DATE || $this->propelType === PropelTypes::TIME || $this->propelType === PropelTypes::TIMESTAMP) {
+            // Under PHP 5.2.5, using '0000-00-00' as the default value will trigger an exception
+            // so instead of converting it to unix timestamp, we turn it into a null
+            if(preg_match('/^0000-00-00/', $this->defaultValue)) {
+                return null;
+            } 
-                        // DATE/TIME vals need to be converted to integer timestamp
-                        $ts = strtotime($this->defaultValue);