Allow usage of milliseconds/microseconds in TIMESTAMP and TIME column…

…s using sqlType="DATETIME(6)" Example: $dateTime = \DateTime::createFromFormat('U.u', microtime(true)); $status->setCreatedAt($dateTime);
morgandenning · Apr 20, 2016 · 4911238 · 4911238
1 parent c0a0d21
commit 4911238
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/src/Propel/Generator/Builder/Om/ObjectBuilder.php b/src/Propel/Generator/Builder/Om/ObjectBuilder.php
@@ -1722,10 +1722,10 @@ protected function addTemporalMutator(&$script, Column $col)
                     $format = 'Y-m-d';
                     break;
                 case 'TIME':
-                    $format = 'H:i:s';
+                    $format = 'H:i:s.u';
                     break;
                 default:
-                    $format = 'Y-m-d H:i:s';
+                    $format = 'Y-m-d H:i:s.u';
             }
             $script .= "
             if (\$this->{$clo} === null || \$dt === null || \$dt->format(\"$format\") !== \$this->{$clo}->format(\"$format\")) {";

diff --git a/src/Propel/Generator/Platform/DefaultPlatform.php b/src/Propel/Generator/Platform/DefaultPlatform.php
@@ -1283,7 +1283,7 @@ public function getPhpArrayString($stringValue)
      */
     public function getTimestampFormatter()
     {
-        return 'Y-m-d H:i:s';
+        return 'Y-m-d H:i:s.u';
     }
 
     /**
@@ -1292,7 +1292,7 @@ public function getTimestampFormatter()
      */
     public function getTimeFormatter()
     {
-        return 'H:i:s';
+        return 'H:i:s.u';
     }
 
     /**

diff --git a/src/Propel/Generator/Platform/MysqlPlatform.php b/src/Propel/Generator/Platform/MysqlPlatform.php
@@ -791,11 +791,6 @@ public function doQuoting($text)
         return '`' . strtr($text, ['.' => '`.`']) . '`';
     }
 
-    public function getTimestampFormatter()
-    {
-        return 'Y-m-d H:i:s';
-    }
-
     public function getColumnBindingPHP(Column $column, $identifier, $columnValueAccessor, $tab = "            ")
     {
         // FIXME - This is a temporary hack to get around apparent bugs w/ PDO+MYSQL