Commit 694810b
committed
Server:判断数据库类型时忽略大小写
1 parent 17e3502 commit 694810b
2 files changed
Lines changed: 7 additions & 7 deletions
File tree
- APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server
Lines changed: 5 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -45,15 +45,15 @@ public class DemoSQLConfig extends AbstractSQLConfig { | |||
| 45 | 45 | @Override | |
| 46 | 46 | public String getDBUri() { | |
| 47 | 47 | //TODO 改成你自己的 | |
| 48 | - return DATABASE_POSTGRESQL.equals(getDatabase()) ? "jdbc:postgresql://localhost:5432" : "jdbc:mysql://localhost:3306"; | ||
| 48 | + return DATABASE_POSTGRESQL.equalsIgnoreCase(getDatabase()) ? "jdbc:postgresql://localhost:5432" : "jdbc:mysql://localhost:3306"; | ||
| 49 | 49 | } | |
| 50 | 50 | @Override | |
| 51 | 51 | public String getDBAccount() { | |
| 52 | - return DATABASE_POSTGRESQL.equals(getDatabase()) ? "postgres" : "root"; //TODO 改成你自己的 | ||
| 52 | + return DATABASE_POSTGRESQL.equalsIgnoreCase(getDatabase()) ? "postgres" : "root"; //TODO 改成你自己的 | ||
| 53 | 53 | } | |
| 54 | 54 | @Override | |
| 55 | 55 | public String getDBPassword() { | |
| 56 | - return DATABASE_POSTGRESQL.equals(getDatabase()) ? null : "apijson"; //TODO 改成你自己的 | ||
| 56 | + return DATABASE_POSTGRESQL.equalsIgnoreCase(getDatabase()) ? null : "apijson"; //TODO 改成你自己的 | ||
| 57 | 57 | } | |
| 58 | 58 | @Override | |
| 59 | 59 | public String getSchema() { | |
@@ -63,8 +63,8 @@ public String getSchema() { | |||
| 63 | 63 | ||
| 64 | 64 | @JSONField(serialize = false) | |
| 65 | 65 | @Override | |
| 66 | - public String getTablePath() { | ||
| 67 | - return DATABASE_POSTGRESQL.equals(getDatabase()) ? getSQLTable() : super.getTablePath(); | ||
| 66 | + public String getTablePath() { //PostgreSQL 不允许 cross-database | ||
| 67 | + return DATABASE_POSTGRESQL.equalsIgnoreCase(getDatabase()) ? getSQLTable() : super.getTablePath(); | ||
| 68 | 68 | } | |
| 69 | 69 | ||
| 70 | 70 | ||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -77,7 +77,7 @@ private PreparedStatement getStatement(@NotNull SQLConfig config) throws Excepti | |||
| 77 | 77 | Log.i(TAG, "select connection " + (connection == null ? " = null" : ("isClosed = " + connection.isClosed()))) ; | |
| 78 | 78 | ||
| 79 | 79 | ||
| 80 | - if (DemoSQLConfig.DATABASE_POSTGRESQL.equals(config.getDatabase())) { | ||
| 80 | + if (DemoSQLConfig.DATABASE_POSTGRESQL.equalsIgnoreCase(config.getDatabase())) { //PostgreSQL 不允许 cross-database | ||
| 81 | 81 | connection = DriverManager.getConnection(config.getDBUri() + "/" + config.getSchema(), config.getDBAccount(), config.getDBPassword()); | |
| 82 | 82 | } | |
| 83 | 83 | else { | |
@@ -93,7 +93,7 @@ private PreparedStatement getStatement(@NotNull SQLConfig config) throws Excepti | |||
| 93 | 93 | ||
| 94 | 94 | for (int i = 0; i < valueList.size(); i++) { | |
| 95 | 95 | ||
| 96 | - if (DemoSQLConfig.DATABASE_POSTGRESQL.equals(config.getDatabase())) { | ||
| 96 | + if (DemoSQLConfig.DATABASE_POSTGRESQL.equalsIgnoreCase(config.getDatabase())) { | ||
| 97 | 97 | statement.setObject(i + 1, valueList.get(i)); //PostgreSQL JDBC 不支持隐式类型转换 tinyint = varchar 报错 | |
| 98 | 98 | } | |
| 99 | 99 | else { | |
0 commit comments