Merge pull request diesel-rs#1027 from diesel-rs/sg-set-timezone-and-encoding

Explicitly set the time zone and client encoding at connection startup

Author: sgrif

CHANGELOG.md

@@ -22,6 +22,9 @@ for Rust libraries in [RFC #1105](https://github.com/rust-lang/rfcs/blob/master/
   remove the `Nullable` portion (Unless you are using it with fields that are
   actually nullable)
 
+* Connections will now explicitly set the session time zone to UTC when the
+  connection is established
+
 ## [0.14.1] - 2017-07-10
 
 ### Changed

diesel/src/mysql/connection/mod.rs

@@ -115,7 +115,11 @@ impl MysqlConnection {
     }
 
     fn set_config_options(&self) -> QueryResult<()> {
-        try!(self.execute("SET sql_mode=(SELECT CONCAT(@@sql_mode, ',PIPES_AS_CONCAT'))"));
+        self.execute("SET sql_mode=(SELECT CONCAT(@@sql_mode, ',PIPES_AS_CONCAT'))")?;
+        self.execute("SET time_zone = '+00:00';")?;
+        self.execute("SET character_set_client = 'utf8mb4'")?;
+        self.execute("SET character_set_connection = 'utf8mb4'")?;
+        self.execute("SET character_set_results = 'utf8mb4'")?;
         Ok(())
     }
 }

diesel/src/pg/connection/mod.rs

@@ -14,6 +14,7 @@ use query_builder::*;
 use query_builder::bind_collector::RawBytesBindCollector;
 use query_source::Queryable;
 use result::*;
+use result::ConnectionError::CouldntSetupConfiguration;
 use self::cursor::Cursor;
 use self::raw::RawConnection;
 use self::result::PgResult;
@@ -48,12 +49,14 @@ impl Connection for PgConnection {
     type TransactionManager = AnsiTransactionManager;
 
     fn establish(database_url: &str) -> ConnectionResult<PgConnection> {
-        RawConnection::establish(database_url).map(|raw_conn| {
-            PgConnection {
+        RawConnection::establish(database_url).and_then(|raw_conn| {
+            let conn = PgConnection {
                 raw_connection: raw_conn,
                 transaction_manager: AnsiTransactionManager::new(),
                 statement_cache: StatementCache::new(),
-            }
+            };
+            conn.set_config_options().map_err(CouldntSetupConfiguration)?;
+            Ok(conn)
         })
     }
 
@@ -129,6 +132,12 @@ impl PgConnection {
         let query = try!(Statement::prepare(&self.raw_connection, query, None, &[]));
         query.execute(&self.raw_connection, &Vec::new())
     }
+
+    fn set_config_options(&self) -> QueryResult<()> {
+        self.execute("SET TIME ZONE 'UTC'")?;
+        self.execute("SET CLIENT_ENCODING TO 'UTF8'")?;
+        Ok(())
+    }
 }
 
 extern "C" fn noop_notice_processor(_: *mut libc::c_void, _message: *const libc::c_char) {