CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactoring additional fields for data scope

Browse Source
This commit is contained in:
John Woodlock
2012-08-30 14:16:18 +10:00
parent f4dd25b521
commit 9da34579a0
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosng/platform/noncore/ReadWriteNonCoreDataServiceImpl.java
+6 -14
View File
@@ -94,18 +94,7 @@ public class ReadWriteNonCoreDataServiceImpl implements
Long id) { Long id) {
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
GenericResultsetData result = fillExtraDataGenericResultSet(type, set,
id);
long elapsed = System.currentTimeMillis() - startTime;
logger.info("FINISHING SET: " + set + " Elapsed Time: " + elapsed);
return result;
}
private GenericResultsetData fillExtraDataGenericResultSet(
final String type, final String set, final Long id) {
checkMainResourceExistsWithinScope(type, id); checkMainResourceExistsWithinScope(type, id);
CachedRowSet columnDefinitions = getAdditionalFieldsMetaData(type, set); CachedRowSet columnDefinitions = getAdditionalFieldsMetaData(type, set);
@@ -117,12 +106,15 @@ public class ReadWriteNonCoreDataServiceImpl implements
String selectFieldList = getSelectFieldListFromColumnHeaders(columnHeaders); String selectFieldList = getSelectFieldListFromColumnHeaders(columnHeaders);
String sql = "select " + selectFieldList + " from `" + getFullDatasetName(type, set) + "` on id = " + id; String sql = "select " + selectFieldList + " from `" + type + "` t left join `" + getFullDatasetName(type, set) + "` s on s.id = t.id where t.id = " + id;
logger.info("addition fields sql: " + sql); logger.info("addition fields sql: " + sql);
List<ResultsetDataRow> resultsetDataRows = getResultsetDataRows( List<ResultsetDataRow> resultsetDataRows = getResultsetDataRows(
columnHeaders, sql, sqlErrorMsg); columnHeaders, sql, sqlErrorMsg);
long elapsed = System.currentTimeMillis() - startTime;
logger.info("FINISHING SET: " + set + " Elapsed Time: " + elapsed);
return new GenericResultsetData(columnHeaders, resultsetDataRows); return new GenericResultsetData(columnHeaders, resultsetDataRows);
} }
@@ -141,7 +133,7 @@ public class ReadWriteNonCoreDataServiceImpl implements
} else { } else {
selectFieldSeparator = ", "; selectFieldSeparator = ", ";
} }
selectFieldList += selectFieldSeparator + "`" selectFieldList += selectFieldSeparator + "s.`"
+ columnHeader.getColumnName() + "`"; + columnHeader.getColumnName() + "`";
} }
return selectFieldList; return selectFieldList;