lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Redkale
2018-07-15 20:10:09 +08:00
parent e8dacd6b70
commit 86895eb5ef
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/redkale/source/DataSources.java
View File

@@ -47,6 +47,8 @@ public final class DataSources {
public static final String JDBC_PWD = "javax.persistence.jdbc.password"; public static final String JDBC_PWD = "javax.persistence.jdbc.password";
public static final String JDBC_ENCODING = "javax.persistence.jdbc.encoding";
public static final String JDBC_DRIVER = "javax.persistence.jdbc.driver"; public static final String JDBC_DRIVER = "javax.persistence.jdbc.driver";
public static final String JDBC_SOURCE = "javax.persistence.jdbc.source"; public static final String JDBC_SOURCE = "javax.persistence.jdbc.source";

5
src/org/redkale/source/PoolSource.java
View File

@@ -57,6 +57,8 @@ public abstract class PoolSource<DBChannel> {
protected String database; protected String database;
protected String encoding;
protected Properties props; protected Properties props;
protected Properties attributes = new Properties(); protected Properties attributes = new Properties();
@@ -69,6 +71,7 @@ public abstract class PoolSource<DBChannel> {
this.url = prop.getProperty(JDBC_URL); this.url = prop.getProperty(JDBC_URL);
this.username = prop.getProperty(JDBC_USER, ""); this.username = prop.getProperty(JDBC_USER, "");
this.password = prop.getProperty(JDBC_PWD, ""); this.password = prop.getProperty(JDBC_PWD, "");
this.encoding = prop.getProperty(JDBC_ENCODING, "");
this.connectTimeoutSeconds = Integer.decode(prop.getProperty(JDBC_CONNECTTIMEOUT_SECONDS, "3")); this.connectTimeoutSeconds = Integer.decode(prop.getProperty(JDBC_CONNECTTIMEOUT_SECONDS, "3"));
this.readTimeoutSeconds = Integer.decode(prop.getProperty(JDBC_READTIMEOUT_SECONDS, "3")); this.readTimeoutSeconds = Integer.decode(prop.getProperty(JDBC_READTIMEOUT_SECONDS, "3"));
this.writeTimeoutSeconds = Integer.decode(prop.getProperty(JDBC_WRITETIMEOUT_SECONDS, "3")); this.writeTimeoutSeconds = Integer.decode(prop.getProperty(JDBC_WRITETIMEOUT_SECONDS, "3"));
@@ -111,6 +114,8 @@ public abstract class PoolSource<DBChannel> {
if (!this.props.containsKey(JDBC_TABLENOTEXIST_SQLSTATES)) { if (!this.props.containsKey(JDBC_TABLENOTEXIST_SQLSTATES)) {
this.props.setProperty(JDBC_TABLENOTEXIST_SQLSTATES, "42P01;3F000"); this.props.setProperty(JDBC_TABLENOTEXIST_SQLSTATES, "42P01;3F000");
} }
} else if ("mysql".equals(this.dbtype)) {
if (this.encoding.isEmpty()) this.encoding = attributes.getProperty("characterEncoding", "");
} }
} }