Visitar URL original
bugfix-修复Colomn非常规数据库字段，获取表名失败导致输出异常 by jackyang-hk · Pull Request #74 · APIJSON/APIJSON · GitHub
Skip to content

bugfix-修复Colomn非常规数据库字段，获取表名失败导致输出异常 #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TommyLemon merged 1 commit into from
Mar 9, 2019
+14 −2
Merged

bugfix-修复Colomn非常规数据库字段，获取表名失败导致输出异常 #74

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
bugfix-修复Colomn非常规数据库字段，获取表名失败导致输出异常
  • Loading branch information
@jackyang-hk
jackyang-hk committed Mar 6, 2019
commit ae249037d7ec887ad0c08cb2268c096be9e0c7bb
16 changes: 14 additions & 2 deletions ...SON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,20 @@ public JSONObject execute(SQLConfig config) throws Exception {

for (int i = 1; i <= length; i++) {

if (hasJoin && viceColumnStart > length && config.getSQLTable().equalsIgnoreCase(rsmd.getTableName(i)) == false) {
viceColumnStart = i;
// if (hasJoin && viceColumnStart > length && config.getSQLTable().equalsIgnoreCase(rsmd.getTableName(i)) == false) {
// viceColumnStart = i;
// }

// FIXME bugfix-修复非常规数据库字段，获取表名失败导致输出异常
if (hasJoin && viceColumnStart > length) {
List<String> column = config.getColumn();

if (column != null && column.isEmpty() == false) {
viceColumnStart = column.size() + 1;
}
else if (config.getSQLTable().equalsIgnoreCase(rsmd.getTableName(i)) == false) {
viceColumnStart = i;
}
}

result = onPutColumn(config, rs, rsmd, index, result, i, hasJoin && i >= viceColumnStart ? childMap : null);
Expand Down