Add an explicit timezone to the database connection (fix #489)

PavlidisLab · Nov 25, 2022 · 963b42b · 963b42b
1 parent e278bf4
commit 963b42b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/gemma-core/src/main/resources/default.properties b/gemma-core/src/main/resources/default.properties
@@ -43,6 +43,8 @@ gemma.db.maxpoolidle=5
 gemma.db.maxtotal=75
 # This ensure some basic behaviors of our database
 gemma.db.sqlMode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
+# Default timezone for storage of DATETIME that are mapped to exact moments (i.e. java.util.Date)
+gemma.db.timezone=America/Vancouver
 ############################################################
 # SECURITY
 # Used to elevate authorities for some methods.

diff --git a/gemma-core/src/main/resources/ubic/gemma/dataSource.xml b/gemma-core/src/main/resources/ubic/gemma/dataSource.xml
@@ -15,7 +15,7 @@
         <property name="maxWaitMillis" value="100000"/>
         <property name="testOnBorrow" value="true"/>
         <property name="validationQuery" value="SELECT 1"/>
-        <property name="connectionProperties" value="sessionVariables=sql_mode='${gemma.db.sqlMode}'"/>
+        <property name="connectionProperties" value="connectionTimeZone=${gemma.db.timezone};sessionVariables=sql_mode='${gemma.db.sqlMode}'"/>
     </bean>