github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-10-27 00:02:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1800 Adjust to allow for null schema and table names

Browse Source
This commit is contained in:
rob bygrave
2019-08-25 11:32:08 +12:00
parent 85a0354d42
commit be66872249
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
+16 -1
View File
@@ -46,10 +46,25 @@ public class DRawSqlService implements SpiRawSqlService {
name = meta.getColumnName(i);
}
if (ret.containsKey(name)) {
name = meta.getSchemaName(i) + "." + meta.getTableName(i) + "." + name;
name = combine(meta.getSchemaName(i), meta.getTableName(i), name);
}
ret.put(name, resultSet.getObject(i));
}
return ret;
}
/**
* Combine schema table and column names allowing for null schema and table.
*/
String combine(String schemaName, String tableName, String name) {
StringBuilder sb = new StringBuilder();
if (schemaName != null) {
sb.append(schemaName).append(".");
}
if (tableName != null) {
sb.append(tableName).append(".");
}
return sb.append(name).toString();
}
}