From 9da34579a0c6160fb588b486a9129a7779dff34b Mon Sep 17 00:00:00 2001
From: John Woodlock <john.woodlock@gmail.com>
Date: Thu, 30 Aug 2012 14:16:18 +1000
Subject: [PATCH] refactoring additional fields for data scope

---
 .../ReadWriteNonCoreDataServiceImpl.java      | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/noncore/ReadWriteNonCoreDataServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/noncore/ReadWriteNonCoreDataServiceImpl.java
index 1254d848a..570915102 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/noncore/ReadWriteNonCoreDataServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/noncore/ReadWriteNonCoreDataServiceImpl.java
@@ -94,18 +94,7 @@ public class ReadWriteNonCoreDataServiceImpl implements
 			Long id) {
 
 		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);
 
 		CachedRowSet columnDefinitions = getAdditionalFieldsMetaData(type, set);
@@ -117,12 +106,15 @@ public class ReadWriteNonCoreDataServiceImpl implements
 
 		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);
 
 		List<ResultsetDataRow> resultsetDataRows = getResultsetDataRows(
 				columnHeaders, sql, sqlErrorMsg);
 
+		long elapsed = System.currentTimeMillis() - startTime;
+		logger.info("FINISHING SET: " + set + "     Elapsed Time: " + elapsed);
+		
 		return new GenericResultsetData(columnHeaders, resultsetDataRows);
 
 	}
@@ -141,7 +133,7 @@ public class ReadWriteNonCoreDataServiceImpl implements
 			} else {
 				selectFieldSeparator = ", ";
 			}
-			selectFieldList += selectFieldSeparator + "`"
+			selectFieldList += selectFieldSeparator + "s.`"
 					+ columnHeader.getColumnName() + "`";
 		}
 		return selectFieldList;