Changeset 600 for trunk/lib

Timestamp:

Apr 27, 2017 3:29:17 PM (7 years ago)

Author:

anonymous

Message:

Update strToSQLDate() to be mysql-version-aware

File:

• trunk/lib/Utilities.inc.php (modified) (2 diffs)

trunk/lib/Utilities.inc.php

@@ -915 +915 @@
 function escapedList($in, $separator="', '")
 {
+    require_once dirname(__FILE__) . '/DB.inc.php';
     $db =& DB::getInstance();
 
@@ -930 +931 @@
  *
  * @param  array $date     String date to convert.
- * @param  array $format   Date format to pass to date().
- *                         Default produces MySQL datetime: 0000-00-00 00:00:00.
+ * @param  array $format   Date format to pass to date(). Default produces MySQL datetime: YYYY-MM-DD hh:mm:ss
  * @return string          SQL-safe date.
  */
 function strToSQLDate($date, $format='Y-m-d H:i:s')
 {
+    require_once dirname(__FILE__) . '/DB.inc.php';
+    $db =& DB::getInstance();
+
+    if ($db->isConnected() && version_compare(mysql_get_server_info(), '5.7.4', '>=')) {
+        // Mysql version >= 5.7.4 stopped allowing a "zero" date of 0000-00-00.
+        // https://dev.mysql.com/doc/refman/5.7/en/sql-mode.html#sqlmode_no_zero_date
+        $zero_y = '1000';
+        $zero_m = '01';
+        $zero_d = '01';
+    } else {
+        $zero_y = '0000';
+        $zero_m = '00';
+        $zero_d = '00';
+    }
     // Translate the human string date into SQL-safe date format.
-    if (empty($date) || mb_strpos($date, '0000-00-00') !== false || strtotime($date) === -1 || strtotime($date) === false || strtotime($date) === null) {
+    if (empty($date) || mb_strpos($date, sprintf('%s-%s-%s', $zero_y, $zero_m, $zero_d)) !== false || strtotime($date) === -1 || strtotime($date) === false || strtotime($date) === null) {
         // Return a string of zero time, formatted the same as $format.
         return strtr($format, array(
-            'Y' => '0000',
-            'm' => '00',
-            'd' => '00',
+            'Y' => $zero_y,
+            'm' => $zero_m,
+            'd' => $zero_d,
             'H' => '00',
             'i' => '00',