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

ensure reporting uses tenant database

Browse Source
This commit is contained in:
John Woodlock
2012-07-15 22:01:34 +10:00
parent b84429a787
commit 47b5334ca1
1 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosng/platform/ReadExtraDataAndReportingServiceImpl.java
+12 -26
View File
@@ -47,29 +47,20 @@ import org.springframework.stereotype.Service;
public class ReadExtraDataAndReportingServiceImpl implements public class ReadExtraDataAndReportingServiceImpl implements
ReadExtraDataAndReportingService { ReadExtraDataAndReportingService {
private final static Logger logger = LoggerFactory.getLogger(ReadExtraDataAndReportingServiceImpl.class); private final static Logger logger = LoggerFactory
.getLogger(ReadExtraDataAndReportingServiceImpl.class);
private final DataSource dataSource; private final DataSource dataSource;
private final String reportingMetaDataDB;
private Boolean noPentaho = false; private Boolean noPentaho = false;
@Autowired @Autowired
public ReadExtraDataAndReportingServiceImpl(final TenantAwareRoutingDataSource dataSource) { public ReadExtraDataAndReportingServiceImpl(
final TenantAwareRoutingDataSource dataSource) {
// kick off pentaho reports server // kick off pentaho reports server
ClassicEngineBoot.getInstance().start(); ClassicEngineBoot.getInstance().start();
noPentaho = false; noPentaho = false;
Connection db_connection = null; this.dataSource = dataSource;
try {
this.dataSource = dataSource;
db_connection = dataSource.getConnection();
this.reportingMetaDataDB = db_connection.getCatalog();
} catch (SQLException e) {
throw new PlatformDataIntegrityException("error.msg.sql.error",
e.getMessage(), "DataSource: " + dataSource);
} finally {
dbClose(null, db_connection);
}
} }
@Override @Override
@@ -245,15 +236,11 @@ public class ReadExtraDataAndReportingServiceImpl implements
private String getSQLtoRun(final String name, final String type, private String getSQLtoRun(final String name, final String type,
final Map<String, String> queryParams) { final Map<String, String> queryParams) {
String sql = null; String sql = null;
String rptDB = queryParams.get("${rptDB}");
if ((rptDB == null) || rptDB.equals("")) {
rptDB = reportingMetaDataDB;
}
if (type.equals("report")) { if (type.equals("report")) {
sql = getReportSql(rptDB, name); sql = getReportSql(name);
} else { } else {
sql = getParameterSql(rptDB, name); sql = getParameterSql(name);
} }
Set<String> keys = queryParams.keySet(); Set<String> keys = queryParams.keySet();
@@ -299,15 +286,14 @@ public class ReadExtraDataAndReportingServiceImpl implements
// return true; // return true;
// } // }
private String getReportSql(String rptDB, String reportName) { private String getReportSql(String reportName) {
String sql = "select report_sql as the_sql from " + rptDB String sql = "select report_sql as the_sql from stretchy_report where report_name = '"
+ ".stretchy_report where report_name = '" + reportName + "'"; + reportName + "'";
return getSql(sql); return getSql(sql);
} }
private String getParameterSql(String rptDB, String parameterName) { private String getParameterSql(String parameterName) {
String sql = "select parameter_sql as the_sql from " + rptDB String sql = "select parameter_sql as the_sql from stretchy_parameter where parameter_name = '"
+ ".stretchy_parameter where parameter_name = '"
+ parameterName + "'"; + parameterName + "'";
return getSql(sql); return getSql(sql);
} }