Add a mysql_session_timezone define to disable MySQL date functions

haxetink · Oct 26, 2023 · c940d97 · c940d97
2 parents 726a83a + 4de530a
commit c940d97
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/tink/sql/drivers/MySql.hx b/src/tink/sql/drivers/MySql.hx
@@ -29,7 +29,11 @@ private class MySqlSanitizer implements Sanitizer {
     if (Std.is(v, Bool)) return v ? 'true' : 'false';
     if (v == null || Std.is(v, Int)) return '$v';
     if (Std.is(v, Bytes)) v = (cast v: Bytes).toString();
-    if (Std.is(v, Date)) return 'DATE_ADD(FROM_UNIXTIME(0), INTERVAL ${(v:Date).getTime()/1000} SECOND)';
+
+    if (Std.is(v, Date)) return
+      #if mysql_session_timezone string((v: Date).toString())
+      #else 'DATE_ADD(FROM_UNIXTIME(0), INTERVAL ${(v: Date).getTime() / 1000} SECOND)' #end;
+
     return string('$v');
   }
 

diff --git a/src/tink/sql/drivers/node/MySql.hx b/src/tink/sql/drivers/node/MySql.hx
@@ -137,8 +137,9 @@ class MySqlConnection<Db> implements Connection<Db> implements Sanitizer {
   }
 
   public function value(v:Any):String {
-    if (Std.is(v, Date))
-      return 'DATE_ADD(FROM_UNIXTIME(0), INTERVAL ${(v : Date).getTime() / 1000} SECOND)';
+    if (Std.is(v, Date)) return
+      #if mysql_session_timezone NativeDriver.escape((v: Date).toString())
+      #else 'DATE_ADD(FROM_UNIXTIME(0), INTERVAL ${(v: Date).getTime() / 1000} SECOND)' #end;
 
     if (Int64.isInt64(v))
       return Int64.toStr(v);