safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-76: Clean MySQL and PostgreSQL modules for consistency.

Browse Source
This commit is contained in:
Michael Jumper
2016-08-20 12:41:48 -07:00
parent 2e3d3c4f5f
commit 5794338b8d
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java
View File

@@ -70,7 +70,7 @@ public class MySQLAuthenticationProviderModule implements Module {
myBatisProperties.setProperty("mybatis.pooled.pingQuery", "SELECT 1"); myBatisProperties.setProperty("mybatis.pooled.pingQuery", "SELECT 1");
// Use UTF-8 in database // Use UTF-8 in database
driverProperties.setProperty("characterEncoding","UTF-8"); driverProperties.setProperty("characterEncoding", "UTF-8");
// Allow use of multiple statements within a single query // Allow use of multiple statements within a single query
driverProperties.setProperty("allowMultiQueries", "true"); driverProperties.setProperty("allowMultiQueries", "true");
@@ -86,7 +86,7 @@ public class MySQLAuthenticationProviderModule implements Module {
// Bind MyBatis properties // Bind MyBatis properties
Names.bindProperties(binder, myBatisProperties); Names.bindProperties(binder, myBatisProperties);
// Bing JDBC driver properties // Bind JDBC driver properties
binder.bind(Properties.class) binder.bind(Properties.class)
.annotatedWith(Names.named("JDBC.driverProperties")) .annotatedWith(Names.named("JDBC.driverProperties"))
.toInstance(driverProperties); .toInstance(driverProperties);

5
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java
View File

@@ -71,8 +71,7 @@ public class PostgreSQLAuthenticationProviderModule implements Module {
myBatisProperties.setProperty("mybatis.pooled.pingQuery", "SELECT 1"); myBatisProperties.setProperty("mybatis.pooled.pingQuery", "SELECT 1");
// Use UTF-8 in database // Use UTF-8 in database
driverProperties.setProperty("characterEncoding","UTF-8"); driverProperties.setProperty("characterEncoding", "UTF-8");
} }
@@ -85,7 +84,7 @@ public class PostgreSQLAuthenticationProviderModule implements Module {
// Bind MyBatis properties // Bind MyBatis properties
Names.bindProperties(binder, myBatisProperties); Names.bindProperties(binder, myBatisProperties);
// Bing JDBC driver properties // Bind JDBC driver properties
binder.bind(Properties.class) binder.bind(Properties.class)
.annotatedWith(Names.named("JDBC.driverProperties")) .annotatedWith(Names.named("JDBC.driverProperties"))
.toInstance(driverProperties); .toInstance(driverProperties);